<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[279124] branches/safari-611-branch/Source/ThirdParty/libwebrtc</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/279124">279124</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2021-06-22 10:36:55 -0700 (Tue, 22 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Revert <a href="http://trac.webkit.org/projects/webkit/changeset/279011">r279011</a>. rdar://problem/79474211

This reverts commit <a href="http://trac.webkit.org/projects/webkit/changeset/279021">r279021</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari611branchSourceThirdPartylibwebrtcChangeLog">branches/safari-611-branch/Source/ThirdParty/libwebrtc/ChangeLog</a></li>
<li><a href="#branchessafari611branchSourceThirdPartylibwebrtcSourcewebrtcsdkWebKitWebKitVP8Decodercpp">branches/safari-611-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP8Decoder.cpp</a></li>
<li><a href="#branchessafari611branchSourceThirdPartylibwebrtcSourcewebrtcsdkWebKitWebKitVP9Decodercpp">branches/safari-611-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP9Decoder.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari611branchSourceThirdPartylibwebrtcChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-611-branch/Source/ThirdParty/libwebrtc/ChangeLog (279123 => 279124)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-611-branch/Source/ThirdParty/libwebrtc/ChangeLog 2021-06-22 17:30:16 UTC (rev 279123)
+++ branches/safari-611-branch/Source/ThirdParty/libwebrtc/ChangeLog    2021-06-22 17:36:55 UTC (rev 279124)
</span><span class="lines">@@ -1,36 +1,3 @@
</span><del>-2021-06-17  Alan Coon  <alancoon@apple.com>
-
-        Cherry-pick r279011. rdar://problem/79474211
-
-    [Mac] libwebrtc CMBaseClass objects need alignment fixup
-    https://bugs.webkit.org/show_bug.cgi?id=227137
-    
-    Reviewed by Youenn Fablet.
-    
-    * Source/webrtc/sdk/WebKit/WebKitVP8Decoder.cpp:
-    (webrtc::createWebKitVP8Decoder): Add padding to the CMBaseClass object on x86_64
-    so function pointers are naturally aligned. Add static_asserts to ensure alignment
-    and sizes are correct.
-    * Source/webrtc/sdk/WebKit/WebKitVP9Decoder.cpp:
-    (webrtc::createWebKitVP9Decoder): Ditto.
-    
-    
-    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@279011 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
-    2021-06-17  Eric Carlson  <eric.carlson@apple.com>
-
-            [Mac] libwebrtc CMBaseClass objects need alignment fixup
-            https://bugs.webkit.org/show_bug.cgi?id=227137
-
-            Reviewed by Youenn Fablet.
-
-            * Source/webrtc/sdk/WebKit/WebKitVP8Decoder.cpp:
-            (webrtc::createWebKitVP8Decoder): Add padding to the CMBaseClass object on x86_64
-            so function pointers are naturally aligned. Add static_asserts to ensure alignment
-            and sizes are correct.
-            * Source/webrtc/sdk/WebKit/WebKitVP9Decoder.cpp:
-            (webrtc::createWebKitVP9Decoder): Ditto.
-
</del><span class="cx"> 2021-06-15  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r278410. rdar://problem/79355285
</span></span></pre></div>
<a id="branchessafari611branchSourceThirdPartylibwebrtcSourcewebrtcsdkWebKitWebKitVP8Decodercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-611-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP8Decoder.cpp (279123 => 279124)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-611-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP8Decoder.cpp     2021-06-22 17:30:16 UTC (rev 279123)
+++ branches/safari-611-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP8Decoder.cpp        2021-06-22 17:36:55 UTC (rev 279124)
</span><span class="lines">@@ -47,34 +47,20 @@
</span><span class="cx"> static void finalizeVP8Decoder(CMBaseObjectRef);
</span><span class="cx"> static CFStringRef copyVP8DecoderDebugDescription(CMBaseObjectRef);
</span><span class="cx"> 
</span><del>-#if defined(__x86_64__) || defined(_M_X64)
-    constexpr size_t padSize = 4;
-#else
-    constexpr size_t padSize = 0;
-#endif
</del><ins>+static const CMBaseClass WebKitVP8Decoder_BaseClass =
+{
+    kCMBaseObject_ClassVersion_1,
+    sizeof(WebKitVP8Decoder),
+    nullptr, // Comparison by pointer equality
+    invalidateVP8Decoder,
+    finalizeVP8Decoder,
+    copyVP8DecoderDebugDescription,
+    nullptr, // CopyProperty
+    nullptr, // SetProperty
+    nullptr,
+    nullptr
+};
</ins><span class="cx"> 
</span><del>-#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");
-
</del><span class="cx"> static OSStatus startVP8DecoderSession(VTVideoDecoderRef, VTVideoDecoderSession, CMVideoFormatDescriptionRef);
</span><span class="cx"> static OSStatus decodeVP8DecoderFrame(VTVideoDecoderRef, VTVideoDecoderFrame, CMSampleBufferRef, VTDecodeFrameFlags, VTDecodeInfoFlags*);
</span><span class="cx"> 
</span><span class="lines">@@ -95,7 +81,7 @@
</span><span class="cx"> 
</span><span class="cx"> static const VTVideoDecoderVTable WebKitVP8DecoderVTable =
</span><span class="cx"> {
</span><del>-    { nullptr, &WebKitVP8Decoder_BaseClass.alignedClass },
</del><ins>+    { nullptr, &WebKitVP8Decoder_BaseClass },
</ins><span class="cx">     &WebKitVP8Decoder_VideoDecoderClass
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari611branchSourceThirdPartylibwebrtcSourcewebrtcsdkWebKitWebKitVP9Decodercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-611-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP9Decoder.cpp (279123 => 279124)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-611-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP9Decoder.cpp     2021-06-22 17:30:16 UTC (rev 279123)
+++ branches/safari-611-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP9Decoder.cpp        2021-06-22 17:36:55 UTC (rev 279124)
</span><span class="lines">@@ -47,34 +47,20 @@
</span><span class="cx"> static void finalizeVP9Decoder(CMBaseObjectRef);
</span><span class="cx"> static CFStringRef copyVP9DecoderDebugDescription(CMBaseObjectRef);
</span><span class="cx"> 
</span><del>-#if defined(__x86_64__) || defined(_M_X64)
-    constexpr size_t padSize = 4;
-#else
-    constexpr size_t padSize = 0;
-#endif
</del><ins>+static const CMBaseClass WebKitVP9Decoder_BaseClass =
+{
+    kCMBaseObject_ClassVersion_1,
+    sizeof(WebKitVP9Decoder),
+    nullptr, // Comparison by pointer equality
+    invalidateVP9Decoder,
+    finalizeVP9Decoder,
+    copyVP9DecoderDebugDescription,
+    nullptr, // CopyProperty
+    nullptr, // SetProperty
+    nullptr,
+    nullptr
+};
</ins><span class="cx"> 
</span><del>-#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");
-
</del><span class="cx"> static OSStatus startVP9DecoderSession(VTVideoDecoderRef, VTVideoDecoderSession, CMVideoFormatDescriptionRef);
</span><span class="cx"> static OSStatus decodeVP9DecoderFrame(VTVideoDecoderRef, VTVideoDecoderFrame, CMSampleBufferRef, VTDecodeFrameFlags, VTDecodeInfoFlags*);
</span><span class="cx"> 
</span><span class="lines">@@ -95,7 +81,7 @@
</span><span class="cx"> 
</span><span class="cx"> static const VTVideoDecoderVTable WebKitVP9DecoderVTable =
</span><span class="cx"> {
</span><del>-    { nullptr, &WebKitVP9Decoder_BaseClass.alignedClass },
</del><ins>+    { nullptr, &WebKitVP9Decoder_BaseClass },
</ins><span class="cx">     &WebKitVP9Decoder_VideoDecoderClass
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>