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

Unified Diff: media/audio/audio_output_resampler.h

Issue 10918098: Introduce AudioOutputResampler for browser side resampling. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: First draft! Created 8 years, 3 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_output_resampler.h
diff --git a/media/audio/audio_output_resampler.h b/media/audio/audio_output_resampler.h
new file mode 100644
index 0000000000000000000000000000000000000000..baecfa2164a2c401bce467ccae0e75ca0c787fd1
--- /dev/null
+++ b/media/audio/audio_output_resampler.h
@@ -0,0 +1,82 @@
+// 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.
+//
+// AudioOutputResampler is a browser-side resampler which ensures audio data is
+// always output at the configured hardware parameters.
scherkus (not reviewing) 2012/09/07 13:30:17 move to class def instead of top of file
DaleCurtis 2012/09/10 12:06:24 Done.
+
+#ifndef MEDIA_AUDIO_AUDIO_OUTPUT_RESAMPLER_H_
+#define MEDIA_AUDIO_AUDIO_OUTPUT_RESAMPLER_H_
+
+#include "base/basictypes.h"
+#include "base/memory/ref_counted.h"
+#include "base/synchronization/lock.h"
+#include "base/time.h"
+#include "media/audio/audio_io.h"
+#include "media/audio/audio_manager.h"
+#include "media/audio/audio_output_dispatcher.h"
+#include "media/audio/audio_parameters.h"
+
+namespace media {
+class AudioFifo;
scherkus (not reviewing) 2012/09/07 13:30:17 nit: blank line before
DaleCurtis 2012/09/10 12:06:24 Done.
+class MultiChannelResampler;
+
+class MEDIA_EXPORT AudioOutputResampler
+ : public AudioOutputDispatcher,
+ public AudioOutputStream::AudioSourceCallback {
+ public:
+ AudioOutputResampler(AudioManager* audio_manager,
+ const AudioParameters& params,
+ const base::TimeDelta& close_delay);
+
+ // AudioOutputDispatcher interface.
+ virtual bool OpenStream() OVERRIDE;
+ virtual bool StartStream(AudioOutputStream::AudioSourceCallback* callback,
+ AudioOutputProxy* stream_proxy) OVERRIDE;
+ virtual void StopStream(AudioOutputProxy* stream_proxy) OVERRIDE;
+ virtual void StreamVolumeSet(AudioOutputProxy* stream_proxy,
+ double volume) OVERRIDE;
+ virtual void CloseStream(AudioOutputProxy* stream_proxy) OVERRIDE;
+ virtual void Shutdown() OVERRIDE;
+
+ // AudioSourceCallback interface.
+ virtual int OnMoreData(AudioBus* audio_bus,
+ AudioBuffersState buffers_state) OVERRIDE;
+ virtual void OnError(AudioOutputStream* stream, int code) OVERRIDE;
+ virtual void WaitTillDataReady() OVERRIDE;
+
+ private:
+ friend class base::RefCountedThreadSafe<AudioOutputResampler>;
+ virtual ~AudioOutputResampler();
+
+ // ProvideInput() will be called by MultiChannelResampler when more data is
+ // necessary.
+ void ProvideInput(AudioBus* audio_bus);
+
+ // Handles resampling.
+ scoped_ptr<MultiChannelResampler> resampler_;
+
+ // Dispatcher to proxy all AudioOutputDispatcher calls too.
+ scoped_refptr<AudioOutputDispatcher> dispatcher_;
+
+ // Source callback and associated lock.
+ base::Lock source_lock_;
+ AudioOutputStream::AudioSourceCallback* source_callback_;
+
+ AudioBuffersState current_buffers_state_;
+ int outstanding_audio_bytes_;
+ int current_filled_audio_bytes_;
+
+ scoped_ptr<AudioBus> temp_bus_;
+ scoped_ptr<AudioFifo> audio_fifo_;
+
+ double io_ratio_;
+ int output_bytes_per_frame_;
+ int input_bytes_per_frame_;
+
+ DISALLOW_COPY_AND_ASSIGN(AudioOutputResampler);
+};
+
+} // namespace media
+
+#endif // MEDIA_AUDIO_AUDIO_OUTPUT_RESAMPLER_H_

Powered by Google App Engine
This is Rietveld 408576698