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

Unified Diff: content/browser/renderer_host/media/audio_renderer_host.cc

Issue 10832285: Switch OnMoreData() to use AudioBus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review ready. Created 8 years, 4 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: content/browser/renderer_host/media/audio_renderer_host.cc
diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc
index 0042f28bcd85a16ae2dbf581b625e8d8be2c232e..29ccf34db25f38968ab50164cd3eba0a3f3c3784 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host.cc
@@ -13,6 +13,7 @@
#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;
@@ -198,8 +199,8 @@ void AudioRendererHost::OnCreateStream(
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 unsi
DaleCurtis 2012/08/24 23:53:12 It does make sense since buffer_size could still b
scoped_ptr<AudioEntry> entry(new AudioEntry());
@@ -214,7 +215,7 @@ void AudioRendererHost::OnCreateStream(
// 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);

Powered by Google App Engine
This is Rietveld 408576698