| 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 0eac81eeb648c20fe03221d6d69056b8d74abccf..db4a830c6a9428f351f415fdda4c2864b0007102 100644
|
| --- a/content/renderer/pepper/video_decoder_shim.h
|
| +++ b/content/renderer/pepper/video_decoder_shim.h
|
| @@ -7,17 +7,16 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <queue>
|
| #include <vector>
|
|
|
| #include "base/containers/hash_tables.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "gpu/command_buffer/common/mailbox.h"
|
| #include "media/base/video_decoder_config.h"
|
| #include "media/video/video_decode_accelerator.h"
|
| -
|
| #include "ppapi/c/pp_codecs.h"
|
|
|
| namespace base {
|
| @@ -76,7 +75,7 @@ class VideoDecoderShim : public media::VideoDecodeAccelerator {
|
|
|
| void OnInitializeFailed();
|
| void OnDecodeComplete(int32_t result, uint32_t decode_id);
|
| - void OnOutputComplete(scoped_ptr<PendingFrame> frame);
|
| + void OnOutputComplete(std::unique_ptr<PendingFrame> frame);
|
| void SendPictures();
|
| void OnResetComplete();
|
| void NotifyCompletedDecodes();
|
| @@ -86,7 +85,7 @@ class VideoDecoderShim : public media::VideoDecodeAccelerator {
|
| // creating picture textures.
|
| void FlushCommandBuffer();
|
|
|
| - scoped_ptr<DecoderImpl> decoder_impl_;
|
| + std::unique_ptr<DecoderImpl> decoder_impl_;
|
| State state_;
|
|
|
| PepperVideoDecoderHost* host_;
|
| @@ -111,7 +110,7 @@ class VideoDecoderShim : public media::VideoDecodeAccelerator {
|
| CompletedDecodeQueue completed_decodes_;
|
|
|
| // Queue of decoded frames that await rgb->yuv conversion.
|
| - typedef std::queue<scoped_ptr<PendingFrame>> PendingFrameQueue;
|
| + typedef std::queue<std::unique_ptr<PendingFrame>> PendingFrameQueue;
|
| PendingFrameQueue pending_frames_;
|
|
|
| // The optimal number of textures to allocate for decoder_impl_.
|
| @@ -119,7 +118,7 @@ class VideoDecoderShim : public media::VideoDecodeAccelerator {
|
|
|
| uint32_t num_pending_decodes_;
|
|
|
| - scoped_ptr<YUVConverter> yuv_converter_;
|
| + std::unique_ptr<YUVConverter> yuv_converter_;
|
|
|
| base::WeakPtrFactory<VideoDecoderShim> weak_ptr_factory_;
|
|
|
|
|