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

Commit 6bfae72b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Changing max SampleRate limits for raw audio decoder" am: 525e0439 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2180355



Change-Id: I20f6c3c28283362e8671c85cfe21175fc80d0b9f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c92aeec5 525e0439

media/java/android/media/MediaCodecInfo.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1445,7 +1445,7 @@ public final class MediaCodecInfo { 
                sampleRates = new int[] { 8000, 12000, 16000, 24000, 48000 };

                sampleRates = new int[] { 8000, 12000, 16000, 24000, 48000 };

                maxChannels = 255;

                maxChannels = 255;

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

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

                sampleRateRange = Range.create(1, 96000);

                sampleRateRange = Range.create(1, 192000);

                bitRates = Range.create(1, 10000000);

                bitRates = Range.create(1, 10000000);

                maxChannels = AudioSystem.OUT_CHANNEL_COUNT_MAX;

                maxChannels = AudioSystem.OUT_CHANNEL_COUNT_MAX;

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

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