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-14 11:32:19 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
b705ed0b90daf9f142921923788a541e317bbf16
b705ed0b
1 parent
c80477d5
for bug #288, refine the codec decode info frame failed. 1.0.21
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
14 行增加
和
5 行删除
trunk/src/app/srs_app_avc_aac.cpp
trunk/src/app/srs_app_hls.cpp
trunk/src/core/srs_core.hpp
trunk/src/app/srs_app_avc_aac.cpp
查看文件 @
b705ed0
...
...
@@ -337,6 +337,13 @@ int SrsAvcAacCodec::video_avc_demux(char* data, int size, SrsCodecSample* sample
sample
->
frame_type
=
(
SrsCodecVideoAVCFrame
)
frame_type
;
// ignore info frame without error,
// @see https://github.com/winlinvip/simple-rtmp-server/issues/288#issuecomment-69863909
if
(
sample
->
frame_type
==
SrsCodecVideoAVCFrameVideoInfoFrame
)
{
srs_warn
(
"hls igone the info frame, ret=%d"
,
ret
);
return
ret
;
}
// only support h.264/avc
if
(
codec_id
!=
SrsCodecVideoAVC
)
{
ret
=
ERROR_HLS_DECODE_ERROR
;
...
...
trunk/src/app/srs_app_hls.cpp
查看文件 @
b705ed0
...
...
@@ -1491,14 +1491,16 @@ int SrsHls::on_video(SrsSharedPtrMessage* video)
sample
->
clear
();
if
((
ret
=
codec
->
video_avc_demux
(
video
->
payload
,
video
->
size
,
sample
))
!=
ERROR_SUCCESS
)
{
if
(
sample
->
frame_type
==
SrsCodecVideoAVCFrameVideoInfoFrame
)
{
srs_warn
(
"hls igone the info frame, ret=%d"
,
ret
);
return
ERROR_SUCCESS
;
}
srs_error
(
"hls codec demux video failed. ret=%d"
,
ret
);
return
ret
;
}
// ignore info frame,
// @see https://github.com/winlinvip/simple-rtmp-server/issues/288#issuecomment-69863909
if
(
sample
->
frame_type
==
SrsCodecVideoAVCFrameVideoInfoFrame
)
{
return
ret
;
}
if
(
codec
->
video_codec_id
!=
SrsCodecVideoAVC
)
{
return
ret
;
}
...
...
trunk/src/core/srs_core.hpp
查看文件 @
b705ed0
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_REVISION 2
0
#define VERSION_REVISION 2
1
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
#define RTMP_SIG_SRS_ROLE "origin/edge server"
...
...
请
注册
或
登录
后发表评论