Merge 123292 - Increase the buffer size in AudioRendererImpl to fix muted playback rate

content/browser/renderer_host/media/audio_renderer_host.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 "content/browser/renderer_host/media/audio_renderer_host.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
-#include "content/browser/renderer_host/media/audio_common.h"
 #include "content/browser/renderer_host/media/audio_sync_reader.h"
 #include "content/browser/renderer_host/media/media_observer.h"
 #include "content/browser/resource_context.h"
 #include "content/common/media/audio_messages.h"
 #include "media/audio/audio_util.h"
 #include "ipc/ipc_logging.h"
 
 using content::BrowserMessageFilter;
 using content::BrowserThread;
 
@@ skipping 210 matching lines @@
 
 void AudioRendererHost::OnCreateStream(
     int stream_id, const AudioParameters& params, bool low_latency) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(LookupById(stream_id) == NULL);
 
   AudioParameters audio_params(params);
 
   // Select the hardware packet size if not specified.
   if (!audio_params.samples_per_packet) {
-    audio_params.samples_per_packet = SelectSamplesPerPacket(audio_params);
+    audio_params.samples_per_packet =
+        media::SelectSamplesPerPacket(audio_params.sample_rate);
   }
   uint32 packet_size = audio_params.GetPacketSize();
 
   scoped_ptr<AudioEntry> entry(new AudioEntry());
   // Create the shared memory and share with the renderer process.
   uint32 shared_memory_size = packet_size;
   if (low_latency) {
     shared_memory_size =
         media::TotalSharedMemorySizeInBytes(shared_memory_size);
   }
@@ skipping 212 matching lines @@
   }
   return NULL;
 }
 
 MediaObserver* AudioRendererHost::media_observer() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!media_observer_)
     media_observer_ = resource_context_->media_observer();
   return media_observer_;
 }