| Index: content/common/gpu/media/android_copying_backing_strategy.cc
|
| diff --git a/content/common/gpu/media/android_copying_backing_strategy.cc b/content/common/gpu/media/android_copying_backing_strategy.cc
|
| index 53faeef96ffc522a7f1bba8e0c96dda3afc44a84..be01f7ce3948a13046c363723f48ee9838efec23 100644
|
| --- a/content/common/gpu/media/android_copying_backing_strategy.cc
|
| +++ b/content/common/gpu/media/android_copying_backing_strategy.cc
|
| @@ -56,7 +56,7 @@ gfx::ScopedJavaSurface AndroidCopyingBackingStrategy::Initialize(
|
|
|
| void AndroidCopyingBackingStrategy::Cleanup(
|
| bool have_context,
|
| - const AndroidVideoDecodeAccelerator::OutputBufferMap&) {
|
| + const AndroidVideoDecodeAccelerator::OutputBufferMap& buffers) {
|
| DCHECK(state_provider_->ThreadChecker().CalledOnValidThread());
|
|
|
| if (copier_)
|
| @@ -81,7 +81,8 @@ gfx::Size AndroidCopyingBackingStrategy::GetPictureBufferSize() const {
|
|
|
| void AndroidCopyingBackingStrategy::UseCodecBufferForPictureBuffer(
|
| int32_t codec_buf_index,
|
| - const media::PictureBuffer& picture_buffer) {
|
| + const media::PictureBuffer& picture_buffer,
|
| + const std::vector<int32_t>& pictures_out_for_display) {
|
| // Make sure that the decoder is available.
|
| RETURN_ON_FAILURE(state_provider_, state_provider_->GetGlDecoder().get(),
|
| "Failed to get gles2 decoder instance.", ILLEGAL_STATE);
|
|
|