Revert of Use double microseconds for tracking back/front timestamp in AudioClock.

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 "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "media/base/audio_timestamp_helper.h"
 #include "media/filters/audio_clock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 class AudioClockTest : public testing::Test {
  public:
-  AudioClockTest() { SetupClock(base::TimeDelta(), 10); }
+  AudioClockTest()
+      : sample_rate_(10), clock_(base::TimeDelta(), sample_rate_) {}
 
   ~AudioClockTest() override {}
 
   void WroteAudio(int frames_written,
                   int frames_requested,
                   int delay_frames,
                   double playback_rate) {
-    clock_->WroteAudio(frames_written, frames_requested, delay_frames,
-                       playback_rate);
+    clock_.WroteAudio(
+        frames_written, frames_requested, delay_frames, playback_rate);
   }
 
-  void SetupClock(base::TimeDelta start_time, int sample_rate) {
-    sample_rate_ = sample_rate;
-    clock_.reset(new AudioClock(start_time, sample_rate_));
-  }
-
-  int FrontTimestampInDays() { return clock_->front_timestamp().InDays(); }
+  int FrontTimestampInDays() { return clock_.front_timestamp().InDays(); }
 
   int FrontTimestampInMilliseconds() {
-    return clock_->front_timestamp().InMilliseconds();
+    return clock_.front_timestamp().InMilliseconds();
   }
 
   int BackTimestampInMilliseconds() {
-    return clock_->back_timestamp().InMilliseconds();
+    return clock_.back_timestamp().InMilliseconds();
   }
 
   int TimeUntilPlaybackInMilliseconds(int timestamp_ms) {
-    return clock_
-        ->TimeUntilPlayback(base::TimeDelta::FromMilliseconds(timestamp_ms))
-        .InMilliseconds();
+    return clock_.TimeUntilPlayback(base::TimeDelta::FromMilliseconds(
+                                        timestamp_ms)).InMilliseconds();
   }
 
   int ContiguousAudioDataBufferedInDays() {
     base::TimeDelta total, same_rate_total;
-    clock_->ContiguousAudioDataBufferedForTesting(&total, &same_rate_total);
+    clock_.ContiguousAudioDataBufferedForTesting(&total, &same_rate_total);
     return total.InDays();
   }
 
   int ContiguousAudioDataBufferedInMilliseconds() {
     base::TimeDelta total, same_rate_total;
-    clock_->ContiguousAudioDataBufferedForTesting(&total, &same_rate_total);
+    clock_.ContiguousAudioDataBufferedForTesting(&total, &same_rate_total);
     return total.InMilliseconds();
   }
 
   int ContiguousAudioDataBufferedAtSameRateInMilliseconds() {
     base::TimeDelta total, same_rate_total;
-    clock_->ContiguousAudioDataBufferedForTesting(&total, &same_rate_total);
+    clock_.ContiguousAudioDataBufferedForTesting(&total, &same_rate_total);
     return same_rate_total.InMilliseconds();
   }
 
-  int sample_rate_;
-  scoped_ptr<AudioClock> clock_;
+  const int sample_rate_;
+  AudioClock clock_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AudioClockTest);
 };
 
 TEST_F(AudioClockTest, FrontTimestampStartsAtStartTimestamp) {
   base::TimeDelta expected = base::TimeDelta::FromSeconds(123);
   AudioClock clock(expected, sample_rate_);
 
   EXPECT_EQ(expected, clock.front_timestamp());
@@ skipping 258 matching lines @@
   // Buffer 6 seconds of delay and 1 second of audio data.
   WroteAudio(10, 10, 60, 1.0);
 
   // Media timestamp zero has to wait for silence to pass.
   const int kBaseTimeMs = 6000;
   EXPECT_EQ(kBaseTimeMs, TimeUntilPlaybackInMilliseconds(0));
 
   // Elapsing frames less than we have buffered should do nothing.
   const int kDelayFrames = 2;
   for (int i = 1000; i <= kBaseTimeMs; i += 1000) {
-    clock_->CompensateForSuspendedWrites(base::TimeDelta::FromMilliseconds(i),
-                                         kDelayFrames);
+    clock_.CompensateForSuspendedWrites(base::TimeDelta::FromMilliseconds(i),
+                                        kDelayFrames);
     EXPECT_EQ(kBaseTimeMs - (i - 1000), TimeUntilPlaybackInMilliseconds(0));
 
     // Write silence to simulate maintaining a 7s output buffer.
     WroteAudio(0, 10, 60, 1.0);
   }
 
   // Exhausting all frames should advance timestamps and prime the buffer with
   // our delay frames value.
-  clock_->CompensateForSuspendedWrites(base::TimeDelta::FromMilliseconds(7000),
-                                       kDelayFrames);
+  clock_.CompensateForSuspendedWrites(base::TimeDelta::FromMilliseconds(7000),
+                                      kDelayFrames);
   EXPECT_EQ(kDelayFrames * 100, TimeUntilPlaybackInMilliseconds(1000));
 }
 
-TEST_F(AudioClockTest, FramesToTimePrecision) {
-  SetupClock(base::TimeDelta(), 48000);
-  double micros_per_frame = base::Time::kMicrosecondsPerSecond / 48000.0;
-  int frames_written = 0;
-
-  // Write ~2 hours of data to clock to give any error a significant chance to
-  // accumulate.
-  while (clock_->back_timestamp() <= base::TimeDelta::FromHours(2)) {
-    frames_written += 1024;
-    WroteAudio(1024, 1024, 0, 1);
-  }
-
-  // Verify no error accumulated.
-  EXPECT_EQ(std::round(frames_written * micros_per_frame),
-            clock_->back_timestamp().InMicroseconds());
-}
-
 }  // namespace media