| Index: media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
|
| diff --git a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
|
| index adc7f7747ba6cc06e6dcdac94df591864da070a7..8af311153324667ccc26d78bef864672996b6e43 100644
|
| --- a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
|
| +++ b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
|
| @@ -410,9 +410,9 @@ class MediaCodecBridge {
|
|
|
| @CalledByNative
|
| private boolean configureVideo(MediaFormat format, Surface surface, MediaCrypto crypto,
|
| - int flags) {
|
| + int flags, boolean allowAdaptivePlayback) {
|
| try {
|
| - if (mAdaptivePlaybackSupported) {
|
| + if (mAdaptivePlaybackSupported && allowAdaptivePlayback) {
|
| format.setInteger(MediaFormat.KEY_MAX_WIDTH, MAX_ADAPTIVE_PLAYBACK_WIDTH);
|
| format.setInteger(MediaFormat.KEY_MAX_HEIGHT, MAX_ADAPTIVE_PLAYBACK_HEIGHT);
|
| }
|
|
|