Switch OnMoreData() to use AudioBus.

content/browser/renderer_host/media/audio_renderer_host.cc

 // Copyright (c) 2012 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/browser_main_loop.h"
 #include "content/browser/renderer_host/media/audio_sync_reader.h"
 #include "content/common/media/audio_messages.h"
 #include "content/public/browser/media_observer.h"
 #include "media/audio/shared_memory_util.h"
+#include "media/base/audio_bus.h"
 
 using content::BrowserMessageFilter;
 using content::BrowserThread;
 
 AudioRendererHost::AudioEntry::AudioEntry()
     : stream_id(0),
       pending_close(false) {
 }
 
 AudioRendererHost::AudioEntry::~AudioEntry() {}
@@ skipping 165 matching lines @@
   return handled;
 }
 
 void AudioRendererHost::OnCreateStream(
     int stream_id, const media::AudioParameters& params) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(LookupById(stream_id) == NULL);
 
   media::AudioParameters audio_params(params);
   DCHECK_GT(audio_params.frames_per_buffer(), 0);
-
-  uint32 buffer_size = audio_params.GetBytesPerBuffer();
+  uint32 buffer_size = media::AudioBus::CalculateMemorySize(audio_params);
+  DCHECK_GT(buffer_size, 0U);

[Chris Rogers, 2012/08/24 20:20:26]

Does this DCHECK make sense?  Since uint32 is unsigned it will always be
positive.  On the other hand we probably want some kind of sanity check against
wildly huge values.

[DaleCurtis, 2012/08/24 23:53:12]

It does make sense since buffer_size could still be 0 which is wrong. I've added
a new check based on media::limits::kMaxPacketSizeBytes now.

 
   scoped_ptr<AudioEntry> entry(new AudioEntry());
 
   // Create the shared memory and share with the renderer process.
   uint32 shared_memory_size =
       media::TotalSharedMemorySizeInBytes(buffer_size);
   if (!entry->shared_memory.CreateAndMapAnonymous(shared_memory_size)) {
     // If creation of shared memory failed then send an error message.
     SendErrorMessage(stream_id);
     return;
   }
 
   // Create sync reader and try to initialize it.
   scoped_ptr<AudioSyncReader> reader(
-      new AudioSyncReader(&entry->shared_memory));
+      new AudioSyncReader(&entry->shared_memory, params));
 
   if (!reader->Init()) {
     SendErrorMessage(stream_id);
     return;
   }
 
   // If we have successfully created the SyncReader then assign it to the
   // entry and construct an AudioOutputController.
   entry->reader.reset(reader.release());
   entry->controller = media::AudioOutputController::Create(
@@ skipping 148 matching lines @@
 
   // Iterate the map of entries.
   // TODO(hclam): Implement a faster look up method.
   for (AudioEntryMap::iterator i = audio_entries_.begin();
        i != audio_entries_.end(); ++i) {
     if (!i->second->pending_close && controller == i->second->controller.get())
       return i->second;
   }
   return NULL;
 }