| Index: media/base/decode_capabilities.cc
|
| diff --git a/media/base/decode_capabilities.cc b/media/base/decode_capabilities.cc
|
| index 64c32ba1b4e506f373c6ef6d126e173fa885eba3..19765f0de74973c32cba926795a88334d8e3d781 100644
|
| --- a/media/base/decode_capabilities.cc
|
| +++ b/media/base/decode_capabilities.cc
|
| @@ -7,6 +7,7 @@
|
| #include "base/command_line.h"
|
| #include "base/feature_list.h"
|
| #include "media/base/media_switches.h"
|
| +#include "media/filters/vpx_video_decoder.h"
|
| #include "ui/display/display_switches.h"
|
|
|
| namespace media {
|
| @@ -142,7 +143,9 @@ bool IsSupportedVideoConfig(const VideoConfig& config) {
|
| switch (config.codec) {
|
| case media::kCodecVP9:
|
| // Color management required for HDR to not look terrible.
|
| - return IsColorSpaceSupported(config.color_space);
|
| + return IsColorSpaceSupported(config.color_space)
|
| + // VP9 decoding will fall through to LibVPX.
|
| + && VpxVideoDecoder::IsVideoConfigSupported(config);
|
|
|
| case media::kCodecH264:
|
| case media::kCodecVP8:
|
|
|