Pass delay and timestamp to AudioSourceCallback::OnMoreData.

media/audio/audio_low_latency_input_output_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 <stddef.h>
 #include <stdint.h>
 
+#include <algorithm>
 #include <memory>
 
 #include "base/bind.h"
 #include "base/environment.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/synchronization/lock.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 198 matching lines @@
     // Double the buffer capacity to ensure that we have a buffer large
     // enough to handle the current sample test scenario.
     //   buffer_->set_forward_capacity(2 * buffer_->forward_capacity());
     //   buffer_->Clear();
     // }
   }
 
   void OnError(AudioInputStream* stream) override {}
 
   // AudioOutputStream::AudioSourceCallback.
-  int OnMoreData(AudioBus* audio_bus,
-                 uint32_t total_bytes_delay,
-                 uint32_t frames_skipped) override {
+  int OnMoreData(base::TimeTicks target_playout_time,
+                 int /* prior_frames_skipped */,
+                 AudioBus* dest) override {
     base::AutoLock lock(lock_);
 
+    base::TimeDelta output_delay = std::max(
+        target_playout_time - base::TimeTicks::Now(), base::TimeDelta());
+
     // Update one component in the AudioDelayState for the packet
     // which is about to be played out.
     if (output_elements_to_write_ < kMaxDelayMeasurements) {
       delay_states_[output_elements_to_write_].output_delay_ms =
-          BytesToMilliseconds(total_bytes_delay);
+          output_delay.InMilliseconds();
       ++output_elements_to_write_;
     }
 
     int size;
     const uint8_t* source;
     // Read the data from the seekable media buffer which contains
     // captured data at the same size and sample rate as the output side.
     if (buffer_->GetCurrentChunk(&source, &size) && size > 0) {
-      EXPECT_EQ(channels_, audio_bus->channels());
-      size = std::min(audio_bus->frames() * frame_size_, size);
-      EXPECT_EQ(static_cast<size_t>(size) % sizeof(*audio_bus->channel(0)), 0U);
-      audio_bus->FromInterleaved(
-          source, size / frame_size_, frame_size_ / channels_);
+      EXPECT_EQ(channels_, dest->channels());
+      size = std::min(dest->frames() * frame_size_, size);
+      EXPECT_EQ(static_cast<size_t>(size) % sizeof(*dest->channel(0)), 0U);
+      dest->FromInterleaved(source, size / frame_size_,
+                            frame_size_ / channels_);
       buffer_->Seek(size);
       return size / frame_size_;
     }
 
     return 0;
   }
 
   void OnError(AudioOutputStream* stream) override {}
 
  protected:
@@ skipping 180 matching lines @@
 
   // All Close() operations that run on the mocked audio thread,
   // should be synchronous and not post additional close tasks to
   // mocked the audio thread. Hence, there is no need to call
   // message_loop()->RunUntilIdle() after the Close() methods.
   aos->Close();
   ais->Close();
 }
 
 }  // namespace media