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
2017-01-18 11:11:36 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
2ef1ef06e93d6b353b7dd843960418babbf907aa
2ef1ef06
1 parent
3fe338d1
increase the nb_samples because some large video may overflow.
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
7 行增加
和
5 行删除
trunk/src/kernel/srs_kernel_codec.cpp
trunk/src/kernel/srs_kernel_codec.hpp
trunk/src/kernel/srs_kernel_codec.cpp
查看文件 @
2ef1ef0
...
...
@@ -353,10 +353,9 @@ int SrsCodecSample::add_sample_unit(char* bytes, int size)
{
int
ret
=
ERROR_SUCCESS
;
if
(
nb_sample_units
>=
SRS_
SRS_
MAX_CODEC_SAMPLE
)
{
if
(
nb_sample_units
>=
SRS_MAX_CODEC_SAMPLE
)
{
ret
=
ERROR_HLS_DECODE_ERROR
;
srs_error
(
"hls decode samples error, "
"exceed the max count: %d, ret=%d"
,
SRS_SRS_MAX_CODEC_SAMPLE
,
ret
);
srs_error
(
"avc exceed samples count, max=%d, video=%d. ret=%d"
,
SRS_MAX_CODEC_SAMPLE
,
is_video
,
ret
);
return
ret
;
}
...
...
trunk/src/kernel/srs_kernel_codec.hpp
查看文件 @
2ef1ef0
...
...
@@ -243,9 +243,12 @@ extern int flv_sample_rates[];
*/
extern
int
aac_sample_rates
[];
#define SRS_SRS_MAX_CODEC_SAMPLE 128
// The impossible aac sample rate index.
#define SRS_AAC_SAMPLE_RATE_UNSET 15
// The max number of NALUs in a video, or aac frame in audio packet.
#define SRS_MAX_CODEC_SAMPLE 256
/**
* the FLV/RTMP supported audio sample size.
* Size of each audio sample. This parameter only pertains to
...
...
@@ -368,7 +371,7 @@ public:
* where avc/h264 video packet may contains multiple buffer.
*/
int
nb_sample_units
;
SrsCodecSampleUnit
sample_units
[
SRS_
SRS_
MAX_CODEC_SAMPLE
];
SrsCodecSampleUnit
sample_units
[
SRS_MAX_CODEC_SAMPLE
];
public
:
/**
* whether the sample is video sample which demux from video packet.
...
...
请
注册
或
登录
后发表评论