Commit dce82fac authored by watk's avatar watk Committed by Commit bot

Enable software decoding video with libvpx on Android

VpxVideoDecoder previously would reject VP8 without an alpha
channel, leaving it to be decoded by FFmpegVideoDecoder. Now,
when it's compiled without FFmpegVideoDecoder it will handle
all VP8.

BUG=507834

Review URL: https://codereview.chromium.org/1281433002

Cr-Commit-Position: refs/heads/master@{#342405}
parent 297cae0b
...@@ -294,10 +294,12 @@ bool VpxVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config) { ...@@ -294,10 +294,12 @@ bool VpxVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config) {
if (config.codec() != kCodecVP8 && config.codec() != kCodecVP9) if (config.codec() != kCodecVP8 && config.codec() != kCodecVP9)
return false; return false;
// In VP8 videos, only those with alpha are handled by VpxVideoDecoder. All #if !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
// other VP8 videos go to FFmpegVideoDecoder. // When FFmpegVideoDecoder is available it handles VP8 that doesn't have
// alpha, and VpxVideoDecoder will handle VP8 with alpha.
if (config.codec() == kCodecVP8 && config.format() != PIXEL_FORMAT_YV12A) if (config.codec() == kCodecVP8 && config.format() != PIXEL_FORMAT_YV12A)
return false; return false;
#endif
CloseDecoder(); CloseDecoder();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment