Diff
Modified: trunk/Source/WebCore/ChangeLog (271040 => 271041)
--- trunk/Source/WebCore/ChangeLog 2020-12-21 21:59:00 UTC (rev 271040)
+++ trunk/Source/WebCore/ChangeLog 2020-12-21 22:31:35 UTC (rev 271041)
@@ -1,3 +1,24 @@
+2020-12-21 Chris Dumez <[email protected]>
+
+ Simplify CARingBuffer usage with SharedMemory storage
+ https://bugs.webkit.org/show_bug.cgi?id=220047
+
+ Reviewed by Geoff Garen.
+
+ Simplify CARingBuffer usage with SharedMemory storage:
+ 1. There are now 2 storage types:
+ - ReadOnlySharedRingBufferStorage: Used by the reader
+ - SharedRingBufferStorage: Used by the writer
+ One type inherits the other. This allows the API to be a bit
+ clearer and we can drop the m_readyOnly flag.
+ 2. Drop SharedRingBufferStorage::updateReadOnlyStorage() function. Instead, the reader
+ can now construct a new ReadOnlySharedRingBufferStorage directly of the SharedMemory
+ handle and pass it to the CARingBuffer constructor.
+
+ * platform/audio/cocoa/CARingBuffer.cpp:
+ (WebCore::CARingBuffer::CARingBuffer):
+ * platform/audio/cocoa/CARingBuffer.h:
+
2020-12-21 Ryan Haddad <[email protected]>
Unreviewed, reverting r270939 and r270952.
Modified: trunk/Source/WebCore/platform/audio/cocoa/CARingBuffer.cpp (271040 => 271041)
--- trunk/Source/WebCore/platform/audio/cocoa/CARingBuffer.cpp 2020-12-21 21:59:00 UTC (rev 271040)
+++ trunk/Source/WebCore/platform/audio/cocoa/CARingBuffer.cpp 2020-12-21 22:31:35 UTC (rev 271041)
@@ -58,6 +58,12 @@
{
}
+CARingBuffer::CARingBuffer(UniqueRef<CARingBufferStorage>&& storage, const CAAudioStreamDescription& format, size_t frameCount)
+ : m_buffers(WTFMove(storage))
+{
+ allocate(format, frameCount);
+}
+
void CARingBuffer::allocate(const CAAudioStreamDescription& format, size_t frameCount)
{
m_description = format;
Modified: trunk/Source/WebCore/platform/audio/cocoa/CARingBuffer.h (271040 => 271041)
--- trunk/Source/WebCore/platform/audio/cocoa/CARingBuffer.h 2020-12-21 21:59:00 UTC (rev 271040)
+++ trunk/Source/WebCore/platform/audio/cocoa/CARingBuffer.h 2020-12-21 22:31:35 UTC (rev 271041)
@@ -90,7 +90,8 @@
WTF_MAKE_FAST_ALLOCATED;
public:
WEBCORE_EXPORT CARingBuffer();
- WEBCORE_EXPORT CARingBuffer(UniqueRef<CARingBufferStorage>&&);
+ WEBCORE_EXPORT explicit CARingBuffer(UniqueRef<CARingBufferStorage>&&);
+ WEBCORE_EXPORT CARingBuffer(UniqueRef<CARingBufferStorage>&&, const CAAudioStreamDescription&, size_t frameCount);
WEBCORE_EXPORT ~CARingBuffer();
enum Error {
Modified: trunk/Source/WebKit/ChangeLog (271040 => 271041)
--- trunk/Source/WebKit/ChangeLog 2020-12-21 21:59:00 UTC (rev 271040)
+++ trunk/Source/WebKit/ChangeLog 2020-12-21 22:31:35 UTC (rev 271041)
@@ -1,3 +1,54 @@
+2020-12-21 Chris Dumez <[email protected]>
+
+ Simplify CARingBuffer usage with SharedMemory storage
+ https://bugs.webkit.org/show_bug.cgi?id=220047
+
+ Reviewed by Geoff Garen.
+
+ Simplify CARingBuffer usage with SharedMemory storage:
+ 1. There are now 2 storage types:
+ - ReadOnlySharedRingBufferStorage: Used by the reader
+ - SharedRingBufferStorage: Used by the writer
+ One type inherits the other. This allows the API to be a bit
+ clearer and we can drop the m_readyOnly flag.
+ 2. Drop SharedRingBufferStorage::updateReadOnlyStorage() function. Instead, the reader
+ can now construct a new ReadOnlySharedRingBufferStorage directly of the SharedMemory
+ handle and pass it to the CARingBuffer constructor.
+
+ * GPUProcess/media/RemoteAudioDestinationManager.cpp:
+ (WebKit::RemoteAudioDestination::audioSamplesStorageChanged):
+ (WebKit::RemoteAudioDestination::RemoteAudioDestination):
+ * GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.cpp:
+ (WebKit::RemoteAudioMediaStreamTrackRenderer::RemoteAudioMediaStreamTrackRenderer):
+ (WebKit::RemoteAudioMediaStreamTrackRenderer::audioSamplesStorageChanged):
+ * GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.h:
+ * GPUProcess/webrtc/RemoteMediaRecorder.cpp:
+ (WebKit::RemoteMediaRecorder::RemoteMediaRecorder):
+ (WebKit::RemoteMediaRecorder::audioSamplesStorageChanged):
+ * GPUProcess/webrtc/RemoteMediaRecorder.h:
+ * Shared/Cocoa/SharedRingBufferStorage.cpp:
+ (WebKit::ReadOnlySharedRingBufferStorage::ReadOnlySharedRingBufferStorage):
+ (WebKit::ReadOnlySharedRingBufferStorage::data):
+ (WebKit::ReadOnlySharedRingBufferStorage::sharedFrameBounds const):
+ (WebKit::ReadOnlySharedRingBufferStorage::getCurrentFrameBounds):
+ (WebKit::ReadOnlySharedRingBufferStorage::flush):
+ (WebKit::ReadOnlySharedRingBufferStorage::updateFrameBounds):
+ (WebKit::SharedRingBufferStorage::setStorage):
+ (WebKit::SharedRingBufferStorage::allocate):
+ (WebKit::SharedRingBufferStorage::deallocate):
+ (WebKit::SharedRingBufferStorage::setCurrentFrameBounds):
+ * Shared/Cocoa/SharedRingBufferStorage.h:
+ (WebKit::ReadOnlySharedRingBufferStorage::storage const):
+ * UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp:
+ (WebKit::m_ringBuffer):
+ (WebKit::SpeechRecognitionRemoteRealtimeMediaSource::setStorage):
+ * WebProcess/GPU/media/RemoteAudioSourceProviderManager.cpp:
+ (WebKit::RemoteAudioSourceProviderManager::RemoteAudio::RemoteAudio):
+ (WebKit::RemoteAudioSourceProviderManager::RemoteAudio::setStorage):
+ * WebProcess/cocoa/RemoteCaptureSampleManager.cpp:
+ (WebKit::RemoteCaptureSampleManager::RemoteAudio::RemoteAudio):
+ (WebKit::RemoteCaptureSampleManager::RemoteAudio::setStorage):
+
2020-12-21 Alex Christensen <[email protected]>
Retain IPC::Connection when using it when making a NetworkDataTask
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteAudioDestinationManager.cpp (271040 => 271041)
--- trunk/Source/WebKit/GPUProcess/media/RemoteAudioDestinationManager.cpp 2020-12-21 21:59:00 UTC (rev 271040)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteAudioDestinationManager.cpp 2020-12-21 22:31:35 UTC (rev 271041)
@@ -72,7 +72,7 @@
void audioSamplesStorageChanged(const SharedMemory::IPCHandle& ipcHandle, const WebCore::CAAudioStreamDescription& description, uint64_t numberOfFrames)
{
- storage().updateReadOnlyStorage(m_ringBuffer.get(), ipcHandle.handle, description, numberOfFrames);
+ m_ringBuffer = makeUniqueRef<WebCore::CARingBuffer>(makeUniqueRef<ReadOnlySharedRingBufferStorage>(ipcHandle.handle), description, numberOfFrames);
}
#endif
@@ -108,7 +108,7 @@
: m_id(identifier)
#if PLATFORM(COCOA)
, m_audioOutputUnitAdaptor(*this)
- , m_ringBuffer(makeUniqueRef<WebCore::CARingBuffer>(makeUniqueRef<SharedRingBufferStorage>()))
+ , m_ringBuffer(makeUniqueRef<WebCore::CARingBuffer>())
#endif
{
#if PLATFORM(COCOA)
@@ -117,11 +117,6 @@
}
#if PLATFORM(COCOA)
- SharedRingBufferStorage& storage()
- {
- return static_cast<SharedRingBufferStorage&>(m_ringBuffer->storage());
- }
-
OSStatus render(double sampleTime, uint64_t hostTime, UInt32 numberOfFrames, AudioBufferList* ioData)
{
ASSERT(!isMainThread());
Modified: trunk/Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.cpp (271040 => 271041)
--- trunk/Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.cpp 2020-12-21 21:59:00 UTC (rev 271040)
+++ trunk/Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.cpp 2020-12-21 22:31:35 UTC (rev 271041)
@@ -57,7 +57,7 @@
RemoteAudioMediaStreamTrackRenderer::RemoteAudioMediaStreamTrackRenderer(RemoteAudioMediaStreamTrackRendererManager& manager)
: m_manager(manager)
, m_renderer(WebCore::AudioMediaStreamTrackRenderer::create())
- , m_ringBuffer(makeUniqueRef<CARingBuffer>(makeUniqueRef<SharedRingBufferStorage>()))
+ , m_ringBuffer(makeUniqueRef<CARingBuffer>())
{
ASSERT(m_renderer);
@@ -75,11 +75,6 @@
m_renderer->clear();
}
-SharedRingBufferStorage& RemoteAudioMediaStreamTrackRenderer::storage()
-{
- return static_cast<SharedRingBufferStorage&>(m_ringBuffer->storage());
-}
-
void RemoteAudioMediaStreamTrackRenderer::start()
{
m_renderer->start();
@@ -105,8 +100,7 @@
MESSAGE_CHECK(WebAudioBufferList::isSupportedDescription(description, numberOfFrames));
m_description = description;
- storage().updateReadOnlyStorage(m_ringBuffer.get(), ipcHandle.handle, description, numberOfFrames);
-
+ m_ringBuffer = makeUniqueRef<CARingBuffer>(makeUniqueRef<ReadOnlySharedRingBufferStorage>(ipcHandle.handle), description, numberOfFrames);
m_audioBufferList = makeUnique<WebAudioBufferList>(m_description);
}
Modified: trunk/Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.h (271040 => 271041)
--- trunk/Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.h 2020-12-21 21:59:00 UTC (rev 271040)
+++ trunk/Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.h 2020-12-21 22:31:35 UTC (rev 271041)
@@ -61,8 +61,6 @@
void audioSamplesStorageChanged(const SharedMemory::IPCHandle&, const WebCore::CAAudioStreamDescription&, uint64_t numberOfFrames);
void audioSamplesAvailable(MediaTime, uint64_t numberOfFrames);
- SharedRingBufferStorage& storage();
-
RemoteAudioMediaStreamTrackRendererManager& m_manager;
std::unique_ptr<WebCore::AudioMediaStreamTrackRenderer> m_renderer;
WebCore::CAAudioStreamDescription m_description;
Modified: trunk/Source/WebKit/GPUProcess/webrtc/RemoteMediaRecorder.cpp (271040 => 271041)
--- trunk/Source/WebKit/GPUProcess/webrtc/RemoteMediaRecorder.cpp 2020-12-21 21:59:00 UTC (rev 271040)
+++ trunk/Source/WebKit/GPUProcess/webrtc/RemoteMediaRecorder.cpp 2020-12-21 22:31:35 UTC (rev 271041)
@@ -56,7 +56,7 @@
, m_writer(WTFMove(writer))
{
if (recordAudio)
- m_ringBuffer = makeUnique<CARingBuffer>(makeUniqueRef<SharedRingBufferStorage>());
+ m_ringBuffer = makeUnique<CARingBuffer>();
}
RemoteMediaRecorder::~RemoteMediaRecorder()
@@ -63,11 +63,6 @@
{
}
-SharedRingBufferStorage& RemoteMediaRecorder::storage()
-{
- return static_cast<SharedRingBufferStorage&>(m_ringBuffer->storage());
-}
-
void RemoteMediaRecorder::audioSamplesStorageChanged(const SharedMemory::IPCHandle& ipcHandle, const WebCore::CAAudioStreamDescription& description, uint64_t numberOfFrames)
{
MESSAGE_CHECK(m_ringBuffer);
@@ -74,7 +69,7 @@
m_description = description;
- storage().updateReadOnlyStorage(*m_ringBuffer, ipcHandle.handle, description, numberOfFrames);
+ m_ringBuffer = makeUnique<CARingBuffer>(makeUniqueRef<ReadOnlySharedRingBufferStorage>(ipcHandle.handle), description, numberOfFrames);
m_audioBufferList = makeUnique<WebAudioBufferList>(m_description);
}
Modified: trunk/Source/WebKit/GPUProcess/webrtc/RemoteMediaRecorder.h (271040 => 271041)
--- trunk/Source/WebKit/GPUProcess/webrtc/RemoteMediaRecorder.h 2020-12-21 21:59:00 UTC (rev 271040)
+++ trunk/Source/WebKit/GPUProcess/webrtc/RemoteMediaRecorder.h 2020-12-21 22:31:35 UTC (rev 271041)
@@ -77,8 +77,6 @@
void pause(CompletionHandler<void()>&&);
void resume(CompletionHandler<void()>&&);
- SharedRingBufferStorage& storage();
-
GPUConnectionToWebProcess& m_gpuConnectionToWebProcess;
MediaRecorderIdentifier m_identifier;
Ref<WebCore::MediaRecorderPrivateWriter> m_writer;
Modified: trunk/Source/WebKit/Shared/Cocoa/SharedRingBufferStorage.cpp (271040 => 271041)
--- trunk/Source/WebKit/Shared/Cocoa/SharedRingBufferStorage.cpp 2020-12-21 21:59:00 UTC (rev 271040)
+++ trunk/Source/WebKit/Shared/Cocoa/SharedRingBufferStorage.cpp 2020-12-21 22:31:35 UTC (rev 271041)
@@ -32,69 +32,74 @@
namespace WebKit {
-void SharedRingBufferStorage::setStorage(RefPtr<SharedMemory>&& storage, const CAAudioStreamDescription& format, size_t frameCount)
+ReadOnlySharedRingBufferStorage::ReadOnlySharedRingBufferStorage(const SharedMemory::Handle& handle)
+ : m_storage(SharedMemory::map(handle, SharedMemory::Protection::ReadOnly))
{
- ASSERT(storage || !m_readOnly);
- m_storage = WTFMove(storage);
- if (m_storageChangedHandler)
- m_storageChangedHandler(m_storage.get(), format, frameCount);
}
-void SharedRingBufferStorage::updateReadOnlyStorage(WebCore::CARingBuffer& ringBuffer, const SharedMemory::Handle& handle, const CAAudioStreamDescription& format, size_t frameCount)
+void* ReadOnlySharedRingBufferStorage::data()
{
- if (handle.isNull()) {
- ringBuffer.deallocate();
- m_readOnly = false;
- m_storage = nullptr;
- return;
- }
+ return m_storage ? static_cast<Byte*>(m_storage->data()) + sizeof(FrameBounds) : nullptr;
+}
- auto memory = SharedMemory::map(handle, SharedMemory::Protection::ReadOnly);
- m_storage = WTFMove(memory);
- m_readOnly = true;
- ringBuffer.allocate(format, frameCount);
+auto ReadOnlySharedRingBufferStorage::sharedFrameBounds() const -> const FrameBounds*
+{
+ return m_storage ? reinterpret_cast<const FrameBounds*>(m_storage->data()) : nullptr;
}
-void SharedRingBufferStorage::allocate(size_t byteCount, const CAAudioStreamDescription& format, size_t frameCount)
+auto ReadOnlySharedRingBufferStorage::sharedFrameBounds() -> FrameBounds*
{
- if (!m_readOnly) {
- auto sharedMemory = SharedMemory::allocate(byteCount + sizeof(FrameBounds));
- new (NotNull, sharedMemory->data()) FrameBounds;
- setStorage(WTFMove(sharedMemory), format, frameCount);
- }
+ return m_storage ? reinterpret_cast<FrameBounds*>(m_storage->data()) : nullptr;
}
-void SharedRingBufferStorage::deallocate()
+void ReadOnlySharedRingBufferStorage::getCurrentFrameBounds(uint64_t& startFrame, uint64_t& endFrame)
{
- if (!m_readOnly)
- setStorage(nullptr, { }, 0);
+ startFrame = m_startFrame;
+ endFrame = m_endFrame;
}
-auto SharedRingBufferStorage::sharedFrameBounds() const -> FrameBounds*
+void ReadOnlySharedRingBufferStorage::flush()
{
- return m_storage ? reinterpret_cast<FrameBounds*>(m_storage->data()) : nullptr;
+ m_startFrame = m_endFrame = 0;
}
-void* SharedRingBufferStorage::data()
+void ReadOnlySharedRingBufferStorage::updateFrameBounds()
{
- return m_storage ? static_cast<Byte*>(m_storage->data()) + sizeof(FrameBounds) : nullptr;
+ auto* sharedBounds = sharedFrameBounds();
+ if (!sharedBounds) {
+ m_startFrame = m_endFrame = 0;
+ return;
+ }
+
+ auto pair = sharedBounds->boundsBuffer[sharedBounds->boundsBufferIndex.load(std::memory_order_acquire)];
+ m_startFrame = pair.first;
+ m_endFrame = pair.second;
}
-void SharedRingBufferStorage::getCurrentFrameBounds(uint64_t& startFrame, uint64_t& endFrame)
+void SharedRingBufferStorage::setStorage(RefPtr<SharedMemory>&& storage, const CAAudioStreamDescription& format, size_t frameCount)
{
- startFrame = m_startFrame;
- endFrame = m_endFrame;
+ m_storage = WTFMove(storage);
+ if (m_storageChangedHandler)
+ m_storageChangedHandler(m_storage.get(), format, frameCount);
}
+void SharedRingBufferStorage::allocate(size_t byteCount, const CAAudioStreamDescription& format, size_t frameCount)
+{
+ auto sharedMemory = SharedMemory::allocate(byteCount + sizeof(FrameBounds));
+ new (NotNull, sharedMemory->data()) FrameBounds;
+ setStorage(WTFMove(sharedMemory), format, frameCount);
+}
+
+void SharedRingBufferStorage::deallocate()
+{
+ setStorage(nullptr, { }, 0);
+}
+
void SharedRingBufferStorage::setCurrentFrameBounds(uint64_t startFrame, uint64_t endFrame)
{
m_startFrame = startFrame;
m_endFrame = endFrame;
- ASSERT(!m_readOnly);
- if (m_readOnly)
- return;
-
auto* sharedBounds = sharedFrameBounds();
if (!sharedBounds)
return;
@@ -104,24 +109,6 @@
sharedBounds->boundsBufferIndex.store(indexToWrite, std::memory_order_release);
}
-void SharedRingBufferStorage::updateFrameBounds()
-{
- auto* sharedBounds = sharedFrameBounds();
- if (!sharedBounds) {
- m_startFrame = m_endFrame = 0;
- return;
- }
-
- auto pair = sharedBounds->boundsBuffer[sharedBounds->boundsBufferIndex.load(std::memory_order_acquire)];
- m_startFrame = pair.first;
- m_endFrame = pair.second;
-}
-
-void SharedRingBufferStorage::flush()
-{
- m_startFrame = m_endFrame = 0;
-}
-
} // namespace WebKit
#endif
Modified: trunk/Source/WebKit/Shared/Cocoa/SharedRingBufferStorage.h (271040 => 271041)
--- trunk/Source/WebKit/Shared/Cocoa/SharedRingBufferStorage.h 2020-12-21 21:59:00 UTC (rev 271040)
+++ trunk/Source/WebKit/Shared/Cocoa/SharedRingBufferStorage.h 2020-12-21 22:31:35 UTC (rev 271041)
@@ -38,46 +38,58 @@
namespace WebKit {
-class SharedRingBufferStorage : public WebCore::CARingBufferStorage {
+class ReadOnlySharedRingBufferStorage : public WebCore::CARingBufferStorage {
public:
- SharedRingBufferStorage(Function<void(SharedMemory*, const WebCore::CAAudioStreamDescription& format, size_t frameCount)>&& storageChangedHandler = nullptr)
- : m_storageChangedHandler(WTFMove(storageChangedHandler))
- {
- }
+ ReadOnlySharedRingBufferStorage() = default;
+ explicit ReadOnlySharedRingBufferStorage(const SharedMemory::Handle&);
- void invalidate() { m_storageChangedHandler = nullptr; }
-
SharedMemory* storage() const { return m_storage.get(); }
- void updateReadOnlyStorage(WebCore::CARingBuffer&, const SharedMemory::Handle&, const WebCore::CAAudioStreamDescription& format, size_t frameCount);
+protected:
// WebCore::CARingBufferStorage
- void allocate(size_t, const WebCore::CAAudioStreamDescription& format, size_t frameCount) final;
- void deallocate() final;
+ void allocate(size_t, const WebCore::CAAudioStreamDescription& format, size_t frameCount) override { }
+ void deallocate() override { }
void* data() final;
void getCurrentFrameBounds(uint64_t& startTime, uint64_t& endTime) final;
- void setCurrentFrameBounds(uint64_t startFrame, uint64_t endFrame) final;
+ void setCurrentFrameBounds(uint64_t startFrame, uint64_t endFrame) override { }
uint64_t currentStartFrame() const final { return m_startFrame; }
uint64_t currentEndFrame() const final { return m_endFrame; }
void updateFrameBounds() final;
void flush() final;
-private:
static constexpr unsigned boundsBufferSize { 32 };
struct FrameBounds {
std::pair<uint64_t, uint64_t> boundsBuffer[boundsBufferSize];
Atomic<unsigned> boundsBufferIndex { 0 };
};
+ const FrameBounds* sharedFrameBounds() const;
+ FrameBounds* sharedFrameBounds();
- void setStorage(RefPtr<SharedMemory>&&, const WebCore::CAAudioStreamDescription& format, size_t frameCount);
- FrameBounds* sharedFrameBounds() const;
-
- Function<void(SharedMemory*, const WebCore::CAAudioStreamDescription& format, size_t frameCount)> m_storageChangedHandler;
RefPtr<SharedMemory> m_storage;
- bool m_readOnly { false };
uint64_t m_startFrame { 0 };
uint64_t m_endFrame { 0 };
};
+class SharedRingBufferStorage final : public ReadOnlySharedRingBufferStorage {
+public:
+ SharedRingBufferStorage(Function<void(SharedMemory*, const WebCore::CAAudioStreamDescription& format, size_t frameCount)>&& storageChangedHandler)
+ : m_storageChangedHandler(WTFMove(storageChangedHandler))
+ {
+ }
+
+ void invalidate() { m_storageChangedHandler = nullptr; }
+
+private:
+ // WebCore::CARingBufferStorage
+ void allocate(size_t, const WebCore::CAAudioStreamDescription& format, size_t frameCount) final;
+ void deallocate() final;
+ void setCurrentFrameBounds(uint64_t startFrame, uint64_t endFrame) final;
+
+ void setStorage(RefPtr<SharedMemory>&&, const WebCore::CAAudioStreamDescription& format, size_t frameCount);
+
+ Function<void(SharedMemory*, const WebCore::CAAudioStreamDescription& format, size_t frameCount)> m_storageChangedHandler;
+};
+
}
#endif
Modified: trunk/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp (271040 => 271041)
--- trunk/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp 2020-12-21 21:59:00 UTC (rev 271040)
+++ trunk/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSource.cpp 2020-12-21 22:31:35 UTC (rev 271041)
@@ -47,7 +47,7 @@
, m_identifier(identifier)
, m_manager(makeWeakPtr(manager))
#if PLATFORM(COCOA)
- , m_ringBuffer(makeUnique<CARingBuffer>(makeUniqueRef<SharedRingBufferStorage>()))
+ , m_ringBuffer(makeUnique<CARingBuffer>())
#endif
{
m_manager->addSource(*this, captureDevice);
@@ -77,8 +77,7 @@
{
m_description = description;
- auto& storage = static_cast<SharedRingBufferStorage&>(m_ringBuffer->storage());
- storage.updateReadOnlyStorage(*m_ringBuffer, handle, description, numberOfFrames);
+ m_ringBuffer = makeUnique<CARingBuffer>(makeUniqueRef<ReadOnlySharedRingBufferStorage>(handle), description, numberOfFrames);
m_buffer = makeUnique<WebAudioBufferList>(description, numberOfFrames);
}
Modified: trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSourceProviderManager.cpp (271040 => 271041)
--- trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSourceProviderManager.cpp 2020-12-21 21:59:00 UTC (rev 271040)
+++ trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSourceProviderManager.cpp 2020-12-21 22:31:35 UTC (rev 271041)
@@ -116,7 +116,7 @@
RemoteAudioSourceProviderManager::RemoteAudio::RemoteAudio(Ref<RemoteAudioSourceProvider>&& provider)
: m_provider(WTFMove(provider))
- , m_ringBuffer(makeUnique<CARingBuffer>(makeUniqueRef<SharedRingBufferStorage>()))
+ , m_ringBuffer(makeUnique<CARingBuffer>())
{
}
@@ -124,8 +124,7 @@
{
m_description = description;
- auto& storage = static_cast<SharedRingBufferStorage&>(m_ringBuffer->storage());
- storage.updateReadOnlyStorage(*m_ringBuffer, handle, description, numberOfFrames);
+ m_ringBuffer = makeUnique<CARingBuffer>(makeUniqueRef<ReadOnlySharedRingBufferStorage>(handle), description, numberOfFrames);
m_buffer = makeUnique<WebAudioBufferList>(description, numberOfFrames);
}
Modified: trunk/Source/WebKit/WebProcess/cocoa/RemoteCaptureSampleManager.cpp (271040 => 271041)
--- trunk/Source/WebKit/WebProcess/cocoa/RemoteCaptureSampleManager.cpp 2020-12-21 21:59:00 UTC (rev 271040)
+++ trunk/Source/WebKit/WebProcess/cocoa/RemoteCaptureSampleManager.cpp 2020-12-21 22:31:35 UTC (rev 271041)
@@ -113,7 +113,7 @@
RemoteCaptureSampleManager::RemoteAudio::RemoteAudio(Ref<RemoteRealtimeMediaSource>&& source)
: m_source(WTFMove(source))
- , m_ringBuffer(makeUnique<CARingBuffer>(makeUniqueRef<SharedRingBufferStorage>()))
+ , m_ringBuffer(makeUnique<CARingBuffer>())
{
}
@@ -120,8 +120,7 @@
void RemoteCaptureSampleManager::RemoteAudio::setStorage(const SharedMemory::Handle& handle, const WebCore::CAAudioStreamDescription& description, uint64_t numberOfFrames)
{
m_description = description;
- auto& storage = static_cast<SharedRingBufferStorage&>(m_ringBuffer->storage());
- storage.updateReadOnlyStorage(*m_ringBuffer, handle, description, numberOfFrames);
+ m_ringBuffer = makeUnique<CARingBuffer>(makeUniqueRef<ReadOnlySharedRingBufferStorage>(handle), description, numberOfFrames);
}
void RemoteCaptureSampleManager::RemoteAudio::audioSamplesAvailable(MediaTime time, uint64_t numberOfFrames)