Deprecate LogCB in favor of using MediaLog

media/filters/source_buffer_stream.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.
 
 // SourceBufferStream is a data structure that stores media Buffers in ranges.
 // Buffers can be appended out of presentation order. Buffers are retrieved by
 // seeking to the desired start point and calling GetNextBuffer(). Buffers are
 // returned in sequential presentation order.
 
 #ifndef MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_
@@ skipping 36 matching lines @@
     kEndOfStream
   };
 
   enum Type {
     kAudio,
     kVideo,
     kText
   };
 
   SourceBufferStream(const AudioDecoderConfig& audio_config,
-                     const LogCB& log_cb,
+                     const scoped_refptr<MediaLog>& media_log,
                      bool splice_frames_enabled);
   SourceBufferStream(const VideoDecoderConfig& video_config,
-                     const LogCB& log_cb,
+                     const scoped_refptr<MediaLog>& media_log,
                      bool splice_frames_enabled);
   SourceBufferStream(const TextTrackConfig& text_config,
-                     const LogCB& log_cb,
+                     const scoped_refptr<MediaLog>& media_log,
                      bool splice_frames_enabled);
 
   ~SourceBufferStream();
 
   // Signals that the next buffers appended are part of a new media segment
   // starting at |media_segment_start_time|.
   // TODO(acolwell/wolenetz): This should be changed to a presentation
   // timestamp. See http://crbug.com/402502
   void OnNewMediaSegment(DecodeTimestamp media_segment_start_time);
 
@@ skipping 247 matching lines @@
   // Called by PrepareRangesForNextAppend() before pruning overlapped buffers to
   // generate a splice frame with a small portion of the overlapped buffers.  If
   // a splice frame is generated, the first buffer in |new_buffers| will have
   // its timestamps, duration, and fade out preroll updated.
   void GenerateSpliceFrame(const BufferQueue& new_buffers);
 
   // If |out_buffer| has splice buffers or preroll, sets |pending_buffer_|
   // appropriately and returns true.  Otherwise returns false.
   bool SetPendingBuffer(scoped_refptr<StreamParserBuffer>* out_buffer);
 
-  // Callback used to report log messages that can help the web developer figure
-  // out what is wrong with the content.
-  LogCB log_cb_;
+  // Used to report log messages that can help the web developer figure out what
+  // is wrong with the content.
+  scoped_refptr<MediaLog> media_log_;
 
   // List of disjoint buffered ranges, ordered by start time.
   RangeList ranges_;
 
   // Indicates which decoder config is being used by the decoder.
   // GetNextBuffer() is only allows to return buffers that have a
   // config ID that matches this index. If there is a mismatch then
   // it must signal that a config change is needed.
   int current_config_index_;
 
@@ skipping 68 matching lines @@
   // Indicates which of the splice buffers in |splice_buffer_| should be
   // handled out next.
   size_t splice_buffers_index_;
 
   // Indicates that all buffers before |pending_buffer_| have been handed out.
   bool pending_buffers_complete_;
 
   // Indicates that splice frame generation is enabled.
   const bool splice_frames_enabled_;
 
+  // Fields supporting statistics reporting for audio splice frame generation.

[wolenetz, 2015/07/13 22:25:29]

Oops! These were from a CL I'll send later that depends on this
deprecation/plumbing... PS2 will remove this part of this change.

+  // TODO(wolenetz,chcunningham): Once multi-track audio is enabled, report
+  // these statistics to chrome://media-internals per track.
+  int audio_splice_count_;
+  double total_audio_splice_duration_;
+  double min_audio_splice_duration_;
+  double max_audio_splice_duration_;
+
   DISALLOW_COPY_AND_ASSIGN(SourceBufferStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_