Index: chromecast/media/cma/pipeline/av_pipeline_impl.h |
diff --git a/chromecast/media/cma/pipeline/av_pipeline_impl.h b/chromecast/media/cma/pipeline/av_pipeline_impl.h |
index ad44026edaac46737ed7d33eb9e5f6e5f2c4702d..1ceb0ebb8f173405e2fd4d04563476fd4ff2f08d 100644 |
--- a/chromecast/media/cma/pipeline/av_pipeline_impl.h |
+++ b/chromecast/media/cma/pipeline/av_pipeline_impl.h |
@@ -9,12 +9,12 @@ |
#include <stdint.h> |
#include <list> |
+#include <memory> |
#include <string> |
#include "base/callback.h" |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "base/threading/thread_checker.h" |
#include "chromecast/media/cma/pipeline/av_pipeline_client.h" |
@@ -79,7 +79,7 @@ class AvPipelineImpl : MediaPipelineBackend::Decoder::Delegate { |
const ::media::VideoDecoderConfig& video_config) = 0; |
// Setting the frame provider must be done in the |kUninitialized| state. |
- void SetCodedFrameProvider(scoped_ptr<CodedFrameProvider> frame_provider, |
+ void SetCodedFrameProvider(std::unique_ptr<CodedFrameProvider> frame_provider, |
size_t max_buffer_size, |
size_t max_frame_size); |
@@ -151,7 +151,7 @@ class AvPipelineImpl : MediaPipelineBackend::Decoder::Delegate { |
std::list<scoped_refptr<DecoderBufferBase> > non_playable_frames_; |
// Buffer provider. |
- scoped_ptr<BufferingFrameProvider> frame_provider_; |
+ std::unique_ptr<BufferingFrameProvider> frame_provider_; |
// Indicate whether the frame fetching process is active. |
bool enable_feeding_; |