Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / media / audio / pulse / audio_manager_pulse.cc

diff --git a/src/media/audio/pulse/audio_manager_pulse.cc b/src/media/audio/pulse/audio_manager_pulse.cc
index da106c2..d01c8ac 100644 (file)
--- a/src/media/audio/pulse/audio_manager_pulse.cc
+++ b/src/media/audio/pulse/audio_manager_pulse.cc
@@ -16,7 +16,6 @@
 #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"
 
@@ -133,16 +132,16 @@ AudioParameters AudioManagerPulse::GetInputStreamParameters(
 AudioOutputStream* AudioManagerPulse::MakeLinearOutputStream(
     const AudioParameters& params) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
-  return MakeOutputStream(params, std::string());
+  return MakeOutputStream(params, AudioManagerBase::kDefaultDeviceId);
 }
 
 AudioOutputStream* AudioManagerPulse::MakeLowLatencyOutputStream(
     const AudioParameters& params,
-    const std::string& device_id,
-    const std::string& input_device_id) {
-  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
+    const std::string& device_id) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
-  return MakeOutputStream(params, input_device_id);
+  return MakeOutputStream(
+      params,
+      device_id.empty() ? AudioManagerBase::kDefaultDeviceId : device_id);
 }
 
 AudioInputStream* AudioManagerPulse::MakeLinearInputStream(
@@ -189,12 +188,10 @@ AudioParameters AudioManagerPulse::GetPreferredOutputStreamParameters(
 }
 
 AudioOutputStream* AudioManagerPulse::MakeOutputStream(
-    const AudioParameters& params, const std::string& input_device_id) {
-  if (params.input_channels()) {
-    return new PulseAudioUnifiedStream(params, input_device_id, this);
-  }
-
-  return new PulseAudioOutputStream(params, this);
+    const AudioParameters& params,
+    const std::string& device_id) {
+  DCHECK(!device_id.empty());
+  return new PulseAudioOutputStream(params, device_id, this);
 }
 
 AudioInputStream* AudioManagerPulse::MakeInputStream(