| Index: media/base/android/sdk_media_codec_bridge.h
|
| diff --git a/media/base/android/sdk_media_codec_bridge.h b/media/base/android/sdk_media_codec_bridge.h
|
| index b729eab67770f35ae83203d94212b5ac74067f8b..bf072b41c02507f3579645f91ba6dd5bfc91dcfe 100644
|
| --- a/media/base/android/sdk_media_codec_bridge.h
|
| +++ b/media/base/android/sdk_media_codec_bridge.h
|
| @@ -162,10 +162,12 @@ class MEDIA_EXPORT VideoCodecBridge : public SdkMediaCodecBridge {
|
| // Create, start, and return a VideoCodecBridge decoder or NULL on failure.
|
| static VideoCodecBridge* CreateDecoder(
|
| const VideoCodec& codec, // e.g. media::kCodecVP8
|
| - bool is_secure,
|
| - const gfx::Size& size, // Output frame size.
|
| - jobject surface, // Output surface, optional.
|
| - jobject media_crypto); // MediaCrypto object, optional.
|
| + bool is_secure, // Will be used with encrypted content.
|
| + const gfx::Size& size, // Output frame size.
|
| + jobject surface, // Output surface, optional.
|
| + jobject media_crypto, // MediaCrypto object, optional.
|
| + bool allow_adaptive_playback =
|
| + true); // Should adaptive playback be allowed if supported.
|
|
|
| // Create, start, and return a VideoCodecBridge encoder or NULL on failure.
|
| static VideoCodecBridge* CreateEncoder(
|
|
|