Changeset 285756 in webkit

Timestamp:

Nov 12, 2021, 3:54:38 PM (5 years ago)

Author:

Russell Epstein

Message:

Revert r285690. rdar://problem/83381842

Location:

branches/safari-612.3.6.1-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp (modified) (1 diff)
• WebProcess/Speech/SpeechRecognitionRealtimeMediaSourceManager.cpp (modified) (5 diffs)

branches/safari-612.3.6.1-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2021-11-12  Russell Epstein  <repstein@apple.com>
+
+        Revert r285690. rdar://problem/83381842
+
 2021-11-11  Alan Coon  <alancoon@apple.com>
 

branches/safari-612.3.6.1-branch/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp

@@ -78 +78 @@
 void SpeechRecognitionRemoteRealtimeMediaSource::setStorage(const SharedMemory::Handle& handle, const WebCore::CAAudioStreamDescription& description, uint64_t numberOfFrames)
 {
-    if (!numberOfFrames) {
-        m_ringBuffer = nullptr;
-        m_buffer = nullptr;
-        return;
-    }
+    m_description = description;
 
-    m_description = description;
     m_ringBuffer = WebCore::CARingBuffer::adoptStorage(makeUniqueRef<ReadOnlySharedRingBufferStorage>(handle), description, numberOfFrames).moveToUniquePtr();
     m_buffer = makeUnique<WebCore::WebAudioBufferList>(description);

branches/safari-612.3.6.1-branch/Source/WebKit/WebProcess/Speech/SpeechRecognitionRealtimeMediaSourceManager.cpp

@@ -64 +64 @@
         , m_connection(WTFMove(connection))
 #if PLATFORM(COCOA)
-        , m_ringBuffer(makeUniqueRef<SharedRingBufferStorage>(std::bind(&Source::storageChanged, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)))
+        , m_ringBuffer(makeUniqueRef<SharedRingBufferStorage>(std::bind(&Source::storageChanged, this, std::placeholders::_1)))
 #endif
     {
@@ -114 +114 @@
             ASSERT(description.platformDescription().type == PlatformDescription::CAAudioStreamBasicType);
             m_description = *WTF::get<const AudioStreamBasicDescription*>(description.platformDescription().description);
-            m_ringBuffer.allocate(m_description.streamDescription(), m_description.sampleRate() * 2);
+
+            m_numberOfFrames = m_description.sampleRate() * 2;
+            m_ringBuffer.allocate(m_description.streamDescription(), m_numberOfFrames);
         }
 
@@ -130 +132 @@
 #if PLATFORM(COCOA)
 
-    void storageChanged(SharedMemory* storage, const WebCore::CAAudioStreamDescription& description, size_t numberOfFrames)
+    void storageChanged(SharedMemory* storage)
     {
         DisableMallocRestrictionsForCurrentThreadScope scope;
@@ -141 +143 @@
         uint64_t dataSize = 0;
 #endif
-        m_connection->send(Messages::SpeechRecognitionRemoteRealtimeMediaSourceManager::SetStorage(m_identifier, SharedMemory::IPCHandle { WTFMove(handle),  dataSize }, description, numberOfFrames), 0);
+        m_connection->send(Messages::SpeechRecognitionRemoteRealtimeMediaSourceManager::SetStorage(m_identifier, SharedMemory::IPCHandle { WTFMove(handle),  dataSize }, m_description, m_numberOfFrames), 0);
     }
 
@@ -161 +163 @@
 
 #if PLATFORM(COCOA)
+    uint64_t m_numberOfFrames { 0 };
     CARingBuffer m_ringBuffer;
     CAAudioStreamDescription m_description { };