From 896983c1dce21fcc99be28c7f0df248eccb1acd1 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 26 Mar 2015 11:31:40 +0800 Subject: [PATCH] refine the aac codec enum name --- trunk/src/kernel/srs_kernel_codec.cpp | 8 ++++---- trunk/src/kernel/srs_kernel_codec.hpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/trunk/src/kernel/srs_kernel_codec.cpp b/trunk/src/kernel/srs_kernel_codec.cpp index 20f636276..f695b4f49 100644 --- a/trunk/src/kernel/srs_kernel_codec.cpp +++ b/trunk/src/kernel/srs_kernel_codec.cpp @@ -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; diff --git a/trunk/src/kernel/srs_kernel_codec.hpp b/trunk/src/kernel/srs_kernel_codec.hpp index 033484ef3..b619bb9e1 100644 --- a/trunk/src/kernel/srs_kernel_codec.hpp +++ b/trunk/src/kernel/srs_kernel_codec.hpp @@ -406,9 +406,9 @@ enum SrsAacObjectType SrsAacObjectTypeAacSSR = 3, // AAC HE = LC+SBR - SrsAacObjectTypeHE = 5, + SrsAacObjectTypeAacHE = 5, // AAC HEv2 = LC+SBR+PS - SrsAacObjectTypeHEV2 = 29, + SrsAacObjectTypeAacHEV2 = 29, }; std::string srs_codec_aac_object2str(SrsAacObjectType aac_object); // ts/hls/adts audio header profile to RTMP sequence header object type.