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

Unified Diff: media/filters/audio_renderer_impl.h

Issue 557333002: Revert of Switch to using media::TimeSource inside media::RendererImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « media/base/wall_clock_time_source.cc ('k') | media/filters/audio_renderer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/audio_renderer_impl.h
diff --git a/media/filters/audio_renderer_impl.h b/media/filters/audio_renderer_impl.h
index ac8c3adcdaab1becce54e241aa1794a1529cdd4c..b927d1f9b69f9c8f216aa25bb0c520c79aebdff2 100644
--- a/media/filters/audio_renderer_impl.h
+++ b/media/filters/audio_renderer_impl.h
@@ -75,12 +75,12 @@
virtual void SetPlaybackRate(float rate) OVERRIDE;
virtual void SetMediaTime(base::TimeDelta time) OVERRIDE;
virtual base::TimeDelta CurrentMediaTime() OVERRIDE;
- virtual base::TimeDelta CurrentMediaTimeForSyncingVideo() OVERRIDE;
// AudioRenderer implementation.
virtual void Initialize(DemuxerStream* stream,
const PipelineStatusCB& init_cb,
const StatisticsCB& statistics_cb,
+ const TimeCB& time_cb,
const BufferingStateCB& buffering_state_cb,
const base::Closure& ended_cb,
const PipelineStatusCB& error_cb) OVERRIDE;
@@ -215,6 +215,7 @@
// Callbacks provided during Initialize().
PipelineStatusCB init_cb_;
+ TimeCB time_cb_;
BufferingStateCB buffering_state_cb_;
base::Closure ended_cb_;
PipelineStatusCB error_cb_;
@@ -249,17 +250,9 @@
scoped_ptr<AudioClock> audio_clock_;
- // The media timestamp to begin playback at after seeking. Set via
- // SetMediaTime().
base::TimeDelta start_timestamp_;
-
- // The media timestamp to signal end of audio playback. Determined during
- // Render() when writing the final frames of decoded audio data.
base::TimeDelta ended_timestamp_;
-
- // Set every Render() and used to provide an interpolated time value to
- // CurrentMediaTimeForSyncingVideo().
- base::TimeTicks last_render_ticks_;
+ base::TimeDelta last_timestamp_update_;
// End variables which must be accessed under |lock_|. ----------------------
« no previous file with comments | « media/base/wall_clock_time_source.cc ('k') | media/filters/audio_renderer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698