Deprecate LogCB in favor of using MediaLog

media/formats/webm/webm_cluster_parser.h

 // Copyright 2014 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.
 
 #ifndef MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
 #define MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 33 matching lines @@
   // https://tools.ietf.org/html/rfc6716#page-14
   static const uint16_t kOpusFrameDurationsMu[];
 
  private:
   // Helper class that manages per-track state.
   class Track {
    public:
     Track(int track_num,
           bool is_video,
           base::TimeDelta default_duration,
-          const LogCB& log_cb);
+          const scoped_refptr<MediaLog>& media_log);
     ~Track();
 
     int track_num() const { return track_num_; }
 
     // If a buffer is currently held aside pending duration calculation, returns
     // its decode timestamp. Otherwise, returns kInfiniteDuration().
     DecodeTimestamp GetReadyUpperBound();
 
     // Prepares |ready_buffers_| for retrieval. Prior to calling,
     // |ready_buffers_| must be empty. Moves all |buffers_| with decode
@@ skipping 71 matching lines @@
     // If kNoTimestamp(), then |estimated_next_frame_duration_| will be used.
     base::TimeDelta default_duration_;
 
     // If kNoTimestamp(), then a default value will be used. This estimate is
     // the maximum (for video), or minimum (for audio) duration seen so far for
     // this track, and is used only if |default_duration_| is kNoTimestamp().
     // TODO(chcunningham): Use maximum for audio too, adding checks to disable
     // splicing when these estimates are observed in SourceBufferStream.
     base::TimeDelta estimated_next_frame_duration_;
 
-    LogCB log_cb_;
+    scoped_refptr<MediaLog> media_log_;
   };
 
   typedef std::map<int, Track> TextTrackMap;
 
  public:
   WebMClusterParser(int64 timecode_scale,
                     int audio_track_num,
                     base::TimeDelta audio_default_duration,
                     int video_track_num,
                     base::TimeDelta video_default_duration,
                     const WebMTracksParser::TextTracks& text_tracks,
                     const std::set<int64>& ignored_tracks,
                     const std::string& audio_encryption_key_id,
                     const std::string& video_encryption_key_id,
-                    const AudioCodec audio_codec_,
-                    const LogCB& log_cb);
+                    const AudioCodec audio_codec,
+                    const scoped_refptr<MediaLog>& media_log);
   ~WebMClusterParser() override;
 
   // Resets the parser state so it can accept a new cluster.
   void Reset();
 
   // Parses a WebM cluster element in |buf|.
   //
   // Returns -1 if the parse fails.
   // Returns 0 if more data is needed.
   // Returns the number of bytes parsed on success.
@@ skipping 135 matching lines @@
   TextBufferQueueMap text_buffers_map_;
 
   // Limits the range of buffers returned by Get{Audio,Video,Text}Buffers() to
   // this exclusive upper bound. Set to kNoDecodeTimestamp(), meaning not yet
   // calculated, by Reset() and Parse(). If kNoDecodeTimestamp(), then
   // Get{Audio,Video,Text}Buffers() will calculate it to be the minimum (decode)
   // timestamp across all tracks' |last_buffer_missing_duration_|, or
   // kInfiniteDuration() if no buffers are currently missing duration.
   DecodeTimestamp ready_buffer_upper_bound_;
 
-  LogCB log_cb_;
+  scoped_refptr<MediaLog> media_log_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMClusterParser);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_