Android: Propagate sample rate change to audio decoder job

media/base/android/java/src/org/chromium/media/MediaCodecBridge.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.media;
 
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioTrack;
 import android.media.MediaCodec;
@@ skipping 59 matching lines @@
 
     private ByteBuffer[] mInputBuffers;
     private ByteBuffer[] mOutputBuffers;
 
     private MediaCodec mMediaCodec;
     private AudioTrack mAudioTrack;
     private boolean mFlushed;
     private long mLastPresentationTimeUs;
     private String mMime;
     private boolean mAdaptivePlaybackSupported;
-    private int mSampleRate;
 
     private static class DequeueInputResult {
         private final int mStatus;
         private final int mIndex;
 
         private DequeueInputResult(int status, int index) {
             mStatus = status;
             mIndex = index;
         }
 
@@ skipping 351 matching lines @@
 
     @CalledByNative
     private int getOutputWidth() {
         MediaFormat format = mMediaCodec.getOutputFormat();
         return outputFormatHasCropValues(format)
                 ? format.getInteger(KEY_CROP_RIGHT) - format.getInteger(KEY_CROP_LEFT) + 1
                 : format.getInteger(MediaFormat.KEY_WIDTH);
     }
 
     @CalledByNative
+    private int getOutputSamplingRate() {
+        MediaFormat format = mMediaCodec.getOutputFormat();
+        return format.getInteger(MediaFormat.KEY_SAMPLE_RATE);
+    }
+
+    @CalledByNative
     private ByteBuffer getInputBuffer(int index) {
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
             return mMediaCodec.getInputBuffer(index);
         }
         return mInputBuffers[index];
     }
 
     @CalledByNative
     private ByteBuffer getOutputBuffer(int index) {
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
@@ skipping 100 matching lines @@
                 status = MEDIA_CODEC_OK;
                 index = indexOrStatus;
             } else if (indexOrStatus == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED) {
                 mOutputBuffers = mMediaCodec.getOutputBuffers();
                 status = MEDIA_CODEC_OUTPUT_BUFFERS_CHANGED;
             } else if (indexOrStatus == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
                 status = MEDIA_CODEC_OUTPUT_FORMAT_CHANGED;
                 MediaFormat newFormat = mMediaCodec.getOutputFormat();
                 if (mAudioTrack != null && newFormat.containsKey(MediaFormat.KEY_SAMPLE_RATE)) {
                     int newSampleRate = newFormat.getInteger(MediaFormat.KEY_SAMPLE_RATE);
-                    if (newSampleRate != mSampleRate && !reconfigureAudioTrack(newFormat)) {
+                    if (mAudioTrack.setPlaybackRate(newSampleRate) != AudioTrack.SUCCESS) {
                         status = MEDIA_CODEC_ERROR;
                     }
                 }
             } else if (indexOrStatus == MediaCodec.INFO_TRY_AGAIN_LATER) {
                 status = MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER;
             } else {
                 Log.e(TAG, "Unexpected index_or_status: " + indexOrStatus);
                 assert false;
             }
         } catch (IllegalStateException e) {
@@ skipping 82 matching lines @@
     @CalledByNative
     private static void setFrameHasADTSHeader(MediaFormat format) {
         format.setInteger(MediaFormat.KEY_IS_ADTS, 1);
     }
 
     @CalledByNative
     private boolean configureAudio(MediaFormat format, MediaCrypto crypto, int flags,
             boolean playAudio) {
         try {
             mMediaCodec.configure(format, null, crypto, flags);
-            if (playAudio && !reconfigureAudioTrack(format)) {
-                return false;
+            if (playAudio) {
+                int sampleRate = format.getInteger(MediaFormat.KEY_SAMPLE_RATE);
+                int channelCount = format.getInteger(MediaFormat.KEY_CHANNEL_COUNT);
+                int channelConfig = getAudioFormat(channelCount);
+                // Using 16bit PCM for output. Keep this value in sync with
+                // kBytesPerAudioOutputSample in media_codec_bridge.cc.
+                int minBufferSize = AudioTrack.getMinBufferSize(sampleRate, channelConfig,
+                        AudioFormat.ENCODING_PCM_16BIT);
+                mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate, channelConfig,
+                        AudioFormat.ENCODING_PCM_16BIT, minBufferSize, AudioTrack.MODE_STREAM);
+                if (mAudioTrack.getState() == AudioTrack.STATE_UNINITIALIZED) {
+                    mAudioTrack = null;
+                    return false;
+                }
             }
             return true;
         } catch (IllegalStateException e) {
             Log.e(TAG, "Cannot configure the audio codec", e);
         }
         return false;
     }
 
     /**
-     * Resets the AudioTrack instance, configured according to the given format.
-     * If a previous AudioTrack instance already exists, release it.
-     *
-     * @param format The format from which to get sample rate and channel count.
-     * @return Whether or not creating the AudioTrack succeeded.
-     */
-    private boolean reconfigureAudioTrack(MediaFormat format) {
-        if (mAudioTrack != null) {
-            mAudioTrack.release();
-        }
-
-        mSampleRate = format.getInteger(MediaFormat.KEY_SAMPLE_RATE);
-        int channelCount = format.getInteger(MediaFormat.KEY_CHANNEL_COUNT);
-        int channelConfig = getAudioFormat(channelCount);
-        // Using 16bit PCM for output. Keep this value in sync with
-        // kBytesPerAudioOutputSample in media_codec_bridge.cc.
-        int minBufferSize = AudioTrack.getMinBufferSize(mSampleRate, channelConfig,
-                AudioFormat.ENCODING_PCM_16BIT);
-        mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, mSampleRate, channelConfig,
-                AudioFormat.ENCODING_PCM_16BIT, minBufferSize, AudioTrack.MODE_STREAM);
-        if (mAudioTrack.getState() == AudioTrack.STATE_UNINITIALIZED) {
-            mAudioTrack = null;
-            Log.e(TAG, "Failed to initialize AudioTrack");
-            return false;
-        }
-        return true;
-    }
-
-    /**
      *  Play the audio buffer that is passed in.
      *
      *  @param buf Audio buffer to be rendered.
      *  @return The number of frames that have already been consumed by the
      *  hardware. This number resets to 0 after each flush call.
      */
     @CalledByNative
     private long playOutputBuffer(byte[] buf) {
         if (mAudioTrack == null) {
             return 0;
@@ skipping 44 matching lines @@
                 return AudioFormat.CHANNEL_OUT_QUAD;
             case 6:
                 return AudioFormat.CHANNEL_OUT_5POINT1;
             case 8:
                 return AudioFormat.CHANNEL_OUT_7POINT1;
             default:
                 return AudioFormat.CHANNEL_OUT_DEFAULT;
         }
     }
 }