Chromium Code Reviews| 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 9be4cbc78a9378da230780aa8c2a3979c8d1e891..b8bbb6df82f4faa495e325e33b2fe519c009d75b 100644 |
| --- a/media/base/android/sdk_media_codec_bridge.h |
| +++ b/media/base/android/sdk_media_codec_bridge.h |
| @@ -136,14 +136,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. |
|
dcheng
2016/10/17 22:39:49
FWIW, the wrapping here might be a bit nicer if th
watk
2016/10/17 22:47:17
Done.
|
| + 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( |