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

Side by Side Diff: media/renderers/renderer_impl.h

Issue 1094553002: Revert "Speculative revert by sheriff" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 unified diff | Download patch
« no previous file with comments | « media/renderers/default_renderer_factory.cc ('k') | media/renderers/renderer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_RENDERERS_RENDERER_IMPL_H_ 5 #ifndef MEDIA_RENDERERS_RENDERER_IMPL_H_
6 #define MEDIA_RENDERERS_RENDERER_IMPL_H_ 6 #define MEDIA_RENDERERS_RENDERER_IMPL_H_
7 7
8 #include "base/cancelable_callback.h" 8 #include "base/cancelable_callback.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 30 matching lines...) Expand all
41 scoped_ptr<AudioRenderer> audio_renderer, 41 scoped_ptr<AudioRenderer> audio_renderer,
42 scoped_ptr<VideoRenderer> video_renderer); 42 scoped_ptr<VideoRenderer> video_renderer);
43 43
44 ~RendererImpl() final; 44 ~RendererImpl() final;
45 45
46 // Renderer implementation. 46 // Renderer implementation.
47 void Initialize(DemuxerStreamProvider* demuxer_stream_provider, 47 void Initialize(DemuxerStreamProvider* demuxer_stream_provider,
48 const PipelineStatusCB& init_cb, 48 const PipelineStatusCB& init_cb,
49 const StatisticsCB& statistics_cb, 49 const StatisticsCB& statistics_cb,
50 const BufferingStateCB& buffering_state_cb, 50 const BufferingStateCB& buffering_state_cb,
51 const PaintCB& paint_cb,
52 const base::Closure& ended_cb, 51 const base::Closure& ended_cb,
53 const PipelineStatusCB& error_cb, 52 const PipelineStatusCB& error_cb,
54 const base::Closure& waiting_for_decryption_key_cb) final; 53 const base::Closure& waiting_for_decryption_key_cb) final;
55 void SetCdm(CdmContext* cdm_context, 54 void SetCdm(CdmContext* cdm_context,
56 const CdmAttachedCB& cdm_attached_cb) final; 55 const CdmAttachedCB& cdm_attached_cb) final;
57 void Flush(const base::Closure& flush_cb) final; 56 void Flush(const base::Closure& flush_cb) final;
58 void StartPlayingFrom(base::TimeDelta time) final; 57 void StartPlayingFrom(base::TimeDelta time) final;
59 void SetPlaybackRate(float playback_rate) final; 58 void SetPlaybackRate(float playback_rate) final;
60 void SetVolume(float volume) final; 59 void SetVolume(float volume) final;
61 base::TimeDelta GetMediaTime() final; 60 base::TimeDelta GetMediaTime() final;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 // Task runner used to execute pipeline tasks. 132 // Task runner used to execute pipeline tasks.
134 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 133 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
135 134
136 DemuxerStreamProvider* demuxer_stream_provider_; 135 DemuxerStreamProvider* demuxer_stream_provider_;
137 136
138 // Permanent callbacks to notify various renderer states/stats. 137 // Permanent callbacks to notify various renderer states/stats.
139 StatisticsCB statistics_cb_; 138 StatisticsCB statistics_cb_;
140 base::Closure ended_cb_; 139 base::Closure ended_cb_;
141 PipelineStatusCB error_cb_; 140 PipelineStatusCB error_cb_;
142 BufferingStateCB buffering_state_cb_; 141 BufferingStateCB buffering_state_cb_;
143 PaintCB paint_cb_;
144 base::Closure waiting_for_decryption_key_cb_; 142 base::Closure waiting_for_decryption_key_cb_;
145 143
146 // Temporary callback used for Initialize() and Flush(). 144 // Temporary callback used for Initialize() and Flush().
147 PipelineStatusCB init_cb_; 145 PipelineStatusCB init_cb_;
148 base::Closure flush_cb_; 146 base::Closure flush_cb_;
149 147
150 scoped_ptr<AudioRenderer> audio_renderer_; 148 scoped_ptr<AudioRenderer> audio_renderer_;
151 scoped_ptr<VideoRenderer> video_renderer_; 149 scoped_ptr<VideoRenderer> video_renderer_;
152 150
153 // Renderer-provided time source used to control playback. 151 // Renderer-provided time source used to control playback.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 186
189 base::WeakPtr<RendererImpl> weak_this_; 187 base::WeakPtr<RendererImpl> weak_this_;
190 base::WeakPtrFactory<RendererImpl> weak_factory_; 188 base::WeakPtrFactory<RendererImpl> weak_factory_;
191 189
192 DISALLOW_COPY_AND_ASSIGN(RendererImpl); 190 DISALLOW_COPY_AND_ASSIGN(RendererImpl);
193 }; 191 };
194 192
195 } // namespace media 193 } // namespace media
196 194
197 #endif // MEDIA_RENDERERS_RENDERER_IMPL_H_ 195 #endif // MEDIA_RENDERERS_RENDERER_IMPL_H_
OLDNEW
« no previous file with comments | « media/renderers/default_renderer_factory.cc ('k') | media/renderers/renderer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698