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-03-29 22:34:53 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
85afb6ea6fabddbf3c3ba88a7e12318d8094caf2
85afb6ea
1 parent
01ee4566
add donation. fix bug of adts.
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
3 行增加
和
1 行删除
DONATIONS.txt
trunk/src/protocol/srs_raw_avc.cpp
DONATIONS.txt
查看文件 @
85afb6e
...
...
@@ -13,6 +13,7 @@ RMB 500-999
* [2015-xx-xx xx:xx] xxx
RMB 100-499
* [2015-03-29 11-07] 姚伟斌
* [2015-03-14 20:21] 万伟
* [2015-03-11 09:44] 叶发养
* [2015-02-08 21:10] 韩友洪
...
...
trunk/src/protocol/srs_raw_avc.cpp
查看文件 @
85afb6e
...
...
@@ -438,6 +438,7 @@ int SrsRawAacStream::adts_demux(SrsStream* stream, char** pframe, int* pnb_frame
codec
.
frame_length
=
frame_length
;
// @see srs_audio_write_raw_frame().
// TODO: FIXME: maybe need to resample audio.
codec
.
sound_format
=
10
;
// AAC
if
(
sampling_frequency_index
<=
0x0c
&&
sampling_frequency_index
>
0x0a
)
{
codec
.
sound_rate
=
SrsCodecAudioSampleRate5512
;
...
...
@@ -451,7 +452,7 @@ int SrsRawAacStream::adts_demux(SrsStream* stream, char** pframe, int* pnb_frame
codec
.
sound_rate
=
SrsCodecAudioSampleRate44100
;
srs_warn
(
"adts invalid sample rate for flv, rate=%#x"
,
sampling_frequency_index
);
}
codec
.
sound_
siz
e
=
srs_max
(
0
,
srs_min
(
1
,
channel_configuration
-
1
));
codec
.
sound_
typ
e
=
srs_max
(
0
,
srs_min
(
1
,
channel_configuration
-
1
));
// TODO: FIXME: finger it out the sound size by adts.
codec
.
sound_size
=
1
;
// 0(8bits) or 1(16bits).
...
...
请
注册
或
登录
后发表评论