| Index: media/audio/simple_sources.h
|
| diff --git a/media/audio/simple_sources.h b/media/audio/simple_sources.h
|
| index bd5797d814bf132b002f54bba94c67315bff5425..cc1a99d8ece0f105c199b6463b1c6a4dc53b4c61 100644
|
| --- a/media/audio/simple_sources.h
|
| +++ b/media/audio/simple_sources.h
|
| @@ -11,6 +11,7 @@
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/synchronization/lock.h"
|
| +#include "base/time/time.h"
|
| #include "media/audio/audio_io.h"
|
| #include "media/base/audio_converter.h"
|
| #include "media/base/seekable_buffer.h"
|
| @@ -35,9 +36,10 @@ class MEDIA_EXPORT SineWaveAudioSource
|
| void Reset();
|
|
|
| // Implementation of AudioSourceCallback.
|
| - int OnMoreData(AudioBus* audio_bus,
|
| - uint32_t total_bytes_delay,
|
| - uint32_t frames_skipped) override;
|
| + int OnMoreData(base::TimeDelta delay,
|
| + base::TimeTicks timestamp,
|
| + int prior_frames_skipped,
|
| + AudioBus* dest) override;
|
| void OnError(AudioOutputStream* stream) override;
|
|
|
| // The number of OnMoreData() and OnError() calls respectively.
|
| @@ -63,9 +65,10 @@ class MEDIA_EXPORT FileSource : public AudioOutputStream::AudioSourceCallback,
|
| ~FileSource() override;
|
|
|
| // Implementation of AudioSourceCallback.
|
| - int OnMoreData(AudioBus* audio_bus,
|
| - uint32_t total_bytes_delay,
|
| - uint32_t frames_skipped) override;
|
| + int OnMoreData(base::TimeDelta delay,
|
| + base::TimeTicks delay_timestamp,
|
| + int prior_frames_skipped,
|
| + AudioBus* dest) override;
|
| void OnError(AudioOutputStream* stream) override;
|
|
|
| private:
|
| @@ -95,13 +98,14 @@ class MEDIA_EXPORT FileSource : public AudioOutputStream::AudioSourceCallback,
|
|
|
| class BeepingSource : public AudioOutputStream::AudioSourceCallback {
|
| public:
|
| - BeepingSource(const AudioParameters& params);
|
| + explicit BeepingSource(const AudioParameters& params);
|
| ~BeepingSource() override;
|
|
|
| // Implementation of AudioSourceCallback.
|
| - int OnMoreData(AudioBus* audio_bus,
|
| - uint32_t total_bytes_delay,
|
| - uint32_t frames_skipped) override;
|
| + int OnMoreData(base::TimeDelta delay,
|
| + base::TimeTicks delay_timestamp,
|
| + int prior_frames_skipped,
|
| + AudioBus* dest) override;
|
| void OnError(AudioOutputStream* stream) override;
|
|
|
| static void BeepOnce();
|
|
|