OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "content/renderer/media/webmediaplayer_impl.h" | 5 #include "content/renderer/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> |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 #include "media/base/text_renderer.h" | 50 #include "media/base/text_renderer.h" |
51 #include "media/base/video_frame.h" | 51 #include "media/base/video_frame.h" |
52 #include "media/filters/audio_renderer_impl.h" | 52 #include "media/filters/audio_renderer_impl.h" |
53 #include "media/filters/chunk_demuxer.h" | 53 #include "media/filters/chunk_demuxer.h" |
54 #include "media/filters/ffmpeg_audio_decoder.h" | 54 #include "media/filters/ffmpeg_audio_decoder.h" |
55 #include "media/filters/ffmpeg_demuxer.h" | 55 #include "media/filters/ffmpeg_demuxer.h" |
56 #include "media/filters/ffmpeg_video_decoder.h" | 56 #include "media/filters/ffmpeg_video_decoder.h" |
57 #include "media/filters/gpu_video_accelerator_factories.h" | 57 #include "media/filters/gpu_video_accelerator_factories.h" |
58 #include "media/filters/gpu_video_decoder.h" | 58 #include "media/filters/gpu_video_decoder.h" |
59 #include "media/filters/opus_audio_decoder.h" | 59 #include "media/filters/opus_audio_decoder.h" |
| 60 #include "media/filters/video_frame_scheduler_impl.h" |
| 61 #include "media/filters/video_frame_scheduler_proxy.h" |
60 #include "media/filters/video_renderer_impl.h" | 62 #include "media/filters/video_renderer_impl.h" |
61 #include "media/filters/vpx_video_decoder.h" | 63 #include "media/filters/vpx_video_decoder.h" |
62 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h" | 64 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h" |
63 #include "third_party/WebKit/public/platform/WebMediaSource.h" | 65 #include "third_party/WebKit/public/platform/WebMediaSource.h" |
64 #include "third_party/WebKit/public/platform/WebRect.h" | 66 #include "third_party/WebKit/public/platform/WebRect.h" |
65 #include "third_party/WebKit/public/platform/WebSize.h" | 67 #include "third_party/WebKit/public/platform/WebSize.h" |
66 #include "third_party/WebKit/public/platform/WebString.h" | 68 #include "third_party/WebKit/public/platform/WebString.h" |
67 #include "third_party/WebKit/public/platform/WebURL.h" | 69 #include "third_party/WebKit/public/platform/WebURL.h" |
68 #include "third_party/WebKit/public/web/WebDocument.h" | 70 #include "third_party/WebKit/public/web/WebDocument.h" |
69 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 71 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
164 client_(client), | 166 client_(client), |
165 delegate_(delegate), | 167 delegate_(delegate), |
166 defer_load_cb_(params.defer_load_cb()), | 168 defer_load_cb_(params.defer_load_cb()), |
167 accelerated_compositing_reported_(false), | 169 accelerated_compositing_reported_(false), |
168 incremented_externally_allocated_memory_(false), | 170 incremented_externally_allocated_memory_(false), |
169 gpu_factories_(RenderThreadImpl::current()->GetGpuFactories()), | 171 gpu_factories_(RenderThreadImpl::current()->GetGpuFactories()), |
170 is_local_source_(false), | 172 is_local_source_(false), |
171 supports_save_(true), | 173 supports_save_(true), |
172 starting_(false), | 174 starting_(false), |
173 chunk_demuxer_(NULL), | 175 chunk_demuxer_(NULL), |
174 compositor_( // Threaded compositing isn't enabled universally yet. | 176 // Threaded compositing isn't enabled universally yet. |
175 (RenderThreadImpl::current()->compositor_message_loop_proxy() | 177 compositor_runner_( |
176 ? RenderThreadImpl::current()->compositor_message_loop_proxy() | 178 RenderThreadImpl::current()->compositor_message_loop_proxy() |
177 : base::MessageLoopProxy::current()), | 179 ? RenderThreadImpl::current()->compositor_message_loop_proxy() |
| 180 : base::MessageLoopProxy::current()), |
| 181 compositor_( |
| 182 compositor_runner_, |
178 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNaturalSizeChanged), | 183 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNaturalSizeChanged), |
179 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnOpacityChanged)), | 184 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnOpacityChanged)), |
180 text_track_index_(0), | 185 text_track_index_(0), |
181 web_cdm_(NULL) { | 186 web_cdm_(NULL) { |
182 media_log_->AddEvent( | 187 media_log_->AddEvent( |
183 media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED)); | 188 media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED)); |
184 | 189 |
185 // |gpu_factories_| requires that its entry points be called on its | 190 // |gpu_factories_| requires that its entry points be called on its |
186 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the | 191 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the |
187 // factories, require that their message loops are identical. | 192 // factories, require that their message loops are identical. |
(...skipping 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1198 video_decoders.push_back( | 1203 video_decoders.push_back( |
1199 new media::GpuVideoDecoder(gpu_factories_, media_log_)); | 1204 new media::GpuVideoDecoder(gpu_factories_, media_log_)); |
1200 } | 1205 } |
1201 | 1206 |
1202 #if !defined(MEDIA_DISABLE_LIBVPX) | 1207 #if !defined(MEDIA_DISABLE_LIBVPX) |
1203 video_decoders.push_back(new media::VpxVideoDecoder(media_loop_)); | 1208 video_decoders.push_back(new media::VpxVideoDecoder(media_loop_)); |
1204 #endif // !defined(MEDIA_DISABLE_LIBVPX) | 1209 #endif // !defined(MEDIA_DISABLE_LIBVPX) |
1205 | 1210 |
1206 video_decoders.push_back(new media::FFmpegVideoDecoder(media_loop_)); | 1211 video_decoders.push_back(new media::FFmpegVideoDecoder(media_loop_)); |
1207 | 1212 |
1208 scoped_ptr<media::VideoRenderer> video_renderer( | 1213 // Use a proxy to deliver frames from the media thread to the real scheduler |
1209 new media::VideoRendererImpl( | 1214 // living on the compositor thread. |
1210 media_loop_, | 1215 scoped_ptr<media::VideoFrameScheduler> scheduler_impl( |
1211 video_decoders.Pass(), | 1216 new media::VideoFrameSchedulerImpl( |
1212 set_decryptor_ready_cb, | 1217 compositor_runner_, |
1213 base::Bind(&WebMediaPlayerImpl::FrameReady, base::Unretained(this)), | 1218 base::Bind(&WebMediaPlayerImpl::FrameReady, base::Unretained(this)))); |
1214 true)); | 1219 scoped_ptr<media::VideoFrameScheduler> scheduler_proxy( |
| 1220 new media::VideoFrameSchedulerProxy( |
| 1221 media_loop_, compositor_runner_, scheduler_impl.Pass())); |
| 1222 |
| 1223 scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererImpl( |
| 1224 media_loop_, |
| 1225 scheduler_proxy.Pass(), |
| 1226 video_decoders.Pass(), |
| 1227 set_decryptor_ready_cb)); |
1215 filter_collection->SetVideoRenderer(video_renderer.Pass()); | 1228 filter_collection->SetVideoRenderer(video_renderer.Pass()); |
1216 | 1229 |
1217 if (cmd_line->HasSwitch(switches::kEnableInbandTextTracks)) { | 1230 if (cmd_line->HasSwitch(switches::kEnableInbandTextTracks)) { |
1218 scoped_ptr<media::TextRenderer> text_renderer( | 1231 scoped_ptr<media::TextRenderer> text_renderer( |
1219 new media::TextRenderer( | 1232 new media::TextRenderer( |
1220 media_loop_, | 1233 media_loop_, |
1221 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnAddTextTrack))); | 1234 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnAddTextTrack))); |
1222 | 1235 |
1223 filter_collection->SetTextRenderer(text_renderer.Pass()); | 1236 filter_collection->SetTextRenderer(text_renderer.Pass()); |
1224 } | 1237 } |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1340 | 1353 |
1341 if (web_cdm_) { | 1354 if (web_cdm_) { |
1342 decryptor_ready_cb.Run(web_cdm_->GetDecryptor()); | 1355 decryptor_ready_cb.Run(web_cdm_->GetDecryptor()); |
1343 return; | 1356 return; |
1344 } | 1357 } |
1345 | 1358 |
1346 decryptor_ready_cb_ = decryptor_ready_cb; | 1359 decryptor_ready_cb_ = decryptor_ready_cb; |
1347 } | 1360 } |
1348 | 1361 |
1349 } // namespace content | 1362 } // namespace content |
OLD | NEW |