summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webmediaplayer_impl.cc
diff options
context:
space:
mode:
authorjiesun@google.com <jiesun@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-13 20:13:33 +0000
committerjiesun@google.com <jiesun@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-13 20:13:33 +0000
commitf57c6416bb8ef6adc12b081b44ba5a83eae3c5ba (patch)
tree1ea83a39abaed84d6708e17821681c7f49931e0a /webkit/glue/webmediaplayer_impl.cc
parent68f1df43323a3a81cd14ed0061e7c3578394d8fd (diff)
downloadchromium_src-f57c6416bb8ef6adc12b081b44ba5a83eae3c5ba.zip
chromium_src-f57c6416bb8ef6adc12b081b44ba5a83eae3c5ba.tar.gz
chromium_src-f57c6416bb8ef6adc12b081b44ba5a83eae3c5ba.tar.bz2
[media] inject VDC to decoder.
which VDC to be used should be determined by something outside instead of inside video decoder. 1. whether hardware composition is used( probably always true). 2. whether hardware composition is disabled.(if not, why we keep the skbitmap path). 3. whether a opengl or a opengles VDC is needed, probably only apply to player_x11. 4. the video decoder context are sharing a lot of states with "painter/compositor" (e.g. graphic context). and if we create VDC inside decoder, and there is no current code path to inject this to Renderer, there are also complication of the factories and creating orders. even we add that path, it maybe too late for renderer. while we need to refactor ipc_video_decoder later. BUG=None TEST=Bots Review URL: http://codereview.chromium.org/3534015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62443 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webmediaplayer_impl.cc')
-rw-r--r--webkit/glue/webmediaplayer_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
index d5c667d..e4aca5a 100644
--- a/webkit/glue/webmediaplayer_impl.cc
+++ b/webkit/glue/webmediaplayer_impl.cc
@@ -244,7 +244,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(WebKit::WebMediaPlayerClient* client,
// Add in the default filter factories.
filter_factory_->AddFactory(media::FFmpegDemuxer::CreateFilterFactory());
filter_factory_->AddFactory(media::FFmpegAudioDecoder::CreateFactory());
- filter_factory_->AddFactory(media::FFmpegVideoDecoder::CreateFactory());
+ filter_factory_->AddFactory(media::FFmpegVideoDecoder::CreateFactory(NULL));
filter_factory_->AddFactory(media::NullAudioRenderer::CreateFilterFactory());
filter_factory_->AddFactory(video_renderer_factory->CreateFactory(proxy_));
}