| Index: content/renderer/pepper/video_decoder_shim.h
|
| diff --git a/content/renderer/pepper/video_decoder_shim.h b/content/renderer/pepper/video_decoder_shim.h
|
| index 3a0f32ae592ed93c1331ea24d64c58c52a9943c4..0d71d4b16a2e2e8bc6ba90a34aa5266aa5341ef8 100644
|
| --- a/content/renderer/pepper/video_decoder_shim.h
|
| +++ b/content/renderer/pepper/video_decoder_shim.h
|
| @@ -72,6 +72,7 @@ class VideoDecoderShim : public media::VideoDecodeAccelerator {
|
| struct PendingDecode;
|
| struct PendingFrame;
|
| class DecoderImpl;
|
| + class YUVConverter;
|
|
|
| void OnInitializeComplete(int32_t result, uint32_t texture_pool_size);
|
| void OnDecodeComplete(int32_t result, uint32_t decode_id);
|
| @@ -109,8 +110,7 @@ class VideoDecoderShim : public media::VideoDecodeAccelerator {
|
| typedef std::queue<uint32_t> CompletedDecodeQueue;
|
| CompletedDecodeQueue completed_decodes_;
|
|
|
| - // Queue of decoded frames that have been converted to RGB and await upload to
|
| - // a GL texture.
|
| + // Queue of decoded frames that await rgb->yuv conversion.
|
| typedef std::queue<linked_ptr<PendingFrame> > PendingFrameQueue;
|
| PendingFrameQueue pending_frames_;
|
|
|
| @@ -119,6 +119,8 @@ class VideoDecoderShim : public media::VideoDecodeAccelerator {
|
|
|
| uint32_t num_pending_decodes_;
|
|
|
| + scoped_ptr<YUVConverter> yuv_converter_;
|
| +
|
| base::WeakPtrFactory<VideoDecoderShim> weak_ptr_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(VideoDecoderShim);
|
|
|