Enable adaptive playback for spitzer, use conservative size.

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 437 matching lines @@
         }
 
         return new DequeueOutputResult(
                 status, index, info.flags, info.offset, info.presentationTimeUs, info.size);
     }
 
     @CalledByNative
     private boolean configureVideo(MediaFormat format, Surface surface, MediaCrypto crypto,
             int flags, boolean allowAdaptivePlayback) {
         try {
-            if (mAdaptivePlaybackSupported && allowAdaptivePlayback) {
-                format.setInteger(MediaFormat.KEY_MAX_WIDTH, MAX_ADAPTIVE_PLAYBACK_WIDTH);
-                format.setInteger(MediaFormat.KEY_MAX_HEIGHT, MAX_ADAPTIVE_PLAYBACK_HEIGHT);
+            // If adaptive playback is turned off by request, then treat it as
+            // not supported.  Note that configureVideo is only called once
+            // during creation, else this would prevent re-enabling adaptive
+            // playback later.
+            if (!allowAdaptivePlayback) mAdaptivePlaybackSupported = false;
+
+            if (mAdaptivePlaybackSupported) {
+                // The max size is a hint to the codec, and causes it to
+                // allocate more memory up front.  It still supports higher
+                // resolutions if they arrive.  So, we try to ask only for
+                // the initial size now, if it's known.
+                final int max_width = format.containsKey(MediaFormat.KEY_WIDTH)

[Tima Vaisburd, 2016/04/07 18:50:01]

I think KEY_WITH and KEY_HEIGHT are mandatory keys for Video configuration and
thus they will always be there, so you can simplify.
http://developer.android.com/reference/android/media/MediaFormat.html

[liberato (no reviews please), 2016/04/07 20:46:29]

Done.

+                        ? format.getInteger(MediaFormat.KEY_WIDTH)
+                        : MAX_ADAPTIVE_PLAYBACK_WIDTH;
+                final int max_height = format.containsKey(MediaFormat.KEY_HEIGHT)
+                        ? format.getInteger(MediaFormat.KEY_HEIGHT)
+                        : MAX_ADAPTIVE_PLAYBACK_HEIGHT;
+                format.setInteger(MediaFormat.KEY_MAX_WIDTH, max_width);
+                format.setInteger(MediaFormat.KEY_MAX_HEIGHT, max_height);
             }
             mMediaCodec.configure(format, surface, crypto, flags);
             return true;
         } catch (IllegalArgumentException e) {
             Log.e(TAG, "Cannot configure the video codec, wrong format or surface", e);
         } catch (IllegalStateException e) {
             Log.e(TAG, "Cannot configure the video codec", e);
         } catch (MediaCodec.CryptoException e) {
             Log.e(TAG, "Cannot configure the video codec: DRM error", e);
         } catch (Exception e) {
@@ skipping 18 matching lines @@
         MediaFormat format = MediaFormat.createVideoFormat(mime, width, height);
         format.setInteger(MediaFormat.KEY_BIT_RATE, bitRate);
         format.setInteger(MediaFormat.KEY_FRAME_RATE, frameRate);
         format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, iFrameInterval);
         format.setInteger(MediaFormat.KEY_COLOR_FORMAT, colorFormat);
         return format;
     }
 
     @CalledByNative
     private boolean isAdaptivePlaybackSupported(int width, int height) {
-        if (!mAdaptivePlaybackSupported) return false;
-        return width <= MAX_ADAPTIVE_PLAYBACK_WIDTH && height <= MAX_ADAPTIVE_PLAYBACK_HEIGHT;
+        // If media codec has adaptive playback supported, then the max sizes
+        // used during creation are only hints.
+        return mAdaptivePlaybackSupported;
     }
 
     @CalledByNative
     private static void setCodecSpecificData(MediaFormat format, int index, byte[] bytes) {
         // Codec Specific Data is set in the MediaFormat as ByteBuffer entries with keys csd-0,
         // csd-1, and so on. See: http://developer.android.com/reference/android/media/MediaCodec.html
         // for details.
         String name;
         switch (index) {
             case 0:
@@ skipping 154 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;
         }
     }
 }