| 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 compositor_(new VideoFrameCompositor( | 164 compositor_(new VideoFrameCompositor( |
| 165 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNaturalSizeChanged), | 165 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNaturalSizeChanged), |
| 166 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnOpacityChanged))), | 166 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnOpacityChanged))), |
| 167 text_track_index_(0), | 167 text_track_index_(0), |
| 168 encrypted_media_support_( | 168 encrypted_media_support_( |
| 169 params.CreateEncryptedMediaPlayerSupport(client)), | 169 params.CreateEncryptedMediaPlayerSupport(client)), |
| 170 audio_hardware_config_(params.audio_hardware_config()) { | 170 audio_hardware_config_(params.audio_hardware_config()) { |
| 171 DCHECK(encrypted_media_support_); | 171 DCHECK(encrypted_media_support_); |
| 172 | 172 |
| 173 // Threaded compositing isn't enabled universally yet. | 173 // Threaded compositing isn't enabled universally yet. |
| 174 if (!compositor_task_runner_) | 174 if (!compositor_task_runner_.get()) |
| 175 compositor_task_runner_ = base::MessageLoopProxy::current(); | 175 compositor_task_runner_ = base::MessageLoopProxy::current(); |
| 176 | 176 |
| 177 media_log_->AddEvent( | 177 media_log_->AddEvent( |
| 178 media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED)); | 178 media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED)); |
| 179 | 179 |
| 180 // |gpu_factories_| requires that its entry points be called on its | 180 // |gpu_factories_| requires that its entry points be called on its |
| 181 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the | 181 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the |
| 182 // factories, require that their message loops are identical. | 182 // factories, require that their message loops are identical. |
| 183 DCHECK(!gpu_factories_.get() || | 183 DCHECK(!gpu_factories_.get() || |
| 184 (gpu_factories_->GetTaskRunner() == media_task_runner_.get())); | 184 (gpu_factories_->GetTaskRunner() == media_task_runner_.get())); |
| (...skipping 826 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1011 compositor_task_runner_->PostTask(FROM_HERE, | 1011 compositor_task_runner_->PostTask(FROM_HERE, |
| 1012 base::Bind(&GetCurrentFrameAndSignal, | 1012 base::Bind(&GetCurrentFrameAndSignal, |
| 1013 base::Unretained(compositor_), | 1013 base::Unretained(compositor_), |
| 1014 &video_frame, | 1014 &video_frame, |
| 1015 &event)); | 1015 &event)); |
| 1016 event.Wait(); | 1016 event.Wait(); |
| 1017 return video_frame; | 1017 return video_frame; |
| 1018 } | 1018 } |
| 1019 | 1019 |
| 1020 } // namespace content | 1020 } // namespace content |
| OLD | NEW |