Deprecate LogCB in favor of using MediaLog

media/formats/webm/webm_stream_parser.cc

 // 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.
 
 #include "media/formats/webm/webm_stream_parser.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
@@ skipping 15 matching lines @@
 }
 
 void WebMStreamParser::Init(
     const InitCB& init_cb,
     const NewConfigCB& config_cb,
     const NewBuffersCB& new_buffers_cb,
     bool ignore_text_tracks,
     const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
     const NewMediaSegmentCB& new_segment_cb,
     const base::Closure& end_of_segment_cb,
-    const LogCB& log_cb) {
+    const scoped_refptr<MediaLog>& media_log) {
   DCHECK_EQ(state_, kWaitingForInit);
   DCHECK(init_cb_.is_null());
   DCHECK(!init_cb.is_null());
   DCHECK(!config_cb.is_null());
   DCHECK(!new_buffers_cb.is_null());
   DCHECK(!encrypted_media_init_data_cb.is_null());
   DCHECK(!new_segment_cb.is_null());
   DCHECK(!end_of_segment_cb.is_null());
 
   ChangeState(kParsingHeaders);
   init_cb_ = init_cb;
   config_cb_ = config_cb;
   new_buffers_cb_ = new_buffers_cb;
   ignore_text_tracks_ = ignore_text_tracks;
   encrypted_media_init_data_cb_ = encrypted_media_init_data_cb;
   new_segment_cb_ = new_segment_cb;
   end_of_segment_cb_ = end_of_segment_cb;
-  log_cb_ = log_cb;
+  media_log_ = media_log;
 }
 
 void WebMStreamParser::Flush() {
   DCHECK_NE(state_, kWaitingForInit);
 
   byte_queue_.Reset();
   if (cluster_parser_)
     cluster_parser_->Reset();
   if (state_ == kParsingClusters) {
     ChangeState(kParsingHeaders);
@@ skipping 82 matching lines @@
       // TODO(matthewjheaney): Implement support for chapters.
       if (cur_size < (result + element_size)) {
         // We don't have the whole element yet. Signal we need more data.
         return 0;
       }
       // Skip the element.
       return result + element_size;
       break;
     case kWebMIdCluster:
       if (!cluster_parser_) {
-        MEDIA_LOG(ERROR, log_cb_) << "Found Cluster element before Info.";
+        MEDIA_LOG(ERROR, media_log_) << "Found Cluster element before Info.";
         return -1;
       }
       ChangeState(kParsingClusters);
       new_segment_cb_.Run();
       return 0;
       break;
     case kWebMIdSegment:
       // Segment of unknown size indicates live stream.
       if (element_size == kWebMUnknownSize)
         unknown_segment_size_ = true;
       // Just consume the segment header.
       return result;
       break;
     case kWebMIdInfo:
       // We've found the element we are looking for.
       break;
     default: {
-      MEDIA_LOG(ERROR, log_cb_) << "Unexpected element ID 0x" << std::hex << id;
+      MEDIA_LOG(ERROR, media_log_) << "Unexpected element ID 0x" << std::hex
+                                   << id;
       return -1;
     }
   }
 
   WebMInfoParser info_parser;
   result = info_parser.Parse(cur, cur_size);
 
   if (result <= 0)
     return result;
 
   cur += result;
   cur_size -= result;
   bytes_parsed += result;
 
-  WebMTracksParser tracks_parser(log_cb_, ignore_text_tracks_);
+  WebMTracksParser tracks_parser(media_log_, ignore_text_tracks_);
   result = tracks_parser.Parse(cur, cur_size);
 
   if (result <= 0)
     return result;
 
   bytes_parsed += result;
 
   double timecode_scale_in_us = info_parser.timecode_scale() / 1000.0;
   InitParameters params(kInfiniteDuration());
 
@@ skipping 22 matching lines @@
     OnEncryptedMediaInitData(tracks_parser.video_encryption_key_id());
 
   if (!config_cb_.Run(audio_config,
                       video_config,
                       tracks_parser.text_tracks())) {
     DVLOG(1) << "New config data isn't allowed.";
     return -1;
   }
 
   cluster_parser_.reset(new WebMClusterParser(
-      info_parser.timecode_scale(),
-      tracks_parser.audio_track_num(),
+      info_parser.timecode_scale(), tracks_parser.audio_track_num(),
       tracks_parser.GetAudioDefaultDuration(timecode_scale_in_us),
       tracks_parser.video_track_num(),
       tracks_parser.GetVideoDefaultDuration(timecode_scale_in_us),
-      tracks_parser.text_tracks(),
-      tracks_parser.ignored_tracks(),
+      tracks_parser.text_tracks(), tracks_parser.ignored_tracks(),
       tracks_parser.audio_encryption_key_id(),
-      tracks_parser.video_encryption_key_id(),
-      audio_config.codec(),
-      log_cb_));
+      tracks_parser.video_encryption_key_id(), audio_config.codec(),
+      media_log_));
 
   if (!init_cb_.is_null())
     base::ResetAndReturn(&init_cb_).Run(params);
 
   return bytes_parsed;
 }
 
 int WebMStreamParser::ParseCluster(const uint8* data, int size) {
   if (!cluster_parser_)
     return -1;
@@ skipping 21 matching lines @@
 
   return bytes_parsed;
 }
 
 void WebMStreamParser::OnEncryptedMediaInitData(const std::string& key_id) {
   std::vector<uint8> key_id_vector(key_id.begin(), key_id.end());
   encrypted_media_init_data_cb_.Run(EmeInitDataType::WEBM, key_id_vector);
 }
 
 }  // namespace media