Change the TimeSource interface to return wallclock time for video.

media/filters/audio_clock_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/audio_timestamp_helper.h"
 #include "media/base/buffers.h"
 #include "media/filters/audio_clock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
@@ skipping 16 matching lines @@
   int FrontTimestampInDays() { return clock_.front_timestamp().InDays(); }
 
   int FrontTimestampInMilliseconds() {
     return clock_.front_timestamp().InMilliseconds();
   }
 
   int BackTimestampInMilliseconds() {
     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();
   }
 
   int ContiguousAudioDataBufferedInDays() {
     return clock_.contiguous_audio_data_buffered().InDays();
   }
 
   int ContiguousAudioDataBufferedInMilliseconds() {
@@ skipping 19 matching lines @@
   EXPECT_EQ(expected, clock.front_timestamp());
 }
 
 TEST_F(AudioClockTest, BackTimestampStartsAtStartTimestamp) {
   base::TimeDelta expected = base::TimeDelta::FromSeconds(123);
   AudioClock clock(expected, sample_rate_);
 
   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());
 }
 
 TEST_F(AudioClockTest, ContiguousAudioDataBufferedAtSameRateStartsAtZero) {
   EXPECT_EQ(base::TimeDelta(),
             clock_.contiguous_audio_data_buffered_at_same_rate());
 }
 
 TEST_F(AudioClockTest, Playback) {
@@ skipping 174 matching lines @@
   EXPECT_EQ(3000, FrontTimestampInMilliseconds());
   EXPECT_EQ(3000, BackTimestampInMilliseconds());
   EXPECT_EQ(0, ContiguousAudioDataBufferedInMilliseconds());
 
   WroteAudio(0, 10, 0, 1.0);
   EXPECT_EQ(3000, FrontTimestampInMilliseconds());
   EXPECT_EQ(3000, BackTimestampInMilliseconds());
   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:
   //
   //    existing
   // |-  delay   -|------------------ calls to WroteAudio() ------------------|
   // +------------+---------+------------+-----------+------------+-----------+
   // | 20 silence | 10 @ 1x | 10 silence | 10 @ 0.5x | 10 silence | 10 @ 2.0x |
   // +------------+---------+------------+-----------+------------+-----------+
   // Media:       0       1000         1000        1500         1500        3500
   // Wall:      2000      3000         4000        5000         6000        7000
@@ skipping 44 matching lines @@
   EXPECT_EQ(huge.InDays(), ContiguousAudioDataBufferedInDays());
 
   // Use huge delay to test calculation of buffered data.
   WroteAudio(
       huge_amount_of_frames, huge_amount_of_frames, huge_amount_of_frames, 1.0);
   EXPECT_EQ((huge * 3).InDays(), FrontTimestampInDays());
   EXPECT_EQ((huge * 2).InDays(), ContiguousAudioDataBufferedInDays());
 }
 
 }  // namespace media