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

Unified Diff: content/renderer/media/audio_device_factory.cc

Issue 2108673004: Enable renderer-side mixing output of different audio sources basing on finch (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/audio_device_factory.cc
diff --git a/content/renderer/media/audio_device_factory.cc b/content/renderer/media/audio_device_factory.cc
index af6ddbe18517603da9da3e48b18ab1fac458e51b..d6fcbaf9c55e30faf02614be1ccb14e799f495c1 100644
--- a/content/renderer/media/audio_device_factory.cc
+++ b/content/renderer/media/audio_device_factory.cc
@@ -15,6 +15,7 @@
#include "media/audio/audio_input_device.h"
#include "media/audio/audio_output_device.h"
#include "media/base/audio_renderer_mixer_input.h"
+#include "media/base/media_switches.h"
#include "url/origin.h"
namespace content {
@@ -48,8 +49,9 @@ bool IsMixable(AudioDeviceFactory::SourceType source_type) {
if (source_type == AudioDeviceFactory::kSourceMediaElement)
return true; // Must ALWAYS go through mixer.
- // TODO(olka): make a decision for the rest of the sources basing on OS
- // type and configuration parameters.
+ if (base::FeatureList::IsEnabled(media::kNewAudioRenderingMixingStrategy))
tommi (sloooow) - chröme 2016/06/29 14:03:40 return base::FeatureList::IsEnabled(media::kNewAud
o1ka 2016/06/29 14:28:35 Done.
+ return true; // Mix everything if experiment is enabled.
+
return false;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698