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-07-06 13:53:30 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f895523ac65ab113dcf594c854efbaa7fb397db8
f895523a
1 parent
21a75924
fix hls media codec info bug, ignore nal_unit_type 7/8/9. 0.9.152
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
14 行增加
和
6 行删除
trunk/src/app/srs_app_hls.cpp
trunk/src/app/srs_app_hls.cpp
查看文件 @
f895523
...
...
@@ -1256,6 +1256,19 @@ int SrsHlsCache::cache_video(SrsAvcAacCodec* codec, SrsCodecSample* sample)
if
(
nal_unit_type
==
1
)
{
sps_pps_sent
=
false
;
}
// 6: Supplemental enhancement information (SEI) sei_rbsp( ), page 61
// @see: ngx_rtmp_hls_append_aud
if
(
!
aud_sent
)
{
if
(
nal_unit_type
==
9
)
{
aud_sent
=
true
;
}
if
(
nal_unit_type
==
1
||
nal_unit_type
==
5
||
nal_unit_type
==
6
)
{
// for type 6, append a aud with type 9.
vb
->
append
(
aud_nal
,
sizeof
(
aud_nal
));
}
}
// 5: Coded slice of an IDR picture.
// insert sps/pps before IDR or key frame is ok.
if
(
nal_unit_type
==
5
&&
!
sps_pps_sent
)
{
...
...
@@ -1276,12 +1289,7 @@ int SrsHlsCache::cache_video(SrsAvcAacCodec* codec, SrsCodecSample* sample)
vb
->
append
(
codec
->
pictureParameterSetNALUnit
,
codec
->
pictureParameterSetLength
);
}
}
// 6: Supplemental enhancement information (SEI) sei_rbsp( ), page 61
// @see: ngx_rtmp_hls_append_aud
if
(
nal_unit_type
==
6
&&
!
aud_sent
)
{
// for type 6, append a aud with type 9.
vb
->
append
(
aud_nal
,
sizeof
(
aud_nal
));
}
// 7-9, ignore, @see: ngx_rtmp_hls_video
if
(
nal_unit_type
>=
7
&&
nal_unit_type
<=
9
)
{
continue
;
...
...
请
注册
或
登录
后发表评论