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

Unified Diff: media/audio/android/audio_track_output_android.cc

Issue 9691001: Audio software mixer. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 9 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
Index: media/audio/android/audio_track_output_android.cc
===================================================================
--- media/audio/android/audio_track_output_android.cc (revision 128216)
+++ media/audio/android/audio_track_output_android.cc (working copy)
@@ -4,6 +4,8 @@
#include "media/audio/android/audio_track_output_android.h"
+#include <algorithm>
+
#include "base/android/jni_android.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
@@ -73,6 +75,7 @@
AudioTrackOutputStream::AudioTrackOutputStream(const AudioParameters& params)
: source_callback_(NULL),
params_(params.format,
+ params.use_browser_mixer(),
params.sample_rate,
params.bits_per_sample,
params.samples_per_packet,

Powered by Google App Engine
This is Rietveld 408576698