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

Unified Diff: content/browser/renderer_host/media/audio_input_sync_writer.h

Issue 314713002: Modifies AudioInputCallback::OnData and use media::AudioBus instead of plain byte vector (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Now uses AudioBus::WrapMemory instead of From/ToInterleaved Created 6 years, 6 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_input_sync_writer.h
diff --git a/content/browser/renderer_host/media/audio_input_sync_writer.h b/content/browser/renderer_host/media/audio_input_sync_writer.h
index 75b2bbf1e2efba4f77b26e0470756ed7b2ad94dd..d0f1f7f8e40db49af400abcba54b0d83cce62670 100644
--- a/content/browser/renderer_host/media/audio_input_sync_writer.h
+++ b/content/browser/renderer_host/media/audio_input_sync_writer.h
@@ -9,6 +9,7 @@
#include "base/sync_socket.h"
#include "base/time/time.h"
#include "media/audio/audio_input_controller.h"
+#include "media/audio/audio_parameters.h"
#if defined(OS_POSIX)
#include "base/file_descriptor_posix.h"
@@ -18,6 +19,10 @@ namespace base {
class SharedMemory;
}
+namespace media {
+class AudioBus;
+}
+
namespace content {
// A AudioInputController::SyncWriter implementation using SyncSocket. This
// is used by AudioInputController to provide a low latency data source for
@@ -26,14 +31,14 @@ namespace content {
class AudioInputSyncWriter : public media::AudioInputController::SyncWriter {
public:
explicit AudioInputSyncWriter(base::SharedMemory* shared_memory,
- int shared_memory_segment_count);
+ int shared_memory_segment_count,
+ const media::AudioParameters& params);
virtual ~AudioInputSyncWriter();
// media::AudioOutputController::SyncWriter implementation.
virtual void UpdateRecordedBytes(uint32 bytes) OVERRIDE;
- virtual uint32 Write(const void* data,
- uint32 size,
+ virtual uint32 Write(const media::AudioBus* data,
double volume,
bool key_pressed) OVERRIDE;
virtual void Close() OVERRIDE;
@@ -65,6 +70,8 @@ class AudioInputSyncWriter : public media::AudioInputController::SyncWriter {
// The time of the last Write call.
base::Time last_write_time_;
+ media::AudioParameters params_;
no longer working on chromium 2014/06/04 12:38:13 nit, const
henrika (OOO until Aug 14) 2014/06/04 13:52:33 Done.
+
DISALLOW_IMPLICIT_CONSTRUCTORS(AudioInputSyncWriter);
};

Powered by Google App Engine
This is Rietveld 408576698