Changeset 285928 in webkit

Timestamp:

Nov 17, 2021 6:52:21 AM (8 months ago)

Author:

youenn@apple.com

Message:

Safari 15.1 H264 FullHD video encode/decode fails
​https://bugs.webkit.org/show_bug.cgi?id=233036
<rdar://80345048>

Reviewed by Eric Carlson.

Source/ThirdParty/libwebrtc:

H264 encoder now checks the profile and fails if frame is too big.
To get back to the past behavior, we are now using auto level for both ARM64 devices as well as devices with Monterey OS.

• Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.h:
• Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm:

LayoutTests:

• platform/mac-wk2/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk2/TestExpectations (modified) (1 diff)
• Source/ThirdParty/libwebrtc/ChangeLog (modified) (1 diff)
• Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.h (modified) (2 diffs)
• Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-11-17  Youenn Fablet  <youenn@apple.com>
+
+        Safari 15.1 H264 FullHD video encode/decode fails
+        https://bugs.webkit.org/show_bug.cgi?id=233036
+        <rdar://80345048>
+
+        Reviewed by Eric Carlson.
+
+        * platform/mac-wk2/TestExpectations:
+
 2021-11-17  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -1494 +1494 @@
 webkit.org/b/227639 [ BigSur Release ] fast/history/visited-href-mutation.html [ Pass ImageOnlyFailure ]
 
-# rdar://80345048 ([ Monterey wk2 ] webrtc/h264-high.html is a constant timeout)
-[ Monterey ] webrtc/h264-high.html [ Timeout ]
-
 # rdar://80346382 ([ Monterey Release wk2 arm64 ] platform/mac/fast/overflow/overflow-scrollbar-hit-test.html is a flaky crash)
 [ Monterey arm64 ] platform/mac/fast/overflow/overflow-scrollbar-hit-test.html [ Failure Crash ]

trunk/Source/ThirdParty/libwebrtc/ChangeLog

@@ +1 @@
+2021-11-17  Youenn Fablet  <youenn@apple.com>
+
+        Safari 15.1 H264 FullHD video encode/decode fails
+        https://bugs.webkit.org/show_bug.cgi?id=233036
+        <rdar://80345048>
+
+        Reviewed by Eric Carlson.
+
+        H264 encoder now checks the profile and fails if frame is too big.
+        To get back to the past behavior, we are now using auto level for both ARM64 devices as well as devices with Monterey OS.
+
+        * Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.h:
+        * Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm:
+
 2021-11-10  Youenn Fablet  <youenn@apple.com> and Victor M. Jaquez L. <vjaquez@igalia.com>
 

trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.h

@@ -46 +46 @@
 #define HAVE_VTB_REQUIREDLOWLATENCY __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000
 #define ENABLE_VCP_FOR_H264_BASELINE __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000
+#define ENABLE_H264_HIGHPROFILE_AUTOLEVEL __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000
 #endif
 
@@ -59 +60 @@
 #if !defined(ENABLE_VCP_FOR_H264_BASELINE)
 #define ENABLE_VCP_FOR_H264_BASELINE 0
+#endif
+
+#if !defined(ENABLE_H264_HIGHPROFILE_AUTOLEVEL)
+#if defined(WEBRTC_ARCH_ARM64)
+#define ENABLE_H264_HIGHPROFILE_AUTOLEVEL 1
+#else
+#define ENABLE_H264_HIGHPROFILE_AUTOLEVEL 0
+#endif
 #endif
 

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

@@ -261 +261 @@
     case webrtc::H264Profile::kProfileConstrainedHigh:
     case webrtc::H264Profile::kProfileHigh:
-#if !defined(WEBRTC_ARCH_ARM64)
+#if !ENABLE_H264_HIGHPROFILE_AUTOLEVEL
       switch (profile_level_id.level) {
         case webrtc::H264Level::kLevel3: