| 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 "media/blink/webmediaplayer_impl.h" | 5 #include "media/blink/webmediaplayer_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <limits> | 9 #include <limits> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 } | 206 } |
| 207 | 207 |
| 208 // TODO(xhwang): When we use an external Renderer, many methods won't work, | 208 // TODO(xhwang): When we use an external Renderer, many methods won't work, |
| 209 // e.g. GetCurrentFrameFromCompositor(). See http://crbug.com/434861 | 209 // e.g. GetCurrentFrameFromCompositor(). See http://crbug.com/434861 |
| 210 | 210 |
| 211 // Use the null sink if no sink was provided. | 211 // Use the null sink if no sink was provided. |
| 212 audio_source_provider_ = new WebAudioSourceProviderImpl( | 212 audio_source_provider_ = new WebAudioSourceProviderImpl( |
| 213 params.audio_renderer_sink().get() | 213 params.audio_renderer_sink().get() |
| 214 ? params.audio_renderer_sink() | 214 ? params.audio_renderer_sink() |
| 215 : new NullAudioSink(media_task_runner_)); | 215 : new NullAudioSink(media_task_runner_)); |
| 216 #if defined(OS_ANDROID) |
| 217 audio_source_provider_->enable_audio_focus(); |
| 218 #endif |
| 216 } | 219 } |
| 217 | 220 |
| 218 WebMediaPlayerImpl::~WebMediaPlayerImpl() { | 221 WebMediaPlayerImpl::~WebMediaPlayerImpl() { |
| 219 client_->setWebLayer(NULL); | 222 client_->setWebLayer(NULL); |
| 220 | 223 |
| 221 DCHECK(main_task_runner_->BelongsToCurrentThread()); | 224 DCHECK(main_task_runner_->BelongsToCurrentThread()); |
| 222 | 225 |
| 223 if (delegate_) { | 226 if (delegate_) { |
| 224 delegate_->PlayerGone(delegate_id_); | 227 delegate_->PlayerGone(delegate_id_); |
| 225 delegate_->RemoveObserver(delegate_id_); | 228 delegate_->RemoveObserver(delegate_id_); |
| (...skipping 1323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1549 << ", Video: " << stats.video_memory_usage << ", DataSource: " | 1552 << ", Video: " << stats.video_memory_usage << ", DataSource: " |
| 1550 << (data_source_ ? data_source_->GetMemoryUsage() : 0) | 1553 << (data_source_ ? data_source_->GetMemoryUsage() : 0) |
| 1551 << ", Demuxer: " << demuxer_memory_usage; | 1554 << ", Demuxer: " << demuxer_memory_usage; |
| 1552 | 1555 |
| 1553 const int64_t delta = current_memory_usage - last_reported_memory_usage_; | 1556 const int64_t delta = current_memory_usage - last_reported_memory_usage_; |
| 1554 last_reported_memory_usage_ = current_memory_usage; | 1557 last_reported_memory_usage_ = current_memory_usage; |
| 1555 adjust_allocated_memory_cb_.Run(delta); | 1558 adjust_allocated_memory_cb_.Run(delta); |
| 1556 } | 1559 } |
| 1557 | 1560 |
| 1558 } // namespace media | 1561 } // namespace media |
| OLD | NEW |