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-07-14 10:03:15 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
54bb42483b210cc4067493d64da7af5114d48425
54bb4248
1 parent
be342178
change time jitter to off for hls and forward.
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
5 行增加
和
5 行删除
trunk/src/app/srs_app_forward.cpp
trunk/src/app/srs_app_hls.cpp
trunk/src/app/srs_app_forward.cpp
查看文件 @
54bb424
...
...
@@ -164,7 +164,7 @@ int SrsForwarder::on_meta_data(SrsSharedPtrMessage* shared_metadata)
SrsSharedPtrMessage
*
metadata
=
shared_metadata
->
copy
();
// TODO: FIXME: config the jitter of Forwarder.
if
((
ret
=
jitter
->
correct
(
metadata
,
SrsRtmpJitterAlgorithm
FULL
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
jitter
->
correct
(
metadata
,
SrsRtmpJitterAlgorithm
OFF
))
!=
ERROR_SUCCESS
)
{
srs_freep
(
metadata
);
return
ret
;
}
...
...
@@ -183,7 +183,7 @@ int SrsForwarder::on_audio(SrsSharedPtrMessage* shared_audio)
SrsSharedPtrMessage
*
msg
=
shared_audio
->
copy
();
// TODO: FIXME: config the jitter of Forwarder.
if
((
ret
=
jitter
->
correct
(
msg
,
SrsRtmpJitterAlgorithm
FULL
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
jitter
->
correct
(
msg
,
SrsRtmpJitterAlgorithm
OFF
))
!=
ERROR_SUCCESS
)
{
srs_freep
(
msg
);
return
ret
;
}
...
...
@@ -207,7 +207,7 @@ int SrsForwarder::on_video(SrsSharedPtrMessage* shared_video)
SrsSharedPtrMessage
*
msg
=
shared_video
->
copy
();
// TODO: FIXME: config the jitter of Forwarder.
if
((
ret
=
jitter
->
correct
(
msg
,
SrsRtmpJitterAlgorithm
FULL
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
jitter
->
correct
(
msg
,
SrsRtmpJitterAlgorithm
OFF
))
!=
ERROR_SUCCESS
)
{
srs_freep
(
msg
);
return
ret
;
}
...
...
trunk/src/app/srs_app_hls.cpp
查看文件 @
54bb424
...
...
@@ -1335,7 +1335,7 @@ int SrsHls::on_audio(SrsSharedPtrMessage* shared_audio)
}
// TODO: FIXME: config the jitter of HLS.
if
((
ret
=
jitter
->
correct
(
audio
,
SrsRtmpJitterAlgorithm
FULL
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
jitter
->
correct
(
audio
,
SrsRtmpJitterAlgorithm
OFF
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"rtmp jitter correct audio failed. ret=%d"
,
ret
);
return
ret
;
}
...
...
@@ -1393,7 +1393,7 @@ int SrsHls::on_video(SrsSharedPtrMessage* shared_video)
}
// TODO: FIXME: config the jitter of HLS.
if
((
ret
=
jitter
->
correct
(
video
,
SrsRtmpJitterAlgorithm
FULL
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
jitter
->
correct
(
video
,
SrsRtmpJitterAlgorithm
OFF
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"rtmp jitter correct video failed. ret=%d"
,
ret
);
return
ret
;
}
...
...
请
注册
或
登录
后发表评论