| Index: media/base/android/media_codec_bridge.h
|
| diff --git a/media/base/android/media_codec_bridge.h b/media/base/android/media_codec_bridge.h
|
| index 99ac6e8e9994c9963f950766cac643c9182d83ed..73f070d81de9cb44542d0d050c6f0d71c6c46e0d 100644
|
| --- a/media/base/android/media_codec_bridge.h
|
| +++ b/media/base/android/media_codec_bridge.h
|
| @@ -129,6 +129,19 @@ class MEDIA_EXPORT MediaCodecBridge {
|
| int index,
|
| const uint8* data,
|
| size_t data_size,
|
| + const std::string& key_id,
|
| + const std::string& iv,
|
| + const std::vector<SubsampleEntry>& subsamples,
|
| + const base::TimeDelta& presentation_time);
|
| +
|
| + // Same QueueSecureInputBuffer overriden for the use with MediaSourcePlayer
|
| + // and MediaCodecPlayer.
|
| + // TODO(timav): remove this method and keep only the one above after we
|
| + // switch to the Spitzer pipeline.
|
| + MediaCodecStatus QueueSecureInputBuffer(
|
| + int index,
|
| + const uint8* data,
|
| + size_t data_size,
|
| const uint8* key_id,
|
| int key_id_size,
|
| const uint8* iv,
|
|
|