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

Unified Diff: media/audio/win/audio_low_latency_input_win_unittest.cc

Issue 2689483006: Switch browser side audio capture path to use base time primitives. (Closed)
Patch Set: Bloop Created 3 years, 10 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/win/audio_low_latency_input_win_unittest.cc
diff --git a/media/audio/win/audio_low_latency_input_win_unittest.cc b/media/audio/win/audio_low_latency_input_win_unittest.cc
index 7e16bae23fcaf65fb470ce310b5c13109c78021c..5523dc5d6325d5f14d16b8fe3dcef58ae103c47a 100644
--- a/media/audio/win/audio_low_latency_input_win_unittest.cc
+++ b/media/audio/win/audio_low_latency_input_win_unittest.cc
@@ -44,10 +44,11 @@ ACTION_P4(CheckCountAndPostQuitTask, count, limit, task_runner, quit_closure) {
class MockAudioInputCallback : public AudioInputStream::AudioInputCallback {
public:
- MOCK_METHOD4(OnData,
+ MOCK_METHOD5(OnData,
void(AudioInputStream* stream,
const AudioBus* src,
- uint32_t hardware_delay_bytes,
+ base::TimeDelta delay,
+ base::TimeTicks delay_timestamp,
double volume));
MOCK_METHOD1(OnError, void(AudioInputStream* stream));
};
@@ -70,10 +71,10 @@ class FakeAudioInputCallback : public AudioInputStream::AudioInputCallback {
void OnData(AudioInputStream* stream,
const AudioBus* src,
- uint32_t hardware_delay_bytes,
+ base::TimeDelta delay,
+ base::TimeTicks delay_timestamp,
double volume) override {
- EXPECT_GE(hardware_delay_bytes, 0u);
- EXPECT_LT(hardware_delay_bytes, 0xFFFFu); // Arbitrarily picked.
+ EXPECT_GE(delay, base::TimeDelta());
num_received_audio_frames_ += src->frames();
data_event_.Signal();
}
@@ -132,7 +133,8 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback {
// AudioInputStream::AudioInputCallback implementation.
void OnData(AudioInputStream* stream,
const AudioBus* src,
- uint32_t hardware_delay_bytes,
+ base::TimeDelta delay,
+ base::TimeTicks delay_timestamp,
double volume) override {
EXPECT_EQ(bits_per_sample_, 16);
const int num_samples = src->frames() * src->channels();
@@ -384,7 +386,7 @@ TEST_F(WinAudioInputTest, WASAPIAudioInputStreamTestPacketSizes) {
// All should contain valid packets of the same size and a valid delay
// estimate.
base::RunLoop run_loop;
- EXPECT_CALL(sink, OnData(ais.get(), NotNull(), _, _))
+ EXPECT_CALL(sink, OnData(ais.get(), NotNull(), _, _, _))
.Times(AtLeast(10))
.WillRepeatedly(
CheckCountAndPostQuitTask(&count, 10, message_loop_.task_runner(),
@@ -409,7 +411,7 @@ TEST_F(WinAudioInputTest, WASAPIAudioInputStreamTestPacketSizes) {
{
base::RunLoop run_loop;
- EXPECT_CALL(sink, OnData(ais.get(), NotNull(), _, _))
+ EXPECT_CALL(sink, OnData(ais.get(), NotNull(), _, _, _))
.Times(AtLeast(10))
.WillRepeatedly(
CheckCountAndPostQuitTask(&count, 10, message_loop_.task_runner(),
@@ -430,7 +432,7 @@ TEST_F(WinAudioInputTest, WASAPIAudioInputStreamTestPacketSizes) {
{
base::RunLoop run_loop;
- EXPECT_CALL(sink, OnData(ais.get(), NotNull(), _, _))
+ EXPECT_CALL(sink, OnData(ais.get(), NotNull(), _, _, _))
.Times(AtLeast(10))
.WillRepeatedly(
CheckCountAndPostQuitTask(&count, 10, message_loop_.task_runner(),

Powered by Google App Engine
This is Rietveld 408576698