Revert of Reland: Forward output glitch information from stream WebRTC log

media/audio/mac/audio_auhal_mac.cc

 // Copyright 2013 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/audio/mac/audio_auhal_mac.h"
 
 #include <CoreServices/CoreServices.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/mac/mac_logging.h"
 #include "base/metrics/histogram_macros.h"
-#include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "media/audio/mac/audio_manager_mac.h"
 #include "media/base/audio_pull_fifo.h"
 
 namespace media {
 
 static void WrapBufferList(AudioBufferList* buffer_list,
                            AudioBus* bus,
                            int frames) {
   DCHECK(buffer_list);
   DCHECK(bus);
   const int channels = bus->channels();
   const int buffer_list_channels = buffer_list->mNumberBuffers;
   CHECK_EQ(channels, buffer_list_channels);
 
   // Copy pointers from AudioBufferList.
   for (int i = 0; i < channels; ++i) {
     bus->SetChannelData(
         i, static_cast<float*>(buffer_list->mBuffers[i].mData));
   }
 
   // Finally set the actual length.
   bus->set_frames(frames);
 }
 
 AUHALStream::AUHALStream(AudioManagerMac* manager,
                          const AudioParameters& params,
-                         AudioDeviceID device,
-                         const AudioManager::LogCallback& log_callback)
+                         AudioDeviceID device)
     : manager_(manager),
       params_(params),
       output_channels_(params_.channels()),
       number_of_frames_(params_.frames_per_buffer()),
       number_of_frames_requested_(0),
       source_(NULL),
       device_(device),
       audio_unit_(0),
       volume_(1),
       hardware_latency_frames_(0),
       stopped_(true),
       current_hardware_pending_bytes_(0),
       current_lost_frames_(0),
       last_sample_time_(0.0),
       last_number_of_frames_(0),
       total_lost_frames_(0),
       largest_glitch_frames_(0),
-      glitches_detected_(0),
-      log_callback_(log_callback) {
+      glitches_detected_(0) {
   // We must have a manager.
   DCHECK(manager_);
-  DCHECK(!log_callback_.Equals(AudioManager::LogCallback()));
 
   DVLOG(1) << "ctor";
   DVLOG(1) << "device ID: 0x" << std::hex << device;
   DVLOG(1) << "buffer size: " << number_of_frames_;
   DVLOG(1) << "output channels: " << output_channels_;
   DVLOG(1) << "sample rate: " << params_.sample_rate();
 }
 
 AUHALStream::~AUHALStream() {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 310 matching lines @@
     return;  // No stats gathered to report.
 
   // A value of 0 indicates that we got the buffer size we asked for.
   UMA_HISTOGRAM_COUNTS("Media.Audio.Render.FramesRequested",
                        number_of_frames_requested_);
   // Even if there aren't any glitches, we want to record it to get a feel for
   // how often we get no glitches vs the alternative.
   UMA_HISTOGRAM_CUSTOM_COUNTS("Media.Audio.Render.Glitches", glitches_detected_,
                               0, 999999, 100);
 
-  auto lost_frames_ms = (total_lost_frames_ * 1000) / params_.sample_rate();
-  std::string log_message = base::StringPrintf(
-      "AU out: Total glitches=%d. Total frames lost=%d (%d ms).",
-      glitches_detected_, total_lost_frames_, lost_frames_ms);
-  log_callback_.Run(log_message);
-
   if (glitches_detected_ != 0) {
+    auto lost_frames_ms = (total_lost_frames_ * 1000) / params_.sample_rate();
     UMA_HISTOGRAM_COUNTS("Media.Audio.Render.LostFramesInMs", lost_frames_ms);
     auto largest_glitch_ms =
         (largest_glitch_frames_ * 1000) / params_.sample_rate();
     UMA_HISTOGRAM_COUNTS("Media.Audio.Render.LargestGlitchMs",
                          largest_glitch_ms);
-    DLOG(WARNING) << log_message;
+    DLOG(WARNING) << "Total glitches=" << glitches_detected_
+                  << ". Total frames lost=" << total_lost_frames_ << " ("
+                  << lost_frames_ms;
   }
 
   number_of_frames_requested_ = 0;
   glitches_detected_ = 0;
   last_sample_time_ = 0;
   last_number_of_frames_ = 0;
   total_lost_frames_ = 0;
   largest_glitch_frames_ = 0;
 }
 
@@ skipping 135 matching lines @@
   OSStatus result = AudioUnitUninitialize(audio_unit_);
   OSSTATUS_DLOG_IF(ERROR, result != noErr, result)
       << "AudioUnitUninitialize() failed.";
   result = AudioComponentInstanceDispose(audio_unit_);
   OSSTATUS_DLOG_IF(ERROR, result != noErr, result)
       << "AudioComponentInstanceDispose() failed.";
   audio_unit_ = 0;
 }
 
 }  // namespace media