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

Unified Diff: trunk/src/media/audio/cras/cras_input_unittest.cc

Issue 335343004: Revert 277794 "Modifies AudioInputCallback::OnData and use media..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
« no previous file with comments | « trunk/src/media/audio/cras/cras_input.cc ('k') | trunk/src/media/audio/fake_audio_input_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/media/audio/cras/cras_input_unittest.cc
===================================================================
--- trunk/src/media/audio/cras/cras_input_unittest.cc (revision 277811)
+++ trunk/src/media/audio/cras/cras_input_unittest.cc (working copy)
@@ -28,8 +28,8 @@
class MockAudioInputCallback : public AudioInputStream::AudioInputCallback {
public:
- MOCK_METHOD4(OnData, void(
- AudioInputStream*, const AudioBus*, uint32, double));
+ MOCK_METHOD5(OnData, void(
+ AudioInputStream*, const uint8*, uint32, uint32, double));
MOCK_METHOD1(OnError, void(AudioInputStream*));
};
@@ -85,10 +85,14 @@
// samples can be provided when doing non-integer SRC. For example
// converting from 192k to 44.1k is a ratio of 4.35 to 1.
MockAudioInputCallback mock_callback;
+ unsigned int expected_size = (kTestFramesPerPacket - 8) *
+ params.channels() *
+ params.bits_per_sample() / 8;
+
base::WaitableEvent event(false, false);
EXPECT_CALL(mock_callback,
- OnData(test_stream, _, _, _))
+ OnData(test_stream, _, Ge(expected_size), _, _))
.WillOnce(InvokeWithoutArgs(&event, &base::WaitableEvent::Signal));
test_stream->Start(&mock_callback);
« no previous file with comments | « trunk/src/media/audio/cras/cras_input.cc ('k') | trunk/src/media/audio/fake_audio_input_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698