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
2014-04-30 13:20:53 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
7cbe18902f040d6af41f54c02f3c430c3b8548e1
7cbe1890
1 parent
e3be7bfa
fix bug of librtmp after RTMP protocol stack refined, never use cid=2 to send data.
显示空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
11 行增加
和
1 行删除
trunk/src/rtmp/srs_protocol_rtmp_stack.cpp
trunk/src/rtmp/srs_protocol_rtmp_stack.cpp
查看文件 @
7cbe189
...
...
@@ -1393,7 +1393,8 @@ SrsMessageHeader::SrsMessageHeader()
stream_id
=
0
;
timestamp
=
0
;
perfer_cid
=
RTMP_CID_ProtocolControl
;
// we always use the connection chunk-id
perfer_cid
=
RTMP_CID_OverConnection
;
}
SrsMessageHeader
::~
SrsMessageHeader
()
...
...
@@ -1457,6 +1458,9 @@ void SrsMessageHeader::initialize_amf0_script(int size, int stream)
timestamp_delta
=
(
int32_t
)
0
;
timestamp
=
(
int64_t
)
0
;
stream_id
=
(
int32_t
)
stream
;
// amf0 script use connection2 chunk-id
perfer_cid
=
RTMP_CID_OverConnection2
;
}
void
SrsMessageHeader
::
initialize_audio
(
int
size
,
u_int32_t
time
,
int
stream
)
...
...
@@ -1466,6 +1470,9 @@ void SrsMessageHeader::initialize_audio(int size, u_int32_t time, int stream)
timestamp_delta
=
(
int32_t
)
time
;
timestamp
=
(
int64_t
)
time
;
stream_id
=
(
int32_t
)
stream
;
// audio chunk-id
perfer_cid
=
RTMP_CID_Audio
;
}
void
SrsMessageHeader
::
initialize_video
(
int
size
,
u_int32_t
time
,
int
stream
)
...
...
@@ -1475,6 +1482,9 @@ void SrsMessageHeader::initialize_video(int size, u_int32_t time, int stream)
timestamp_delta
=
(
int32_t
)
time
;
timestamp
=
(
int64_t
)
time
;
stream_id
=
(
int32_t
)
stream
;
// video chunk-id
perfer_cid
=
RTMP_CID_Video
;
}
SrsChunkStream
::
SrsChunkStream
(
int
_cid
)
...
...
请
注册
或
登录
后发表评论