Remove deprecated media switches.

media/filters/vpx_video_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/vpx_video_decoder.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 241 matching lines @@
                                               0);
   if (status != VPX_CODEC_OK) {
     LOG(ERROR) << "vpx_codec_dec_init failed, status=" << status;
     delete context;
     return NULL;
   }
   return context;
 }
 
 bool VpxVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config) {
-  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
-  bool can_handle = false;
-  if (config.codec() == kCodecVP9)
-    can_handle = true;
-  if (!cmd_line->HasSwitch(switches::kDisableVp8AlphaPlayback) &&
-      config.codec() == kCodecVP8 && config.format() == VideoFrame::YV12A) {
-    can_handle = true;
+  if (config.codec() == kCodecVP8 && config.format() != VideoFrame::YV12A) {

[ddorwin, 2014/03/06 21:57:17]

It appears the old code would not support VP8 entirely if disable-vp8-alpha was
specified. Am I reading that right? Is that because non-alpha VP8 goes through
FFmpeg? This could probably use a comment.

[vignesh, 2014/03/06 22:06:53]

the current check is wrong. this will always reject VP8 Alpha because of the
second else if.

the following could be easier to follow.
if (config.codec() != kCodecVP8 && config.codec() != kCodecVP9)
  return false;
// Only VP8 videos with alpha goes through this decoder. Everything else goes
through ffmpeg.
if (config.codec() == kCodecVP8 && config.format() != VideoFrame::YV12A)
  return false;

The pipeline integration tests wouldn't have caught this because the ffmpeg
decoder still won't say no to VP8 videos with alpha, it will decode them
ignoring the alpha channel, so the pipeline won't see any errors.

[DaleCurtis, 2014/03/06 22:13:24]

Whoops, fixed.

+    return false;
+  } else if (config.codec() != kCodecVP9) {
+    return false;
   }
-  if (!can_handle)
-    return false;
 
   CloseDecoder();
 
   vpx_codec_ = InitializeVpxContext(vpx_codec_, config);
   if (!vpx_codec_)
     return false;
 
   // We use our own buffers for VP9 so that there is no need to copy data after
   // decoding.
   if (config.codec() == kCodecVP9) {
@@ skipping 249 matching lines @@
         vpx_image->stride[VPX_PLANE_Y], vpx_image->d_h, video_frame->get());
     return;
   }
   CopyAPlane(vpx_image_alpha->planes[VPX_PLANE_Y],
              vpx_image->stride[VPX_PLANE_Y],
              vpx_image->d_h,
              video_frame->get());
 }
 
 }  // namespace media