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

Commit 46011f88 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

AudioRecord.Builder works with no or partial parameters 

Complete missing build-time parameters for encoding and channel
  mask, according to documentation.

Bug 20894895

Change-Id: I61f9bfab374effeeded5ae782c4e8513b7310c06
parent 3ce72722

media/java/android/media/AudioRecord.java

+18 −2
Original line number Original line Diff line number Diff line
@@ -416,7 +416,8 @@ public class AudioRecord 
     * <br>If the audio format is not specified or is incomplete, its sample rate will be the

     * <br>If the audio format is not specified or is incomplete, its sample rate will be the

     * default output sample rate of the device (see

     * default output sample rate of the device (see

     * {@link AudioManager#PROPERTY_OUTPUT_SAMPLE_RATE}), its channel configuration will be

     * {@link AudioManager#PROPERTY_OUTPUT_SAMPLE_RATE}), its channel configuration will be

     * {@link AudioFormat#CHANNEL_IN_DEFAULT}.

     * {@link AudioFormat#CHANNEL_IN_MONO}, and the encoding will be

     * {@link AudioFormat#ENCODING_PCM_16BIT}.

     * <br>If the buffer size is not specified with {@link #setBufferSizeInBytes(int)},

     * <br>If the buffer size is not specified with {@link #setBufferSizeInBytes(int)},

     * the minimum buffer size for the source is used.

     * the minimum buffer size for the source is used.

     */

     */
@@ -533,7 +534,22 @@ public class AudioRecord 
         */

         */

        public AudioRecord build() throws UnsupportedOperationException {

        public AudioRecord build() throws UnsupportedOperationException {

            if (mFormat == null) {

            if (mFormat == null) {

                mFormat = new AudioFormat.Builder().build();

                mFormat = new AudioFormat.Builder()

                        .setEncoding(AudioFormat.ENCODING_PCM_16BIT)

                        .setChannelMask(AudioFormat.CHANNEL_IN_MONO)

                        .build();

            } else {

                if (mFormat.getEncoding() == AudioFormat.ENCODING_INVALID) {

                    mFormat = new AudioFormat.Builder(mFormat)

                            .setEncoding(AudioFormat.ENCODING_PCM_16BIT)

                            .build();

                }

                if (mFormat.getChannelMask() == AudioFormat.CHANNEL_INVALID

                        && mFormat.getChannelIndexMask() == AudioFormat.CHANNEL_INVALID) {

                    mFormat = new AudioFormat.Builder(mFormat)

                            .setChannelMask(AudioFormat.CHANNEL_IN_MONO)

                            .build();

                }

            }

            }

            if (mAttributes == null) {

            if (mAttributes == null) {

                mAttributes = new AudioAttributes.Builder()

                mAttributes = new AudioAttributes.Builder()