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

Unified Diff: media/audio/audio_device_thread.h

Issue 10823175: Switch AudioRenderSink::Callback to use AudioBus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Gotta catch'em all! 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: media/audio/audio_device_thread.h
diff --git a/media/audio/audio_device_thread.h b/media/audio/audio_device_thread.h
index a50339ae5d793b88c0f6b643390dbf48902556d8..d22961348fce348daea18b636ddb90655f713578 100644
--- a/media/audio/audio_device_thread.h
+++ b/media/audio/audio_device_thread.h
@@ -5,10 +5,9 @@
#ifndef MEDIA_AUDIO_AUDIO_DEVICE_THREAD_H_
#define MEDIA_AUDIO_AUDIO_DEVICE_THREAD_H_
-#include <vector>
-
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
#include "base/shared_memory.h"
#include "base/sync_socket.h"
#include "base/synchronization/lock.h"
@@ -18,6 +17,7 @@
class MessageLoop;
namespace media {
+class AudioBus;
// Data transfer between browser and render process uses a combination
// of sync sockets and shared memory. To read from the socket and render
@@ -60,7 +60,7 @@ class MEDIA_EXPORT AudioDeviceThread {
// Audio buffers that are allocated in InitializeOnAudioThread() based on
// info from audio_parameters_.
- std::vector<float*> audio_data_;
+ scoped_ptr<AudioBus> audio_bus_;
base::SharedMemory shared_memory_;
const int memory_length_;

Powered by Google App Engine
This is Rietveld 408576698