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:07:57 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
127daa41b10fdf12ee9da11aa5e6515ed8e5c395
127daa41
1 parent
dea0b4fc
use time jitter off for hls and forward. 1.0.33
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
7 行增加
和
6 行删除
README.md
trunk/src/app/srs_app_forward.cpp
trunk/src/app/srs_app_hls.cpp
trunk/src/core/srs_core.hpp
README.md
查看文件 @
127daa4
...
...
@@ -244,6 +244,7 @@ Supported operating systems and hardware:
## History
*
v1.0, 2015-07-14, use time jitter off for hls and forward. 1.0.33
*
<strong>
v1.0, 2015-05-23,
[
1.0r4 release(1.0.32)
](
https://github.com/simple-rtmp-server/srs/releases/tag/1.0r4
)
released. 59509 lines.
</strong>
*
v1.0, 2015-05-22, fix
[
#397
](
https://github.com/simple-rtmp-server/srs/issues/397
)
the USER_HZ maybe not 100. 1.0.32
*
v1.0, 2015-03-26, fix hls aac adts bug, in aac mux. 1.0.31.
...
...
trunk/src/app/srs_app_forward.cpp
查看文件 @
127daa4
...
...
@@ -160,7 +160,7 @@ int SrsForwarder::on_meta_data(SrsSharedPtrMessage* metadata)
{
int
ret
=
ERROR_SUCCESS
;
if
((
ret
=
jitter
->
correct
(
metadata
,
0
,
0
,
SrsRtmpJitterAlgorithm
FULL
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
jitter
->
correct
(
metadata
,
0
,
0
,
SrsRtmpJitterAlgorithm
OFF
))
!=
ERROR_SUCCESS
)
{
srs_freep
(
metadata
);
return
ret
;
}
...
...
@@ -176,7 +176,7 @@ int SrsForwarder::on_audio(SrsSharedPtrMessage* msg)
{
int
ret
=
ERROR_SUCCESS
;
if
((
ret
=
jitter
->
correct
(
msg
,
0
,
0
,
SrsRtmpJitterAlgorithm
FULL
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
jitter
->
correct
(
msg
,
0
,
0
,
SrsRtmpJitterAlgorithm
OFF
))
!=
ERROR_SUCCESS
)
{
srs_freep
(
msg
);
return
ret
;
}
...
...
@@ -197,7 +197,7 @@ int SrsForwarder::on_video(SrsSharedPtrMessage* msg)
{
int
ret
=
ERROR_SUCCESS
;
if
((
ret
=
jitter
->
correct
(
msg
,
0
,
0
,
SrsRtmpJitterAlgorithm
FULL
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
jitter
->
correct
(
msg
,
0
,
0
,
SrsRtmpJitterAlgorithm
OFF
))
!=
ERROR_SUCCESS
)
{
srs_freep
(
msg
);
return
ret
;
}
...
...
trunk/src/app/srs_app_hls.cpp
查看文件 @
127daa4
...
...
@@ -1472,7 +1472,7 @@ int SrsHls::on_audio(SrsSharedPtrMessage* audio)
return
hls_cache
->
on_sequence_header
(
muxer
);
}
if
((
ret
=
jitter
->
correct
(
audio
,
0
,
0
,
SrsRtmpJitterAlgorithm
FULL
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
jitter
->
correct
(
audio
,
0
,
0
,
SrsRtmpJitterAlgorithm
OFF
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"rtmp jitter correct audio failed. ret=%d"
,
ret
);
return
ret
;
}
...
...
@@ -1523,7 +1523,7 @@ int SrsHls::on_video(SrsSharedPtrMessage* video)
return
hls_cache
->
on_sequence_header
(
muxer
);
}
if
((
ret
=
jitter
->
correct
(
video
,
0
,
0
,
SrsRtmpJitterAlgorithm
FULL
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
jitter
->
correct
(
video
,
0
,
0
,
SrsRtmpJitterAlgorithm
OFF
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"rtmp jitter correct video failed. ret=%d"
,
ret
);
return
ret
;
}
...
...
trunk/src/core/srs_core.hpp
查看文件 @
127daa4
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_REVISION 3
2
#define VERSION_REVISION 3
3
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
请
注册
或
登录
后发表评论