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-07-01 14:50:45 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
438914c481dc1f49cd47a33173b1cd9c701bc340
438914c4
1 parent
312366bb
fix #433, fix the sps parse bug. 2.0.176
显示空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
13 行增加
和
3 行删除
README.md
trunk/src/core/srs_core.hpp
trunk/src/kernel/srs_kernel_codec.cpp
README.md
查看文件 @
438914c
...
...
@@ -344,6 +344,7 @@ Remark:
### SRS 2.0 history
*
v2.0, 2015-07-01, fix
[
#433
](
https://github.com/simple-rtmp-server/srs/issues/433
)
fix the sps parse bug. 2.0.176
*
v2.0, 2015-06-10, fix
[
#425
](
https://github.com/simple-rtmp-server/srs/issues/425
)
refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175
*
v2.0, 2015-06-10, fix
[
#424
](
https://github.com/simple-rtmp-server/srs/issues/424
)
fix aggregate timestamp bug. 2.0.174
*
v2.0, 2015-06-06, fix
[
#421
](
https://github.com/simple-rtmp-server/srs/issues/421
)
drop video for unkown RTMP header.
...
...
trunk/src/core/srs_core.hpp
查看文件 @
438914c
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 17
5
#define VERSION_REVISION 17
6
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
trunk/src/kernel/srs_kernel_codec.cpp
查看文件 @
438914c
...
...
@@ -981,11 +981,11 @@ int SrsAvcAacCodec::avc_demux_sps_rbsp(char* rbsp, int nb_rbsp)
}
srs_info
(
"sps parse profile=%d, level=%d, sps_id=%d"
,
profile_idc
,
level_idc
,
seq_parameter_set_id
);
int32_t
chroma_format_idc
=
-
1
;
if
(
profile_idc
==
100
||
profile_idc
==
110
||
profile_idc
==
122
||
profile_idc
==
244
||
profile_idc
==
44
||
profile_idc
==
83
||
profile_idc
==
86
||
profile_idc
==
118
||
profile_idc
==
128
)
{
int32_t
chroma_format_idc
=
-
1
;
if
((
ret
=
srs_avc_nalu_read_uev
(
&
bs
,
chroma_format_idc
))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
...
...
@@ -1016,11 +1016,20 @@ int SrsAvcAacCodec::avc_demux_sps_rbsp(char* rbsp, int nb_rbsp)
return
ret
;
}
if
(
seq_scaling_matrix_present_flag
)
{
int
nb_scmpfs
=
((
chroma_format_idc
!=
3
)
?
8
:
12
);
for
(
int
i
=
0
;
i
<
nb_scmpfs
;
i
++
)
{
int8_t
seq_scaling_matrix_present_flag_i
=
-
1
;
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. ret=%d"
,
ret
);
srs_error
(
"sps the seq_scaling_matrix_present_flag invalid, i=%d, nb_scmpfs=%d. ret=%d"
,
i
,
nb_scmpfs
,
ret
);
return
ret
;
}
}
}
}
int32_t
log2_max_frame_num_minus4
=
-
1
;
if
((
ret
=
srs_avc_nalu_read_uev
(
&
bs
,
log2_max_frame_num_minus4
))
!=
ERROR_SUCCESS
)
{
...
...
请
注册
或
登录
后发表评论