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-26 11:31:40 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
896983c1dce21fcc99be28c7f0df248eccb1acd1
896983c1
1 parent
1401f2e0
refine the aac codec enum name
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
6 行增加
和
6 行删除
trunk/src/kernel/srs_kernel_codec.cpp
trunk/src/kernel/srs_kernel_codec.hpp
trunk/src/kernel/srs_kernel_codec.cpp
查看文件 @
896983c
...
...
@@ -91,8 +91,8 @@ string srs_codec_aac_object2str(SrsAacObjectType aac_object)
{
switch
(
aac_object
)
{
case
SrsAacObjectTypeAacMain
:
return
"Main"
;
case
SrsAacObjectTypeHE
:
return
"HE"
;
case
SrsAacObjectTypeHEV2
:
return
"HEv2"
;
case
SrsAacObjectTypeAacHE
:
return
"HE"
;
case
SrsAacObjectTypeAacHEV2
:
return
"HEv2"
;
case
SrsAacObjectTypeAacLC
:
return
"LC"
;
case
SrsAacObjectTypeAacSSR
:
return
"SSR"
;
default:
return
"Other"
;
...
...
@@ -113,8 +113,8 @@ SrsAacProfile srs_codec_aac_rtmp2ts(SrsAacObjectType object_type)
{
switch
(
object_type
)
{
case
SrsAacObjectTypeAacMain
:
return
SrsAacProfileMain
;
case
SrsAacObjectTypeHE
:
case
SrsAacObjectTypeHEV2
:
case
SrsAacObjectTypeAacHE
:
case
SrsAacObjectTypeAacHEV2
:
case
SrsAacObjectTypeAacLC
:
return
SrsAacProfileLC
;
case
SrsAacObjectTypeAacSSR
:
return
SrsAacProfileSSR
;
default:
return
SrsAacProfileReserved
;
...
...
trunk/src/kernel/srs_kernel_codec.hpp
查看文件 @
896983c
...
...
@@ -406,9 +406,9 @@ enum SrsAacObjectType
SrsAacObjectTypeAacSSR
=
3
,
// AAC HE = LC+SBR
SrsAacObjectTypeHE
=
5
,
SrsAacObjectType
Aac
HE
=
5
,
// AAC HEv2 = LC+SBR+PS
SrsAacObjectTypeHEV2
=
29
,
SrsAacObjectType
Aac
HEV2
=
29
,
};
std
::
string
srs_codec_aac_object2str
(
SrsAacObjectType
aac_object
);
// ts/hls/adts audio header profile to RTMP sequence header object type.
...
...
请
注册
或
登录
后发表评论