Allow padding in WrapVideoFrameInCVPixelBuffer

media/base/mac/video_frame_mac.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 "media/base/mac/video_frame_mac.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 41 matching lines @@
     cv_format = kCVPixelFormatType_420YpCbCr8Planar;
   } else if (video_frame_format == PIXEL_FORMAT_NV12) {
     cv_format = CoreVideoGlue::kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
   } else {
     DLOG(ERROR) << " unsupported frame format: " << video_frame_format;
     return pixel_buffer;
   }
 
   int num_planes = VideoFrame::NumPlanes(video_frame_format);
   DCHECK_LE(num_planes, kMaxPlanes);
-  gfx::Size coded_size = frame.coded_size();
-
-  // TODO(jfroy): Support extended pixels (i.e. padding).
-  if (coded_size != frame.visible_rect().size()) {
-    DLOG(ERROR) << " frame with extended pixels not supported: "
-                << " coded_size: " << coded_size.ToString()
-                << ", visible_rect: " << frame.visible_rect().ToString();
-    return pixel_buffer;
-  }
+  const gfx::Rect& visible_rect = frame.visible_rect();
 
   // Build arrays for each plane's data pointer, dimensions and byte alignment.
   void* plane_ptrs[kMaxPlanes];
   size_t plane_widths[kMaxPlanes];
   size_t plane_heights[kMaxPlanes];
   size_t plane_bytes_per_row[kMaxPlanes];
   for (int plane_i = 0; plane_i < num_planes; ++plane_i) {
-    plane_ptrs[plane_i] = const_cast<uint8_t*>(frame.data(plane_i));
+    plane_ptrs[plane_i] = const_cast<uint8_t*>(frame.visible_data(plane_i));
     gfx::Size plane_size =
-        VideoFrame::PlaneSize(video_frame_format, plane_i, coded_size);
+        VideoFrame::PlaneSize(video_frame_format, plane_i, visible_rect.size());
     plane_widths[plane_i] = plane_size.width();
     plane_heights[plane_i] = plane_size.height();
     plane_bytes_per_row[plane_i] = frame.stride(plane_i);
   }
 
   // CVPixelBufferCreateWithPlanarBytes needs a dummy plane descriptor or the
   // release callback will not execute. The descriptor is freed in the callback.
   void* descriptor = calloc(
       1,
       std::max(sizeof(CVPlanarPixelBufferInfo_YCbCrPlanar),
                sizeof(CoreVideoGlue::CVPlanarPixelBufferInfo_YCbCrBiPlanar)));
 
   // Wrap the frame's data in a CVPixelBuffer. Because this is a C API, we can't
   // give it a smart pointer to the frame, so instead pass a raw pointer and
   // increment the frame's reference count manually.
   CVReturn result = CVPixelBufferCreateWithPlanarBytes(
-      kCFAllocatorDefault, coded_size.width(), coded_size.height(), cv_format,
-      descriptor, 0, num_planes, plane_ptrs, plane_widths, plane_heights,
-      plane_bytes_per_row, &CvPixelBufferReleaseCallback,
+      kCFAllocatorDefault, visible_rect.width(), visible_rect.height(),
+      cv_format, descriptor, 0, num_planes, plane_ptrs, plane_widths,
+      plane_heights, plane_bytes_per_row, &CvPixelBufferReleaseCallback,
       const_cast<VideoFrame*>(&frame), nullptr, pixel_buffer.InitializeInto());
   if (result != kCVReturnSuccess) {
     DLOG(ERROR) << " CVPixelBufferCreateWithPlanarBytes failed: " << result;
     return base::ScopedCFTypeRef<CVPixelBufferRef>(nullptr);
   }
 
   // The CVPixelBuffer now references the data of the frame, so increment its
   // reference count manually. The release callback set on the pixel buffer will
   // release the frame.
   frame.AddRef();
 
   // Apply required colorimetric attachments.
   CVBufferSetAttachment(pixel_buffer, kCVImageBufferColorPrimariesKey,
                         kCVImageBufferColorPrimaries_ITU_R_709_2,
                         kCVAttachmentMode_ShouldPropagate);
   CVBufferSetAttachment(pixel_buffer, kCVImageBufferTransferFunctionKey,
                         kCVImageBufferTransferFunction_ITU_R_709_2,
                         kCVAttachmentMode_ShouldPropagate);
   CVBufferSetAttachment(pixel_buffer, kCVImageBufferYCbCrMatrixKey,
                         kCVImageBufferYCbCrMatrix_ITU_R_709_2,
                         kCVAttachmentMode_ShouldPropagate);
 
   return pixel_buffer;
 }
 
 }  // namespace media