Revert of Mac Video Capture: Add support for pixel format NV12 for AVFoundation

media/video/capture/mac/video_capture_device_avfoundation_mac.mm

 // 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.
 
 #import "media/video/capture/mac/video_capture_device_avfoundation_mac.h"
 
 #import <CoreVideo/CoreVideo.h>
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
-#include "media/base/mac/corevideo_glue.h"
 #include "media/video/capture/mac/video_capture_device_mac.h"
 #include "ui/gfx/geometry/size.h"
 
 // Prefer MJPEG if frame width or height is larger than this.
 static const int kMjpegWidthThreshold = 640;
 static const int kMjpegHeightThreshold = 480;
 
 // This function translates Mac Core Video pixel formats to Chromium pixel
 // formats. Chromium pixel formats are sorted in order of preference.
 media::VideoPixelFormat FourCCToChromiumPixelFormat(FourCharCode code) {
   switch (code) {
     case kCVPixelFormatType_422YpCbCr8:
       return media::PIXEL_FORMAT_UYVY;
     case CoreMediaGlue::kCMPixelFormat_422YpCbCr8_yuvs:
       return media::PIXEL_FORMAT_YUY2;
     case CoreMediaGlue::kCMVideoCodecType_JPEG_OpenDML:
       return media::PIXEL_FORMAT_MJPEG;
-    case CoreVideoGlue::kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange:
-      return media::PIXEL_FORMAT_NV12;
     default:
       return media::PIXEL_FORMAT_UNKNOWN;
   }
 }
 
 @implementation VideoCaptureDeviceAVFoundation
 
 #pragma mark Class methods
 
 + (void)getDeviceNames:(NSMutableDictionary*)deviceNames {
@@ skipping 267 matching lines @@
           blockBuffer, 0, &lengthAtOffset, &frameSize, &baseAddress);
       // Expect the MJPEG data to be available as a contiguous reference, i.e.
       // not covered by multiple memory blocks.
       CHECK_EQ(lengthAtOffset, frameSize);
     }
   } else {
     videoFrame = CoreMediaGlue::CMSampleBufferGetImageBuffer(sampleBuffer);
     // Lock the frame and calculate frame size.
     if (CVPixelBufferLockBaseAddress(videoFrame, kCVPixelBufferLock_ReadOnly) ==
         kCVReturnSuccess) {
-      baseAddress = static_cast<char*>(
-          CVPixelBufferGetPlaneCount(videoFrame) == 0
-              ? CVPixelBufferGetBaseAddress(videoFrame)
-              : CVPixelBufferGetBaseAddressOfPlane(videoFrame, 0));
-      // Chromium expects the data to be tightly packed, i.e. no row padding
-      // and the planes should follow consecutively.
-      switch (captureFormat.pixel_format) {
-        case media::PIXEL_FORMAT_YUY2:
-        case media::PIXEL_FORMAT_UYVY:
-          CHECK_EQ(CVPixelBufferGetBytesPerRow(videoFrame),
-                   static_cast<size_t>(2 * captureFormat.frame_size.width()));
-          frameSize = captureFormat.frame_size.GetArea() * 16 / 8;  // 16bpp.
-          break;
-        case media::PIXEL_FORMAT_NV12:
-          CHECK_EQ(CVPixelBufferGetBytesPerRowOfPlane(videoFrame, 0),
-                   static_cast<size_t>(captureFormat.frame_size.width()));
-          CHECK_EQ(CVPixelBufferGetBytesPerRowOfPlane(videoFrame, 1),
-                   static_cast<size_t>(captureFormat.frame_size.width()));
-          CHECK_EQ(CVPixelBufferGetBaseAddressOfPlane(videoFrame, 1),
-                   baseAddress + captureFormat.frame_size.GetArea());
-          frameSize = captureFormat.frame_size.GetArea() * 12 / 8;  // 12bpp.
-          break;
-        default:
-          NOTREACHED();
-      }
+      baseAddress = static_cast<char*>(CVPixelBufferGetBaseAddress(videoFrame));
+      frameSize = CVPixelBufferGetHeight(videoFrame) *
+                  CVPixelBufferGetBytesPerRow(videoFrame);
     } else {
       videoFrame = nil;
     }
   }
 
   {
     base::AutoLock lock(lock_);
     if (frameReceiver_ && baseAddress) {
       frameReceiver_->ReceiveFrame(reinterpret_cast<uint8_t*>(baseAddress),
                                    frameSize, captureFormat, 0, 0);
@@ skipping 14 matching lines @@
 }
 
 - (void)sendErrorString:(NSString*)error {
   DLOG(ERROR) << [error UTF8String];
   base::AutoLock lock(lock_);
   if (frameReceiver_)
     frameReceiver_->ReceiveError([error UTF8String]);
 }
 
 @end