diff options
| author | Dave Burke <daveburke@google.com> | 2012-04-28 22:02:13 -0700 |
|---|---|---|
| committer | Dave Burke <daveburke@google.com> | 2012-04-30 09:24:01 -0700 |
| commit | ec3f31f6215cb380bba5ab36c9e4c21b13f046a1 (patch) | |
| tree | 0531fe4d8c20f7603f101a3707446a8832d460c7 /media/tests/MediaFrameworkTest | |
| parent | 427db9b3d10d5c203d0351e683c3cddfd270250c (diff) | |
| download | frameworks_base-ec3f31f6215cb380bba5ab36c9e4c21b13f046a1.zip frameworks_base-ec3f31f6215cb380bba5ab36c9e4c21b13f046a1.tar.gz frameworks_base-ec3f31f6215cb380bba5ab36c9e4c21b13f046a1.tar.bz2 | |
Added support for HE-AAC recording.
Not unhiding HE-AACv2 since that requires stereo mics.
Bug: 6275957
Change-Id: I953a6d21e615c8fd23f9390e3c86d63089f5fb75
Diffstat (limited to 'media/tests/MediaFrameworkTest')
| -rw-r--r-- | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java index b1d049e..abe8b8c 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java @@ -88,8 +88,7 @@ public class MediaProfileReader if (audioEncoder != MediaRecorder.AudioEncoder.AMR_NB && audioEncoder != MediaRecorder.AudioEncoder.AMR_WB && audioEncoder != MediaRecorder.AudioEncoder.AAC && - audioEncoder != MediaRecorder.AudioEncoder.AAC_PLUS && - audioEncoder != MediaRecorder.AudioEncoder.EAAC_PLUS) { + audioEncoder != MediaRecorder.AudioEncoder.HE_AAC) { throw new IllegalArgumentException("Unsupported audio encodeer " + audioEncoder); } return audioEncoderMap.get(audioEncoder); @@ -128,7 +127,6 @@ public class MediaProfileReader audioEncoderMap.put(MediaRecorder.AudioEncoder.AMR_NB, "amrnb"); audioEncoderMap.put(MediaRecorder.AudioEncoder.AMR_WB, "amrwb"); audioEncoderMap.put(MediaRecorder.AudioEncoder.AAC, "aac"); - audioEncoderMap.put(MediaRecorder.AudioEncoder.AAC_PLUS, "aacplus"); - audioEncoderMap.put(MediaRecorder.AudioEncoder.EAAC_PLUS, "eaacplus"); + audioEncoderMap.put(MediaRecorder.AudioEncoder.HE_AAC, "heaac"); } } |