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-06-13 17:23:38 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
17c276113ef799aaf247b013adc556fbd22d1534
17c27611
1 parent
ec90ae20
refine the hls dispose, when not cycle always dispose it.
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
2 行增加
和
10 行删除
trunk/src/app/srs_app_hls.cpp
trunk/src/app/srs_app_source.cpp
trunk/src/app/srs_app_hls.cpp
查看文件 @
17c2761
...
...
@@ -1164,14 +1164,6 @@ void SrsHls::dispose()
on_unpublish
();
}
// only dispose hls when positive.
if
(
_req
)
{
int
hls_dispose
=
_srs_config
->
get_hls_dispose
(
_req
->
vhost
);
if
(
hls_dispose
<=
0
)
{
return
;
}
}
muxer
->
dispose
();
}
...
...
trunk/src/app/srs_app_source.cpp
查看文件 @
17c2761
...
...
@@ -1472,7 +1472,7 @@ int SrsSource::on_audio(SrsCommonMessage* shared_audio)
if
(
!
mix_correct
&&
is_monotonically_increase
)
{
if
(
last_packet_time
>
0
&&
shared_audio
->
header
.
timestamp
<
last_packet_time
)
{
is_monotonically_increase
=
false
;
srs_warn
(
"stream not monotonically increase, please open mix_correct."
);
srs_warn
(
"
AUTIO:
stream not monotonically increase, please open mix_correct."
);
}
}
last_packet_time
=
shared_audio
->
header
.
timestamp
;
...
...
@@ -1663,7 +1663,7 @@ int SrsSource::on_video(SrsCommonMessage* shared_video)
if
(
!
mix_correct
&&
is_monotonically_increase
)
{
if
(
last_packet_time
>
0
&&
shared_video
->
header
.
timestamp
<
last_packet_time
)
{
is_monotonically_increase
=
false
;
srs_warn
(
"stream not monotonically increase, please open mix_correct."
);
srs_warn
(
"
VIDEO:
stream not monotonically increase, please open mix_correct."
);
}
}
last_packet_time
=
shared_video
->
header
.
timestamp
;
...
...
请
注册
或
登录
后发表评论