Use MediaFormat's crop rectangle when available instead of width/height.

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 44 matching lines @@
     private static final int MAX_ADAPTIVE_PLAYBACK_HEIGHT = 1080;
 
     // 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;
 
+    // TODO(qinmin): Use MediaFormat constants when part of the public API.
+    private static final String KEY_CROP_LEFT = "crop-left";
+    private static final String KEY_CROP_RIGHT = "crop-right";
+    private static final String KEY_CROP_BOTTOM = "crop-bottom";
+    private static final String KEY_CROP_TOP = "crop-top";
+
     private ByteBuffer[] mInputBuffers;
     private ByteBuffer[] mOutputBuffers;
 
     private MediaCodec mMediaCodec;
     private AudioTrack mAudioTrack;
     private boolean mFlushed;
     private long mLastPresentationTimeUs;
     private String mMime;
     private boolean mAdaptivePlaybackSupported;
 
@@ skipping 162 matching lines @@
         for (int i = 0; i < count; ++i) {
             MediaCodecInfo info = MediaCodecList.getCodecInfoAt(i);
             if (!info.isEncoder())
                 continue;
 
             String[] supportedTypes = info.getSupportedTypes();
             for (int j = 0; j < supportedTypes.length; ++j) {
                 if (!supportedTypes[j].equalsIgnoreCase(mime))
                     continue;
 
-                MediaCodecInfo.CodecCapabilities capabilities =
-                    info.getCapabilitiesForType(mime);
+                MediaCodecInfo.CodecCapabilities capabilities = info.getCapabilitiesForType(mime);

[gunsch, 2014/11/05 00:05:51]

note: this change was due to a presubmit error, prevented me from uploading

[qinmin, 2014/11/05 00:28:00]

this line is now more than 100 chars long, what is the presubmit error? I think
the previous presubmit error is probably 8 char spacing against 4 char spacing

[gunsch, 2014/11/05 00:31:44]

Yes, indentation was the warning. This is only 98 characters, however.

                 return capabilities.colorFormats;
             }
         }
         return null;
     }
 
     @SuppressWarnings("deprecation")
     private static String getDecoderNameForMime(String mime) {
         int count = MediaCodecList.getCodecCount();
         for (int i = 0; i < count; ++i) {
@@ skipping 135 matching lines @@
     }
 
     @CalledByNative
     private void stop() {
         mMediaCodec.stop();
         if (mAudioTrack != null) {
             mAudioTrack.pause();
         }
     }
 
+    private boolean outputFormatHasCropValues(MediaFormat format) {
+        return format.containsKey(KEY_CROP_RIGHT) && format.containsKey(KEY_CROP_LEFT)
+                && format.containsKey(KEY_CROP_BOTTOM) && format.containsKey(KEY_CROP_TOP);
+    }
+
     @CalledByNative
     private int getOutputHeight() {
-        return mMediaCodec.getOutputFormat().getInteger(MediaFormat.KEY_HEIGHT);
+        MediaFormat format = mMediaCodec.getOutputFormat();
+        return outputFormatHasCropValues(format)
+                ? format.getInteger(KEY_CROP_BOTTOM) - format.getInteger(KEY_CROP_TOP) + 1
+                : format.getInteger(MediaFormat.KEY_HEIGHT);
     }
 
     @CalledByNative
     private int getOutputWidth() {
-        return mMediaCodec.getOutputFormat().getInteger(MediaFormat.KEY_WIDTH);
+        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 ByteBuffer getInputBuffer(int index) {
         return mInputBuffers[index];
     }
 
     @CalledByNative
     private ByteBuffer getOutputBuffer(int index) {
         return mOutputBuffers[index];
@@ skipping 290 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;
         }
     }
 }