Pass delay and timestamp to AudioSourceCallback::OnMoreData.

media/audio/alsa/alsa_output.h

 // Copyright 2013 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.
 //
 // Creates an output stream based on the ALSA PCM interface.
 //
 // On device write failure, the stream will move itself to an invalid state.
 // No more data will be pulled from the data source, or written to the device.
 // All calls to public API functions will either no-op themselves, or return an
 // error if possible.  Specifically, If the stream is in an error state, Open()
@@ skipping 16 matching lines @@
 #include <memory>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/non_thread_safe.h"
+#include "base/time/tick_clock.h"
 #include "base/time/time.h"
 #include "media/audio/audio_io.h"
 #include "media/base/audio_parameters.h"
 
 namespace media {
 
 class AlsaWrapper;
 class AudioManagerBase;
 class ChannelMixer;
 class SeekableBuffer;
@@ skipping 30 matching lines @@
   ~AlsaPcmOutputStream() override;
 
   // Implementation of AudioOutputStream.
   bool Open() override;
   void Close() override;
   void Start(AudioSourceCallback* callback) override;
   void Stop() override;
   void SetVolume(double volume) override;
   void GetVolume(double* volume) override;
 
+  void SetTickClockForTesting(std::unique_ptr<base::TickClock> tick_clock);
+
  private:
   friend class AlsaPcmOutputStreamTest;
   FRIEND_TEST_ALL_PREFIXES(AlsaPcmOutputStreamTest,
                            AutoSelectDevice_DeviceSelect);
   FRIEND_TEST_ALL_PREFIXES(AlsaPcmOutputStreamTest,
                            AutoSelectDevice_FallbackDevices);
   FRIEND_TEST_ALL_PREFIXES(AlsaPcmOutputStreamTest, AutoSelectDevice_HintFail);
   FRIEND_TEST_ALL_PREFIXES(AlsaPcmOutputStreamTest, BufferPacket);
   FRIEND_TEST_ALL_PREFIXES(AlsaPcmOutputStreamTest, BufferPacket_Negative);
   FRIEND_TEST_ALL_PREFIXES(AlsaPcmOutputStreamTest, BufferPacket_StopStream);
@@ skipping 25 matching lines @@
   friend std::ostream& operator<<(std::ostream& os, InternalState);
 
   // Functions to get another packet from the data source and write it into the
   // ALSA device.
   void BufferPacket(bool* source_exhausted);
   void WritePacket();
   void WriteTask();
   void ScheduleNextWrite(bool source_exhausted);
 
   // Utility functions for talking with the ALSA API.
-  static base::TimeDelta FramesToTimeDelta(int frames, double sample_rate);
   std::string FindDeviceForChannels(uint32_t channels);
   snd_pcm_sframes_t GetAvailableFrames();
   snd_pcm_sframes_t GetCurrentDelay();
 
   // Attempts to find the best matching linux audio device for the given number
   // of channels.  This function will set |device_name_| and |channel_mixer_|.
   snd_pcm_t* AutoSelectDevice(uint32_t latency);
 
   // Functions to safeguard state transitions.  All changes to the object state
   // should go through these functions.
   bool CanTransitionTo(InternalState to);
   InternalState TransitionTo(InternalState to);
   InternalState state();
 
   // API for Proxying calls to the AudioSourceCallback provided during
   // Start().
   //
   // TODO(ajwong): This is necessary because the ownership semantics for the
   // |source_callback_| object are incorrect in AudioRenderHost. The callback
   // is passed into the output stream, but ownership is not transfered which
   // requires a synchronization on access of the |source_callback_| to avoid
   // using a deleted callback.
-  int RunDataCallback(AudioBus* audio_bus, uint32_t total_bytes_delay);
+  int RunDataCallback(base::TimeDelta delay,
+                      base::TimeTicks delay_timestamp,
+                      AudioBus* audio_bus);
   void RunErrorCallback(int code);
 
   // Changes the AudioSourceCallback to proxy calls to.  Pass in NULL to
   // release ownership of the currently registered callback.
   void set_source_callback(AudioSourceCallback* callback);
 
   // Configuration constants from the constructor.  Referenceable by all threads
   // since they are constants.
   const std::string requested_device_name_;
   const snd_pcm_format_t pcm_format_;
@@ skipping 35 matching lines @@
 
   AudioSourceCallback* source_callback_;
 
   // Container for retrieving data from AudioSourceCallback::OnMoreData().
   std::unique_ptr<AudioBus> audio_bus_;
 
   // Channel mixer and temporary bus for the final mixed channel data.
   std::unique_ptr<ChannelMixer> channel_mixer_;
   std::unique_ptr<AudioBus> mixed_audio_bus_;
 
+  std::unique_ptr<base::TickClock> tick_clock_;
+
   // Allows us to run tasks on the AlsaPcmOutputStream instance which are
   // bound by its lifetime.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<AlsaPcmOutputStream> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AlsaPcmOutputStream);
 };
 
 MEDIA_EXPORT std::ostream& operator<<(std::ostream& os,
                                       AlsaPcmOutputStream::InternalState);
 
 };  // namespace media
 
 #endif  // MEDIA_AUDIO_ALSA_ALSA_OUTPUT_H_