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-08-20 14:20:49 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
575a698820e088fbc942830fad3d9ed6a1c29220
575a6988
1 parent
ec87dd9c
fix #380, srs-librtmp send sequence header when sps or pps changed.
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
10 行增加
和
4 行删除
README.md
trunk/src/libs/srs_librtmp.cpp
README.md
查看文件 @
575a698
...
...
@@ -342,6 +342,7 @@ Remark:
## History
*
v2.0, 2015-08-20, fix
[
#380
](
https://github.com/simple-rtmp-server/srs/issues/380
)
, srs-librtmp send sequence header when sps or pps changed.
*
v2.0, 2015-08-18, close
[
#454
](
https://github.com/simple-rtmp-server/srs/issues/454
)
, support obs restart publish. 2.0.184
*
v2.0, 2015-08-14, use reduce_sequence_header for stream control.
*
v2.0, 2015-08-14, use send_min_interval for stream control. 2.0.183
...
...
trunk/src/libs/srs_librtmp.cpp
查看文件 @
575a698
...
...
@@ -1279,8 +1279,8 @@ int srs_write_h264_sps_pps(Context* context, u_int32_t dts, u_int32_t pts)
{
int
ret
=
ERROR_SUCCESS
;
// only send when both sps and pps changed.
if
(
!
context
->
h264_sps_changed
||
!
context
->
h264_pps_changed
)
{
// send when sps or pps changed.
if
(
!
context
->
h264_sps_changed
&&
!
context
->
h264_pps_changed
)
{
return
ret
;
}
...
...
@@ -1330,7 +1330,7 @@ int srs_write_h264_raw_frame(Context* context,
context
->
h264_sps_changed
=
true
;
context
->
h264_sps
=
sps
;
return
srs_write_h264_sps_pps
(
context
,
dts
,
pts
)
;
return
ret
;
}
// for pps
...
...
@@ -1346,7 +1346,12 @@ int srs_write_h264_raw_frame(Context* context,
context
->
h264_pps_changed
=
true
;
context
->
h264_pps
=
pps
;
return
srs_write_h264_sps_pps
(
context
,
dts
,
pts
);
return
ret
;
}
// send pps+sps before ipb frames when sps/pps changed.
if
((
ret
=
srs_write_h264_sps_pps
(
context
,
dts
,
pts
))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
// ibp frame.
...
...
请
注册
或
登录
后发表评论