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
2015-02-10 19:32:42 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
b8d4f68a697f948068d3c2aa858707281bc78396
b8d4f68a
1 parent
5a3cd235
try to refine hls, always flush video when reap segment.
显示空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
1 行增加
和
12 行删除
trunk/src/app/srs_app_hls.cpp
trunk/src/app/srs_app_hls.cpp
查看文件 @
b8d4f68
...
...
@@ -309,12 +309,6 @@ int SrsHlsMuxer::flush_audio(SrsMpegtsFrame* af, SrsSimpleBuffer* ab)
{
int
ret
=
ERROR_SUCCESS
;
// if flushed yet, ignore.
if
(
ab
->
length
()
==
0
)
{
srs_info
(
"ignore hls segment audio flushed yet."
);
return
ret
;
}
// if current is NULL, segment is not open, ignore the flush event.
if
(
!
current
)
{
srs_warn
(
"flush audio ignored, for segment is not open."
);
...
...
@@ -342,12 +336,6 @@ int SrsHlsMuxer::flush_video(SrsMpegtsFrame* /*af*/, SrsSimpleBuffer* /*ab*/, Sr
{
int
ret
=
ERROR_SUCCESS
;
// if flushed yet, ignore.
if
(
vb
->
length
()
==
0
)
{
srs_info
(
"ignore hls segment video flushed yet."
);
return
ret
;
}
// if current is NULL, segment is not open, ignore the flush event.
if
(
!
current
)
{
srs_warn
(
"flush video ignored, for segment is not open."
);
...
...
@@ -762,6 +750,7 @@ int SrsHlsCache::write_video(SrsAvcAacCodec* codec, SrsHlsMuxer* muxer, int64_t
if
((
ret
=
reap_segment
(
"video"
,
muxer
,
cache
->
vf
->
dts
))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
return
ret
;
}
// flush video when got one
...
...
请
注册
或
登录
后发表评论