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

Unified Diff: content/browser/renderer_host/media/audio_input_renderer_host.cc

Issue 22408006: Properly set loopback device ID for system audio capture. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Give a valid name to the system audio capture device. Created 7 years, 4 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 | « chrome/browser/media/media_capture_devices_dispatcher.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/audio_input_renderer_host.cc
diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.cc b/content/browser/renderer_host/media/audio_input_renderer_host.cc
index 37d93ef8ca2f8c4afe849febd24beab6f3e3796b..4a2f731a81c300fc7390832ae60132917dc69659 100644
--- a/content/browser/renderer_host/media/audio_input_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.cc
@@ -15,10 +15,6 @@
#include "content/browser/renderer_host/media/web_contents_capture_util.h"
#include "media/audio/audio_manager_base.h"
-#if defined(USE_CRAS)
-#include "media/audio/cras/audio_manager_cras.h"
-#endif
-
namespace content {
struct AudioInputRendererHost::AudioEntry {
@@ -241,18 +237,7 @@ void AudioInputRendererHost::OnCreateStream(
return;
}
- if (info->device.type == content::MEDIA_SYSTEM_AUDIO_CAPTURE) {
-#if defined(USE_CRAS)
- // Use the special loopback device ID for system audio capture.
- device_id = media::AudioManagerCras::kLoopbackDeviceId;
-#else
- SendErrorMessage(stream_id);
- DLOG(WARNING) << "Loopback device is not supported on this platform";
- return;
-#endif
- } else {
- device_id = info->device.id;
- }
+ device_id = info->device.id;
}
// Create a new AudioEntry structure.
« no previous file with comments | « chrome/browser/media/media_capture_devices_dispatcher.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698