| 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 57d218bbaa9c8014fdbe0846d22238bb1c023faa..ac4a4021b696dd57173d72c026701955707729ae 100644
|
| --- a/media/base/android/sdk_media_codec_bridge.h
|
| +++ b/media/base/android/sdk_media_codec_bridge.h
|
| @@ -163,14 +163,17 @@ 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, // Will be used with encrypted content.
|
| - const gfx::Size& size, // Output frame size.
|
| - jobject surface, // Output surface, optional.
|
| - jobject media_crypto, // MediaCrypto object, optional.
|
| + const VideoCodec& codec,
|
| + 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.
|
| + const std::vector<uint8_t>&
|
| + csd0, // Codec specific data. See MediaCodec docs.
|
| + const std::vector<uint8_t>& csd1,
|
| bool allow_adaptive_playback =
|
| true, // Should adaptive playback be allowed if supported.
|
| - bool require_software_codec = false); // Require software decoder?
|
| + bool require_software_codec = false);
|
|
|
| // Create, start, and return a VideoCodecBridge encoder or NULL on failure.
|
| static VideoCodecBridge* CreateEncoder(
|
|
|