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

Unified Diff: media/audio/fake_audio_input_stream.h

Issue 831693004: Added WebRTC audio quality test using fake device; improved fake device (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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/fake_audio_input_stream.h
diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h
index 8824e19450ad3739a3266b9b5dddd91cfb62321d..fafcca330dd809f5efe73effaab9ba4bfc9a949c 100644
--- a/media/audio/fake_audio_input_stream.h
+++ b/media/audio/fake_audio_input_stream.h
@@ -17,6 +17,7 @@
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/audio/sounds/wav_audio_handler.h"
+#include "media/base/audio_converter.h"
namespace media {
@@ -25,7 +26,7 @@ class AudioManagerBase;
// This class can either generate a beep sound or play audio from a file.
class MEDIA_EXPORT FakeAudioInputStream
- : public AudioInputStream {
+ : public AudioInputStream, AudioConverter::InputCallback {
public:
static AudioInputStream* MakeFakeStream(
AudioManagerBase* manager, const AudioParameters& params);
@@ -83,12 +84,17 @@ class MEDIA_EXPORT FakeAudioInputStream
scoped_ptr<media::AudioBus> audio_bus_;
scoped_ptr<uint8[]> wav_file_data_;
scoped_ptr<media::WavAudioHandler> wav_audio_handler_;
+ scoped_ptr<media::AudioConverter> file_audio_converter_;
int wav_file_read_pos_;
// Allows us to run tasks on the FakeAudioInputStream instance which are
// bound by its lifetime.
base::WeakPtrFactory<FakeAudioInputStream> weak_factory_;
+ // If running in file mode, this provides audio data from wav_audio_handler_.
+ double ProvideInput(AudioBus* audio_bus,
+ base::TimeDelta buffer_delay) override;
+
DISALLOW_COPY_AND_ASSIGN(FakeAudioInputStream);
};

Powered by Google App Engine
This is Rietveld 408576698