| Index: content/common/gpu/media/android_deferred_rendering_backing_strategy.h
|
| diff --git a/content/common/gpu/media/android_deferred_rendering_backing_strategy.h b/content/common/gpu/media/android_deferred_rendering_backing_strategy.h
|
| index a16e0a6d1b81a3e566d25bfd3a92213132aa02d9..214fbe372e0abfbac9fcdcbbb163ce3e4868d36d 100644
|
| --- a/content/common/gpu/media/android_deferred_rendering_backing_strategy.h
|
| +++ b/content/common/gpu/media/android_deferred_rendering_backing_strategy.h
|
| @@ -40,16 +40,23 @@ class CONTENT_EXPORT AndroidDeferredRenderingBackingStrategy
|
|
|
| // AndroidVideoDecodeAccelerator::BackingStrategy
|
| gfx::ScopedJavaSurface Initialize(int surface_view_id) override;
|
| - void Cleanup(bool have_context,
|
| - const AndroidVideoDecodeAccelerator::OutputBufferMap&) override;
|
| + void Cleanup(
|
| + bool have_context,
|
| + const AndroidVideoDecodeAccelerator::OutputBufferMap& buffers) override;
|
| scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture() const override;
|
| uint32_t GetTextureTarget() const override;
|
| gfx::Size GetPictureBufferSize() const override;
|
| - void UseCodecBufferForPictureBuffer(int32_t codec_buffer_index,
|
| - const media::PictureBuffer&) override;
|
| + void UseCodecBufferForPictureBuffer(
|
| + int32_t codec_buffer_index,
|
| + const media::PictureBuffer& picture_buffer,
|
| + const std::vector<int32_t>& pictures_out_for_display) override;
|
| void AssignOnePictureBuffer(const media::PictureBuffer&, bool) override;
|
| - void ReuseOnePictureBuffer(const media::PictureBuffer&) override;
|
| - void CodecChanged(media::VideoCodecBridge*) override;
|
| + void ReuseOnePictureBuffer(
|
| + const media::PictureBuffer& picture_buffer,
|
| + const std::vector<int32_t>& pictures_out_for_display) override;
|
| + void MaybeRenderEarly(
|
| + const std::vector<int32_t>& pictures_out_for_display) override;
|
| + void CodecChanged(media::VideoCodecBridge* codec) override;
|
| void OnFrameAvailable() override;
|
| bool ArePicturesOverlayable() override;
|
| void UpdatePictureBufferSize(media::PictureBuffer* picture_buffer,
|
|
|