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-04-09 18:03:45 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
23b310971ef1d6d1f21b3174ef7650c8cd665daf
23b31097
1 parent
bd77f995
guess again when annexb change to ibmf.
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
13 行增加
和
1 行删除
trunk/src/kernel/srs_kernel_codec.cpp
trunk/src/kernel/srs_kernel_codec.cpp
查看文件 @
23b3109
...
...
@@ -696,7 +696,19 @@ int SrsAvcAacCodec::video_avc_demux(char* data, int size, SrsCodecSample* sample
// One or more NALUs (Full frames are required)
// try "AnnexB" from H.264-AVC-ISO_IEC_14496-10.pdf, page 211.
if
((
ret
=
avc_demux_annexb_format
(
stream
,
sample
))
!=
ERROR_SUCCESS
)
{
return
ret
;
// ok, we guess out the payload is annexb, but maybe changed to ibmf.
if
(
ret
!=
ERROR_HLS_AVC_TRY_OTHERS
)
{
srs_error
(
"avc demux for annexb failed. ret=%d"
,
ret
);
return
ret
;
}
// try "ISO Base Media File Format" from H.264-AVC-ISO_IEC_14496-15.pdf, page 20
if
((
ret
=
avc_demux_ibmf_format
(
stream
,
sample
))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
else
{
payload_format
=
SrsAvcPayloadFormatIbmf
;
srs_warn
(
"hls avc payload change from annexb to ibmf format."
);
}
}
srs_info
(
"hls decode avc payload in annexb format."
);
}
...
...
请
注册
或
登录
后发表评论