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

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

Merge "Add eac3-joc MIME type"

parents 7209d7d6 cdf22ef7

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -24754,6 +24754,7 @@ package android.media { 
    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";

    field public static final java.lang.String MIMETYPE_AUDIO_EAC3_JOC = "audio/eac3-joc";

    field public static final java.lang.String MIMETYPE_AUDIO_FLAC = "audio/flac";

    field public static final java.lang.String MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw";

    field public static final java.lang.String MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw";

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_EAC3_JOC)) {

                sampleRates = new int[] { 48000 };

                bitRates = Range.create(32000, 6144000);

                maxChannels = 16;

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

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

                bitRates = Range.create(16000, 2688000);

media/java/android/media/MediaFormat.java

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,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_EAC3_JOC = "audio/eac3-joc";

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

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