Express audio delay more precisely in frames rather than milliseconds.

media/renderers/audio_renderer_impl_unittest.cc

 // Copyright (c) 2012 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/renderers/audio_renderer_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 38 matching lines @@
 // Constants to specify the type of audio data used.
 static AudioCodec kCodec = kCodecVorbis;
 static SampleFormat kSampleFormat = kSampleFormatPlanarF32;
 static ChannelLayout kChannelLayout = CHANNEL_LAYOUT_STEREO;
 static int kChannelCount = 2;
 static int kChannels = ChannelLayoutToChannelCount(kChannelLayout);
 
 // Use a different output sample rate so the AudioBufferConverter is invoked.
 static int kInputSamplesPerSecond = 5000;
 static int kOutputSamplesPerSecond = 10000;
+static double kOutputMicrosPerFrame =
+    static_cast<double>(base::Time::kMicrosecondsPerSecond) /
+    kOutputSamplesPerSecond;
 
 ACTION_P(EnterPendingDecoderInitStateAction, test) {
   test->EnterPendingDecoderInitState(arg2);
 }
 
 class AudioRendererImplTest : public ::testing::Test {
  public:
   // Give the decoder some non-garbage media properties.
   AudioRendererImplTest()
       : hardware_config_(AudioParameters(), AudioParameters()),
@@ skipping 222 matching lines @@
   void DeliverRemainingAudio() {
     while (frames_remaining_in_buffer().value > 0) {
       SatisfyPendingRead(InputFrames(256));
     }
   }
 
   // Attempts to consume |requested_frames| frames from |renderer_|'s internal
   // buffer. Returns true if and only if all of |requested_frames| were able
   // to be consumed.
   bool ConsumeBufferedData(OutputFrames requested_frames,
-                           base::TimeDelta delay) {
+                           uint32_t delay_frames) {
     scoped_ptr<AudioBus> bus =
         AudioBus::Create(kChannels, requested_frames.value);
     int frames_read = 0;
-    EXPECT_TRUE(sink_->Render(bus.get(), delay.InMilliseconds(), &frames_read));
+    EXPECT_TRUE(sink_->Render(bus.get(), delay_frames, &frames_read));
     return frames_read == requested_frames.value;
   }
 
   bool ConsumeBufferedData(OutputFrames requested_frames) {
-    return ConsumeBufferedData(requested_frames, base::TimeDelta());
+    return ConsumeBufferedData(requested_frames, 0);
   }
 
   base::TimeTicks ConvertMediaTime(base::TimeDelta timestamp,
                                    bool* is_time_moving) {
     std::vector<base::TimeTicks> wall_clock_times;
     *is_time_moving = renderer_->GetWallClockTimes(
         std::vector<base::TimeDelta>(1, timestamp), &wall_clock_times);
     return wall_clock_times[0];
   }
 
@@ skipping 542 matching lines @@
   // Elapse a lot of time between StopTicking() and the next Render() call.
   const base::TimeDelta kOneSecond = base::TimeDelta::FromSeconds(1);
   tick_clock_->Advance(kOneSecond);
   StartTicking();
 
   // Time should be stopped until the next render call.
   EXPECT_EQ(current_time, CurrentMediaWallClockTime(&is_time_moving));
   EXPECT_FALSE(is_time_moving);
 
   // Consume some buffered data with a small delay.
-  base::TimeDelta delay_time = base::TimeDelta::FromMilliseconds(50);
+  uint32_t delay_frames = 500;
+  base::TimeDelta delay_time = base::TimeDelta::FromMicroseconds(
+      std::round(delay_frames * kOutputMicrosPerFrame));
+
   frames_to_consume.value = frames_buffered().value / 16;
-  EXPECT_TRUE(ConsumeBufferedData(frames_to_consume, delay_time));
+  EXPECT_TRUE(ConsumeBufferedData(frames_to_consume, delay_frames));
 
   // Verify time is adjusted for the current delay.
   current_time = tick_clock_->NowTicks() + delay_time;
   EXPECT_EQ(current_time, CurrentMediaWallClockTime(&is_time_moving));
   EXPECT_TRUE(is_time_moving);
   EXPECT_EQ(current_time,
             ConvertMediaTime(renderer_->CurrentMediaTime(), &is_time_moving));
   EXPECT_TRUE(is_time_moving);
 
   // Advance far enough that we shouldn't be clamped to current time (tested
   // already above).
   tick_clock_->Advance(kOneSecond);
   EXPECT_EQ(
       current_time + timestamp_helper.GetFrameDuration(frames_to_consume.value),
       CurrentMediaWallClockTime(&is_time_moving));
   EXPECT_TRUE(is_time_moving);
 }
 
 }  // namespace media