Revert 194465 "media: Add support for playback for VP8 Alpha vid..."

trunk/src/cc/resources/video_resource_updater.cc

 // Copyright 2013 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 "cc/resources/video_resource_updater.h"
 
 #include "base/bind.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/resources/resource_provider.h"
 #include "gpu/GLES2/gl2extchromium.h"
@@ skipping 28 matching lines @@
     const scoped_refptr<media::VideoFrame>& video_frame) {
   // If these fail, we'll have to add logic that handles offset bitmap/texture
   // UVs. For now, just expect (0, 0) offset, since all our decoders so far
   // don't offset.
   DCHECK_EQ(video_frame->visible_rect().x(), 0);
   DCHECK_EQ(video_frame->visible_rect().y(), 0);
 
   switch (video_frame->format()) {
     // Acceptable inputs.
     case media::VideoFrame::YV12:
-    case media::VideoFrame::YV12A:
     case media::VideoFrame::YV16:
     case media::VideoFrame::NATIVE_TEXTURE:
 #if defined(GOOGLE_TV)
     case media::VideoFrame::HOLE:
 #endif
       return true;
 
     // Unacceptable inputs. ¯\(°_o)/¯
     case media::VideoFrame::INVALID:
     case media::VideoFrame::RGB32:
@@ skipping 10 matching lines @@
     media::VideoFrame::Format input_frame_format,
     gfx::Size coded_size,
     GLenum output_resource_format,
     int plane_index) {
   if (output_resource_format == kYUVResourceFormat) {
     if (plane_index == media::VideoFrame::kYPlane)
       return coded_size;
 
     switch (input_frame_format) {
       case media::VideoFrame::YV12:
-      case media::VideoFrame::YV12A:
         return gfx::ToFlooredSize(gfx::ScaleSize(coded_size, 0.5f, 0.5f));
       case media::VideoFrame::YV16:
         return gfx::ToFlooredSize(gfx::ScaleSize(coded_size, 0.5f, 1.f));
 
       case media::VideoFrame::INVALID:
       case media::VideoFrame::RGB32:
       case media::VideoFrame::EMPTY:
       case media::VideoFrame::I420:
       case media::VideoFrame::NATIVE_TEXTURE:
 #if defined(GOOGLE_TV)
@@ skipping 17 matching lines @@
 #if defined(GOOGLE_TV)
   if (input_frame_format == media::VideoFrame::HOLE) {
     VideoFrameExternalResources external_resources;
     external_resources.type = VideoFrameExternalResources::HOLE;
     return external_resources;
   }
 #endif
 
   // Only YUV software video frames are supported.
   DCHECK(input_frame_format == media::VideoFrame::YV12 ||
-         input_frame_format == media::VideoFrame::YV12A ||
          input_frame_format == media::VideoFrame::YV16);
   if (input_frame_format != media::VideoFrame::YV12 &&
-      input_frame_format != media::VideoFrame::YV12A &&
       input_frame_format != media::VideoFrame::YV16)
     return VideoFrameExternalResources();
 
   bool software_compositor = !resource_provider_->GraphicsContext3D();
 
   GLenum output_resource_format = kYUVResourceFormat;
   size_t output_plane_count = 3;
 
   // TODO(skaslev): If we're in software compositing mode, we do the YUV -> RGB
   // conversion here. That involves an extra copy of each frame to a bitmap.
@@ skipping 250 matching lines @@
   }
 
   PlaneResource recycled_resource(data.resource_id,
                                   data.resource_size,
                                   data.resource_format,
                                   sync_point);
   updater->recycled_resources_.push_back(recycled_resource);
 }
 
 }  // namespace cc