Reland 153623004: Remove the unified IO code on the browser

media/audio/pulse/audio_manager_pulse.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/pulse/audio_manager_pulse.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/nix/xdg_util.h"
 #include "base/stl_util.h"
 #if defined(USE_ALSA)
 #include "media/audio/alsa/audio_manager_alsa.h"
 #endif
 #include "media/audio/audio_parameters.h"
 #include "media/audio/pulse/pulse_input.h"
 #include "media/audio/pulse/pulse_output.h"
-#include "media/audio/pulse/pulse_unified.h"
 #include "media/audio/pulse/pulse_util.h"
 #include "media/base/channel_layout.h"
 
 #if defined(DLOPEN_PULSEAUDIO)
 #include "media/audio/pulse/pulse_stubs.h"
 
 using media_audio_pulse::kModulePulse;
 using media_audio_pulse::InitializeStubs;
 using media_audio_pulse::StubPathMap;
 #endif  // defined(DLOPEN_PULSEAUDIO)
@@ skipping 96 matching lines @@
 
   // TODO(xians): add support for querying native channel layout for pulse.
   return AudioParameters(
       AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
       GetNativeSampleRate(), 16, kDefaultInputBufferSize);
 }
 
 AudioOutputStream* AudioManagerPulse::MakeLinearOutputStream(
     const AudioParameters& params) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
-  return MakeOutputStream(params, std::string());
+  return MakeOutputStream(params);
 }
 
 AudioOutputStream* AudioManagerPulse::MakeLowLatencyOutputStream(
     const AudioParameters& params,
-    const std::string& device_id,
-    const std::string& input_device_id) {
+    const std::string& device_id) {
   DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
-  return MakeOutputStream(params, input_device_id);
+  return MakeOutputStream(params);
 }
 
 AudioInputStream* AudioManagerPulse::MakeLinearInputStream(
     const AudioParameters& params, const std::string& device_id) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
   return MakeInputStream(params, device_id);
 }
 
 AudioInputStream* AudioManagerPulse::MakeLowLatencyInputStream(
     const AudioParameters& params, const std::string& device_id) {
@@ skipping 26 matching lines @@
   int user_buffer_size = GetUserBufferSize();
   if (user_buffer_size)
     buffer_size = user_buffer_size;
 
   return AudioParameters(
       AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, input_channels,
       sample_rate, bits_per_sample, buffer_size, AudioParameters::NO_EFFECTS);
 }
 
 AudioOutputStream* AudioManagerPulse::MakeOutputStream(
-    const AudioParameters& params, const std::string& input_device_id) {
-  if (params.input_channels()) {
-    return new PulseAudioUnifiedStream(params, input_device_id, this);
-  }
-
+    const AudioParameters& params) {
   return new PulseAudioOutputStream(params, this);
 }
 
 AudioInputStream* AudioManagerPulse::MakeInputStream(
     const AudioParameters& params, const std::string& device_id) {
   return new PulseAudioInputStream(this, device_id, params,
                                    input_mainloop_, input_context_);
 }
 
 int AudioManagerPulse::GetNativeSampleRate() {
@@ skipping 122 matching lines @@
 void AudioManagerPulse::SampleRateInfoCallback(pa_context* context,
                                                const pa_server_info* info,
                                                void* user_data) {
   AudioManagerPulse* manager = reinterpret_cast<AudioManagerPulse*>(user_data);
 
   manager->native_input_sample_rate_ = info->sample_spec.rate;
   pa_threaded_mainloop_signal(manager->input_mainloop_, 0);
 }
 
 }  // namespace media