<!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>[287571] branches/safari-613.1.12.1-branch/Source/WebCore</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/287571">287571</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2022-01-04 09:35:13 -0800 (Tue, 04 Jan 2022)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/286953">r286953</a>. rdar://problem/86837893

    Unreviewed build fix; add a convenience function to safely compare possibly null CFStringRefs.

    * platform/graphics/avfoundation/FormatDescriptionUtilities.cpp:
    (WebCore::presentationSizeFromFormatDescription):
    (WebCore::colorSpaceFromFormatDescription):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@286953 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6131121branchSourceWebCoreChangeLog">branches/safari-613.1.12.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6131121branchSourceWebCoreplatformgraphicsavfoundationFormatDescriptionUtilitiescpp">branches/safari-613.1.12.1-branch/Source/WebCore/platform/graphics/avfoundation/FormatDescriptionUtilities.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6131121branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.12.1-branch/Source/WebCore/ChangeLog (287570 => 287571)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.12.1-branch/Source/WebCore/ChangeLog       2022-01-04 17:31:27 UTC (rev 287570)
+++ branches/safari-613.1.12.1-branch/Source/WebCore/ChangeLog  2022-01-04 17:35:13 UTC (rev 287571)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2022-01-04  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r286953. rdar://problem/86837893
+
+    Unreviewed build fix; add a convenience function to safely compare possibly null CFStringRefs.
+    
+    
+    * platform/graphics/avfoundation/FormatDescriptionUtilities.cpp:
+    (WebCore::presentationSizeFromFormatDescription):
+    (WebCore::colorSpaceFromFormatDescription):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@286953 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-12-13  Jer Noble  <jer.noble@apple.com>
+
+            Unreviewed build fix; add a convenience function to safely compare possibly null CFStringRefs.
+
+            * platform/graphics/avfoundation/FormatDescriptionUtilities.cpp:
+            (WebCore::presentationSizeFromFormatDescription):
+            (WebCore::colorSpaceFromFormatDescription):
+
</ins><span class="cx"> 2021-12-16  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r287137. rdar://problem/86476583
</span></span></pre></div>
<a id="branchessafari6131121branchSourceWebCoreplatformgraphicsavfoundationFormatDescriptionUtilitiescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.12.1-branch/Source/WebCore/platform/graphics/avfoundation/FormatDescriptionUtilities.cpp (287570 => 287571)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.12.1-branch/Source/WebCore/platform/graphics/avfoundation/FormatDescriptionUtilities.cpp   2022-01-04 17:31:27 UTC (rev 287570)
+++ branches/safari-613.1.12.1-branch/Source/WebCore/platform/graphics/avfoundation/FormatDescriptionUtilities.cpp      2022-01-04 17:35:13 UTC (rev 287571)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> {
</span><span class="cx">     if (!formatDescription)
</span><span class="cx">         return { };
</span><del>-    
</del><ins>+
</ins><span class="cx">     return FloatSize(PAL::CMVideoFormatDescriptionGetPresentationDimensions(formatDescription, true, true));
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -58,29 +58,35 @@
</span><span class="cx">     if (!formatDescription)
</span><span class="cx">         return std::nullopt;
</span><span class="cx"> 
</span><ins>+    auto safeCFStringEquals = [] (CFStringRef one, CFStringRef two) -> bool {
+        if (!one || !two)
+            return false;
+        return CFStringCompare(one, two, 0) == kCFCompareEqualTo;
+    };
+
</ins><span class="cx">     PlatformVideoColorSpace colorSpace;
</span><span class="cx">     if (auto primaries = static_cast<CFStringRef>(PAL::CMFormatDescriptionGetExtension(formatDescription, PAL::get_CoreMedia_kCMFormatDescriptionExtension_ColorPrimaries()))) {
</span><del>-        if (CFStringCompare(primaries, PAL::get_CoreMedia_kCMFormatDescriptionColorPrimaries_ITU_R_709_2(), 0) == kCFCompareEqualTo)
</del><ins>+        if (safeCFStringEquals(primaries, PAL::get_CoreMedia_kCMFormatDescriptionColorPrimaries_ITU_R_709_2()))
</ins><span class="cx">             colorSpace.primaries = PlatformVideoColorPrimaries::Bt709;
</span><del>-        else if (CFStringCompare(primaries, PAL::get_CoreMedia_kCMFormatDescriptionColorPrimaries_EBU_3213(), 0) == kCFCompareEqualTo)
</del><ins>+        else if (safeCFStringEquals(primaries, PAL::get_CoreMedia_kCMFormatDescriptionColorPrimaries_EBU_3213()))
</ins><span class="cx">             colorSpace.primaries = PlatformVideoColorPrimaries::Bt470bg;
</span><del>-        else if (CFStringCompare(primaries, PAL::get_CoreMedia_kCMFormatDescriptionColorPrimaries_SMPTE_C(), 0) == kCFCompareEqualTo)
</del><ins>+        else if (safeCFStringEquals(primaries, PAL::get_CoreMedia_kCMFormatDescriptionColorPrimaries_SMPTE_C()))
</ins><span class="cx">             colorSpace.primaries = PlatformVideoColorPrimaries::Smpte170m;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (auto transfer = static_cast<CFStringRef>(PAL::CMFormatDescriptionGetExtension(formatDescription, PAL::get_CoreMedia_kCMFormatDescriptionExtension_TransferFunction()))) {
</span><del>-        if (CFStringCompare(transfer, PAL::get_CoreMedia_kCMFormatDescriptionTransferFunction_ITU_R_709_2(), 0) == kCFCompareEqualTo)
</del><ins>+        if (safeCFStringEquals(transfer, PAL::get_CoreMedia_kCMFormatDescriptionTransferFunction_ITU_R_709_2()))
</ins><span class="cx">             colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt709;
</span><del>-        else if (CFStringCompare(transfer, PAL::get_CoreMedia_kCMFormatDescriptionTransferFunction_sRGB(), 0) == kCFCompareEqualTo)
</del><ins>+        else if (safeCFStringEquals(transfer, PAL::get_CoreMedia_kCMFormatDescriptionTransferFunction_sRGB()))
</ins><span class="cx">             colorSpace.transfer = PlatformVideoTransferCharacteristics::Iec6196621;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (auto matrix = static_cast<CFStringRef>(PAL::CMFormatDescriptionGetExtension(formatDescription, PAL::get_CoreMedia_kCMFormatDescriptionExtension_YCbCrMatrix()))) {
</span><del>-        if (CFStringCompare(matrix, PAL::get_CoreMedia_kCVImageBufferYCbCrMatrix_ITU_R_709_2(), 0) == kCFCompareEqualTo)
</del><ins>+        if (safeCFStringEquals(matrix, PAL::get_CoreMedia_kCVImageBufferYCbCrMatrix_ITU_R_709_2()))
</ins><span class="cx">             colorSpace.matrix = PlatformVideoMatrixCoefficients::Bt709;
</span><del>-        else if (CFStringCompare(matrix, PAL::get_CoreMedia_kCVImageBufferYCbCrMatrix_ITU_R_601_4(), 0) == kCFCompareEqualTo)
</del><ins>+        else if (safeCFStringEquals(matrix, PAL::get_CoreMedia_kCVImageBufferYCbCrMatrix_ITU_R_601_4()))
</ins><span class="cx">             colorSpace.matrix = PlatformVideoMatrixCoefficients::Bt470bg;
</span><del>-        else if (CFStringCompare(matrix, PAL::get_CoreMedia_kCMFormatDescriptionYCbCrMatrix_SMPTE_240M_1995(), 0) == kCFCompareEqualTo)
</del><ins>+        else if (safeCFStringEquals(matrix, PAL::get_CoreMedia_kCMFormatDescriptionYCbCrMatrix_SMPTE_240M_1995()))
</ins><span class="cx">             colorSpace.matrix = PlatformVideoMatrixCoefficients::Smpte170m;
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>