Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(220)

Unified Diff: chromecast/media/audio/cast_audio_mixer.h

Issue 2101303004: Pass delay and timestamp to AudioSourceCallback::OnMoreData. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Fix Mac CQ errors. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromecast/media/audio/cast_audio_mixer.h
diff --git a/chromecast/media/audio/cast_audio_mixer.h b/chromecast/media/audio/cast_audio_mixer.h
index 33eac2fb61b1b6d0dfdf4097821cac6567e8e1e6..a2016dc6ed66b83892875979c72c966f62aa6cfd 100644
--- a/chromecast/media/audio/cast_audio_mixer.h
+++ b/chromecast/media/audio/cast_audio_mixer.h
@@ -5,11 +5,13 @@
#ifndef CHROMECAST_MEDIA_AUDIO_CAST_AUDIO_MIXER_H_
#define CHROMECAST_MEDIA_AUDIO_CAST_AUDIO_MIXER_H_
+#include <memory>
#include <vector>
#include "base/callback.h"
#include "base/macros.h"
#include "base/threading/thread_checker.h"
+#include "base/time/time.h"
#include "media/audio/audio_io.h"
#include "media/base/audio_converter.h"
#include "media/base/audio_parameters.h"
@@ -27,7 +29,7 @@ class CastAudioMixer : public ::media::AudioOutputStream::AudioSourceCallback {
using RealStreamFactory = base::Callback<::media::AudioOutputStream*(
const ::media::AudioParameters&)>;
- CastAudioMixer(const RealStreamFactory& real_stream_factory);
+ explicit CastAudioMixer(const RealStreamFactory& real_stream_factory);
~CastAudioMixer() override;
virtual ::media::AudioOutputStream* MakeStream(
@@ -38,9 +40,11 @@ class CastAudioMixer : public ::media::AudioOutputStream::AudioSourceCallback {
class MixerProxyStream;
// ::media::AudioOutputStream::AudioSourceCallback implementation
- int OnMoreData(::media::AudioBus* dest,
- uint32_t total_bytes_delay,
- uint32_t frames_skipped) override;
+ int OnMoreData(base::TimeDelta delay,
+ base::TimeTicks delay_timestamp,
+ int prior_frames_skipped,
+ ::media::AudioBus* dest) override;
+
void OnError(::media::AudioOutputStream* stream) override;
// MixedAudioOutputStreams call Register on opening and AddInput on starting.

Powered by Google App Engine
This is Rietveld 408576698