Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/metrics/histogram.h" | 13 #include "base/metrics/histogram.h" |
| 14 #include "content/renderer/media/audio_renderer_impl.h" | |
| 15 #include "content/renderer/render_audiosourceprovider.h" | |
| 14 #include "media/base/composite_data_source_factory.h" | 16 #include "media/base/composite_data_source_factory.h" |
| 15 #include "media/base/filter_collection.h" | 17 #include "media/base/filter_collection.h" |
| 16 #include "media/base/limits.h" | 18 #include "media/base/limits.h" |
| 17 #include "media/base/media_log.h" | 19 #include "media/base/media_log.h" |
| 18 #include "media/base/media_switches.h" | 20 #include "media/base/media_switches.h" |
| 19 #include "media/base/pipeline_impl.h" | 21 #include "media/base/pipeline_impl.h" |
| 20 #include "media/base/video_frame.h" | 22 #include "media/base/video_frame.h" |
| 21 #include "media/filters/chunk_demuxer_factory.h" | 23 #include "media/filters/chunk_demuxer_factory.h" |
| 22 #include "media/filters/dummy_demuxer_factory.h" | 24 #include "media/filters/dummy_demuxer_factory.h" |
| 23 #include "media/filters/ffmpeg_audio_decoder.h" | 25 #include "media/filters/ffmpeg_audio_decoder.h" |
| 24 #include "media/filters/ffmpeg_demuxer_factory.h" | 26 #include "media/filters/ffmpeg_demuxer_factory.h" |
| 25 #include "media/filters/ffmpeg_video_decoder.h" | 27 #include "media/filters/ffmpeg_video_decoder.h" |
| 26 #include "media/filters/null_audio_renderer.h" | 28 #include "media/filters/null_audio_renderer.h" |
| 29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvide r.h" | |
| 30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvide rClient.h" | |
|
acolwell GONE FROM CHROMIUM
2011/12/21 22:53:56
Are these third_party includes needed? content/ren
Chris Rogers
2011/12/22 00:54:33
Done.
| |
| 27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h" | 31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h" |
| 28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 32 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
| 29 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" | 33 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" |
| 30 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" | 34 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" |
| 31 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" | 35 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" |
| 32 #include "v8/include/v8.h" | 36 #include "v8/include/v8.h" |
| 33 #include "webkit/media/buffered_data_source.h" | 37 #include "webkit/media/buffered_data_source.h" |
| 34 #include "webkit/media/media_stream_client.h" | 38 #include "webkit/media/media_stream_client.h" |
| 35 #include "webkit/media/simple_data_source.h" | 39 #include "webkit/media/simple_data_source.h" |
| 36 #include "webkit/media/video_renderer_impl.h" | 40 #include "webkit/media/video_renderer_impl.h" |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 95 } | 99 } |
| 96 | 100 |
| 97 } // namespace | 101 } // namespace |
| 98 | 102 |
| 99 namespace webkit_media { | 103 namespace webkit_media { |
| 100 | 104 |
| 101 WebMediaPlayerImpl::WebMediaPlayerImpl( | 105 WebMediaPlayerImpl::WebMediaPlayerImpl( |
| 102 WebKit::WebMediaPlayerClient* client, | 106 WebKit::WebMediaPlayerClient* client, |
| 103 base::WeakPtr<WebMediaPlayerDelegate> delegate, | 107 base::WeakPtr<WebMediaPlayerDelegate> delegate, |
| 104 media::FilterCollection* collection, | 108 media::FilterCollection* collection, |
| 109 bool disable_audio, | |
| 105 media::MessageLoopFactory* message_loop_factory, | 110 media::MessageLoopFactory* message_loop_factory, |
| 106 MediaStreamClient* media_stream_client, | 111 MediaStreamClient* media_stream_client, |
| 107 media::MediaLog* media_log) | 112 media::MediaLog* media_log) |
| 108 : network_state_(WebKit::WebMediaPlayer::Empty), | 113 : network_state_(WebKit::WebMediaPlayer::Empty), |
| 109 ready_state_(WebKit::WebMediaPlayer::HaveNothing), | 114 ready_state_(WebKit::WebMediaPlayer::HaveNothing), |
| 110 main_loop_(NULL), | 115 main_loop_(NULL), |
| 111 filter_collection_(collection), | 116 filter_collection_(collection), |
| 112 pipeline_(NULL), | 117 pipeline_(NULL), |
| 113 message_loop_factory_(message_loop_factory), | 118 message_loop_factory_(message_loop_factory), |
| 114 paused_(true), | 119 paused_(true), |
| 115 seeking_(false), | 120 seeking_(false), |
| 116 playback_rate_(0.0f), | 121 playback_rate_(0.0f), |
| 117 pending_seek_(false), | 122 pending_seek_(false), |
| 118 client_(client), | 123 client_(client), |
| 119 proxy_(NULL), | 124 proxy_(NULL), |
| 120 delegate_(delegate), | 125 delegate_(delegate), |
| 121 media_stream_client_(media_stream_client), | 126 media_stream_client_(media_stream_client), |
| 122 media_log_(media_log), | 127 media_log_(media_log), |
| 123 is_accelerated_compositing_active_(false), | 128 is_accelerated_compositing_active_(false), |
| 124 incremented_externally_allocated_memory_(false) { | 129 incremented_externally_allocated_memory_(false) { |
| 130 if (!disable_audio) { | |
| 131 // audio_source_provider_ is a "provider" to WebKit, and a sink | |
| 132 // from the perspective of the audio renderer. | |
| 133 audio_source_provider_ = new RenderAudioSourceProvider(); | |
| 134 // Add the chrome specific audio renderer, using audio_source_provider_ | |
| 135 // as the sink. | |
| 136 AudioRendererImpl* audio_renderer = | |
| 137 new AudioRendererImpl(audio_source_provider_.get()); | |
| 138 collection->AddAudioRenderer(audio_renderer); | |
| 139 audio_source_provider_->SetRenderer(audio_renderer); | |
| 140 } | |
| 141 | |
| 125 // Saves the current message loop. | 142 // Saves the current message loop. |
| 126 DCHECK(!main_loop_); | 143 DCHECK(!main_loop_); |
| 127 main_loop_ = MessageLoop::current(); | 144 main_loop_ = MessageLoop::current(); |
| 128 media_log_->AddEvent( | 145 media_log_->AddEvent( |
| 129 media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED)); | 146 media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED)); |
| 130 } | 147 } |
| 131 | 148 |
| 132 bool WebMediaPlayerImpl::Initialize( | 149 bool WebMediaPlayerImpl::Initialize( |
| 133 WebKit::WebFrame* frame, | 150 WebKit::WebFrame* frame, |
| 134 bool use_simple_data_source) { | 151 bool use_simple_data_source) { |
| (...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 912 proxy_ = NULL; | 929 proxy_ = NULL; |
| 913 } | 930 } |
| 914 } | 931 } |
| 915 | 932 |
| 916 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { | 933 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { |
| 917 DCHECK_EQ(main_loop_, MessageLoop::current()); | 934 DCHECK_EQ(main_loop_, MessageLoop::current()); |
| 918 DCHECK(client_); | 935 DCHECK(client_); |
| 919 return client_; | 936 return client_; |
| 920 } | 937 } |
| 921 | 938 |
| 939 WebKit::WebAudioSourceProvider* WebMediaPlayerImpl::audioSourceProvider() { | |
| 940 return audio_source_provider_; | |
| 941 } | |
| 942 | |
| 922 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() { | 943 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() { |
| 923 DCHECK_EQ(main_loop_, MessageLoop::current()); | 944 DCHECK_EQ(main_loop_, MessageLoop::current()); |
| 924 incremented_externally_allocated_memory_ = true; | 945 incremented_externally_allocated_memory_ = true; |
| 925 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory); | 946 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory); |
| 926 } | 947 } |
| 927 | 948 |
| 928 } // namespace webkit_media | 949 } // namespace webkit_media |
| OLD | NEW |