[macOS Safari] Local and outgoing shared screen is not adjusted to the full screen when User resizes the shared window

rdar://161736839
https://bugs.webkit.org/show_bug.cgi?id=299955

Reviewed by Eric Carlson.

The offsets need to be computed based on the input buffer to get proper cropping.
We update ImageTransferSessionVT::setCroppingRectangle to take the intrinsic size as input to compute the proper offsets.
We update ScreenCaptureKitCaptureSource call site.

Manually tested.

* Source/WebCore/platform/graphics/cv/ImageTransferSessionVT.h:
(WebCore::ImageTransferSessionVT::setCroppingRectangle):
* Source/WebCore/platform/graphics/cv/ImageTransferSessionVT.mm:
(WebCore::ImageTransferSessionVT::setCroppingRectangle):
* Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.mm:
(WebCore::ScreenCaptureKitCaptureSource::streamDidOutputVideoSampleBuffer):

Canonical link: https://commits.webkit.org/301477@main

Author: youennf

Source/WebCore/platform/graphics/cv/ImageTransferSessionVT.h

@@ -70,7 +70,7 @@ class ImageTransferSessionVT {
     void setMaximumBufferPoolSize(size_t maxBufferPoolSize) { m_maxBufferPoolSize = maxBufferPoolSize; }
 
     RetainPtr<CMSampleBufferRef> convertCMSampleBuffer(CMSampleBufferRef, const IntSize&, const WTF::MediaTime* = nullptr);
-    void setCroppingRectangle(std::optional<FloatRect>);
+    void setCroppingRectangle(std::optional<FloatRect>, FloatSize = { });
 
 private:
     WEBCORE_EXPORT ImageTransferSessionVT(uint32_t pixelFormat, bool shouldUseIOSurface);

Source/WebCore/platform/graphics/cv/ImageTransferSessionVT.mm

@@ -75,23 +75,34 @@
     m_pixelFormat = pixelFormat;
 }
 
-void ImageTransferSessionVT::setCroppingRectangle(std::optional<FloatRect> rectangle)
+void ImageTransferSessionVT::setCroppingRectangle(std::optional<FloatRect> rectangle, FloatSize size)
 {
-    if (m_croppingRectangle == rectangle)
+    if (!rectangle) {
+        m_sourceCroppingDictionary = { };
         return;
+    }
 
-    m_croppingRectangle = rectangle;
+    auto width = rectangle->width();
+    auto height = rectangle->height();
+    // Offsets are relative from center of image buffer
+    auto horizontalOffset = rectangle->x() - size.width() / 2 + width / 2;
+    auto verticalOffset = rectangle->y() - size.height() / 2 + height / 2;
 
-    if (!m_croppingRectangle) {
-        m_sourceCroppingDictionary = { };
+    FloatRect apertureRectangle {
+        FloatPoint { horizontalOffset, verticalOffset },
+        FloatSize { width, height }
+    };
+
+    if (m_croppingRectangle == apertureRectangle)
         return;
-    }
+
+    m_croppingRectangle = apertureRectangle;
 
     m_sourceCroppingDictionary = @{
-        (__bridge NSString *)kCVImageBufferCleanApertureWidthKey: @(rectangle->width()),
-        (__bridge NSString *)kCVImageBufferCleanApertureHeightKey: @(rectangle->height()),
-        (__bridge NSString *)kCVImageBufferCleanApertureVerticalOffsetKey: @(rectangle->x()),
-        (__bridge NSString *)kCVImageBufferCleanApertureHorizontalOffsetKey: @(rectangle->y()),
+        (__bridge NSString *)kCVImageBufferCleanApertureWidthKey: @(apertureRectangle.width()),
+        (__bridge NSString *)kCVImageBufferCleanApertureHeightKey: @(apertureRectangle.height()),
+        (__bridge NSString *)kCVImageBufferCleanApertureVerticalOffsetKey: @(apertureRectangle.y()),
+        (__bridge NSString *)kCVImageBufferCleanApertureHorizontalOffsetKey: @(apertureRectangle.x()),
     };
 }
 

Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.mm

@@ -624,7 +624,7 @@ - (void)outputVideoEffectDidStopForStream:(SCStream *)stream
         if (!m_transferSession)
             m_transferSession = ImageTransferSessionVT::create(preferedPixelBufferFormat());
 
-        m_transferSession->setCroppingRectangle(contentRect);
+        m_transferSession->setCroppingRectangle(contentRect, intrinsicSize);
         if (auto newFrame = m_transferSession->convertCMSampleBuffer(m_currentFrame.get(), IntSize { contentRect.size() })) {
             m_currentFrame = WTFMove(newFrame);
             intrinsicSize = FloatSize(PAL::CMVideoFormatDescriptionGetPresentationDimensions(PAL::CMSampleBufferGetFormatDescription(m_currentFrame.get()), true, true));