| Index: media/filters/vpx_video_decoder.cc
|
| diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc
|
| index bf7cc3cdaac32a2c1aa49c5f8d00d362a051ab9b..b4c3629b0cad3400d9e5ca63a0b7e6a87844f08b 100644
|
| --- a/media/filters/vpx_video_decoder.cc
|
| +++ b/media/filters/vpx_video_decoder.cc
|
| @@ -53,15 +53,15 @@ static int GetThreadCount(const VideoDecoderConfig& config) {
|
| const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
|
| std::string threads(cmd_line->GetSwitchValueASCII(switches::kVideoThreads));
|
| if (threads.empty() || !base::StringToInt(threads, &decode_threads)) {
|
| - if (config.codec() == kCodecVP9) {
|
| - // For VP9 decode when using the default thread count, increase the number
|
| - // of decode threads to equal the maximum number of tiles possible for
|
| - // higher resolution streams.
|
| - if (config.coded_size().width() >= 2048)
|
| - decode_threads = 8;
|
| - else if (config.coded_size().width() >= 1024)
|
| - decode_threads = 4;
|
| - }
|
| + // if (config.codec() == kCodecVP9) {
|
| + // // For VP9 decode when using the default thread count, increase the number
|
| + // // of decode threads to equal the maximum number of tiles possible for
|
| + // // higher resolution streams.
|
| + // if (config.coded_size().width() >= 2048)
|
| + // decode_threads = 8;
|
| + // else if (config.coded_size().width() >= 1024)
|
| + // decode_threads = 4;
|
| + // }
|
|
|
| return decode_threads;
|
| }
|
| @@ -250,7 +250,7 @@ static vpx_codec_ctx* InitializeVpxContext(vpx_codec_ctx* context,
|
| }
|
|
|
| bool VpxVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config) {
|
| - if (config.codec() != kCodecVP8 && config.codec() != kCodecVP9)
|
| + if (config.codec() != kCodecVP8)
|
| return false;
|
|
|
| // In VP8 videos, only those with alpha are handled by VpxVideoDecoder. All
|
| @@ -283,6 +283,7 @@ bool VpxVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config) {
|
| return false;
|
| }
|
|
|
| + LOG(ERROR) << "Using libvpx...";
|
| return true;
|
| }
|
|
|
|
|