Remove MediaCodecBridge::GetOutputBuffersCount() and GetOutputBuffersCapacity()

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.annotation.TargetApi;
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioTrack;
@@ skipping 281 matching lines @@
 
     @CalledByNative
     private ByteBuffer getOutputBuffer(int index) {
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
             return mMediaCodec.getOutputBuffer(index);
         }
         return mOutputBuffers[index];
     }
 
     @CalledByNative
-    private int getOutputBuffersCount() {
-        return mOutputBuffers != null ? mOutputBuffers.length : -1;
-    }
-
-    @CalledByNative
-    private int getOutputBuffersCapacity() {
-        return mOutputBuffers != null ? mOutputBuffers[0].capacity() : -1;
-    }
-
-    @CalledByNative
     private int queueInputBuffer(
             int index, int offset, int size, long presentationTimeUs, int flags) {
         resetLastPresentationTimeIfNeeded(presentationTimeUs);
         try {
-            if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
-                mMediaCodec.getInputBuffer(index);
-            }
             mMediaCodec.queueInputBuffer(index, offset, size, presentationTimeUs, flags);
         } catch (Exception e) {
             Log.e(TAG, "Failed to queue input buffer", e);
             return MEDIA_CODEC_ERROR;
         }
         return MEDIA_CODEC_OK;
     }
 
     @TargetApi(Build.VERSION_CODES.KITKAT)
     @CalledByNative
@@ skipping 32 matching lines @@
         } catch (IllegalStateException e) {
             Log.e(TAG, "Failed to queue secure input buffer, IllegalStateException " + e);
             return MEDIA_CODEC_ERROR;
         }
         return MEDIA_CODEC_OK;
     }
 
     @CalledByNative
     private void releaseOutputBuffer(int index, boolean render) {
         try {
-            if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
-                mMediaCodec.getOutputBuffer(index);
-            }
             mMediaCodec.releaseOutputBuffer(index, render);
         } catch (IllegalStateException e) {
             // TODO(qinmin): May need to report the error to the caller. crbug.com/356498.
             Log.e(TAG, "Failed to release output buffer", e);
         }
     }
 
     @SuppressWarnings("deprecation")
     @CalledByNative
     private DequeueOutputResult dequeueOutputBuffer(long timeoutUs) {
         MediaCodec.BufferInfo info = new MediaCodec.BufferInfo();
         int status = MEDIA_CODEC_ERROR;
         int index = -1;
         try {
             int indexOrStatus = mMediaCodec.dequeueOutputBuffer(info, timeoutUs);
             if (info.presentationTimeUs < mLastPresentationTimeUs) {
                 // TODO(qinmin): return a special code through DequeueOutputResult
                 // to notify the native code the the frame has a wrong presentation
                 // timestamp and should be skipped.
                 info.presentationTimeUs = mLastPresentationTimeUs;
             }
             mLastPresentationTimeUs = info.presentationTimeUs;
 
             if (indexOrStatus >= 0) { // index!
                 status = MEDIA_CODEC_OK;
                 index = indexOrStatus;
             } else if (indexOrStatus == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED) {
+                assert Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT;
                 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 (mAudioTrack.setPlaybackRate(newSampleRate) != AudioTrack.SUCCESS) {
                         status = MEDIA_CODEC_ERROR;
                     }
@@ skipping 212 matching lines @@
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                     return AudioFormat.CHANNEL_OUT_7POINT1_SURROUND;
                 } else {
                     return AudioFormat.CHANNEL_OUT_7POINT1;
                 }
             default:
                 return AudioFormat.CHANNEL_OUT_DEFAULT;
         }
     }
 }