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

trunk/src/content/browser/renderer_host/media/video_capture_controller.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 "content/browser/renderer_host/media/video_capture_controller.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 380 matching lines @@
   if (!(frame->format() == media::VideoFrame::I420 ||
         frame->format() == media::VideoFrame::YV12 ||
         frame->format() == media::VideoFrame::RGB32)) {
     NOTREACHED() << "Unsupported format passed to OnIncomingCapturedVideoFrame";
     return;
   }
 
   const int kYPlane = media::VideoFrame::kYPlane;
   const int kUPlane = media::VideoFrame::kUPlane;
   const int kVPlane = media::VideoFrame::kVPlane;
-  const int kAPlane = media::VideoFrame::kAPlane;
   const int kRGBPlane = media::VideoFrame::kRGBPlane;
 
   // Do color conversion from the camera format to I420.
   switch (frame->format()) {
 #if defined(GOOGLE_TV)
     case media::VideoFrame::HOLE:
       // Fall-through to NOTREACHED() block.
 #endif
     case media::VideoFrame::INVALID:
     case media::VideoFrame::YV16:
@@ skipping 12 matching lines @@
       media::CopyUPlane(frame->data(kUPlane),
                         frame->stride(kUPlane),
                         frame->rows(kUPlane),
                         target);
       media::CopyVPlane(frame->data(kVPlane),
                         frame->stride(kVPlane),
                         frame->rows(kVPlane),
                         target);
       break;
     }
-    case media::VideoFrame::YV12A: {
-      DCHECK(!chopped_width_ && !chopped_height_);
-      media::CopyYPlane(frame->data(kYPlane),
-                        frame->stride(kYPlane),
-                        frame->rows(kYPlane),
-                        target);
-      media::CopyUPlane(frame->data(kUPlane),
-                        frame->stride(kUPlane),
-                        frame->rows(kUPlane),
-                        target);
-      media::CopyVPlane(frame->data(kVPlane),
-                        frame->stride(kVPlane),
-                        frame->rows(kVPlane),
-                        target);
-      media::CopyAPlane(frame->data(kAPlane),
-                        frame->stride(kAPlane),
-                        frame->rows(kAPlane),
-                        target);
-      break;
-    }
     case media::VideoFrame::RGB32: {
       media::ConvertRGB32ToYUV(frame->data(kRGBPlane),
                                target->data(kYPlane),
                                target->data(kUPlane),
                                target->data(kVPlane),
                                target->coded_size().width(),
                                target->coded_size().height(),
                                frame->stride(kRGBPlane),
                                target->stride(kYPlane),
                                target->stride(kUPlane));
@@ skipping 225 matching lines @@
     controller_clients_.push_back((*client_it));
     pending_clients_.erase(client_it++);
   }
   // Request the manager to start the actual capture.
   video_capture_manager_->Start(current_params_, this);
   state_ = VIDEO_CAPTURE_STATE_STARTED;
   device_in_use_ = true;
 }
 
 }  // namespace content