Changeset 284862 in webkit

Timestamp:

Oct 26, 2021, 2:46:47 AM (5 years ago)

Author:

youenn@apple.com

Message:

Only one AudioSampleDataSource::pullSamples is needed
​https://bugs.webkit.org/show_bug.cgi?id=232145

Reviewed by Eric Carlson.

Source/WebCore:

Update CoreAudioSharedUnit::provideSpeakerData to use pullSamples taking an AudioBufferList as parameter.
Remove the no longer necessary AudioSampleDataSource::pullSamples and rename pullSamplesInternal in pullSamples.
Update header to forward declare more classes.
This is a refactoring, no change of behavior.

• platform/audio/cocoa/AudioSampleDataSource.h:
• platform/audio/cocoa/AudioSampleDataSource.mm:

(WebCore::AudioSampleDataSource::pullSamples):
(WebCore::AudioSampleDataSource::pullSamplesInternal): Deleted.

• platform/mediastream/mac/CoreAudioCaptureSource.cpp:

(WebCore::CoreAudioSharedUnit::provideSpeakerData):

Source/WebKit:

• WebProcess/GPU/webrtc/AudioMediaStreamTrackRendererInternalUnitManager.cpp:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/audio/cocoa/AudioSampleDataSource.h (modified) (4 diffs)
• WebCore/platform/audio/cocoa/AudioSampleDataSource.mm (modified) (3 diffs)
• WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/GPU/webrtc/AudioMediaStreamTrackRendererInternalUnitManager.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-26  Youenn Fablet  <youenn@apple.com>
+
+        Only one AudioSampleDataSource::pullSamples is needed
+        https://bugs.webkit.org/show_bug.cgi?id=232145
+
+        Reviewed by Eric Carlson.
+
+        Update CoreAudioSharedUnit::provideSpeakerData to use pullSamples taking an AudioBufferList as parameter.
+        Remove the no longer necessary AudioSampleDataSource::pullSamples and rename pullSamplesInternal in pullSamples.
+        Update header to forward declare more classes.
+        This is a refactoring, no change of behavior.
+
+        * platform/audio/cocoa/AudioSampleDataSource.h:
+        * platform/audio/cocoa/AudioSampleDataSource.mm:
+        (WebCore::AudioSampleDataSource::pullSamples):
+        (WebCore::AudioSampleDataSource::pullSamplesInternal): Deleted.
+        * platform/mediastream/mac/CoreAudioCaptureSource.cpp:
+        (WebCore::CoreAudioSharedUnit::provideSpeakerData):
+
 2021-10-26  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/audio/cocoa/AudioSampleDataSource.h

@@ -26 +26 @@
 #pragma once
 
-#include "AudioSampleBufferList.h"
+#include "CARingBuffer.h"
 #include <CoreAudio/CoreAudioTypes.h>
 #include <wtf/LoggerHelper.h>
@@ -34 +34 @@
 #include <wtf/text/WTFString.h>
 
+typedef struct OpaqueAudioConverter* AudioConverterRef;
 typedef struct opaqueCMSampleBuffer *CMSampleBufferRef;
 
 namespace WebCore {
 
-class CAAudioStreamDescription;
-class CARingBuffer;
+class AudioSampleBufferList;
+class PlatformAudioData;
 
 class AudioSampleDataSource : public ThreadSafeRefCounted<AudioSampleDataSource, WTF::DestructionThread::MainRunLoop>
@@ -58 +59 @@
 
     enum PullMode { Copy, Mix };
-    bool pullSamples(AudioSampleBufferList&, size_t, uint64_t, double, PullMode);
     bool pullSamples(AudioBufferList&, size_t, uint64_t, double, PullMode);
 
@@ -85 +85 @@
 
     OSStatus setupConverter();
-    bool pullSamplesInternal(AudioBufferList&, size_t, uint64_t, double, PullMode);
 
     void pushSamplesInternal(const AudioBufferList&, const MediaTime&, size_t frameCount);

trunk/Source/WebCore/platform/audio/cocoa/AudioSampleDataSource.mm

@@ -27 +27 @@
 #import "AudioSampleDataSource.h"
 
-#import "CAAudioStreamDescription.h"
-#import "CARingBuffer.h"
+#import "AudioSampleBufferList.h"
 #import "Logging.h"
 #import "PlatformAudioData.h"
@@ -211 +210 @@
 }
 
-bool AudioSampleDataSource::pullSamplesInternal(AudioBufferList& buffer, size_t sampleCount, uint64_t timeStamp, double /*hostTime*/, PullMode mode)
+bool AudioSampleDataSource::pullSamples(AudioBufferList& buffer, size_t sampleCount, uint64_t timeStamp, double /*hostTime*/, PullMode mode)
 {
     size_t byteCount = sampleCount * m_outputDescription->bytesPerFrame();
@@ -349 +348 @@
 }
 
-bool AudioSampleDataSource::pullSamples(AudioBufferList& buffer, size_t sampleCount, uint64_t timeStamp, double hostTime, PullMode mode)
-{
-    return pullSamplesInternal(buffer, sampleCount, timeStamp, hostTime, mode);
-}
-
-bool AudioSampleDataSource::pullSamples(AudioSampleBufferList& buffer, size_t sampleCount, uint64_t timeStamp, double hostTime, PullMode mode)
-{
-    if (!pullSamplesInternal(buffer.bufferList(), sampleCount, timeStamp, hostTime, mode))
-        return false;
-
-    buffer.setTimes(timeStamp, hostTime);
-    buffer.setSampleCount(sampleCount);
-
-    return true;
-}
-
 #if !RELEASE_LOG_DISABLED
 void AudioSampleDataSource::setLogger(Ref<const Logger>&& logger, const void* logIdentifier)

trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp

@@ -367 +367 @@
     bool firstSource = true;
     for (auto& source : m_activeSources) {
-        source->pullSamples(*m_speakerSampleBuffer.get(), inNumberFrames, adjustedHostTime, sampleTime, firstSource ? AudioSampleDataSource::Copy : AudioSampleDataSource::Mix);
+        source->pullSamples(bufferList, inNumberFrames, adjustedHostTime, sampleTime, firstSource ? AudioSampleDataSource::Copy : AudioSampleDataSource::Mix);
         firstSource = false;
     }

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-10-26  Youenn Fablet  <youenn@apple.com>
+
+        Only one AudioSampleDataSource::pullSamples is needed
+        https://bugs.webkit.org/show_bug.cgi?id=232145
+
+        Reviewed by Eric Carlson.
+
+        * WebProcess/GPU/webrtc/AudioMediaStreamTrackRendererInternalUnitManager.cpp:
+
 2021-10-26  Adrian Perez de Castro  <aperez@igalia.com>
 

trunk/Source/WebKit/WebProcess/GPU/webrtc/AudioMediaStreamTrackRendererInternalUnitManager.cpp

@@ -35 +35 @@
 #include <WebCore/AudioMediaStreamTrackRendererInternalUnit.h>
 #include <WebCore/AudioMediaStreamTrackRendererUnit.h>
+#include <WebCore/AudioSampleBufferList.h>
 #include <WebCore/CAAudioStreamDescription.h>
 #include <WebCore/CARingBuffer.h>