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

media/video/capture/mac/video_capture_device_avfoundation_mac.mm

Index: media/video/capture/mac/video_capture_device_avfoundation_mac.mm
diff --git a/media/video/capture/mac/video_capture_device_avfoundation_mac.mm b/media/video/capture/mac/video_capture_device_avfoundation_mac.mm
index 6c19d3377a77859c0bf6d95884e75d64d7ae7716..2b75cfb8f15282cbd80a6a199cf50fe590c7c8f3 100644
--- a/media/video/capture/mac/video_capture_device_avfoundation_mac.mm
+++ b/media/video/capture/mac/video_capture_device_avfoundation_mac.mm
@@ -8,7 +8,6 @@
 
 #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"
 
@@ -26,8 +25,6 @@
       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;
   }
@@ -315,31 +312,9 @@
     // 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;
     }