| OLD | NEW |
| 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 <limits> | 7 #include <limits> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 base::Bind(&WebMediaPlayerProxy::Repaint, proxy_), | 147 base::Bind(&WebMediaPlayerProxy::Repaint, proxy_), |
| 148 base::Bind(&WebMediaPlayerProxy::SetOpaque, proxy_.get()), | 148 base::Bind(&WebMediaPlayerProxy::SetOpaque, proxy_.get()), |
| 149 true); | 149 true); |
| 150 filter_collection_->AddVideoRenderer(video_renderer); | 150 filter_collection_->AddVideoRenderer(video_renderer); |
| 151 proxy_->set_frame_provider(video_renderer); | 151 proxy_->set_frame_provider(video_renderer); |
| 152 | 152 |
| 153 // Create default audio renderer. | 153 // Create default audio renderer. |
| 154 filter_collection_->AddAudioRenderer( | 154 filter_collection_->AddAudioRenderer( |
| 155 new media::AudioRendererImpl(new media::NullAudioSink())); | 155 new media::AudioRendererImpl(new media::NullAudioSink())); |
| 156 | 156 |
| 157 decryptor_.reset(new media::AesDecryptor()); | 157 decryptor_.reset(new media::HmacAesDecryptor()); |
| 158 } | 158 } |
| 159 | 159 |
| 160 WebMediaPlayerImpl::~WebMediaPlayerImpl() { | 160 WebMediaPlayerImpl::~WebMediaPlayerImpl() { |
| 161 DCHECK_EQ(main_loop_, MessageLoop::current()); | 161 DCHECK_EQ(main_loop_, MessageLoop::current()); |
| 162 Destroy(); | 162 Destroy(); |
| 163 media_log_->AddEvent( | 163 media_log_->AddEvent( |
| 164 media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_DESTROYED)); | 164 media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_DESTROYED)); |
| 165 | 165 |
| 166 if (delegate_) | 166 if (delegate_) |
| 167 delegate_->PlayerGone(this); | 167 delegate_->PlayerGone(this); |
| (...skipping 869 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1037 return audio_source_provider_; | 1037 return audio_source_provider_; |
| 1038 } | 1038 } |
| 1039 | 1039 |
| 1040 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() { | 1040 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() { |
| 1041 DCHECK_EQ(main_loop_, MessageLoop::current()); | 1041 DCHECK_EQ(main_loop_, MessageLoop::current()); |
| 1042 incremented_externally_allocated_memory_ = true; | 1042 incremented_externally_allocated_memory_ = true; |
| 1043 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory); | 1043 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory); |
| 1044 } | 1044 } |
| 1045 | 1045 |
| 1046 } // namespace webkit_media | 1046 } // namespace webkit_media |
| OLD | NEW |