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

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

Merge "Default compressed audio bytes per sample to 1" am: aa2884ac 

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

Change-Id: I4acafbb6c49a9c694463ea7d3afb341e7d07a275
parents 08a11ec1 aa2884ac

media/java/android/media/AudioTrack.java

+13 −7
Original line number Diff line number Diff line
@@ -1261,14 +1261,20 @@ public class AudioTrack extends PlayerBase 


            // TODO: Check mEncapsulationMode compatibility with MODE_STATIC, etc?



            try {

            // If the buffer size is not specified in streaming mode,

            // use a single frame for the buffer size and let the

            // native code figure out the minimum buffer size.

            if (mMode == MODE_STREAM && mBufferSizeInBytes == 0) {

                    mBufferSizeInBytes = mFormat.getChannelCount()

                            * mFormat.getBytesPerSample(mFormat.getEncoding());

                int bytesPerSample = 1;

                try {

                    bytesPerSample = mFormat.getBytesPerSample(mFormat.getEncoding());

                } catch (IllegalArgumentException e) {

                    // do nothing

                }

                mBufferSizeInBytes = mFormat.getChannelCount() * bytesPerSample;

            }



            try {

                final AudioTrack track = new AudioTrack(

                        mAttributes, mFormat, mBufferSizeInBytes, mMode, mSessionId, mOffload,

                        mEncapsulationMode, mTunerConfiguration);