Deprecate LogCB in favor of using MediaLog

media/formats/mp2t/es_parser_mpeg1audio.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/mp2t/es_parser_mpeg1audio.h"
 
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 20 matching lines @@
   // Number of samples in the frame.
   int sample_count;
 
   // Frame offset in the ES queue.
   int64 queue_offset;
 };
 
 EsParserMpeg1Audio::EsParserMpeg1Audio(
     const NewAudioConfigCB& new_audio_config_cb,
     const EmitBufferCB& emit_buffer_cb,
-    const LogCB& log_cb)
-  : log_cb_(log_cb),
-    new_audio_config_cb_(new_audio_config_cb),
-    emit_buffer_cb_(emit_buffer_cb) {
+    const scoped_refptr<MediaLog>& media_log)
+    : media_log_(media_log),
+      new_audio_config_cb_(new_audio_config_cb),
+      emit_buffer_cb_(emit_buffer_cb) {
 }
 
 EsParserMpeg1Audio::~EsParserMpeg1Audio() {
 }
 
 bool EsParserMpeg1Audio::ParseFromEsQueue() {
   // Look for every MPEG1 audio frame in the ES buffer.
   Mpeg1AudioFrame mpeg1audio_frame;
   while (LookForMpeg1AudioFrame(&mpeg1audio_frame)) {
     // Update the audio configuration if needed.
@@ skipping 60 matching lines @@
     return false;
 
   for (int offset = 0; offset < max_offset; offset++) {
     const uint8* cur_buf = &es[offset];
     if (cur_buf[0] != 0xff)
       continue;
 
     int remaining_size = es_size - offset;
     DCHECK_GE(remaining_size, MPEG1AudioStreamParser::kHeaderSize);
     MPEG1AudioStreamParser::Header header;
-    if (!MPEG1AudioStreamParser::ParseHeader(log_cb_, cur_buf, &header))
+    if (!MPEG1AudioStreamParser::ParseHeader(media_log_, cur_buf, &header))
       continue;
 
     if (remaining_size < header.frame_size) {
       // Not a full frame: will resume when we have more data.
       // Remove all the bytes located before the frame header,
       // these bytes will not be used anymore.
       es_queue_->Pop(offset);
       return false;
     }
 
@@ skipping 19 matching lines @@
     return true;
   }
 
   es_queue_->Pop(max_offset);
   return false;
 }
 
 bool EsParserMpeg1Audio::UpdateAudioConfiguration(
     const uint8* mpeg1audio_header) {
   MPEG1AudioStreamParser::Header header;
-  if (!MPEG1AudioStreamParser::ParseHeader(log_cb_,
-                                           mpeg1audio_header,
+  if (!MPEG1AudioStreamParser::ParseHeader(media_log_, mpeg1audio_header,
                                            &header)) {
     return false;
   }
 
   // TODO(damienv): Verify whether Android playback requires the extra data
   // field for Mpeg1 audio. If yes, we should generate this field.
   AudioDecoderConfig audio_decoder_config(
       kCodecMP3,
       kSampleFormatS16,
       header.channel_layout,
@@ skipping 24 matching lines @@
 }
 
 void EsParserMpeg1Audio::SkipMpeg1AudioFrame(
     const Mpeg1AudioFrame& mpeg1audio_frame) {
   DCHECK_EQ(mpeg1audio_frame.queue_offset, es_queue_->head());
   es_queue_->Pop(mpeg1audio_frame.size);
 }
 
 }  // namespace mp2t
 }  // namespace media