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

Side by Side Diff: webkit/media/webmediaplayer_proxy.cc

Issue 8764002: Finish the base::Bind migration for webkit/media. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "webkit/media/webmediaplayer_proxy.h" 5 #include "webkit/media/webmediaplayer_proxy.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "media/base/pipeline_status.h" 10 #include "media/base/pipeline_status.h"
(...skipping 22 matching lines...) Expand all
33 33
34 WebMediaPlayerProxy::~WebMediaPlayerProxy() { 34 WebMediaPlayerProxy::~WebMediaPlayerProxy() {
35 Detach(); 35 Detach();
36 } 36 }
37 37
38 void WebMediaPlayerProxy::Repaint() { 38 void WebMediaPlayerProxy::Repaint() {
39 base::AutoLock auto_lock(lock_); 39 base::AutoLock auto_lock(lock_);
40 if (outstanding_repaints_ < kMaxOutstandingRepaints) { 40 if (outstanding_repaints_ < kMaxOutstandingRepaints) {
41 ++outstanding_repaints_; 41 ++outstanding_repaints_;
42 42
43 render_loop_->PostTask(FROM_HERE, 43 render_loop_->PostTask(
44 NewRunnableMethod(this, &WebMediaPlayerProxy::RepaintTask)); 44 FROM_HERE,
scherkus (not reviewing) 2011/12/01 17:42:18 nit: we seemed to have settled on having: message
Ami GONE FROM CHROMIUM 2011/12/01 18:11:26 Dunno about "settled on" but that's a violation of
45 base::Bind(&WebMediaPlayerProxy::RepaintTask, this));
45 } 46 }
46 } 47 }
47 48
48 void WebMediaPlayerProxy::SetVideoRenderer( 49 void WebMediaPlayerProxy::SetVideoRenderer(
49 const scoped_refptr<VideoRendererImpl>& video_renderer) { 50 const scoped_refptr<VideoRendererImpl>& video_renderer) {
50 video_renderer_ = video_renderer; 51 video_renderer_ = video_renderer;
51 } 52 }
52 53
53 WebDataSourceBuildObserverHack WebMediaPlayerProxy::GetBuildObserver() { 54 WebDataSourceBuildObserverHack WebMediaPlayerProxy::GetBuildObserver() {
54 return base::Bind(&WebMediaPlayerProxy::AddDataSource, this); 55 return base::Bind(&WebMediaPlayerProxy::AddDataSource, this);
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 video_renderer_ = NULL; 93 video_renderer_ = NULL;
93 94
94 { 95 {
95 base::AutoLock auto_lock(data_sources_lock_); 96 base::AutoLock auto_lock(data_sources_lock_);
96 data_sources_.clear(); 97 data_sources_.clear();
97 } 98 }
98 } 99 }
99 100
100 void WebMediaPlayerProxy::PipelineInitializationCallback( 101 void WebMediaPlayerProxy::PipelineInitializationCallback(
101 PipelineStatus status) { 102 PipelineStatus status) {
102 render_loop_->PostTask(FROM_HERE, NewRunnableMethod( 103 render_loop_->PostTask(FROM_HERE, base::Bind(
103 this, &WebMediaPlayerProxy::PipelineInitializationTask, status)); 104 &WebMediaPlayerProxy::PipelineInitializationTask, this, status));
104 } 105 }
105 106
106 void WebMediaPlayerProxy::PipelineSeekCallback(PipelineStatus status) { 107 void WebMediaPlayerProxy::PipelineSeekCallback(PipelineStatus status) {
107 render_loop_->PostTask(FROM_HERE, NewRunnableMethod( 108 render_loop_->PostTask(FROM_HERE, base::Bind(
108 this, &WebMediaPlayerProxy::PipelineSeekTask, status)); 109 &WebMediaPlayerProxy::PipelineSeekTask, this, status));
109 } 110 }
110 111
111 void WebMediaPlayerProxy::PipelineEndedCallback(PipelineStatus status) { 112 void WebMediaPlayerProxy::PipelineEndedCallback(PipelineStatus status) {
112 render_loop_->PostTask(FROM_HERE, NewRunnableMethod( 113 render_loop_->PostTask(FROM_HERE, base::Bind(
113 this, &WebMediaPlayerProxy::PipelineEndedTask, status)); 114 &WebMediaPlayerProxy::PipelineEndedTask, this, status));
114 } 115 }
115 116
116 void WebMediaPlayerProxy::PipelineErrorCallback(PipelineStatus error) { 117 void WebMediaPlayerProxy::PipelineErrorCallback(PipelineStatus error) {
117 DCHECK_NE(error, media::PIPELINE_OK); 118 DCHECK_NE(error, media::PIPELINE_OK);
118 render_loop_->PostTask(FROM_HERE, NewRunnableMethod( 119 render_loop_->PostTask(FROM_HERE, base::Bind(
119 this, &WebMediaPlayerProxy::PipelineErrorTask, error)); 120 &WebMediaPlayerProxy::PipelineErrorTask, this, error));
120 } 121 }
121 122
122 void WebMediaPlayerProxy::NetworkEventCallback(NetworkEvent type) { 123 void WebMediaPlayerProxy::NetworkEventCallback(NetworkEvent type) {
123 render_loop_->PostTask(FROM_HERE, NewRunnableMethod( 124 render_loop_->PostTask(FROM_HERE, base::Bind(
124 this, &WebMediaPlayerProxy::NetworkEventTask, type)); 125 &WebMediaPlayerProxy::NetworkEventTask, this, type));
125 } 126 }
126 127
127 void WebMediaPlayerProxy::AddDataSource(WebDataSource* data_source) { 128 void WebMediaPlayerProxy::AddDataSource(WebDataSource* data_source) {
128 base::AutoLock auto_lock(data_sources_lock_); 129 base::AutoLock auto_lock(data_sources_lock_);
129 data_sources_.push_back(make_scoped_refptr(data_source)); 130 data_sources_.push_back(make_scoped_refptr(data_source));
130 } 131 }
131 132
132 void WebMediaPlayerProxy::RepaintTask() { 133 void WebMediaPlayerProxy::RepaintTask() {
133 DCHECK(MessageLoop::current() == render_loop_); 134 DCHECK(MessageLoop::current() == render_loop_);
134 { 135 {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 video_renderer_->GetCurrentFrame(frame_out); 178 video_renderer_->GetCurrentFrame(frame_out);
178 } 179 }
179 180
180 void WebMediaPlayerProxy::PutCurrentFrame( 181 void WebMediaPlayerProxy::PutCurrentFrame(
181 scoped_refptr<media::VideoFrame> frame) { 182 scoped_refptr<media::VideoFrame> frame) {
182 if (video_renderer_) 183 if (video_renderer_)
183 video_renderer_->PutCurrentFrame(frame); 184 video_renderer_->PutCurrentFrame(frame);
184 } 185 }
185 186
186 void WebMediaPlayerProxy::DemuxerOpened(media::ChunkDemuxer* demuxer) { 187 void WebMediaPlayerProxy::DemuxerOpened(media::ChunkDemuxer* demuxer) {
187 render_loop_->PostTask(FROM_HERE, NewRunnableMethod( 188 render_loop_->PostTask(FROM_HERE, base::Bind(
188 this, &WebMediaPlayerProxy::DemuxerOpenedTask, 189 &WebMediaPlayerProxy::DemuxerOpenedTask, this,
189 scoped_refptr<media::ChunkDemuxer>(demuxer))); 190 scoped_refptr<media::ChunkDemuxer>(demuxer)));
190 } 191 }
191 192
192 void WebMediaPlayerProxy::DemuxerClosed() { 193 void WebMediaPlayerProxy::DemuxerClosed() {
193 render_loop_->PostTask(FROM_HERE, NewRunnableMethod( 194 render_loop_->PostTask(FROM_HERE, base::Bind(
194 this, &WebMediaPlayerProxy::DemuxerClosedTask)); 195 &WebMediaPlayerProxy::DemuxerClosedTask, this));
195 } 196 }
196 197
197 void WebMediaPlayerProxy::DemuxerFlush() { 198 void WebMediaPlayerProxy::DemuxerFlush() {
198 if (chunk_demuxer_.get()) 199 if (chunk_demuxer_.get())
199 chunk_demuxer_->FlushData(); 200 chunk_demuxer_->FlushData();
200 } 201 }
201 202
202 bool WebMediaPlayerProxy::DemuxerAppend(const uint8* data, size_t length) { 203 bool WebMediaPlayerProxy::DemuxerAppend(const uint8* data, size_t length) {
203 if (chunk_demuxer_.get()) 204 if (chunk_demuxer_.get())
204 return chunk_demuxer_->AppendData(data, length); 205 return chunk_demuxer_->AppendData(data, length);
(...skipping 16 matching lines...) Expand all
221 chunk_demuxer_ = demuxer; 222 chunk_demuxer_ = demuxer;
222 if (webmediaplayer_) 223 if (webmediaplayer_)
223 webmediaplayer_->OnDemuxerOpened(); 224 webmediaplayer_->OnDemuxerOpened();
224 } 225 }
225 226
226 void WebMediaPlayerProxy::DemuxerClosedTask() { 227 void WebMediaPlayerProxy::DemuxerClosedTask() {
227 chunk_demuxer_ = NULL; 228 chunk_demuxer_ = NULL;
228 } 229 }
229 230
230 } // namespace webkit_media 231 } // namespace webkit_media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698