Convert MediaLog from being ref counted to owned by WebMediaPlayer.

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.
 //
@@ skipping 50 matching lines @@
 
 typedef std::unique_ptr<AVPacket, ScopedPtrAVFreePacket> ScopedAVPacket;
 
 class MEDIA_EXPORT 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 std::unique_ptr<FFmpegDemuxerStream> Create(
-      FFmpegDemuxer* demuxer,
-      AVStream* stream,
-      const scoped_refptr<MediaLog>& media_log);
+  static std::unique_ptr<FFmpegDemuxerStream> Create(FFmpegDemuxer* demuxer,
+                                                     AVStream* stream,
+                                                     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);
 
   // Enters the end of stream state. After delivering remaining queued buffers
   // only end of stream buffers will be delivered.
   void SetEndOfStream();
@@ skipping 63 matching lines @@
   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,
                       std::unique_ptr<AudioDecoderConfig> audio_config,
                       std::unique_ptr<VideoDecoderConfig> video_config,
-                      scoped_refptr<MediaLog> media_log);
+                      MediaLog* media_log);
 
   // 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_;
   base::TimeDelta start_time_;
   std::unique_ptr<AudioDecoderConfig> audio_config_;
   std::unique_ptr<VideoDecoderConfig> video_config_;
-  scoped_refptr<MediaLog> media_log_;
+  MediaLog* media_log_;
   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_;
   bool is_enabled_;
   bool waiting_for_keyframe_;
@@ skipping 12 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxerStream);
 };
 
 class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
  public:
   FFmpegDemuxer(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
                 DataSource* data_source,
                 const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
                 const MediaTracksUpdatedCB& media_tracks_updated_cb,
-                const scoped_refptr<MediaLog>& media_log);
+                MediaLog* media_log);
   ~FFmpegDemuxer() override;
 
   // Demuxer implementation.
   std::string GetDisplayName() const override;
   void Initialize(DemuxerHost* host,
                   const PipelineStatusCB& status_cb,
                   bool enable_text_tracks) override;
   void AbortPendingReads() override;
   void Stop() override;
   void StartWaitingForSeek(base::TimeDelta seek_time) override;
@@ skipping 101 matching lines @@
   //
   // Once initialized, operations on FFmpegDemuxerStreams should be carried out
   // on the demuxer thread.
   using StreamVector = std::vector<std::unique_ptr<FFmpegDemuxerStream>>;
   StreamVector streams_;
 
   // Provides asynchronous IO to this demuxer. Consumed by |url_protocol_| to
   // integrate with libavformat.
   DataSource* data_source_;
 
-  scoped_refptr<MediaLog> media_log_;
+  MediaLog* media_log_;
 
   // Derived bitrate after initialization has completed.
   int bitrate_;
 
   // The first timestamp of the audio or video stream, whichever is lower.  This
   // is used to adjust timestamps so that external consumers always see a zero
   // based timeline.
   base::TimeDelta start_time_;
 
   // Finds the stream with the lowest known start time (i.e. not kNoTimestamp
@@ skipping 33 matching lines @@
   base::WeakPtr<FFmpegDemuxer> weak_this_;
   base::WeakPtrFactory<FFmpegDemuxer> cancel_pending_seek_factory_;
   base::WeakPtrFactory<FFmpegDemuxer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_DEMUXER_H_