Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1790eb5 authored by Dave Burke's avatar Dave Burke Committed by Android (Google) Code Review
Browse files

Merge "Added support for HE-AAC recording." into jb-dev

parents 2f87014e ec3f31f6

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -11283,10 +11283,11 @@ package android.media { 














  public final class MediaRecorder.AudioEncoder {















    field public static final int AAC = 3; // 0x3













    field public static final int AAC_ELD = 6; // 0x6













    field public static final int AAC_ELD = 5; // 0x5















    field public static final int AMR_NB = 1; // 0x1















    field public static final int AMR_WB = 2; // 0x2















    field public static final int DEFAULT = 0; // 0x0













    field public static final int HE_AAC = 4; // 0x4















  }





























  public final class MediaRecorder.AudioSource {

























media/java/android/media/MediaRecorder.java



+5
−7




























Original line number
Diff line number
Diff line








@@ -251,14 +251,12 @@ public class MediaRecorder













        public static final int AMR_NB = 1;















        /** AMR (Wideband) audio codec */















        public static final int AMR_WB = 2;













        /** AAC audio codec */













        /** AAC Low Complexity (AAC-LC) audio codec */















        public static final int AAC = 3;













        /** @hide enhanced AAC audio codec */













        public static final int AAC_PLUS = 4;













        /** @hide enhanced AAC plus audio codec */













        public static final int EAAC_PLUS = 5;













        /** AAC-ELD audio codec */













        public static final int AAC_ELD = 6;













        /** High Efficiency AAC (HE-AAC) audio codec */













        public static final int HE_AAC = 4;













        /** Enhanced Low Delay AAC (AAC-ELD) audio codec */













        public static final int AAC_ELD = 5;















    }































    /**

































media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java



+2
−4




























Original line number
Diff line number
Diff line








@@ -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");















    }















}