media: Remove the unused NdkMediaCodecBridge

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.MediaCodec;
 import android.media.MediaCodec.CryptoInfo;
 import android.media.MediaCrypto;
 import android.media.MediaFormat;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.Surface;
 
 import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.MainDex;
 import org.chromium.media.MediaCodecUtil.BitrateAdjustmentTypes;
 import org.chromium.media.MediaCodecUtil.MimeTypes;
 
 import java.nio.ByteBuffer;
 
 /**
- * A wrapper of the MediaCodec class to facilitate exception capturing and
- * audio rendering.
+ * A MediaCodec wrapper for adapting the API and catching exceptions.
  */
 @JNINamespace("media")
 class MediaCodecBridge {
     private static final String TAG = "cr_MediaCodecBridge";
 
-    // Error code for MediaCodecBridge. Keep this value in sync with
-    // MediaCodecStatus in media_codec_bridge.h.
+    // Status codes. Keep these in sync with MediaCodecStatus in media_codec_bridge.h.
     private static final int MEDIA_CODEC_OK = 0;
     private static final int MEDIA_CODEC_DEQUEUE_INPUT_AGAIN_LATER = 1;
     private static final int MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER = 2;
     private static final int MEDIA_CODEC_OUTPUT_BUFFERS_CHANGED = 3;
     private static final int MEDIA_CODEC_OUTPUT_FORMAT_CHANGED = 4;
-    private static final int MEDIA_CODEC_INPUT_END_OF_STREAM = 5;
-    private static final int MEDIA_CODEC_OUTPUT_END_OF_STREAM = 6;
-    private static final int MEDIA_CODEC_NO_KEY = 7;
-    private static final int MEDIA_CODEC_ABORT = 8;
-    private static final int MEDIA_CODEC_ERROR = 9;
+    private static final int MEDIA_CODEC_NO_KEY = 5;
+    private static final int MEDIA_CODEC_ERROR = 6;
 
     // After a flush(), dequeueOutputBuffer() can often produce empty presentation timestamps
     // for several frames. As a result, the player may find that the time does not increase
     // after decoding a frame. To detect this, we check whether the presentation timestamp from
     // dequeueOutputBuffer() is larger than input_timestamp - MAX_PRESENTATION_TIMESTAMP_SHIFT_US
     // after a flush. And we set the presentation timestamp from dequeueOutputBuffer() to be
     // non-decreasing for the remaining frames.
     private static final long MAX_PRESENTATION_TIMESTAMP_SHIFT_US = 100000;
 
     // We use only one output audio format (PCM16) that has 2 bytes per sample
@@ skipping 178 matching lines @@
                 info.mediaCodec, mime, info.supportsAdaptivePlayback, info.bitrateAdjustmentType);
     }
 
     @CalledByNative
     private void release() {
         try {
             String codecName = "unknown";
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
                 codecName = mMediaCodec.getName();
             }
-            Log.w(TAG, "calling MediaCodec.release() on " + codecName);
+            // This logging is to help us identify hung MediaCodecs in crash reports.
+            Log.w(TAG, "Releasing: " + codecName);
             mMediaCodec.release();
+            Log.w(TAG, "Codec released");

[watk, 2017/02/07 02:45:03]

This change was kind of random. Happy to revert if you want.

[liberato (no reviews please), 2017/02/07 06:19:43]

i like it.

         } catch (IllegalStateException e) {
-            // The MediaCodec is stuck in a wrong state, possibly due to losing
+            // The MediaCodec is stuck in a bad state, possibly due to losing
             // the surface.
             Log.e(TAG, "Cannot release media codec", e);
         }
         mMediaCodec = null;
     }
 
     @SuppressWarnings("deprecation")
     @CalledByNative
     private boolean start() {
         try {
@@ skipping 462 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;
         }
     }
 }