diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-22 02:17:44 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-22 02:17:44 +0000 |
| commit | 2706340c7a2f9a3a7405775b9e67d62fb3a56769 (patch) | |
| tree | 7abfb9a98805a56f71dcac112dd17d667726463d /webkit/media | |
| parent | a9344c52433569d325d19e9ba52f8bb483fce0c0 (diff) | |
| download | chromium_src-2706340c7a2f9a3a7405775b9e67d62fb3a56769.zip chromium_src-2706340c7a2f9a3a7405775b9e67d62fb3a56769.tar.gz chromium_src-2706340c7a2f9a3a7405775b9e67d62fb3a56769.tar.bz2 | |
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
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/filter_helpers.cc | 9 |
1 files changed, 9 insertions, 0 deletions
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<media::VideoDecoder> old_videodecoder; + do { + filter_collection->SelectVideoDecoder(&old_videodecoder); + } while (old_videodecoder); + scoped_refptr<media::VideoDecoder> video_decoder = client->GetVideoDecoder( url, message_loop_factory); if (!video_decoder) |