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
weiyabo
2016-02-18 14:15:23 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Committed by
winlin
2016-05-17 10:53:56 +0800
Commit
8df7135dee1d0acd5cc27ae675ddb16f63ba0656
8df7135d
1 parent
d72b93e5
for bug #5064, success parse 264 sps
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
8 行增加
和
7 行删除
trunk/src/kernel/srs_kernel_codec.cpp
trunk/src/kernel/srs_kernel_utility.cpp
trunk/src/kernel/srs_kernel_codec.cpp
查看文件 @
8df7135
...
...
@@ -1040,11 +1040,6 @@ int SrsAvcAacCodec::avc_demux_sps_rbsp(char* rbsp, int nb_rbsp)
if
((
ret
=
srs_avc_nalu_read_bit
(
&
bs
,
seq_scaling_matrix_present_flag_i
))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
if
(
seq_scaling_matrix_present_flag_i
)
{
ret
=
ERROR_HLS_DECODE_ERROR
;
srs_error
(
"sps the seq_scaling_matrix_present_flag invalid, i=%d, nb_scmpfs=%d. ret=%d"
,
i
,
nb_scmpfs
,
ret
);
return
ret
;
}
}
}
}
...
...
@@ -1084,11 +1079,17 @@ int SrsAvcAacCodec::avc_demux_sps_rbsp(char* rbsp, int nb_rbsp)
if
((
ret
=
srs_avc_nalu_read_uev
(
&
bs
,
num_ref_frames_in_pic_order_cnt_cycle
))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
if
(
num_ref_frames_in_pic_order_cnt_cycle
)
{
if
(
num_ref_frames_in_pic_order_cnt_cycle
<
0
)
{
ret
=
ERROR_HLS_DECODE_ERROR
;
srs_error
(
"sps the num_ref_frames_in_pic_order_cnt_cycle invalid. ret=%d"
,
ret
);
return
ret
;
}
for
(
int
i
=
0
;
i
<
num_ref_frames_in_pic_order_cnt_cycle
;
i
++
)
{
int32_t
offset_for_ref_frame_i
=
-
1
;
if
((
ret
=
srs_avc_nalu_read_uev
(
&
bs
,
offset_for_ref_frame_i
))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
}
}
int32_t
max_num_ref_frames
=
-
1
;
...
...
trunk/src/kernel/srs_kernel_utility.cpp
查看文件 @
8df7135
...
...
@@ -75,7 +75,7 @@ int srs_avc_nalu_read_uev(SrsBitStream* stream, int32_t& v)
v
=
(
1
<<
leadingZeroBits
)
-
1
;
for
(
int
i
=
0
;
i
<
leadingZeroBits
;
i
++
)
{
int32_t
b
=
stream
->
read_bit
();
v
+=
b
<<
(
leadingZeroBits
-
1
);
v
+=
b
<<
(
leadingZeroBits
-
1
-
i
);
}
return
ret
;
...
...
请
注册
或
登录
后发表评论