From 2706340c7a2f9a3a7405775b9e67d62fb3a56769 Mon Sep 17 00:00:00 2001 From: "fischman@chromium.org" Date: Wed, 22 Feb 2012 02:17:44 +0000 Subject: Reimplement r122778 to fix BuildMediaStreamCollection without breaking HW video decode. Review URL: http://codereview.chromium.org/9372075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122950 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/media/filter_helpers.cc | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'webkit/media') diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc index f31e5f2..3c376f9 100644 --- a/webkit/media/filter_helpers.cc +++ b/webkit/media/filter_helpers.cc @@ -33,6 +33,15 @@ bool BuildMediaStreamCollection(const WebKit::WebURL& url, if (!client) return false; + // Remove any "traditional" decoders (e.g. GpuVideoDecoder) from the + // collection. + // NOTE: http://crbug.com/110800 is about replacing this ad-hockery with + // something more designed. + scoped_refptr old_videodecoder; + do { + filter_collection->SelectVideoDecoder(&old_videodecoder); + } while (old_videodecoder); + scoped_refptr video_decoder = client->GetVideoDecoder( url, message_loop_factory); if (!video_decoder) -- cgit v1.1