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

Unified Diff: media/audio/audio_output_device_unittest.cc

Issue 1487983002: Forward the number of skipped frames by the OS in audio playout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Unit test fixes. Created 5 years 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_device_unittest.cc
diff --git a/media/audio/audio_output_device_unittest.cc b/media/audio/audio_output_device_unittest.cc
index 1478e322448145ca3563ce2ab9590c528521f4c8..a5e4e2b8df7d4f9957954a902f511cbe63b8afa4 100644
--- a/media/audio/audio_output_device_unittest.cc
+++ b/media/audio/audio_output_device_unittest.cc
@@ -45,7 +45,10 @@ class MockRenderCallback : public AudioRendererSink::RenderCallback {
MockRenderCallback() {}
virtual ~MockRenderCallback() {}
- MOCK_METHOD2(Render, int(AudioBus* dest, int audio_delay_milliseconds));
+ MOCK_METHOD3(Render,
+ int(AudioBus* dest,
+ uint32_t audio_delay_milliseconds,
+ uint32_t frames_skipped));
MOCK_METHOD0(OnRenderError, void());
};
@@ -118,7 +121,8 @@ class AudioOutputDeviceTest
int AudioOutputDeviceTest::CalculateMemorySize() {
// Calculate output memory size.
- return AudioBus::CalculateMemorySize(default_audio_parameters_);
+ return sizeof(AudioOutputBufferParameters) +
+ AudioBus::CalculateMemorySize(default_audio_parameters_);
}
AudioOutputDeviceTest::AudioOutputDeviceTest()
@@ -215,10 +219,9 @@ void AudioOutputDeviceTest::ExpectRenderCallback() {
// So, for the sake of this test, we consider the call to Render a sign
// of success and quit the loop.
const int kNumberOfFramesToProcess = 0;
- EXPECT_CALL(callback_, Render(_, _))
- .WillOnce(DoAll(
- QuitLoop(io_loop_.task_runner()),
- Return(kNumberOfFramesToProcess)));
+ EXPECT_CALL(callback_, Render(_, _, _))
+ .WillOnce(DoAll(QuitLoop(io_loop_.task_runner()),
+ Return(kNumberOfFramesToProcess)));
}
void AudioOutputDeviceTest::WaitUntilRenderCallback() {

Powered by Google App Engine
This is Rietveld 408576698