| 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" |
| 11 #include "base/callback.h" | 11 #include "base/callback.h" |
| 12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
| 13 #include "base/message_loop_proxy.h" | 13 #include "base/message_loop_proxy.h" |
| 14 #include "base/metrics/histogram.h" | 14 #include "base/metrics/histogram.h" |
| 15 #include "base/synchronization/waitable_event.h" |
| 15 #include "media/audio/null_audio_sink.h" | 16 #include "media/audio/null_audio_sink.h" |
| 16 #include "media/base/filter_collection.h" | 17 #include "media/base/filter_collection.h" |
| 17 #include "media/base/limits.h" | 18 #include "media/base/limits.h" |
| 18 #include "media/base/media_log.h" | 19 #include "media/base/media_log.h" |
| 19 #include "media/base/media_switches.h" | 20 #include "media/base/media_switches.h" |
| 20 #include "media/base/pipeline.h" | 21 #include "media/base/pipeline.h" |
| 21 #include "media/base/video_frame.h" | 22 #include "media/base/video_frame.h" |
| 22 #include "media/filters/audio_renderer_impl.h" | 23 #include "media/filters/audio_renderer_impl.h" |
| 23 #include "media/filters/video_renderer_base.h" | 24 #include "media/filters/video_renderer_base.h" |
| 24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h" | 25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h" |
| (...skipping 888 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 913 return audio_source_provider_; | 914 return audio_source_provider_; |
| 914 } | 915 } |
| 915 | 916 |
| 916 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() { | 917 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() { |
| 917 DCHECK_EQ(main_loop_, MessageLoop::current()); | 918 DCHECK_EQ(main_loop_, MessageLoop::current()); |
| 918 incremented_externally_allocated_memory_ = true; | 919 incremented_externally_allocated_memory_ = true; |
| 919 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory); | 920 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory); |
| 920 } | 921 } |
| 921 | 922 |
| 922 } // namespace webkit_media | 923 } // namespace webkit_media |
| OLD | NEW |