Audio software mixer.

media/audio/android/audio_track_output_android.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "base/time.h"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 
 static const int kTimerIntervalInMilliseconds = 50;
 
@@ skipping 49 matching lines @@
 }
 
 void AudioTrackOutputStream::StreamBuffer::AdvancePosition(uint32 advance) {
   current_ += advance;
   CHECK(current_ <= data_size_);
 }
 
 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,
               params.channels),
       status_(IDLE),
       volume_(0),
       buffer_size_(0),
       j_class_(NULL),
       j_audio_track_(NULL) {
   data_buffer_.reset(
@@ skipping 216 matching lines @@
       reinterpret_cast<const jbyte*>(data_buffer_->ReadBuffer()));
   data_buffer_->AdvancePosition(need_buffer);
 
   // Invoke method to submit samples.
   method = env->GetMethodID(j_class_, "write", "([BII)I");
   env->CallIntMethod(j_audio_track_, method, buf, static_cast<jint>(0),
                      static_cast<jint>(need_buffer));
   CheckException(env);
   env->DeleteLocalRef(buf);
 }