diff options
| author | Dave Burke <daveburke@google.com> | 2012-04-30 12:45:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-30 12:45:27 -0700 |
| commit | 4c9cd95b27a638701be2ffa1713273ba2f624770 (patch) | |
| tree | c7f5f7820aa39c965706b7ea504d9b53f5147688 /include | |
| parent | 0c0abd4ad26971b5fba94734137fe0bb1a590ab6 (diff) | |
| parent | f60c660f048d5f5e2458cff243c20400d73757a7 (diff) | |
| download | frameworks_av-4c9cd95b27a638701be2ffa1713273ba2f624770.zip frameworks_av-4c9cd95b27a638701be2ffa1713273ba2f624770.tar.gz frameworks_av-4c9cd95b27a638701be2ffa1713273ba2f624770.tar.bz2 | |
Merge "Added support for HE-AAC recording" into jb-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/mediarecorder.h | 5 |
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 }; |