| 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 733b25b0a45a7685449bdb4cb00e2b4b3a45267e..2dc95ea9311f700ec4844290a30dd82b52fa932f 100644
|
| --- a/content/common/gpu/media/android_deferred_rendering_backing_strategy.h
|
| +++ b/content/common/gpu/media/android_deferred_rendering_backing_strategy.h
|
| @@ -49,9 +49,7 @@ class CONTENT_EXPORT AndroidDeferredRenderingBackingStrategy
|
| const media::PictureBuffer&) override;
|
| void AssignOnePictureBuffer(const media::PictureBuffer&, bool) override;
|
| void ReuseOnePictureBuffer(const media::PictureBuffer&) override;
|
| - void CodecChanged(
|
| - media::VideoCodecBridge*,
|
| - const AndroidVideoDecodeAccelerator::OutputBufferMap&) override;
|
| + void CodecChanged(media::VideoCodecBridge*) override;
|
| void OnFrameAvailable() override;
|
| bool ArePicturesOverlayable() override;
|
| void UpdatePictureBufferSize(media::PictureBuffer* picture_buffer,
|
| @@ -62,8 +60,9 @@ class CONTENT_EXPORT AndroidDeferredRenderingBackingStrategy
|
| // back to the codec. It is okay if there is no such buffer.
|
| void ReleaseCodecBufferForPicture(const media::PictureBuffer& picture_buffer);
|
|
|
| - // Return the AVDACodecImage for a given PictureBuffer's texture.
|
| - AVDACodecImage* GetImageForPicture(const media::PictureBuffer&);
|
| + // Sets up the texture references (as found by |picture_buffer|), for the
|
| + // specified |image|. If |image| is null, clears any ref on the texture
|
| + // associated with |picture_buffer|.
|
| void SetImageForPicture(
|
| const media::PictureBuffer& picture_buffer,
|
| const scoped_refptr<gpu::gles2::GLStreamTextureImage>& image);
|
|
|