Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(694)

Unified Diff: media/audio/linux/audio_manager_linux.cc

Issue 11959018: Add a unified audio I/O backend for ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/audio/linux/cras_unified.h » ('j') | media/audio/linux/cras_unified.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/linux/audio_manager_linux.cc
diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc
index 47d4195d624d4e6d1b422e2ec70e79acafa3aec2..a937b4fdc13148ab195e4fb8e4a884174893703c 100644
--- a/media/audio/linux/audio_manager_linux.cc
+++ b/media/audio/linux/audio_manager_linux.cc
@@ -21,6 +21,7 @@
#if defined(USE_CRAS)
#include "media/audio/linux/cras_input.h"
#include "media/audio/linux/cras_output.h"
+#include "media/audio/linux/cras_unified.h"
#endif
#include "media/base/limits.h"
#include "media/base/media_switches.h"
@@ -299,6 +300,12 @@ AudioOutputStream* AudioManagerLinux::MakeOutputStream(
const AudioParameters& params) {
#if defined(USE_CRAS)
if (UseCras()) {
+ // TODO(dgreid): remove once we properly handle input device selection.
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableWebAudioInput)) {
+ return new CrasUnifiedStream(params, this);
+ }
+
return new CrasOutputStream(params, this);
}
#endif
« no previous file with comments | « no previous file | media/audio/linux/cras_unified.h » ('j') | media/audio/linux/cras_unified.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698