Index: media/filters/audio_clock_unittest.cc |
diff --git a/media/filters/audio_clock_unittest.cc b/media/filters/audio_clock_unittest.cc |
index 557fa7c968627ec167f04f5cbd056d52650ba3ff..7b4d85fd0668431046bc0f3953fe5f0031b35e02 100644 |
--- a/media/filters/audio_clock_unittest.cc |
+++ b/media/filters/audio_clock_unittest.cc |
@@ -34,11 +34,6 @@ class AudioClockTest : public testing::Test { |
return clock_.back_timestamp().InMilliseconds(); |
} |
- int TimestampSinceLastWritingInMilliseconds(int milliseconds) { |
- return clock_.TimestampSinceWriting(base::TimeDelta::FromMilliseconds( |
- milliseconds)).InMilliseconds(); |
- } |
- |
int TimeUntilPlaybackInMilliseconds(int timestamp_ms) { |
return clock_.TimeUntilPlayback(base::TimeDelta::FromMilliseconds( |
timestamp_ms)).InMilliseconds(); |
@@ -78,14 +73,6 @@ TEST_F(AudioClockTest, BackTimestampStartsAtStartTimestamp) { |
EXPECT_EQ(expected, clock.back_timestamp()); |
} |
-TEST_F(AudioClockTest, TimestampSinceWritingStartsAtStartTimestamp) { |
- base::TimeDelta expected = base::TimeDelta::FromSeconds(123); |
- AudioClock clock(expected, sample_rate_); |
- |
- base::TimeDelta time_since_writing = base::TimeDelta::FromSeconds(456); |
- EXPECT_EQ(expected, clock.TimestampSinceWriting(time_since_writing)); |
-} |
- |
TEST_F(AudioClockTest, ContiguousAudioDataBufferedStartsAtZero) { |
EXPECT_EQ(base::TimeDelta(), clock_.contiguous_audio_data_buffered()); |
} |
@@ -280,47 +267,6 @@ TEST_F(AudioClockTest, ZeroDelay) { |
EXPECT_EQ(0, ContiguousAudioDataBufferedInMilliseconds()); |
} |
-TEST_F(AudioClockTest, TimestampSinceLastWriting) { |
- // Construct an audio clock with the following representation: |
- // |
- // |- existing delay -|------------ calls to WroteAudio() -----------------| |
- // +-------------------+----------------+------------------+----------------+ |
- // | 20 frames silence | 10 frames @ 1x | 10 frames @ 0.5x | 10 frames @ 2x | |
- // +-------------------+----------------+------------------+----------------+ |
- // Media timestamp: 0 1000 1500 3500 |
- // Wall clock time: 2000 3000 4000 5000 |
- WroteAudio(10, 10, 40, 1.0); |
- WroteAudio(10, 10, 40, 0.5); |
- WroteAudio(10, 10, 40, 2.0); |
- EXPECT_EQ(0, FrontTimestampInMilliseconds()); |
- EXPECT_EQ(3500, BackTimestampInMilliseconds()); |
- EXPECT_EQ(0, ContiguousAudioDataBufferedInMilliseconds()); |
- |
- // Simulate passing 2000ms of initial delay in the audio hardware. |
- EXPECT_EQ(0, TimestampSinceLastWritingInMilliseconds(0)); |
- EXPECT_EQ(0, TimestampSinceLastWritingInMilliseconds(500)); |
- EXPECT_EQ(0, TimestampSinceLastWritingInMilliseconds(1000)); |
- EXPECT_EQ(0, TimestampSinceLastWritingInMilliseconds(1500)); |
- EXPECT_EQ(0, TimestampSinceLastWritingInMilliseconds(2000)); |
- |
- // Now we should see the 1.0x buffer. |
- EXPECT_EQ(500, TimestampSinceLastWritingInMilliseconds(2500)); |
- EXPECT_EQ(1000, TimestampSinceLastWritingInMilliseconds(3000)); |
- |
- // Now we should see the 0.5x buffer. |
- EXPECT_EQ(1250, TimestampSinceLastWritingInMilliseconds(3500)); |
- EXPECT_EQ(1500, TimestampSinceLastWritingInMilliseconds(4000)); |
- |
- // Now we should see the 2.0x buffer. |
- EXPECT_EQ(2500, TimestampSinceLastWritingInMilliseconds(4500)); |
- EXPECT_EQ(3500, TimestampSinceLastWritingInMilliseconds(5000)); |
- |
- // Times beyond the known length of the audio clock should return the last |
- // media timestamp we know of. |
- EXPECT_EQ(3500, TimestampSinceLastWritingInMilliseconds(5001)); |
- EXPECT_EQ(3500, TimestampSinceLastWritingInMilliseconds(6000)); |
-} |
- |
TEST_F(AudioClockTest, TimeUntilPlayback) { |
// Construct an audio clock with the following representation: |
// |