Convert //media/filters from scoped_ptr to std::unique_ptr

media/filters/ffmpeg_demuxer.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Implements the Demuxer interface using FFmpeg's libavformat.  At this time
 // will support demuxing any audio/video format thrown at it.  The streams
 // output mime types audio/x-ffmpeg and video/x-ffmpeg and include an integer
 // key FFmpegCodecID which contains the CodecID enumeration value.  The CodecIDs
 // can be used to create and initialize the corresponding FFmpeg decoder.
 //
 // FFmpegDemuxer sets the duration of pipeline during initialization by using
 // the duration of the longest audio/video stream.
 //
 // NOTE: since FFmpegDemuxer reads packets sequentially without seeking, media
 // files with very large drift between audio/video streams may result in
 // excessive memory consumption.
 //
 // When stopped, FFmpegDemuxer and FFmpegDemuxerStream release all callbacks
 // and buffered packets.  Reads from a stopped FFmpegDemuxerStream will not be
 // replied to.
 
 #ifndef MEDIA_FILTERS_FFMPEG_DEMUXER_H_
 #define MEDIA_FILTERS_FFMPEG_DEMUXER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
+#include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/threading/thread.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decoder_buffer_queue.h"
 #include "media/base/demuxer.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/text_track_config.h"
 #include "media/base/video_decoder_config.h"
 #include "media/ffmpeg/ffmpeg_deleters.h"
 #include "media/filters/blocking_url_protocol.h"
 
 // FFmpeg forward declarations.
 struct AVPacket;
 struct AVRational;
 struct AVStream;
 
 namespace media {
 
 class MediaLog;
 class FFmpegBitstreamConverter;
 class FFmpegDemuxer;
 class FFmpegGlue;
 
-typedef scoped_ptr<AVPacket, ScopedPtrAVFreePacket> ScopedAVPacket;
+typedef std::unique_ptr<AVPacket, ScopedPtrAVFreePacket> ScopedAVPacket;
 
 class FFmpegDemuxerStream : public DemuxerStream {
  public:
   // Attempts to create FFmpegDemuxerStream form the given AVStream. Will return
   // null if the AVStream cannot be translated into a valid decoder config.
   //
   // FFmpegDemuxerStream keeps a copy of |demuxer| and initializes itself using
   // information inside |stream|. Both parameters must outlive |this|.
-  static scoped_ptr<FFmpegDemuxerStream> Create(
+  static std::unique_ptr<FFmpegDemuxerStream> Create(
       FFmpegDemuxer* demuxer,
       AVStream* stream,
       const scoped_refptr<MediaLog>& media_log);
 
   ~FFmpegDemuxerStream() override;
 
   // Enqueues the given AVPacket. It is invalid to queue a |packet| after
   // SetEndOfStream() has been called.
   void EnqueuePacket(ScopedAVPacket packet);
 
@@ skipping 55 matching lines @@
 
  private:
   friend class FFmpegDemuxerTest;
 
   // Use FFmpegDemuxerStream::Create to construct.
   // Audio/Video streams must include their respective DecoderConfig. At most
   // one DecoderConfig should be provided (leaving the other nullptr). Both
   // configs should be null for text streams.
   FFmpegDemuxerStream(FFmpegDemuxer* demuxer,
                       AVStream* stream,
-                      scoped_ptr<AudioDecoderConfig> audio_config,
-                      scoped_ptr<VideoDecoderConfig> video_config);
+                      std::unique_ptr<AudioDecoderConfig> audio_config,
+                      std::unique_ptr<VideoDecoderConfig> video_config);
 
   // Runs |read_cb_| if present with the front of |buffer_queue_|, calling
   // NotifyCapacityAvailable() if capacity is still available.
   void SatisfyPendingRead();
 
   // Converts an FFmpeg stream timestamp into a base::TimeDelta.
   static base::TimeDelta ConvertStreamTimestamp(const AVRational& time_base,
                                                 int64_t timestamp);
 
   // Resets any currently active bitstream converter.
   void ResetBitstreamConverter();
 
   // Create new bitstream converter, destroying active converter if present.
   void InitBitstreamConverter();
 
   FFmpegDemuxer* demuxer_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   AVStream* stream_;
-  scoped_ptr<AudioDecoderConfig> audio_config_;
-  scoped_ptr<VideoDecoderConfig> video_config_;
+  std::unique_ptr<AudioDecoderConfig> audio_config_;
+  std::unique_ptr<VideoDecoderConfig> video_config_;
   Type type_;
   Liveness liveness_;
   base::TimeDelta duration_;
   bool end_of_stream_;
   base::TimeDelta last_packet_timestamp_;
   base::TimeDelta last_packet_duration_;
   Ranges<base::TimeDelta> buffered_ranges_;
   VideoRotation video_rotation_;
 
   DecoderBufferQueue buffer_queue_;
   ReadCB read_cb_;
 
 #if defined(USE_PROPRIETARY_CODECS)
-  scoped_ptr<FFmpegBitstreamConverter> bitstream_converter_;
+  std::unique_ptr<FFmpegBitstreamConverter> bitstream_converter_;
 #endif
 
   std::string encryption_key_id_;
   bool fixup_negative_timestamps_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxerStream);
 };
 
 class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
  public:
@@ skipping 130 matching lines @@
   base::Time timeline_offset_;
 
   // Whether text streams have been enabled for this demuxer.
   bool text_enabled_;
 
   // Set if we know duration of the audio stream. Used when processing end of
   // stream -- at this moment we definitely know duration.
   bool duration_known_;
 
   // FFmpegURLProtocol implementation and corresponding glue bits.
-  scoped_ptr<BlockingUrlProtocol> url_protocol_;
-  scoped_ptr<FFmpegGlue> glue_;
+  std::unique_ptr<BlockingUrlProtocol> url_protocol_;
+  std::unique_ptr<FFmpegGlue> glue_;
 
   const EncryptedMediaInitDataCB encrypted_media_init_data_cb_;
 
   const MediaTracksUpdatedCB media_tracks_updated_cb_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<FFmpegDemuxer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_DEMUXER_H_