正在显示
2 个修改的文件
包含
6 行增加
和
6 行删除
| @@ -91,8 +91,8 @@ string srs_codec_aac_object2str(SrsAacObjectType aac_object) | @@ -91,8 +91,8 @@ string srs_codec_aac_object2str(SrsAacObjectType aac_object) | ||
| 91 | { | 91 | { |
| 92 | switch (aac_object) { | 92 | switch (aac_object) { |
| 93 | case SrsAacObjectTypeAacMain: return "Main"; | 93 | case SrsAacObjectTypeAacMain: return "Main"; |
| 94 | - case SrsAacObjectTypeHE: return "HE"; | ||
| 95 | - case SrsAacObjectTypeHEV2: return "HEv2"; | 94 | + case SrsAacObjectTypeAacHE: return "HE"; |
| 95 | + case SrsAacObjectTypeAacHEV2: return "HEv2"; | ||
| 96 | case SrsAacObjectTypeAacLC: return "LC"; | 96 | case SrsAacObjectTypeAacLC: return "LC"; |
| 97 | case SrsAacObjectTypeAacSSR: return "SSR"; | 97 | case SrsAacObjectTypeAacSSR: return "SSR"; |
| 98 | default: return "Other"; | 98 | default: return "Other"; |
| @@ -113,8 +113,8 @@ SrsAacProfile srs_codec_aac_rtmp2ts(SrsAacObjectType object_type) | @@ -113,8 +113,8 @@ SrsAacProfile srs_codec_aac_rtmp2ts(SrsAacObjectType object_type) | ||
| 113 | { | 113 | { |
| 114 | switch (object_type) { | 114 | switch (object_type) { |
| 115 | case SrsAacObjectTypeAacMain: return SrsAacProfileMain; | 115 | case SrsAacObjectTypeAacMain: return SrsAacProfileMain; |
| 116 | - case SrsAacObjectTypeHE: | ||
| 117 | - case SrsAacObjectTypeHEV2: | 116 | + case SrsAacObjectTypeAacHE: |
| 117 | + case SrsAacObjectTypeAacHEV2: | ||
| 118 | case SrsAacObjectTypeAacLC: return SrsAacProfileLC; | 118 | case SrsAacObjectTypeAacLC: return SrsAacProfileLC; |
| 119 | case SrsAacObjectTypeAacSSR: return SrsAacProfileSSR; | 119 | case SrsAacObjectTypeAacSSR: return SrsAacProfileSSR; |
| 120 | default: return SrsAacProfileReserved; | 120 | default: return SrsAacProfileReserved; |
| @@ -406,9 +406,9 @@ enum SrsAacObjectType | @@ -406,9 +406,9 @@ enum SrsAacObjectType | ||
| 406 | SrsAacObjectTypeAacSSR = 3, | 406 | SrsAacObjectTypeAacSSR = 3, |
| 407 | 407 | ||
| 408 | // AAC HE = LC+SBR | 408 | // AAC HE = LC+SBR |
| 409 | - SrsAacObjectTypeHE = 5, | 409 | + SrsAacObjectTypeAacHE = 5, |
| 410 | // AAC HEv2 = LC+SBR+PS | 410 | // AAC HEv2 = LC+SBR+PS |
| 411 | - SrsAacObjectTypeHEV2 = 29, | 411 | + SrsAacObjectTypeAacHEV2 = 29, |
| 412 | }; | 412 | }; |
| 413 | std::string srs_codec_aac_object2str(SrsAacObjectType aac_object); | 413 | std::string srs_codec_aac_object2str(SrsAacObjectType aac_object); |
| 414 | // ts/hls/adts audio header profile to RTMP sequence header object type. | 414 | // ts/hls/adts audio header profile to RTMP sequence header object type. |
-
请 注册 或 登录 后发表评论