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

Unified Diff: media/audio/audio_output_device_unittest.cc

Issue 1538463002: Revert of 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: 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
« no previous file with comments | « media/audio/audio_output_device.cc ('k') | media/audio/audio_output_proxy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 aa7e649d1fa28f5e00c7645d81d03a292a11e293..5faa119a635294dbe873622f0db02bb89d0e8f61 100644
--- a/media/audio/audio_output_device_unittest.cc
+++ b/media/audio/audio_output_device_unittest.cc
@@ -44,10 +44,7 @@
MockRenderCallback() {}
virtual ~MockRenderCallback() {}
- MOCK_METHOD3(Render,
- int(AudioBus* dest,
- uint32_t audio_delay_milliseconds,
- uint32_t frames_skipped));
+ MOCK_METHOD2(Render, int(AudioBus* dest, int audio_delay_milliseconds));
MOCK_METHOD0(OnRenderError, void());
};
@@ -120,8 +117,7 @@
int AudioOutputDeviceTest::CalculateMemorySize() {
// Calculate output memory size.
- return sizeof(AudioOutputBufferParameters) +
- AudioBus::CalculateMemorySize(default_audio_parameters_);
+ return AudioBus::CalculateMemorySize(default_audio_parameters_);
}
AudioOutputDeviceTest::AudioOutputDeviceTest()
@@ -218,9 +214,10 @@
// 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() {
« no previous file with comments | « media/audio/audio_output_device.cc ('k') | media/audio/audio_output_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698