change videotoolbox format from NV12 to I420

webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  *
  */
@@ skipping 106 matching lines @@
   int64_t render_time_ms;
   uint32_t timestamp;
 };
 
 // We receive I420Frames as input, but we need to feed CVPixelBuffers into the
 // encoder. This performs the copy and format conversion.
 // TODO(tkchin): See if encoder will accept i420 frames and compare performance.
 bool CopyVideoFrameToPixelBuffer(const webrtc::VideoFrame& frame,
                                  CVPixelBufferRef pixel_buffer) {
   RTC_DCHECK(pixel_buffer);
-  RTC_DCHECK(CVPixelBufferGetPixelFormatType(pixel_buffer) ==
-             kCVPixelFormatType_420YpCbCr8BiPlanarFullRange);
   RTC_DCHECK(CVPixelBufferGetHeightOfPlane(pixel_buffer, 0) ==
              static_cast<size_t>(frame.height()));
   RTC_DCHECK(CVPixelBufferGetWidthOfPlane(pixel_buffer, 0) ==
              static_cast<size_t>(frame.width()));
 
-  CVReturn cvRet = CVPixelBufferLockBaseAddress(pixel_buffer, 0);
-  if (cvRet != kCVReturnSuccess) {
-    LOG(LS_ERROR) << "Failed to lock base address: " << cvRet;
-    return false;
-  }
-  uint8_t* dst_y = reinterpret_cast<uint8_t*>(
-      CVPixelBufferGetBaseAddressOfPlane(pixel_buffer, 0));
-  int dst_stride_y = CVPixelBufferGetBytesPerRowOfPlane(pixel_buffer, 0);
-  uint8_t* dst_uv = reinterpret_cast<uint8_t*>(
-      CVPixelBufferGetBaseAddressOfPlane(pixel_buffer, 1));
-  int dst_stride_uv = CVPixelBufferGetBytesPerRowOfPlane(pixel_buffer, 1);
-  // Convert I420 to NV12.
-  int ret = libyuv::I420ToNV12(
-      frame.buffer(webrtc::kYPlane), frame.stride(webrtc::kYPlane),
-      frame.buffer(webrtc::kUPlane), frame.stride(webrtc::kUPlane),
-      frame.buffer(webrtc::kVPlane), frame.stride(webrtc::kVPlane),
-      dst_y, dst_stride_y, dst_uv, dst_stride_uv,
-      frame.width(), frame.height());
-  CVPixelBufferUnlockBaseAddress(pixel_buffer, 0);
-  if (ret) {
-    LOG(LS_ERROR) << "Error converting I420 VideoFrame to NV12 :" << ret;
+  OSType format = CVPixelBufferGetPixelFormatType(pixel_buffer);
+  if (format == kCVPixelFormatType_420YpCbCr8Planar ||
+      format == kCVPixelFormatType_420YpCbCr8PlanarFullRange) {
+    CVPixelBufferLockBaseAddress(pixel_buffer, 0);
+    for (size_t planeIndex = 0;
+         planeIndex < CVPixelBufferGetPlaneCount(pixel_buffer); planeIndex++) {
+      void* baseAddress =
+          CVPixelBufferGetBaseAddressOfPlane(pixel_buffer, planeIndex);
+      memcpy(baseAddress, frame.buffer((webrtc::PlaneType)planeIndex),
+             frame.allocated_size((webrtc::PlaneType)planeIndex));
+    }
+    CVPixelBufferUnlockBaseAddress(pixel_buffer, 0);
+  } else if (format == kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange ||
+             format == kCVPixelFormatType_420YpCbCr8BiPlanarFullRange) {
+    CVReturn cvRet = CVPixelBufferLockBaseAddress(pixel_buffer, 0);
+    if (cvRet != kCVReturnSuccess) {
+      LOG(LS_ERROR) << "Failed to lock base address: " << cvRet;
+      return false;
+    }
+    uint8_t* dst_y = reinterpret_cast<uint8_t*>(
+        CVPixelBufferGetBaseAddressOfPlane(pixel_buffer, 0));
+    int dst_stride_y = CVPixelBufferGetBytesPerRowOfPlane(pixel_buffer, 0);
+    uint8_t* dst_uv = reinterpret_cast<uint8_t*>(
+        CVPixelBufferGetBaseAddressOfPlane(pixel_buffer, 1));
+    int dst_stride_uv = CVPixelBufferGetBytesPerRowOfPlane(pixel_buffer, 1);
+    // Convert I420 to NV12.
+    int ret = libyuv::I420ToNV12(
+        frame.buffer(webrtc::kYPlane), frame.stride(webrtc::kYPlane),
+        frame.buffer(webrtc::kUPlane), frame.stride(webrtc::kUPlane),
+        frame.buffer(webrtc::kVPlane), frame.stride(webrtc::kVPlane), dst_y,
+        dst_stride_y, dst_uv, dst_stride_uv, frame.width(), frame.height());
+    CVPixelBufferUnlockBaseAddress(pixel_buffer, 0);
+    if (ret) {
+      LOG(LS_ERROR) << "Error converting I420 VideoFrame to NV12 :" << ret;
+      return false;
+    }
+
+  } else {
+    LOG(LS_ERROR) << "Unsupported pixel format type :" << format;
     return false;
   }
   return true;
 }
 
 // This is the callback function that VideoToolbox calls when encode is
 // complete.
 void VTCompressionOutputCallback(void* encoder,
                                  void* params,
                                  OSStatus status,
@@ skipping 184 matching lines @@
 #if defined(WEBRTC_IOS)
     kCVPixelBufferOpenGLESCompatibilityKey,
 #elif defined(WEBRTC_MAC)
     kCVPixelBufferOpenGLCompatibilityKey,
 #endif
     kCVPixelBufferIOSurfacePropertiesKey,
     kCVPixelBufferPixelFormatTypeKey
   };
   CFDictionaryRef io_surface_value =
       internal::CreateCFDictionary(nullptr, nullptr, 0);
-  int64_t nv12type = kCVPixelFormatType_420YpCbCr8BiPlanarFullRange;
+  OSType i420type = kCVPixelFormatType_420YpCbCr8Planar;
   CFNumberRef pixel_format =
-      CFNumberCreate(nullptr, kCFNumberLongType, &nv12type);
+      CFNumberCreate(nullptr, kCFNumberSInt32Type, &i420type);
   CFTypeRef values[attributes_size] = {
     kCFBooleanTrue,
     io_surface_value,
     pixel_format
   };
   CFDictionaryRef source_attributes =
       internal::CreateCFDictionary(keys, values, attributes_size);
   if (io_surface_value) {
     CFRelease(io_surface_value);
     io_surface_value = nullptr;
@@ skipping 58 matching lines @@
   if (compression_session_) {
     VTCompressionSessionInvalidate(compression_session_);
     CFRelease(compression_session_);
     compression_session_ = nullptr;
   }
 }
 
 }  // namespace webrtc
 
 #endif  // defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)