Chromium Code Reviews| Index: media/base/android/video_decoder_job.cc |
| diff --git a/media/base/android/video_decoder_job.cc b/media/base/android/video_decoder_job.cc |
| index bca7fa4afb4be1cdd9237fe33ff8ff412092cbda..c7ecc66353f17f21c86d911356fc06ba50f31901 100644 |
| --- a/media/base/android/video_decoder_job.cc |
| +++ b/media/base/android/video_decoder_job.cc |
| @@ -137,9 +137,10 @@ MediaDecoderJob::MediaDecoderJobStatus |
| bool is_secure = is_content_encrypted() && drm_bridge() && |
| drm_bridge()->IsProtectedSurfaceRequired(); |
| + const std::vector<uint8_t> csd; |
|
sandersd (OOO until July 31)
2016/09/27 20:03:16
empty_csd?
watk
2016/09/27 21:44:36
Done.
|
| media_codec_bridge_.reset(VideoCodecBridge::CreateDecoder( |
| video_codec_, is_secure, gfx::Size(config_width_, config_height_), |
| - surface_.j_surface().obj(), GetMediaCrypto())); |
| + surface_.j_surface().obj(), GetMediaCrypto(), csd, csd)); |
| if (!media_codec_bridge_) |
| return STATUS_FAILURE; |