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

Unified Diff: media/audio/virtual_audio_input_stream_unittest.cc

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: Created 6 years, 7 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/virtual_audio_input_stream_unittest.cc
diff --git a/media/audio/virtual_audio_input_stream_unittest.cc b/media/audio/virtual_audio_input_stream_unittest.cc
index 07c4948e6de39cd13486f1593ea429211c05d7e9..16d66a92b1b77749e3ff268579d6f698bdaa6728 100644
--- a/media/audio/virtual_audio_input_stream_unittest.cc
+++ b/media/audio/virtual_audio_input_stream_unittest.cc
@@ -32,15 +32,15 @@ class MockInputCallback : public AudioInputStream::AudioInputCallback {
public:
MockInputCallback()
: data_pushed_(false, false) {
- ON_CALL(*this, OnData(_, _, _, _, _))
+ ON_CALL(*this, OnData(_, _, _, _))
.WillByDefault(InvokeWithoutArgs(&data_pushed_,
&base::WaitableEvent::Signal));
}
virtual ~MockInputCallback() {}
- MOCK_METHOD5(OnData, void(AudioInputStream* stream, const uint8* data,
- uint32 size, uint32 hardware_delay_bytes,
+ MOCK_METHOD4(OnData, void(AudioInputStream* stream, const AudioBus* source,
+ uint32 hardware_delay_bytes,
double volume));
MOCK_METHOD1(OnError, void(AudioInputStream* stream));
@@ -113,7 +113,7 @@ class VirtualAudioInputStreamTest : public testing::TestWithParam<bool> {
}
void Start() {
- EXPECT_CALL(input_callback_, OnData(_, NotNull(), _, _, _))
+ EXPECT_CALL(input_callback_, OnData(_, NotNull(), _, _))
.Times(AtLeast(1));
ASSERT_TRUE(!!stream_);
« media/audio/alsa/alsa_input.cc ('K') | « media/audio/virtual_audio_input_stream.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698