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

Commit 9d7964b9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add MIMETYPE_AUDIO_AC4 support in MediaFormat"

parents 8b84998f 14d2d59f

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -24588,6 +24588,7 @@ package android.media { 
    field public static final java.lang.String KEY_WIDTH = "width";

    field public static final java.lang.String MIMETYPE_AUDIO_AAC = "audio/mp4a-latm";

    field public static final java.lang.String MIMETYPE_AUDIO_AC3 = "audio/ac3";

    field public static final java.lang.String MIMETYPE_AUDIO_AC4 = "audio/ac4";

    field public static final java.lang.String MIMETYPE_AUDIO_AMR_NB = "audio/3gpp";

    field public static final java.lang.String MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";

    field public static final java.lang.String MIMETYPE_AUDIO_EAC3 = "audio/eac3";

media/java/android/media/MediaCodecInfo.java

+4 −0
Original line number Diff line number Diff line
@@ -1135,6 +1135,10 @@ public final class MediaCodecInfo { 
                maxChannels = 6;

            } else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_EAC3)) {

                maxChannels = 16;

            } else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_AUDIO_AC4)) {

                sampleRates = new int[] { 44100, 48000, 96000, 192000 };

                bitRates = Range.create(16000, 2688000);

                maxChannels = 24;

            } else {

                Log.w(TAG, "Unsupported mime " + mime);

                mParent.mError |= ERROR_UNSUPPORTED;

media/java/android/media/MediaFormat.java

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ public final class MediaFormat { 
    public static final String MIMETYPE_AUDIO_MSGSM = "audio/gsm";

    public static final String MIMETYPE_AUDIO_AC3 = "audio/ac3";

    public static final String MIMETYPE_AUDIO_EAC3 = "audio/eac3";

    public static final String MIMETYPE_AUDIO_AC4 = "audio/ac4";

    public static final String MIMETYPE_AUDIO_SCRAMBLED = "audio/scrambled";



    /**