Index: media/audio/simple_sources_unittest.cc |
diff --git a/media/audio/simple_sources_unittest.cc b/media/audio/simple_sources_unittest.cc |
index 8e95a78c2007d5262a459f4c422ce4d84e7b2049..ae97d16dfb88ed06706470e1265c3a288d2d15da 100644 |
--- a/media/audio/simple_sources_unittest.cc |
+++ b/media/audio/simple_sources_unittest.cc |
@@ -12,6 +12,7 @@ |
#include "base/files/file_util.h" |
#include "base/logging.h" |
+#include "base/time/time.h" |
#include "media/audio/sounds/test_data.h" |
#include "media/base/audio_bus.h" |
#include "media/base/audio_parameters.h" |
@@ -31,7 +32,7 @@ TEST(SimpleSources, SineWaveAudioSource) { |
SineWaveAudioSource source(1, freq, params.sample_rate()); |
std::unique_ptr<AudioBus> audio_bus = AudioBus::Create(params); |
- source.OnMoreData(audio_bus.get(), 0, 0); |
+ source.OnMoreData(base::TimeTicks(), 0, audio_bus.get()); |
chcunningham
2016/07/29 01:21:10
Now?
jameswest
2016/08/26 02:08:48
Done.
|
EXPECT_EQ(1, source.callbacks()); |
EXPECT_EQ(0, source.errors()); |
@@ -60,12 +61,14 @@ TEST(SimpleSources, SineWaveAudioCapped) { |
source.CapSamples(kSampleCap); |
std::unique_ptr<AudioBus> audio_bus = AudioBus::Create(1, 2 * kSampleCap); |
- EXPECT_EQ(source.OnMoreData(audio_bus.get(), 0, 0), kSampleCap); |
+ EXPECT_EQ(source.OnMoreData(base::TimeTicks(), 0, audio_bus.get()), |
chcunningham
2016/07/29 01:21:09
Now?
jameswest
2016/08/26 02:08:47
Done.
|
+ kSampleCap); |
EXPECT_EQ(1, source.callbacks()); |
- EXPECT_EQ(source.OnMoreData(audio_bus.get(), 0, 0), 0); |
+ EXPECT_EQ(source.OnMoreData(base::TimeTicks(), 0, audio_bus.get()), 0); |
chcunningham
2016/07/29 01:21:09
Now?
jameswest
2016/08/26 02:08:48
Done.
|
EXPECT_EQ(2, source.callbacks()); |
source.Reset(); |
- EXPECT_EQ(source.OnMoreData(audio_bus.get(), 0, 0), kSampleCap); |
+ EXPECT_EQ(source.OnMoreData(base::TimeTicks(), 0, audio_bus.get()), |
chcunningham
2016/07/29 01:21:09
Now?
jameswest
2016/08/26 02:08:48
Done.
|
+ kSampleCap); |
EXPECT_EQ(3, source.callbacks()); |
EXPECT_EQ(0, source.errors()); |
} |
@@ -124,13 +127,14 @@ TEST(SimpleSources, FileSourceTestDataWithoutLooping) { |
// Create a FileSource that reads this file. |
bool loop = false; |
FileSource source(params, temp_path, loop); |
- EXPECT_EQ(kNumFrames, source.OnMoreData(audio_bus.get(), 0, 0)); |
+ EXPECT_EQ(kNumFrames, |
+ source.OnMoreData(base::TimeTicks(), 0, audio_bus.get())); |
chcunningham
2016/07/29 01:21:10
Now?
jameswest
2016/08/26 02:08:47
Done.
|
VerifyContainsTestFile(audio_bus.get()); |
// We should not play any more audio after the file reaches its end. |
audio_bus->Zero(); |
- source.OnMoreData(audio_bus.get(), 0, 0); |
+ source.OnMoreData(base::TimeTicks(), 0, audio_bus.get()); |
chcunningham
2016/07/29 01:21:09
Now?
jameswest
2016/08/26 02:08:48
Done.
|
for (int channel = 0; channel < audio_bus->channels(); ++channel) { |
for (int frame = 0; frame < audio_bus->frames(); ++frame) { |
EXPECT_FLOAT_EQ(0.0, audio_bus->channel(channel)[frame]); |
@@ -160,9 +164,9 @@ TEST(SimpleSources, FileSourceTestDataWithLooping) { |
FileSource source(params, temp_path, loop); |
// Verify that we keep reading in the file when looping. |
- source.OnMoreData(audio_bus.get(), 0, 0); |
+ source.OnMoreData(base::TimeTicks(), 0, audio_bus.get()); |
chcunningham
2016/07/29 01:21:09
Now?
jameswest
2016/08/26 02:08:48
Done.
|
audio_bus->Zero(); |
- source.OnMoreData(audio_bus.get(), 0, 0); |
+ source.OnMoreData(base::TimeTicks(), 0, audio_bus.get()); |
chcunningham
2016/07/29 01:21:10
Now?
jameswest
2016/08/26 02:08:48
Done.
|
VerifyContainsTestFile(audio_bus.get()); |
} |
@@ -180,7 +184,7 @@ TEST(SimpleSources, BadFilePathFails) { |
.Append(FILE_PATH_LITERAL("exist")); |
bool loop = false; |
FileSource source(params, path, loop); |
- EXPECT_EQ(0, source.OnMoreData(audio_bus.get(), 0, 0)); |
+ EXPECT_EQ(0, source.OnMoreData(base::TimeTicks(), 0, audio_bus.get())); |
chcunningham
2016/07/29 01:21:09
Now?
jameswest
2016/08/26 02:08:48
Done.
|
// Confirm all frames are zero-padded. |
for (int channel = 0; channel < audio_bus->channels(); ++channel) { |
@@ -215,7 +219,7 @@ TEST(SimpleSources, FileSourceCorruptTestDataFails) { |
// Create a FileSource that reads this file. |
bool loop = false; |
FileSource source(params, temp_path, loop); |
- EXPECT_EQ(0, source.OnMoreData(audio_bus.get(), 0, 0)); |
+ EXPECT_EQ(0, source.OnMoreData(base::TimeTicks(), 0, audio_bus.get())); |
chcunningham
2016/07/29 01:21:09
Now?
jameswest
2016/08/26 02:08:48
Done.
|
// Confirm all frames are zero-padded. |
for (int channel = 0; channel < audio_bus->channels(); ++channel) { |