<!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>[286649] trunk/Source</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/286649">286649</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2021-12-08 02:08:35 -0800 (Wed, 08 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[MacCatalyst] Various build fixes
https://bugs.webkit.org/show_bug.cgi?id=233995

Unreviewed.

Source/WebCore:

No new tests because there is no behavior change.

* Modules/speech/cocoa/SpeechRecognizerCocoa.mm:
(WebCore::SpeechRecognizer::dataCaptured):
* platform/mediarecorder/cocoa/AudioSampleBufferCompressor.mm:
(WebCore::AudioSampleBufferCompressor::processSampleBuffersUntilLowWaterTime):

Source/WebKit:

* UIProcess/WebPageProxy.cpp:
(WebKit::mediaRelatedMachServices):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesspeechcocoaSpeechRecognizerCocoamm">trunk/Source/WebCore/Modules/speech/cocoa/SpeechRecognizerCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediarecordercocoaAudioSampleBufferCompressormm">trunk/Source/WebCore/platform/mediarecorder/cocoa/AudioSampleBufferCompressor.mm</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebPageProxycpp">trunk/Source/WebKit/UIProcess/WebPageProxy.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (286648 => 286649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-12-08 09:54:25 UTC (rev 286648)
+++ trunk/Source/WebCore/ChangeLog      2021-12-08 10:08:35 UTC (rev 286649)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-12-08  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [MacCatalyst] Various build fixes
+        https://bugs.webkit.org/show_bug.cgi?id=233995
+
+        Unreviewed.
+
+        No new tests because there is no behavior change.
+
+        * Modules/speech/cocoa/SpeechRecognizerCocoa.mm:
+        (WebCore::SpeechRecognizer::dataCaptured):
+        * platform/mediarecorder/cocoa/AudioSampleBufferCompressor.mm:
+        (WebCore::AudioSampleBufferCompressor::processSampleBuffersUntilLowWaterTime):
+
</ins><span class="cx"> 2021-12-08  Philippe Normand  <pnormand@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GStreamer] Enable mediaSourceInlinePainting
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesspeechcocoaSpeechRecognizerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/speech/cocoa/SpeechRecognizerCocoa.mm (286648 => 286649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/speech/cocoa/SpeechRecognizerCocoa.mm       2021-12-08 09:54:25 UTC (rev 286648)
+++ trunk/Source/WebCore/Modules/speech/cocoa/SpeechRecognizerCocoa.mm  2021-12-08 10:08:35 UTC (rev 286649)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #import "WebSpeechRecognizerTaskMock.h"
</span><span class="cx"> #import <Speech/Speech.h>
</span><span class="cx"> #import <pal/avfoundation/MediaTimeAVFoundation.h>
</span><ins>+#import <pal/cf/CoreMediaSoftLink.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="lines">@@ -41,7 +42,7 @@
</span><span class="cx"> {
</span><span class="cx">     auto buffer = createAudioSampleBuffer(data, description, m_currentAudioSampleTime, sampleCount);
</span><span class="cx">     [m_task audioSamplesAvailable:buffer.get()];
</span><del>-    m_currentAudioSampleTime = CMTimeAdd(m_currentAudioSampleTime, PAL::toCMTime(MediaTime(sampleCount, description.sampleRate())));
</del><ins>+    m_currentAudioSampleTime = PAL::CMTimeAdd(m_currentAudioSampleTime, PAL::toCMTime(MediaTime(sampleCount, description.sampleRate())));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool SpeechRecognizer::startRecognition(bool mockSpeechRecognitionEnabled, SpeechRecognitionConnectionClientIdentifier identifier, const String& localeIdentifier, bool continuous, bool interimResults, uint64_t alternatives)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediarecordercocoaAudioSampleBufferCompressormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediarecorder/cocoa/AudioSampleBufferCompressor.mm (286648 => 286649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediarecorder/cocoa/AudioSampleBufferCompressor.mm 2021-12-08 09:54:25 UTC (rev 286648)
+++ trunk/Source/WebCore/platform/mediarecorder/cocoa/AudioSampleBufferCompressor.mm    2021-12-08 10:08:35 UTC (rev 286649)
</span><span class="lines">@@ -491,10 +491,10 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         CMTime nativeDuration = CMSampleBufferGetDuration(buffer.get());
</span><del>-        m_currentNativePresentationTimeStamp = CMTimeAdd(m_currentNativePresentationTimeStamp, nativeDuration);
</del><ins>+        m_currentNativePresentationTimeStamp = PAL::CMTimeAdd(m_currentNativePresentationTimeStamp, nativeDuration);
</ins><span class="cx"> 
</span><span class="cx">         CMTime outputDuration = CMSampleBufferGetOutputDuration(buffer.get());
</span><del>-        m_currentOutputPresentationTimeStamp = CMTimeAdd(m_currentOutputPresentationTimeStamp, outputDuration);
</del><ins>+        m_currentOutputPresentationTimeStamp = PAL::CMTimeAdd(m_currentOutputPresentationTimeStamp, outputDuration);
</ins><span class="cx"> 
</span><span class="cx">         error = CMBufferQueueEnqueue(m_outputBufferQueue.get(), buffer.get());
</span><span class="cx">         if (error) {
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (286648 => 286649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-12-08 09:54:25 UTC (rev 286648)
+++ trunk/Source/WebKit/ChangeLog       2021-12-08 10:08:35 UTC (rev 286649)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-12-08  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [MacCatalyst] Various build fixes
+        https://bugs.webkit.org/show_bug.cgi?id=233995
+
+        Unreviewed.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::mediaRelatedMachServices):
+
</ins><span class="cx"> 2021-12-07  Aditya Keerthi  <akeerthi@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [iOS] Add initial support for find-in-page SPI
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (286648 => 286649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp   2021-12-08 09:54:25 UTC (rev 286648)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp      2021-12-08 10:08:35 UTC (rev 286649)
</span><span class="lines">@@ -8131,7 +8131,7 @@
</span><span class="cx">         "com.apple.audio.audiohald"_s, "com.apple.audio.SandboxHelper"_s, "com.apple.coremedia.endpointstream.xpc"_s, "com.apple.coremedia.endpointplaybacksession.xpc"_s,
</span><span class="cx">         "com.apple.coremedia.endpointremotecontrolsession.xpc"_s, "com.apple.coremedia.videodecoder"_s,
</span><span class="cx">         "com.apple.coremedia.videoencoder"_s, "com.apple.lskdd"_s, "com.apple.trustd.agent"_s,
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED > 120000
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 120000
</ins><span class="cx">         "com.apple.coremedia.samplebufferconsumer.xpc"_s,
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>

</body>
</html>