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
2014-12-25 09:52:18 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
92146712d832594335be25741eedba5be769bc6f
92146712
1 parent
9788570b
fix srs-librtmp send raw aac audio channel bug. 2.0.76
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
5 行增加
和
5 行删除
trunk/src/core/srs_core.hpp
trunk/src/libs/srs_librtmp.cpp
trunk/src/core/srs_core.hpp
100644 → 100755
查看文件 @
9214671
...
...
@@ -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 7
5
#define VERSION_REVISION 7
6
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
#define RTMP_SIG_SRS_ROLE "origin/edge server"
...
...
trunk/src/libs/srs_librtmp.cpp
查看文件 @
9214671
...
...
@@ -925,7 +925,7 @@ int __srs_write_aac_adts_frame(Context* context,
// 7bits left.
// channelConfiguration; 4 bslbf
ch
|=
(
aac_channel
<<
3
)
&
0x7
0
;
ch
|=
(
aac_channel
<<
3
)
&
0x7
8
;
// 3bits left.
// only support aac profile 1-4.
...
...
@@ -939,11 +939,11 @@ int __srs_write_aac_adts_frame(Context* context,
// extensionFlag; 1 bslbf
context
->
aac_specific_config
+=
ch
;
char
*
sh
=
(
char
*
)
context
->
aac_specific_config
.
data
();
int
nb_sh
=
(
int
)
context
->
aac_specific_config
.
length
();
if
((
ret
=
__srs_write_audio_raw_frame
(
context
,
sound_format
,
sound_rate
,
sound_size
,
sound_type
,
0
,
(
char
*
)
context
->
aac_specific_config
.
data
(),
context
->
aac_specific_config
.
length
(),
timestamp
))
!=
ERROR_SUCCESS
0
,
sh
,
nb_sh
,
timestamp
))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
...
...
请
注册
或
登录
后发表评论