Deprecate LogCB in favor of using MediaLog

media/formats/mp4/aac.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/mp4/aac.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "media/base/bit_reader.h"
 #include "media/formats/mp4/rcheck.h"
 #include "media/formats/mpeg/adts_constants.h"
 
 namespace media {
 namespace mp4 {
 
 AAC::AAC()
     : profile_(0), frequency_index_(0), channel_config_(0), frequency_(0),
       extension_frequency_(0), channel_layout_(CHANNEL_LAYOUT_UNSUPPORTED) {
 }
 
 AAC::~AAC() {
 }
 
-bool AAC::Parse(const std::vector<uint8>& data, const LogCB& log_cb) {
+bool AAC::Parse(const std::vector<uint8>& data,
+                const scoped_refptr<MediaLog>& media_log) {
 #if defined(OS_ANDROID)
   codec_specific_data_ = data;
 #endif
   if (data.empty())
     return false;
 
   BitReader reader(&data[0], data.size());
   uint8 extension_type = 0;
   bool ps_present = false;
   uint8 extension_frequency_index = 0xff;
@@ skipping 14 matching lines @@
   // Read extension configuration.
   if (profile_ == 5 || profile_ == 29) {
     ps_present = (profile_ == 29);
     extension_type = 5;
     RCHECK(reader.ReadBits(4, &extension_frequency_index));
     if (extension_frequency_index == 0xf)
       RCHECK(reader.ReadBits(24, &extension_frequency_));
     RCHECK(reader.ReadBits(5, &profile_));
   }
 
-  MEDIA_LOG(INFO, log_cb) << "Audio codec: mp4a.40." << std::hex
-                          << static_cast<int>(profile_);
+  MEDIA_LOG(INFO, media_log) << "Audio codec: mp4a.40." << std::hex
+                             << static_cast<int>(profile_);
 
   RCHECK(SkipDecoderGASpecificConfig(&reader));
   RCHECK(SkipErrorSpecificConfig());
 
   // Read extension configuration again
   // Note: The check for 16 available bits comes from the AAC spec.
   if (extension_type != 5 && reader.bits_available() >= 16) {
     uint16 sync_extension_type;
     uint8 sbr_present_flag;
     uint8 ps_present_flag;
@@ skipping 168 matching lines @@
 
     RCHECK(bit_reader->ReadBits(1, &dummy));  // extensionFlag3
   }
 
   return true;
 }
 
 }  // namespace mp4
 
 }  // namespace media