summaryrefslogtreecommitdiffstats
path: root/include
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 /include
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 'include')
-rw-r--r--include/media/mediarecorder.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/media/mediarecorder.h b/include/media/mediarecorder.h
index 3891809..6d304e0 100644
--- a/include/media/mediarecorder.h
+++ b/include/media/mediarecorder.h
@@ -75,9 +75,8 @@ enum audio_encoder {
AUDIO_ENCODER_AMR_NB = 1,
AUDIO_ENCODER_AMR_WB = 2,
AUDIO_ENCODER_AAC = 3,
- AUDIO_ENCODER_AAC_PLUS = 4,
- AUDIO_ENCODER_EAAC_PLUS = 5,
- AUDIO_ENCODER_AAC_ELD = 6,
+ AUDIO_ENCODER_HE_AAC = 4,
+ AUDIO_ENCODER_AAC_ELD = 5,
AUDIO_ENCODER_LIST_END // must be the last - used to validate the audio encoder type
};