Revert of Forward output glitch information from stream WebRTC log

media/audio/android/audio_manager_android.cc

 // 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.
 
 #include "media/audio/android/audio_manager_android.h"
 
 #include "base/android/build_info.h"
 #include "base/android/context_utils.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ skipping 145 matching lines @@
     buffer_size = user_buffer_size;
 
   AudioParameters params(AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
                          GetNativeOutputSampleRate(), 16, buffer_size);
   params.set_effects(effects);
   return params;
 }
 
 AudioOutputStream* AudioManagerAndroid::MakeAudioOutputStream(
     const AudioParameters& params,
-    const std::string& device_id,
-    const LogCallback& log_callback) {
+    const std::string& device_id) {
   DCHECK(GetTaskRunner()->BelongsToCurrentThread());
-  AudioOutputStream* stream = AudioManagerBase::MakeAudioOutputStream(
-      params, std::string(), AudioManager::LogCallback());
+  AudioOutputStream* stream =
+      AudioManagerBase::MakeAudioOutputStream(params, std::string());
   streams_.insert(static_cast<OpenSLESOutputStream*>(stream));
   return stream;
 }
 
 AudioInputStream* AudioManagerAndroid::MakeAudioInputStream(
-    const AudioParameters& params,
-    const std::string& device_id,
-    const LogCallback& log_callback) {
+    const AudioParameters& params, const std::string& device_id) {
   DCHECK(GetTaskRunner()->BelongsToCurrentThread());
   bool has_no_input_streams = HasNoAudioInputStreams();
-  AudioInputStream* stream = AudioManagerBase::MakeAudioInputStream(
-      params, device_id, AudioManager::LogCallback());
+  AudioInputStream* stream =
+      AudioManagerBase::MakeAudioInputStream(params, device_id);
 
   // The audio manager for Android creates streams intended for real-time
   // VoIP sessions and therefore sets the audio mode to MODE_IN_COMMUNICATION.
   // If a Bluetooth headset is used, the audio stream will use the SCO
   // channel and therefore have a limited bandwidth (8kHz).
   if (stream && has_no_input_streams) {
     communication_mode_is_on_ = true;
     SetCommunicationAudioModeOn(true);
   }
   return stream;
@@ skipping 12 matching lines @@
 
   // Restore the audio mode which was used before the first communication-
   // mode stream was created.
   if (HasNoAudioInputStreams()) {
     communication_mode_is_on_ = false;
     SetCommunicationAudioModeOn(false);
   }
 }
 
 AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream(
-    const AudioParameters& params,
-    const LogCallback& log_callback) {
+    const AudioParameters& params) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
   DCHECK(GetTaskRunner()->BelongsToCurrentThread());
   return new OpenSLESOutputStream(this, params, SL_ANDROID_STREAM_MEDIA);
 }
 
 AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream(
     const AudioParameters& params,
-    const std::string& device_id,
-    const LogCallback& log_callback) {
+    const std::string& device_id) {
   DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
 
   // Set stream type which matches the current system-wide audio mode used by
   // the Android audio manager.
   const SLint32 stream_type = communication_mode_is_on_ ?
       SL_ANDROID_STREAM_VOICE : SL_ANDROID_STREAM_MEDIA;
   return new OpenSLESOutputStream(this, params, stream_type);
 }
 
 AudioInputStream* AudioManagerAndroid::MakeLinearInputStream(
-    const AudioParameters& params,
-    const std::string& device_id,
-    const LogCallback& log_callback) {
+    const AudioParameters& params, const std::string& device_id) {
   // TODO(henrika): add support for device selection if/when any client
   // needs it.
   DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
   return new OpenSLESInputStream(this, params);
 }
 
 AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream(
-    const AudioParameters& params,
-    const std::string& device_id,
-    const LogCallback& log_callback) {
+    const AudioParameters& params, const std::string& device_id) {
   DCHECK(GetTaskRunner()->BelongsToCurrentThread());
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
   DLOG_IF(ERROR, device_id.empty()) << "Invalid device ID!";
 
   // Use the device ID to select the correct input device.
   // Note that the input device is always associated with a certain output
   // device, i.e., this selection does also switch the output device.
   // All input and output streams will be affected by the device selection.
   if (!SetAudioDevice(device_id)) {
     LOG(ERROR) << "Unable to select audio device!";
@@ skipping 168 matching lines @@
   output_volume_override_ = volume;
 
   DCHECK(GetTaskRunner()->BelongsToCurrentThread());
   for (OutputStreams::iterator it = streams_.begin();
        it != streams_.end(); ++it) {
     (*it)->SetVolume(volume);
   }
 }
 
 }  // namespace media