summaryrefslogtreecommitdiffstats
path: root/media/libmedia/MediaProfiles.cpp
diff options
context:
space:
mode:
authorDave Burke <daveburke@google.com>2012-04-28 21:58:22 -0700
committerDave Burke <daveburke@google.com>2012-04-30 09:18:24 -0700
commitf60c660f048d5f5e2458cff243c20400d73757a7 (patch)
treeb2bf22e36da46fd25979df618f8661b4b0510dad /media/libmedia/MediaProfiles.cpp
parent83faee053cfd4251dbb591b62039f563ffdac399 (diff)
downloadframeworks_av-f60c660f048d5f5e2458cff243c20400d73757a7.zip
frameworks_av-f60c660f048d5f5e2458cff243c20400d73757a7.tar.gz
frameworks_av-f60c660f048d5f5e2458cff243c20400d73757a7.tar.bz2
Added support for HE-AAC recording
Fixed bug in decoder related to sample rates / channel counts Made decoder follow Fraunhofer pattern Log if bitrate not available Bug: 6275957 Change-Id: I47a8e29358fa4a88ebc73fe02d46a2bfb96c64fe
Diffstat (limited to 'media/libmedia/MediaProfiles.cpp')
-rw-r--r--media/libmedia/MediaProfiles.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp
index c08f033..6929efa 100644
--- a/media/libmedia/MediaProfiles.cpp
+++ b/media/libmedia/MediaProfiles.cpp
@@ -44,7 +44,8 @@ const MediaProfiles::NameToTagMap MediaProfiles::sAudioEncoderNameMap[] = {
{"amrnb", AUDIO_ENCODER_AMR_NB},
{"amrwb", AUDIO_ENCODER_AMR_WB},
{"aac", AUDIO_ENCODER_AAC},
- {"aaceld", AUDIO_ENCODER_AAC_ELD},
+ {"heaac", AUDIO_ENCODER_HE_AAC},
+ {"aaceld", AUDIO_ENCODER_AAC_ELD}
};
const MediaProfiles::NameToTagMap MediaProfiles::sFileFormatMap[] = {