Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (279022 => 279023)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2021-06-17 23:02:36 UTC (rev 279022)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2021-06-17 23:21:40 UTC (rev 279023)
@@ -1,3 +1,16 @@
+2021-06-17 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, reverting r279011.
+ https://bugs.webkit.org/show_bug.cgi?id=227153
+
+ broke ios build
+
+ Reverted changeset:
+
+ "[Mac] libwebrtc CMBaseClass objects need alignment fixup"
+ https://bugs.webkit.org/show_bug.cgi?id=227137
+ https://trac.webkit.org/changeset/279011
+
2021-06-17 Eric Carlson <eric.carl...@apple.com>
[Mac] libwebrtc CMBaseClass objects need alignment fixup
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP8Decoder.cpp (279022 => 279023)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP8Decoder.cpp 2021-06-17 23:02:36 UTC (rev 279022)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP8Decoder.cpp 2021-06-17 23:21:40 UTC (rev 279023)
@@ -48,34 +48,20 @@
static void finalizeVP8Decoder(CMBaseObjectRef);
static CFStringRef copyVP8DecoderDebugDescription(CMBaseObjectRef);
-#if defined(__x86_64__) || defined(_M_X64)
- constexpr size_t padSize = 4;
-#else
- constexpr size_t padSize = 0;
-#endif
+static const CMBaseClass WebKitVP8Decoder_BaseClass =
+{
+ kCMBaseObject_ClassVersion_1,
+ sizeof(WebKitVP8Decoder),
+ nullptr, // Comparison by pointer equality
+ invalidateVP8Decoder,
+ finalizeVP8Decoder,
+ copyVP8DecoderDebugDescription,
+ nullptr, // CopyProperty
+ nullptr, // SetProperty
+ nullptr,
+ nullptr
+};
-#pragma pack(push, 4)
- struct DecoderClass { uint8_t pad[padSize]; CMBaseClass alignedClass; } WebKitVP8Decoder_BaseClass { { }, {
- kCMBaseObject_ClassVersion_1,
- sizeof(WebKitVP8Decoder),
- nullptr, // Comparison by pointer equality
- invalidateVP8Decoder,
- finalizeVP8Decoder,
- copyVP8DecoderDebugDescription,
- nullptr, // CopyProperty
- nullptr, // SetProperty
- nullptr,
- nullptr
- } };
-#pragma pack(pop)
-
-#if defined(__x86_64__) || defined(_M_X64)
- static_assert(sizeof(WebKitVP8Decoder_BaseClass.alignedClass.version) != sizeof(void*), "CMBaseClass fixup is required on X86_64");
-#else
- static_assert(sizeof(WebKitVP8Decoder_BaseClass.alignedClass.version) == sizeof(void*), "CMBaseClass fixup only required on X86_64");
-#endif
- static_assert(alignof(DecoderClass) == 4, "CMBaseClass must have 4 byte alignment");
-
static OSStatus startVP8DecoderSession(VTVideoDecoderRef, VTVideoDecoderSession, CMVideoFormatDescriptionRef);
static OSStatus decodeVP8DecoderFrame(VTVideoDecoderRef, VTVideoDecoderFrame, CMSampleBufferRef, VTDecodeFrameFlags, VTDecodeInfoFlags*);
@@ -96,7 +82,7 @@
static const VTVideoDecoderVTable WebKitVP8DecoderVTable =
{
- { nullptr, &WebKitVP8Decoder_BaseClass.alignedClass },
+ { nullptr, &WebKitVP8Decoder_BaseClass },
&WebKitVP8Decoder_VideoDecoderClass
};
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP9Decoder.cpp (279022 => 279023)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP9Decoder.cpp 2021-06-17 23:02:36 UTC (rev 279022)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP9Decoder.cpp 2021-06-17 23:21:40 UTC (rev 279023)
@@ -48,34 +48,20 @@
static void finalizeVP9Decoder(CMBaseObjectRef);
static CFStringRef copyVP9DecoderDebugDescription(CMBaseObjectRef);
-#if defined(__x86_64__) || defined(_M_X64)
- constexpr size_t padSize = 4;
-#else
- constexpr size_t padSize = 0;
-#endif
+static const CMBaseClass WebKitVP9Decoder_BaseClass =
+{
+ kCMBaseObject_ClassVersion_1,
+ sizeof(WebKitVP9Decoder),
+ nullptr, // Comparison by pointer equality
+ invalidateVP9Decoder,
+ finalizeVP9Decoder,
+ copyVP9DecoderDebugDescription,
+ nullptr, // CopyProperty
+ nullptr, // SetProperty
+ nullptr,
+ nullptr
+};
-#pragma pack(push, 4)
- struct DecoderClass { uint8_t pad[padSize]; CMBaseClass alignedClass; } WebKitVP9Decoder_BaseClass { { }, {
- kCMBaseObject_ClassVersion_1,
- sizeof(WebKitVP9Decoder),
- nullptr, // Comparison by pointer equality
- invalidateVP9Decoder,
- finalizeVP9Decoder,
- copyVP9DecoderDebugDescription,
- nullptr, // CopyProperty
- nullptr, // SetProperty
- nullptr,
- nullptr
- } };
-#pragma pack(pop)
-
-#if defined(__x86_64__) || defined(_M_X64)
- static_assert(sizeof(WebKitVP9Decoder_BaseClass.alignedClass.version) != sizeof(void*), "CMBaseClass fixup is required on X86_64");
-#else
- static_assert(sizeof(WebKitVP9Decoder_BaseClass.alignedClass.version) == sizeof(void*), "CMBaseClass fixup only required on X86_64");
-#endif
- static_assert(alignof(DecoderClass) == 4, "CMBaseClass must have 4 byte alignment");
-
static OSStatus startVP9DecoderSession(VTVideoDecoderRef, VTVideoDecoderSession, CMVideoFormatDescriptionRef);
static OSStatus decodeVP9DecoderFrame(VTVideoDecoderRef, VTVideoDecoderFrame, CMSampleBufferRef, VTDecodeFrameFlags, VTDecodeInfoFlags*);
@@ -96,7 +82,7 @@
static const VTVideoDecoderVTable WebKitVP9DecoderVTable =
{
- { nullptr, &WebKitVP9Decoder_BaseClass.alignedClass },
+ { nullptr, &WebKitVP9Decoder_BaseClass },
&WebKitVP9Decoder_VideoDecoderClass
};
