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

Unified Diff: media/audio/linux/cras_output_unittest.cc

Issue 10832285: Switch OnMoreData() to use AudioBus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Comments. 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
« no previous file with comments | « media/audio/linux/cras_output.cc ('k') | media/audio/mac/audio_low_latency_output_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/linux/cras_output_unittest.cc
diff --git a/media/audio/linux/cras_output_unittest.cc b/media/audio/linux/cras_output_unittest.cc
index af56ec42291c80020e46b8aec82da0cd7e82e377..a54437a36ac0bf43ca0b6b7a89372b2a50e2ecf3 100644
--- a/media/audio/linux/cras_output_unittest.cc
+++ b/media/audio/linux/cras_output_unittest.cc
@@ -19,8 +19,8 @@ namespace media {
class MockAudioSourceCallback : public AudioOutputStream::AudioSourceCallback {
public:
- MOCK_METHOD3(OnMoreData, uint32(uint8* dest, uint32 max_size,
- AudioBuffersState buffers_state));
+ MOCK_METHOD2(OnMoreData, int(AudioBus* audio_bus,
+ AudioBuffersState buffers_state));
MOCK_METHOD2(OnError, void(AudioOutputStream* stream, int code));
};
@@ -193,16 +193,14 @@ TEST_F(CrasOutputStreamTest, StartStop) {
TEST_F(CrasOutputStreamTest, RenderFrames) {
CrasOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_MONO);
MockAudioSourceCallback mock_callback;
- const uint32 amount_rendered_return = 2048;
// Open the stream.
ASSERT_TRUE(test_stream->Open());
EXPECT_EQ(CrasOutputStream::kIsOpened, test_stream->state());
// Render Callback.
- EXPECT_CALL(mock_callback, OnMoreData(_,
- kTestFramesPerPacket * kTestBytesPerFrame, _))
- .WillRepeatedly(Return(amount_rendered_return));
+ EXPECT_CALL(mock_callback, OnMoreData(_, _))
+ .WillRepeatedly(Return(kTestFramesPerPacket));
// Start.
test_stream->Start(&mock_callback);
« no previous file with comments | « media/audio/linux/cras_output.cc ('k') | media/audio/mac/audio_low_latency_output_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698