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

Unified Diff: media/audio/audio_output_controller_unittest.cc

Issue 2101303004: Pass delay and timestamp to AudioSourceCallback::OnMoreData. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Fix Mac CQ errors. Created 4 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
Index: media/audio/audio_output_controller_unittest.cc
diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc
index b0133f280a5fe866a5999da32ddacde99d605984..62058dacef55ff36d42055bb9b14f6bdb64d1828 100644
--- a/media/audio/audio_output_controller_unittest.cc
+++ b/media/audio/audio_output_controller_unittest.cc
@@ -7,6 +7,7 @@
#include <stdint.h>
#include <memory>
+#include <vector>
#include "base/bind.h"
#include "base/environment.h"
@@ -18,6 +19,7 @@
#include "base/single_thread_task_runner.h"
#include "base/test/test_message_loop.h"
#include "base/threading/thread_task_runner_handle.h"
+#include "base/time/time.h"
#include "media/audio/audio_device_description.h"
#include "media/audio/audio_source_diverter.h"
#include "media/base/audio_bus.h"
@@ -199,8 +201,8 @@ class AudioOutputControllerTest : public testing::Test {
void ReadDivertedAudioData() {
std::unique_ptr<AudioBus> dest = AudioBus::Create(params_);
ASSERT_TRUE(mock_stream_.callback());
- const int frames_read =
- mock_stream_.callback()->OnMoreData(dest.get(), 0, 0);
+ const int frames_read = mock_stream_.callback()->OnMoreData(
+ base::TimeDelta(), base::TimeTicks::Now(), 0, dest.get());
EXPECT_LT(0, frames_read);
EXPECT_EQ(kBufferNonZeroData, dest->channel(0)[0]);
}
@@ -213,7 +215,8 @@ class AudioOutputControllerTest : public testing::Test {
std::unique_ptr<AudioBus> dest = AudioBus::Create(params_);
// It is this OnMoreData() call that triggers |sink|'s OnData().
- const int frames_read = controller_->OnMoreData(dest.get(), 0, 0);
+ const int frames_read = controller_->OnMoreData(
+ base::TimeDelta(), base::TimeTicks::Now(), 0, dest.get());
EXPECT_LT(0, frames_read);
EXPECT_EQ(kBufferNonZeroData, dest->channel(0)[0]);

Powered by Google App Engine
This is Rietveld 408576698