Changeset 284433 in webkit

Timestamp:

Oct 18, 2021 8:43:17 PM (9 months ago)

Author:

Cameron McCormack

Message:

Always set color space for incoming H.264/265 streams
​https://bugs.webkit.org/show_bug.cgi?id=231881
<rdar://problem/84350707>

Reviewed by Youenn Fablet.

Followup from ​https://bugs.webkit.org/show_bug.cgi?id=231353. In some
configurations, the "ColorInfoGuessedBy" attachment is not set on the
CVPixelBuffers coming out of the VTDecompressionSession, but the
guessed, incorrect color space attachments are still there. Since we
currently always have an sRGB stream, don't bother looking for
"ColorInfoGuessedBy".

• Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm:

(overrideColorSpaceAttachments):
(decompressionOutputCallback):
(overrideColorSpaceAttachmentsIfNeeded): Deleted.

• Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH265.mm:

(overrideColorSpaceAttachments):
(h265DecompressionOutputCallback):
(overrideColorSpaceAttachmentsIfNeeded): Deleted.

Location:

trunk/Source/ThirdParty/libwebrtc

Files:

• ChangeLog (modified) (1 diff)
• Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm (modified) (2 diffs)
• Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH265.mm (modified) (2 diffs)

trunk/Source/ThirdParty/libwebrtc/ChangeLog

@@ +1 @@
+2021-10-18  Cameron McCormack  <heycam@apple.com>
+
+        Always set color space for incoming H.264/265 streams
+        https://bugs.webkit.org/show_bug.cgi?id=231881
+        <rdar://problem/84350707>
+
+        Reviewed by Youenn Fablet.
+
+        Followup from https://bugs.webkit.org/show_bug.cgi?id=231353. In some
+        configurations, the "ColorInfoGuessedBy" attachment is not set on the
+        CVPixelBuffers coming out of the VTDecompressionSession, but the
+        guessed, incorrect color space attachments are still there. Since we
+        currently always have an sRGB stream, don't bother looking for
+        "ColorInfoGuessedBy".
+
+        * Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm:
+        (overrideColorSpaceAttachments):
+        (decompressionOutputCallback):
+        (overrideColorSpaceAttachmentsIfNeeded): Deleted.
+        * Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH265.mm:
+        (overrideColorSpaceAttachments):
+        (h265DecompressionOutputCallback):
+        (overrideColorSpaceAttachmentsIfNeeded): Deleted.
+
 2021-10-14  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm

@@ -42 +42 @@
 @end
 
-static void overrideColorSpaceAttachmentsIfNeeded(CVImageBufferRef imageBuffer) {
-  auto guess = CVBufferGetAttachment(imageBuffer, (CFStringRef)@"ColorInfoGuessedBy", nullptr);
-  if (!guess || !CFEqual(guess, (CFStringRef)@"VideoToolbox"))
-    return;
-
+static void overrideColorSpaceAttachments(CVImageBufferRef imageBuffer) {
   CVBufferRemoveAttachment(imageBuffer, kCVImageBufferCGColorSpaceKey);
   CVBufferSetAttachment(imageBuffer, kCVImageBufferColorPrimariesKey, kCVImageBufferColorPrimaries_ITU_R_709_2, kCVAttachmentMode_ShouldPropagate);
@@ -70 +66 @@
   }
 
-  overrideColorSpaceAttachmentsIfNeeded(imageBuffer);
+  overrideColorSpaceAttachments(imageBuffer);
 
   std::unique_ptr<RTCFrameDecodeParams> decodeParams(reinterpret_cast<RTCFrameDecodeParams *>(params));

trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH265.mm

@@ -39 +39 @@
 @end
 
-static void overrideColorSpaceAttachmentsIfNeeded(CVImageBufferRef imageBuffer) {
-  auto guess = CVBufferGetAttachment(imageBuffer, (CFStringRef)@"ColorInfoGuessedBy", nullptr);
-  if (!guess || !CFEqual(guess, (CFStringRef)@"VideoToolbox"))
-    return;
-
+static void overrideColorSpaceAttachments(CVImageBufferRef imageBuffer) {
   CVBufferRemoveAttachment(imageBuffer, kCVImageBufferCGColorSpaceKey);
   CVBufferSetAttachment(imageBuffer, kCVImageBufferColorPrimariesKey, kCVImageBufferColorPrimaries_ITU_R_709_2, kCVAttachmentMode_ShouldPropagate);
@@ -67 +63 @@
   }
 
-  overrideColorSpaceAttachmentsIfNeeded(imageBuffer);
+  overrideColorSpaceAttachments(imageBuffer);
 
   std::unique_ptr<RTCH265FrameDecodeParams> decodeParams(reinterpret_cast<RTCH265FrameDecodeParams*>(params));