<!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>[286239] branches/safari-612-branch/Source/WebKit</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/286239">286239</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-11-29 11:38:11 -0800 (Mon, 29 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Revert <a href="http://trac.webkit.org/projects/webkit/changeset/285690">r285690</a>. rdar://problem/83381842</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612branchSourceWebKitChangeLog">branches/safari-612-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceWebKitUIProcessSpeechRecognitionRemoteRealtimeMediaSourcecpp">branches/safari-612-branch/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp</a></li>
<li><a href="#branchessafari612branchSourceWebKitWebProcessSpeechSpeechRecognitionRealtimeMediaSourceManagercpp">branches/safari-612-branch/Source/WebKit/WebProcess/Speech/SpeechRecognitionRealtimeMediaSourceManager.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebKit/ChangeLog (286238 => 286239)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebKit/ChangeLog       2021-11-29 19:38:08 UTC (rev 286238)
+++ branches/safari-612-branch/Source/WebKit/ChangeLog  2021-11-29 19:38:11 UTC (rev 286239)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2021-11-12  Russell Epstein  <repstein@apple.com>
+
+        Revert r285690. rdar://problem/83381842
+
</ins><span class="cx"> 2021-11-11  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r285565. rdar://problem/83159358
</span></span></pre></div>
<a id="branchessafari612branchSourceWebKitUIProcessSpeechRecognitionRemoteRealtimeMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp (286238 => 286239)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp        2021-11-29 19:38:08 UTC (rev 286238)
+++ branches/safari-612-branch/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp   2021-11-29 19:38:11 UTC (rev 286239)
</span><span class="lines">@@ -77,13 +77,8 @@
</span><span class="cx"> 
</span><span class="cx"> void SpeechRecognitionRemoteRealtimeMediaSource::setStorage(const SharedMemory::Handle& handle, const WebCore::CAAudioStreamDescription& description, uint64_t numberOfFrames)
</span><span class="cx"> {
</span><del>-    if (!numberOfFrames) {
-        m_ringBuffer = nullptr;
-        m_buffer = nullptr;
-        return;
-    }
</del><ins>+    m_description = description;
</ins><span class="cx"> 
</span><del>-    m_description = description;
</del><span class="cx">     m_ringBuffer = WebCore::CARingBuffer::adoptStorage(makeUniqueRef<ReadOnlySharedRingBufferStorage>(handle), description, numberOfFrames).moveToUniquePtr();
</span><span class="cx">     m_buffer = makeUnique<WebCore::WebAudioBufferList>(description);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari612branchSourceWebKitWebProcessSpeechSpeechRecognitionRealtimeMediaSourceManagercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebKit/WebProcess/Speech/SpeechRecognitionRealtimeMediaSourceManager.cpp (286238 => 286239)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebKit/WebProcess/Speech/SpeechRecognitionRealtimeMediaSourceManager.cpp       2021-11-29 19:38:08 UTC (rev 286238)
+++ branches/safari-612-branch/Source/WebKit/WebProcess/Speech/SpeechRecognitionRealtimeMediaSourceManager.cpp  2021-11-29 19:38:11 UTC (rev 286239)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">         , m_source(WTFMove(source))
</span><span class="cx">         , m_connection(WTFMove(connection))
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-        , m_ringBuffer(makeUniqueRef<SharedRingBufferStorage>(std::bind(&Source::storageChanged, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)))
</del><ins>+        , m_ringBuffer(makeUniqueRef<SharedRingBufferStorage>(std::bind(&Source::storageChanged, this, std::placeholders::_1)))
</ins><span class="cx"> #endif
</span><span class="cx">     {
</span><span class="cx">         m_source->addObserver(*this);
</span><span class="lines">@@ -113,7 +113,9 @@
</span><span class="cx">         if (m_description != description) {
</span><span class="cx">             ASSERT(description.platformDescription().type == PlatformDescription::CAAudioStreamBasicType);
</span><span class="cx">             m_description = *WTF::get<const AudioStreamBasicDescription*>(description.platformDescription().description);
</span><del>-            m_ringBuffer.allocate(m_description.streamDescription(), m_description.sampleRate() * 2);
</del><ins>+
+            m_numberOfFrames = m_description.sampleRate() * 2;
+            m_ringBuffer.allocate(m_description.streamDescription(), m_numberOfFrames);
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         ASSERT(is<WebAudioBufferList>(audioData));
</span><span class="lines">@@ -129,7 +131,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> 
</span><del>-    void storageChanged(SharedMemory* storage, const WebCore::CAAudioStreamDescription& description, size_t numberOfFrames)
</del><ins>+    void storageChanged(SharedMemory* storage)
</ins><span class="cx">     {
</span><span class="cx">         DisableMallocRestrictionsForCurrentThreadScope scope;
</span><span class="cx">         SharedMemory::Handle handle;
</span><span class="lines">@@ -140,7 +142,7 @@
</span><span class="cx"> #else
</span><span class="cx">         uint64_t dataSize = 0;
</span><span class="cx"> #endif
</span><del>-        m_connection->send(Messages::SpeechRecognitionRemoteRealtimeMediaSourceManager::SetStorage(m_identifier, SharedMemory::IPCHandle { WTFMove(handle),  dataSize }, description, numberOfFrames), 0);
</del><ins>+        m_connection->send(Messages::SpeechRecognitionRemoteRealtimeMediaSourceManager::SetStorage(m_identifier, SharedMemory::IPCHandle { WTFMove(handle),  dataSize }, m_description, m_numberOfFrames), 0);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> #endif
</span><span class="lines">@@ -160,6 +162,7 @@
</span><span class="cx">     Ref<IPC::Connection> m_connection;
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(COCOA)
</span><ins>+    uint64_t m_numberOfFrames { 0 };
</ins><span class="cx">     CARingBuffer m_ringBuffer;
</span><span class="cx">     CAAudioStreamDescription m_description { };
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>

</body>
</html>