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

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

Issue 12989009: Remove reference counting from media::VideoDecoder and friends. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: client proxy :( Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_impl.h" 5 #include "webkit/media/webmediaplayer_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/command_line.h"
14 #include "base/message_loop_proxy.h" 15 #include "base/message_loop_proxy.h"
15 #include "base/metrics/histogram.h" 16 #include "base/metrics/histogram.h"
16 #include "base/strings/string_number_conversions.h" 17 #include "base/strings/string_number_conversions.h"
17 #include "base/synchronization/waitable_event.h" 18 #include "base/synchronization/waitable_event.h"
18 #include "cc/layers/video_layer.h" 19 #include "cc/layers/video_layer.h"
19 #include "gpu/GLES2/gl2extchromium.h" 20 #include "gpu/GLES2/gl2extchromium.h"
20 #include "media/audio/null_audio_sink.h" 21 #include "media/audio/null_audio_sink.h"
21 #include "media/base/bind_to_loop.h" 22 #include "media/base/bind_to_loop.h"
22 #include "media/base/filter_collection.h" 23 #include "media/base/filter_collection.h"
23 #include "media/base/limits.h" 24 #include "media/base/limits.h"
24 #include "media/base/media_log.h" 25 #include "media/base/media_log.h"
26 #include "media/base/media_switches.h"
25 #include "media/base/pipeline.h" 27 #include "media/base/pipeline.h"
26 #include "media/base/video_frame.h" 28 #include "media/base/video_frame.h"
27 #include "media/filters/audio_renderer_impl.h" 29 #include "media/filters/audio_renderer_impl.h"
28 #include "media/filters/chunk_demuxer.h" 30 #include "media/filters/chunk_demuxer.h"
31 #include "media/filters/ffmpeg_audio_decoder.h"
32 #include "media/filters/ffmpeg_demuxer.h"
33 #include "media/filters/ffmpeg_video_decoder.h"
34 #include "media/filters/opus_audio_decoder.h"
29 #include "media/filters/video_renderer_base.h" 35 #include "media/filters/video_renderer_base.h"
36 #include "media/filters/vpx_video_decoder.h"
30 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" 37 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
31 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" 38 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
32 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" 39 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
33 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" 40 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h" 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h"
35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
37 #include "v8/include/v8.h" 44 #include "v8/include/v8.h"
38 #include "webkit/compositor_bindings/web_layer_impl.h" 45 #include "webkit/compositor_bindings/web_layer_impl.h"
39 #include "webkit/media/buffered_data_source.h" 46 #include "webkit/media/buffered_data_source.h"
40 #include "webkit/media/filter_helpers.h"
41 #include "webkit/media/webaudiosourceprovider_impl.h" 47 #include "webkit/media/webaudiosourceprovider_impl.h"
42 #include "webkit/media/webmediaplayer_delegate.h" 48 #include "webkit/media/webmediaplayer_delegate.h"
43 #include "webkit/media/webmediaplayer_params.h" 49 #include "webkit/media/webmediaplayer_params.h"
44 #include "webkit/media/webmediaplayer_util.h" 50 #include "webkit/media/webmediaplayer_util.h"
45 #include "webkit/media/webmediasourceclient_impl.h" 51 #include "webkit/media/webmediasourceclient_impl.h"
46 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h" 52 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
47 53
48 using WebKit::WebCanvas; 54 using WebKit::WebCanvas;
49 using WebKit::WebMediaPlayer; 55 using WebKit::WebMediaPlayer;
50 using WebKit::WebRect; 56 using WebKit::WebRect;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 130
125 WebMediaPlayerImpl::WebMediaPlayerImpl( 131 WebMediaPlayerImpl::WebMediaPlayerImpl(
126 WebKit::WebFrame* frame, 132 WebKit::WebFrame* frame,
127 WebKit::WebMediaPlayerClient* client, 133 WebKit::WebMediaPlayerClient* client,
128 base::WeakPtr<WebMediaPlayerDelegate> delegate, 134 base::WeakPtr<WebMediaPlayerDelegate> delegate,
129 const WebMediaPlayerParams& params) 135 const WebMediaPlayerParams& params)
130 : frame_(frame), 136 : frame_(frame),
131 network_state_(WebMediaPlayer::NetworkStateEmpty), 137 network_state_(WebMediaPlayer::NetworkStateEmpty),
132 ready_state_(WebMediaPlayer::ReadyStateHaveNothing), 138 ready_state_(WebMediaPlayer::ReadyStateHaveNothing),
133 main_loop_(base::MessageLoopProxy::current()), 139 main_loop_(base::MessageLoopProxy::current()),
134 filter_collection_(new media::FilterCollection()),
135 media_thread_("MediaPipeline"), 140 media_thread_("MediaPipeline"),
136 paused_(true), 141 paused_(true),
137 seeking_(false), 142 seeking_(false),
138 playback_rate_(0.0f), 143 playback_rate_(0.0f),
139 pending_seek_(false), 144 pending_seek_(false),
140 pending_seek_seconds_(0.0f), 145 pending_seek_seconds_(0.0f),
141 client_(client), 146 client_(client),
142 delegate_(delegate), 147 delegate_(delegate),
143 media_log_(params.media_log()), 148 media_log_(params.media_log()),
144 accelerated_compositing_reported_(false), 149 accelerated_compositing_reported_(false),
145 incremented_externally_allocated_memory_(false), 150 incremented_externally_allocated_memory_(false),
151 gpu_factories_(params.gpu_factories()),
146 is_local_source_(false), 152 is_local_source_(false),
147 supports_save_(true), 153 supports_save_(true),
148 starting_(false), 154 starting_(false),
149 pending_repaint_(false), 155 pending_repaint_(false),
150 video_frame_provider_client_(NULL) { 156 video_frame_provider_client_(NULL) {
151 media_log_->AddEvent( 157 media_log_->AddEvent(
152 media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED)); 158 media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED));
153 159
154 CHECK(media_thread_.Start()); 160 CHECK(media_thread_.Start());
155 pipeline_ = new media::Pipeline( 161 pipeline_ = new media::Pipeline(
156 media_thread_.message_loop_proxy(), media_log_); 162 media_thread_.message_loop_proxy(), media_log_);
157 163
158 // Let V8 know we started new thread if we did not do it yet. 164 // Let V8 know we started new thread if we did not do it yet.
159 // Made separate task to avoid deletion of player currently being created. 165 // Made separate task to avoid deletion of player currently being created.
160 // Also, delaying GC until after player starts gets rid of starting lag -- 166 // Also, delaying GC until after player starts gets rid of starting lag --
161 // collection happens in parallel with playing. 167 // collection happens in parallel with playing.
162 // 168 //
163 // TODO(enal): remove when we get rid of per-audio-stream thread. 169 // TODO(enal): remove when we get rid of per-audio-stream thread.
164 main_loop_->PostTask( 170 main_loop_->PostTask(
165 FROM_HERE, 171 FROM_HERE,
166 base::Bind(&WebMediaPlayerImpl::IncrementExternallyAllocatedMemory, 172 base::Bind(&WebMediaPlayerImpl::IncrementExternallyAllocatedMemory,
167 AsWeakPtr())); 173 AsWeakPtr()));
168 174
169 // Also we want to be notified of |main_loop_| destruction. 175 // Also we want to be notified of |main_loop_| destruction.
170 MessageLoop::current()->AddDestructionObserver(this); 176 MessageLoop::current()->AddDestructionObserver(this);
171 177
172 media::SetDecryptorReadyCB set_decryptor_ready_cb;
173 if (WebKit::WebRuntimeFeatures::isEncryptedMediaEnabled()) { 178 if (WebKit::WebRuntimeFeatures::isEncryptedMediaEnabled()) {
174 decryptor_.reset(new ProxyDecryptor( 179 decryptor_.reset(new ProxyDecryptor(
175 client, 180 client,
176 frame, 181 frame,
177 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyAdded), 182 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyAdded),
178 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyError), 183 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyError),
179 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyMessage), 184 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyMessage),
180 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNeedKey))); 185 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNeedKey)));
181 set_decryptor_ready_cb = base::Bind(&ProxyDecryptor::SetDecryptorReadyCB,
182 base::Unretained(decryptor_.get()));
183 } 186 }
184 187
185 // Create the GPU video decoder if factories were provided. 188 // Use the null sink if no sink was provided.
186 if (params.gpu_factories()) {
187 filter_collection_->GetVideoDecoders()->push_back(
188 new media::GpuVideoDecoder(
189 media_thread_.message_loop_proxy(),
190 params.gpu_factories()));
191 gpu_factories_ = params.gpu_factories();
192 }
193
194 // Create default video renderer.
195 scoped_ptr<media::VideoRenderer> video_renderer(
196 new media::VideoRendererBase(
197 media_thread_.message_loop_proxy(),
198 set_decryptor_ready_cb,
199 base::Bind(&WebMediaPlayerImpl::FrameReady, base::Unretained(this)),
200 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetOpaque),
201 true));
202 filter_collection_->SetVideoRenderer(video_renderer.Pass());
203
204 // Create default audio renderer using the null sink if no sink was provided.
205 audio_source_provider_ = new WebAudioSourceProviderImpl( 189 audio_source_provider_ = new WebAudioSourceProviderImpl(
206 params.audio_renderer_sink() ? params.audio_renderer_sink() : 190 params.audio_renderer_sink() ? params.audio_renderer_sink() :
207 new media::NullAudioSink(media_thread_.message_loop_proxy())); 191 new media::NullAudioSink(media_thread_.message_loop_proxy()));
208
209 ScopedVector<media::AudioDecoder> audio_decoders;
210 AddDefaultAudioDecoders(media_thread_.message_loop_proxy(), &audio_decoders);
211
212 scoped_ptr<media::AudioRenderer> audio_renderer(
213 new media::AudioRendererImpl(
214 media_thread_.message_loop_proxy(),
215 audio_source_provider_,
216 audio_decoders.Pass(),
217 set_decryptor_ready_cb));
218 filter_collection_->SetAudioRenderer(audio_renderer.Pass());
219 } 192 }
220 193
221 WebMediaPlayerImpl::~WebMediaPlayerImpl() { 194 WebMediaPlayerImpl::~WebMediaPlayerImpl() {
222 SetVideoFrameProviderClient(NULL); 195 SetVideoFrameProviderClient(NULL);
223 GetClient()->setWebLayer(NULL); 196 GetClient()->setWebLayer(NULL);
224 197
225 DCHECK(main_loop_->BelongsToCurrentThread()); 198 DCHECK(main_loop_->BelongsToCurrentThread());
226 Destroy(); 199 Destroy();
227 media_log_->AddEvent( 200 media_log_->AddEvent(
228 media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_DESTROYED)); 201 media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_DESTROYED));
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 data_source_ = new BufferedDataSource( 253 data_source_ = new BufferedDataSource(
281 main_loop_, frame_, media_log_, base::Bind( 254 main_loop_, frame_, media_log_, base::Bind(
282 &WebMediaPlayerImpl::NotifyDownloading, AsWeakPtr())); 255 &WebMediaPlayerImpl::NotifyDownloading, AsWeakPtr()));
283 data_source_->Initialize( 256 data_source_->Initialize(
284 url, static_cast<BufferedResourceLoader::CORSMode>(cors_mode), 257 url, static_cast<BufferedResourceLoader::CORSMode>(cors_mode),
285 base::Bind( 258 base::Bind(
286 &WebMediaPlayerImpl::DataSourceInitialized, 259 &WebMediaPlayerImpl::DataSourceInitialized,
287 AsWeakPtr(), gurl)); 260 AsWeakPtr(), gurl));
288 261
289 is_local_source_ = !gurl.SchemeIs("http") && !gurl.SchemeIs("https"); 262 is_local_source_ = !gurl.SchemeIs("http") && !gurl.SchemeIs("https");
290
291 BuildDefaultCollection(
292 data_source_,
293 media_thread_.message_loop_proxy(),
294 filter_collection_.get(),
295 BIND_TO_RENDER_LOOP_2(&WebMediaPlayerImpl::OnNeedKey, "", ""));
296 } 263 }
297 264
298 void WebMediaPlayerImpl::load(const WebKit::WebURL& url, 265 void WebMediaPlayerImpl::load(const WebKit::WebURL& url,
299 WebKit::WebMediaSource* media_source, 266 WebKit::WebMediaSource* media_source,
300 CORSMode cors_mode) { 267 CORSMode cors_mode) {
301 scoped_ptr<WebKit::WebMediaSource> ms(media_source); 268 scoped_ptr<WebKit::WebMediaSource> ms(media_source);
302 LoadSetup(url); 269 LoadSetup(url);
303 270
304 // Media source pipelines can start immediately. 271 // Media source pipelines can start immediately.
305 chunk_demuxer_ = new media::ChunkDemuxer( 272 chunk_demuxer_ = new media::ChunkDemuxer(
306 BIND_TO_RENDER_LOOP_1(&WebMediaPlayerImpl::OnDemuxerOpened, 273 BIND_TO_RENDER_LOOP_1(&WebMediaPlayerImpl::OnDemuxerOpened,
307 base::Passed(&ms)), 274 base::Passed(&ms)),
308 BIND_TO_RENDER_LOOP_2(&WebMediaPlayerImpl::OnNeedKey, "", ""), 275 BIND_TO_RENDER_LOOP_2(&WebMediaPlayerImpl::OnNeedKey, "", ""),
309 base::Bind(&LogMediaSourceError, media_log_)); 276 base::Bind(&LogMediaSourceError, media_log_));
310 277
311 BuildMediaSourceCollection(chunk_demuxer_,
312 media_thread_.message_loop_proxy(),
313 filter_collection_.get());
314 supports_save_ = false; 278 supports_save_ = false;
315 StartPipeline(); 279 StartPipeline();
316 } 280 }
317 281
318 void WebMediaPlayerImpl::LoadSetup(const WebKit::WebURL& url) { 282 void WebMediaPlayerImpl::LoadSetup(const WebKit::WebURL& url) {
319 GURL gurl(url); 283 GURL gurl(url);
320 UMA_HISTOGRAM_ENUMERATION("Media.URLScheme", URLScheme(gurl), kMaxURLScheme); 284 UMA_HISTOGRAM_ENUMERATION("Media.URLScheme", URLScheme(gurl), kMaxURLScheme);
321 285
322 // Handle any volume/preload changes that occurred before load(). 286 // Handle any volume/preload changes that occurred before load().
323 setVolume(GetClient()->volume()); 287 setVolume(GetClient()->volume());
(...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after
1122 SetNetworkState(WebMediaPlayer::NetworkStateLoading); 1086 SetNetworkState(WebMediaPlayer::NetworkStateLoading);
1123 media_log_->AddEvent( 1087 media_log_->AddEvent(
1124 media_log_->CreateBooleanEvent( 1088 media_log_->CreateBooleanEvent(
1125 media::MediaLogEvent::NETWORK_ACTIVITY_SET, 1089 media::MediaLogEvent::NETWORK_ACTIVITY_SET,
1126 "is_downloading_data", is_downloading)); 1090 "is_downloading_data", is_downloading));
1127 } 1091 }
1128 1092
1129 void WebMediaPlayerImpl::StartPipeline() { 1093 void WebMediaPlayerImpl::StartPipeline() {
1130 starting_ = true; 1094 starting_ = true;
1131 pipeline_->Start( 1095 pipeline_->Start(
1132 filter_collection_.Pass(), 1096 BuildFilterCollection(),
1133 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineEnded), 1097 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineEnded),
1134 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineError), 1098 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineError),
1135 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineSeek), 1099 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineSeek),
1136 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineBufferingState), 1100 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineBufferingState),
1137 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDurationChange)); 1101 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDurationChange));
1138 } 1102 }
1139 1103
1140 void WebMediaPlayerImpl::SetNetworkState(WebMediaPlayer::NetworkState state) { 1104 void WebMediaPlayerImpl::SetNetworkState(WebMediaPlayer::NetworkState state) {
1141 DCHECK(main_loop_->BelongsToCurrentThread()); 1105 DCHECK(main_loop_->BelongsToCurrentThread());
1142 DVLOG(1) << "SetNetworkState: " << state; 1106 DVLOG(1) << "SetNetworkState: " << state;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
1233 current_frame_ = frame; 1197 current_frame_ = frame;
1234 1198
1235 if (pending_repaint_) 1199 if (pending_repaint_)
1236 return; 1200 return;
1237 1201
1238 pending_repaint_ = true; 1202 pending_repaint_ = true;
1239 main_loop_->PostTask(FROM_HERE, base::Bind( 1203 main_loop_->PostTask(FROM_HERE, base::Bind(
1240 &WebMediaPlayerImpl::Repaint, AsWeakPtr())); 1204 &WebMediaPlayerImpl::Repaint, AsWeakPtr()));
1241 } 1205 }
1242 1206
1207 scoped_ptr<media::FilterCollection>
1208 WebMediaPlayerImpl::BuildFilterCollection() {
1209 const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
1210
1211 scoped_ptr<media::FilterCollection> filter_collection(
1212 new media::FilterCollection());
1213
1214 // Figure out which demuxer to use.
1215 if (data_source_) {
1216 DCHECK(!chunk_demuxer_);
1217 filter_collection->SetDemuxer(new media::FFmpegDemuxer(
1218 media_thread_.message_loop_proxy(), data_source_,
1219 BIND_TO_RENDER_LOOP_2(&WebMediaPlayerImpl::OnNeedKey, "", "")));
1220 } else {
1221 DCHECK(chunk_demuxer_);
1222 filter_collection->SetDemuxer(chunk_demuxer_);
1223
1224 // Disable GpuVideoDecoder creation until it supports codec config changes.
1225 // TODO(acolwell): Remove this once http://crbug.com/151045 is fixed.
1226 gpu_factories_ = NULL;
1227 }
1228
1229 // Figure out if EME is enabled.
1230 media::SetDecryptorReadyCB set_decryptor_ready_cb;
1231 if (decryptor_) {
1232 set_decryptor_ready_cb = base::Bind(&ProxyDecryptor::SetDecryptorReadyCB,
1233 base::Unretained(decryptor_.get()));
1234 }
1235
1236 // Create our audio decoders and renderer.
1237 ScopedVector<media::AudioDecoder> audio_decoders;
1238 audio_decoders.push_back(new media::FFmpegAudioDecoder(
1239 media_thread_.message_loop_proxy()));
1240 if (cmd_line->HasSwitch(switches::kEnableOpusPlayback)) {
1241 audio_decoders.push_back(new media::OpusAudioDecoder(
1242 media_thread_.message_loop_proxy()));
1243 }
1244
1245 scoped_ptr<media::AudioRenderer> audio_renderer(
1246 new media::AudioRendererImpl(media_thread_.message_loop_proxy(),
1247 audio_source_provider_,
1248 audio_decoders.Pass(),
1249 set_decryptor_ready_cb));
1250 filter_collection->SetAudioRenderer(audio_renderer.Pass());
1251
1252 // Create our video decoders and renderer.
1253 ScopedVector<media::VideoDecoder> video_decoders;
1254
1255 if (gpu_factories_) {
1256 video_decoders.push_back(new media::GpuVideoDecoder(
1257 media_thread_.message_loop_proxy(), gpu_factories_));
1258 }
1259
1260 video_decoders.push_back(new media::FFmpegVideoDecoder(
1261 media_thread_.message_loop_proxy()));
1262
1263 // TODO(phajdan.jr): Remove ifdefs when libvpx with vp9 support is released
1264 // (http://crbug.com/174287) .
1265 #if !defined(MEDIA_DISABLE_LIBVPX)
1266 if (cmd_line->HasSwitch(switches::kEnableVp9Playback)) {
1267 video_decoders.push_back(new media::VpxVideoDecoder(
1268 media_thread_.message_loop_proxy()));
1269 }
1270 #endif // !defined(MEDIA_DISABLE_LIBVPX)
1271
1272 scoped_ptr<media::VideoRenderer> video_renderer(
1273 new media::VideoRendererBase(
1274 media_thread_.message_loop_proxy(),
1275 video_decoders.Pass(),
1276 set_decryptor_ready_cb,
1277 base::Bind(&WebMediaPlayerImpl::FrameReady, base::Unretained(this)),
1278 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetOpaque),
1279 true));
1280 filter_collection->SetVideoRenderer(video_renderer.Pass());
1281
1282 return filter_collection.Pass();
1283 }
1284
1243 } // namespace webkit_media 1285 } // namespace webkit_media
OLDNEW
« media/filters/gpu_video_decoder.cc ('K') | « webkit/media/webmediaplayer_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698