Deprecate LogCB in favor of using MediaLog

media/filters/chunk_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.
 
 #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_
 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
 
 #include <deque>
 #include <map>
 #include <string>
@@ skipping 55 matching lines @@
   // Returns base::TimeDelta() if the stream has no buffered data.
   base::TimeDelta GetBufferedDuration() const;
 
   // Signal to the stream that buffers handed in through subsequent calls to
   // Append() belong to a media segment that starts at |start_timestamp|.
   void OnNewMediaSegment(DecodeTimestamp start_timestamp);
 
   // Called when midstream config updates occur.
   // Returns true if the new config is accepted.
   // Returns false if the new config should trigger an error.
-  bool UpdateAudioConfig(const AudioDecoderConfig& config, const LogCB& log_cb);
-  bool UpdateVideoConfig(const VideoDecoderConfig& config, const LogCB& log_cb);
-  void UpdateTextConfig(const TextTrackConfig& config, const LogCB& log_cb);
+  bool UpdateAudioConfig(const AudioDecoderConfig& config,
+                         const scoped_refptr<MediaLog>& media_log);
+  bool UpdateVideoConfig(const VideoDecoderConfig& config,
+                         const scoped_refptr<MediaLog>& media_log);
+  void UpdateTextConfig(const TextTrackConfig& config,
+                        const scoped_refptr<MediaLog>& media_log);
 
   void MarkEndOfStream();
   void UnmarkEndOfStream();
 
   // DemuxerStream methods.
   void Read(const ReadCB& read_cb) override;
   Type type() const override;
   Liveness liveness() const override;
   AudioDecoderConfig audio_decoder_config() override;
   VideoDecoderConfig video_decoder_config() override;
@@ skipping 53 matching lines @@
     kNotSupported,    // Type specified is not supported.
     kReachedIdLimit,  // Reached ID limit. We can't handle any more IDs.
   };
 
   typedef base::Closure InitSegmentReceivedCB;
 
   // |open_cb| Run when Initialize() is called to signal that the demuxer
   //   is ready to receive media data via AppenData().
   // |encrypted_media_init_data_cb| Run when the demuxer determines that an
   //   encryption key is needed to decrypt the content.
-  // |enable_text| Process inband text tracks in the normal way when true,
-  //   otherwise ignore them.
-  // |log_cb| Run when the demuxer needs to emit MediaLog messages.
+  // |media_log| Used to report content and engine debug messages.
   // |splice_frames_enabled| Indicates that it's okay to generate splice frames
   //   per the MSE specification.  Renderers must understand DecoderBuffer's
   //   splice_timestamp() field.
   ChunkDemuxer(const base::Closure& open_cb,
                const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
-               const LogCB& log_cb,
                const scoped_refptr<MediaLog>& media_log,
                bool splice_frames_enabled);
   ~ChunkDemuxer() override;
 
   // Demuxer implementation.
   std::string GetDisplayName() const override;
+
+  // |enable_text| Process inband text tracks in the normal way when true,

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

This was just a drive-by fix. This comment was previously in the wrong place.

+  //   otherwise ignore them.
   void Initialize(DemuxerHost* host,
                   const PipelineStatusCB& cb,
                   bool enable_text_tracks) override;
   void Stop() override;
   void Seek(base::TimeDelta time, const PipelineStatusCB& cb) override;
   base::Time GetTimelineOffset() const override;
   DemuxerStream* GetStream(DemuxerStream::Type type) override;
   base::TimeDelta GetStartTime() const override;
 
   // Methods used by an external object to control this demuxer.
@@ skipping 176 matching lines @@
   void ShutdownAllStreams();
 
   mutable base::Lock lock_;
   State state_;
   bool cancel_next_seek_;
 
   DemuxerHost* host_;
   base::Closure open_cb_;
   EncryptedMediaInitDataCB encrypted_media_init_data_cb_;
   bool enable_text_;
-  // Callback used to report log messages that can help the web developer
-  // figure out what is wrong with the content.
-  LogCB log_cb_;
+
+  // MediaLog for reporting messages and properties to debug content and engine.
   scoped_refptr<MediaLog> media_log_;
 
   PipelineStatusCB init_cb_;
   // Callback to execute upon seek completion.
   // TODO(wolenetz/acolwell): Protect against possible double-locking by first
   // releasing |lock_| before executing this callback. See
   // http://crbug.com/308226
   PipelineStatusCB seek_cb_;
 
   scoped_ptr<ChunkDemuxerStream> audio_;
@@ skipping 22 matching lines @@
 
   // Indicates that splice frame generation is enabled.
   const bool splice_frames_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_CHUNK_DEMUXER_H_