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-01-07 15:37:44 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
0e9c9db3f41f0685935d47d5ae902cc99abc06b9
0e9c9db3
1 parent
5aa31568
fix the aggregate bug, adjust to starttime of msg. 2.0.91
显示空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
13 行增加
和
2 行删除
trunk/src/app/srs_app_source.cpp
trunk/src/core/srs_core.hpp
trunk/src/libs/srs_librtmp.cpp
trunk/src/app/srs_app_source.cpp
查看文件 @
0e9c9db
...
...
@@ -1481,6 +1481,9 @@ int SrsSource::on_aggregate(SrsCommonMessage* msg)
return
ret
;
}
// the aggregate message always use abs time.
int
delta
=
-
1
;
while
(
!
stream
->
empty
())
{
if
(
!
stream
->
require
(
1
))
{
ret
=
ERROR_RTMP_AGGREGATE
;
...
...
@@ -1519,6 +1522,12 @@ int SrsSource::on_aggregate(SrsCommonMessage* msg)
timestamp
|=
time_h
<<
24
;
timestamp
&=
0x7FFFFFFF
;
// adjust abs timestamp in aggregate msg.
if
(
delta
<
0
)
{
delta
=
(
int
)
msg
->
header
.
timestamp
-
(
int
)
timestamp
;
}
timestamp
+=
delta
;
if
(
!
stream
->
require
(
3
))
{
ret
=
ERROR_RTMP_AGGREGATE
;
srs_error
(
"invalid aggregate message stream_id. ret=%d"
,
ret
);
...
...
trunk/src/core/srs_core.hpp
查看文件 @
0e9c9db
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 9
0
#define VERSION_REVISION 9
1
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
#define RTMP_SIG_SRS_ROLE "origin/edge server"
...
...
trunk/src/libs/srs_librtmp.cpp
查看文件 @
0e9c9db
...
...
@@ -823,7 +823,9 @@ int __srs_rtmp_on_aggregate(Context* context, SrsCommonMessage* msg)
return
ret
;
}
// the aggregate message always use abs time.
int
delta
=
-
1
;
while
(
!
stream
->
empty
())
{
if
(
!
stream
->
require
(
1
))
{
ret
=
ERROR_RTMP_AGGREGATE
;
...
...
@@ -862,7 +864,7 @@ int __srs_rtmp_on_aggregate(Context* context, SrsCommonMessage* msg)
timestamp
|=
time_h
<<
24
;
timestamp
&=
0x7FFFFFFF
;
// adjust
timestamp
.
// adjust
abs timestamp in aggregate msg
.
if
(
delta
<
0
)
{
delta
=
(
int
)
msg
->
header
.
timestamp
-
(
int
)
timestamp
;
}
...
...
请
注册
或
登录
后发表评论