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

Commit e86b2905 authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

Merge "Make min/max sampling rate configurable" into qt-dev am: 23645e20 

am: b7913742

Change-Id: I5d50dc26beb1e5eb9b0e7dcb5f9afd80c790b446
parents 60f8279a b7913742

media/java/android/media/MediaCodecInfo.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import android.annotation.Nullable; 
import android.annotation.TestApi;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.annotation.UnsupportedAppUsage;

import android.os.Build;

import android.os.Build;

import android.os.SystemProperties;

import android.util.Log;

import android.util.Log;

import android.util.Pair;

import android.util.Pair;

import android.util.Range;

import android.util.Range;
@@ -1105,7 +1106,11 @@ public final class MediaCodecInfo { 
            mBitrateRange = Range.create(0, Integer.MAX_VALUE);

            mBitrateRange = Range.create(0, Integer.MAX_VALUE);

            mMaxInputChannelCount = MAX_INPUT_CHANNEL_COUNT;

            mMaxInputChannelCount = MAX_INPUT_CHANNEL_COUNT;

            // mBitrateRange = Range.create(1, 320000);

            // mBitrateRange = Range.create(1, 320000);

            mSampleRateRanges = new Range[] { Range.create(8000, 96000) };

            final int minSampleRate = SystemProperties.

                getInt("ro.mediacodec.min_sample_rate", 7350);

            final int maxSampleRate = SystemProperties.

                getInt("ro.mediacodec.max_sample_rate", 192000);

            mSampleRateRanges = new Range[] { Range.create(minSampleRate, maxSampleRate) };

            mSampleRates = null;

            mSampleRates = null;

        }

        }