Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2013-12-06 14:02:10 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
cab88dfe701cd1e2d6a6211a350df28e8e28f77a
cab88dfe
1 parent
679e851f
hls support multiple publish/unpublish. disable hls when not support
显示空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
34 行增加
和
14 行删除
README.md
trunk/src/core/srs_core_hls.cpp
trunk/src/core/srs_core_source.cpp
README.md
查看文件 @
cab88df
...
...
@@ -126,16 +126,16 @@ Supported operating systems and hardware:
16.
support live stream transcoding by ffmpeg.
<br/>
17.
support live stream transcoding by ffmpeg.
<br/>
18.
support ffmpeg filters(logo/overlay/crop), x264 params.
<br/>
19.
[
plan
]
support network based cli and json result.
<br/>
20.
[
plan
]
support http callback api hooks(for authentication).
<br/>
21.
[
plan
]
support bandwidth test api and flash client.
<br/>
22.
[
plan
]
support adobe flash refer/token/swf verification.
<br/>
23.
[
plan
]
support adobe amf3 codec.
<br/>
24.
[
plan
]
support dvr(record live to vod file)
<br/>
25.
[
plan
]
support FMS edge protocol
<br/>
26.
[
plan
]
support encryption: RTMPE/RTMPS, HLS DRM
<br/>
27.
[
plan
]
support RTMPT, http to tranverse firewalls
<br/>
28.
[
plan
]
support audio transcode only, speex to aac
<br/>
19.
[
dev
]
support audio transcode only, speex/mp3 to aac
<br/>
20.
[
plan
]
support network based cli and json result.
<br/>
21.
[
plan
]
support http callback api hooks(for authentication).
<br/>
22.
[
plan
]
support bandwidth test api and flash client.
<br/>
23.
[
plan
]
support adobe flash refer/token/swf verification.
<br/>
24.
[
plan
]
support adobe amf3 codec.
<br/>
25.
[
plan
]
support dvr(record live to vod file)
<br/>
26.
[
plan
]
support FMS edge protocol
<br/>
27.
[
plan
]
support encryption: RTMPE/RTMPS, HLS DRM
<br/>
28.
[
plan
]
support RTMPT, http to tranverse firewalls
<br/>
29.
[
plan
]
support file source, transcoding file to live stream
<br/>
### Performance
...
...
trunk/src/core/srs_core_hls.cpp
查看文件 @
cab88df
...
...
@@ -1139,6 +1139,11 @@ int SrsHls::on_publish(SrsRequest* req)
{
int
ret
=
ERROR_SUCCESS
;
// support multiple publish.
if
(
hls_enabled
)
{
return
ret
;
}
std
::
string
vhost
=
req
->
vhost
;
std
::
string
stream
=
req
->
stream
;
std
::
string
app
=
req
->
app
;
...
...
@@ -1194,6 +1199,11 @@ void SrsHls::on_unpublish()
{
int
ret
=
ERROR_SUCCESS
;
// support multiple unpublish.
if
(
!
hls_enabled
)
{
return
;
}
// close muxer when unpublish.
ret
=
ts_cache
->
flush_audio
(
muxer
);
ret
+=
muxer
->
segment_close
();
...
...
trunk/src/core/srs_core_source.cpp
查看文件 @
cab88df
...
...
@@ -508,8 +508,13 @@ int SrsSource::on_audio(SrsCommonMessage* audio)
#ifdef SRS_HLS
if
((
ret
=
hls
->
on_audio
(
msg
->
copy
()))
!=
ERROR_SUCCESS
)
{
srs_error
(
"hls process audio message failed. ret=%d"
,
ret
);
return
ret
;
srs_warn
(
"hls process audio message failed, ignore and disable hls. ret=%d"
,
ret
);
// unpublish, ignore ret.
hls
->
on_unpublish
();
// ignore.
ret
=
ERROR_SUCCESS
;
}
#endif
...
...
@@ -570,8 +575,13 @@ int SrsSource::on_video(SrsCommonMessage* video)
#ifdef SRS_HLS
if
((
ret
=
hls
->
on_video
(
msg
->
copy
()))
!=
ERROR_SUCCESS
)
{
srs_error
(
"hls process video message failed. ret=%d"
,
ret
);
return
ret
;
srs_warn
(
"hls process video message failed, ignore and disable hls. ret=%d"
,
ret
);
// unpublish, ignore ret.
hls
->
on_unpublish
();
// ignore.
ret
=
ERROR_SUCCESS
;
}
#endif
...
...
请
注册
或
登录
后发表评论