| Index: media/audio/win/audio_low_latency_output_win_unittest.cc
|
| diff --git a/media/audio/win/audio_low_latency_output_win_unittest.cc b/media/audio/win/audio_low_latency_output_win_unittest.cc
|
| index d6c09c214b4375132ceb81c9883880a9a7e8d0bf..a01b4b192bf7832487dbe6de1656aa202026e5a0 100644
|
| --- a/media/audio/win/audio_low_latency_output_win_unittest.cc
|
| +++ b/media/audio/win/audio_low_latency_output_win_unittest.cc
|
| @@ -108,7 +108,8 @@ class ReadFromFileAudioSource : public AudioOutputStream::AudioSourceCallback {
|
| // AudioOutputStream::AudioSourceCallback implementation.
|
| int OnMoreData(AudioBus* audio_bus,
|
| uint32_t total_bytes_delay,
|
| - uint32_t frames_skipped) override {
|
| + uint32_t frames_skipped,
|
| + const AudioTimestamp& output_timestamp) override {
|
| // Store time difference between two successive callbacks in an array.
|
| // These values will be written to a file in the destructor.
|
| const base::TimeTicks now_time = base::TimeTicks::Now();
|
| @@ -394,7 +395,8 @@ TEST_F(WASAPIAudioOutputStreamTest, ValidPacketSize) {
|
|
|
| // Wait for the first callback and verify its parameters. Ignore any
|
| // subsequent callbacks that might arrive.
|
| - EXPECT_CALL(source, OnMoreData(NotNull(), HasValidDelay(bytes_per_packet), 0))
|
| + EXPECT_CALL(source, OnMoreData(NotNull(), HasValidDelay(bytes_per_packet), 0,
|
| + AudioTimestamp()))
|
| .WillOnce(DoAll(QuitLoop(message_loop_.task_runner()),
|
| Return(aosw.samples_per_packet())))
|
| .WillRepeatedly(Return(0));
|
| @@ -584,7 +586,8 @@ TEST_F(WASAPIAudioOutputStreamTest,
|
| (aosw.bits_per_sample() / 8);
|
|
|
| // Wait for the first callback and verify its parameters.
|
| - EXPECT_CALL(source, OnMoreData(NotNull(), HasValidDelay(bytes_per_packet), 0))
|
| + EXPECT_CALL(source, OnMoreData(NotNull(), HasValidDelay(bytes_per_packet), 0,
|
| + AudioTimestamp()))
|
| .WillOnce(DoAll(QuitLoop(message_loop_.task_runner()),
|
| Return(aosw.samples_per_packet())))
|
| .WillRepeatedly(Return(aosw.samples_per_packet()));
|
| @@ -617,7 +620,8 @@ TEST_F(WASAPIAudioOutputStreamTest,
|
| (aosw.bits_per_sample() / 8);
|
|
|
| // Wait for the first callback and verify its parameters.
|
| - EXPECT_CALL(source, OnMoreData(NotNull(), HasValidDelay(bytes_per_packet), 0))
|
| + EXPECT_CALL(source, OnMoreData(NotNull(), HasValidDelay(bytes_per_packet), 0,
|
| + AudioTimestamp()))
|
| .WillOnce(DoAll(QuitLoop(message_loop_.task_runner()),
|
| Return(aosw.samples_per_packet())))
|
| .WillRepeatedly(Return(aosw.samples_per_packet()));
|
|
|