Changeset 269829 in webkit

Timestamp:

Nov 15, 2020 9:47:17 AM (3 years ago)

Author:

youenn@apple.com

Message:

AudioSampleDataSource::pullSamplesInternal does not need to pass its sampleCount parameter as in/out
​https://bugs.webkit.org/show_bug.cgi?id=218899

Reviewed by Eric Carlson.

pullSamplesInternal sets sampleCount to zero in some cases where pullSamplesInternal returns false.
pullSamplesInternal callers do not use the sampleCount parameter if pullSamplesInternal returns false.
Pass sampleCount by value to clarify the behavior and remove setting sampleCount to zero in pullSamplesInternal return false case.

No change of behavior.

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

(WebCore::AudioSampleDataSource::pullSamplesInternal):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/cocoa/AudioSampleDataSource.h (modified) (1 diff)
• platform/audio/cocoa/AudioSampleDataSource.mm (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-15  Youenn Fablet  <youenn@apple.com>
+
+        AudioSampleDataSource::pullSamplesInternal does not need to pass its sampleCount parameter as in/out
+        https://bugs.webkit.org/show_bug.cgi?id=218899
+
+        Reviewed by Eric Carlson.
+
+        pullSamplesInternal sets sampleCount to zero in some cases where pullSamplesInternal returns false.
+        pullSamplesInternal callers do not use the sampleCount parameter if pullSamplesInternal returns false.
+        Pass sampleCount by value to clarify the behavior and remove setting sampleCount to zero in pullSamplesInternal return false case.
+
+        No change of behavior.
+
+        * platform/audio/cocoa/AudioSampleDataSource.h:
+        * platform/audio/cocoa/AudioSampleDataSource.mm:
+        (WebCore::AudioSampleDataSource::pullSamplesInternal):
+
 2020-11-15  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -84 +84 @@
 
     OSStatus setupConverter();
-    bool pullSamplesInternal(AudioBufferList&, size_t&, uint64_t, double, PullMode);
+    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

@@ -208 +208 @@
 }
 
-bool AudioSampleDataSource::pullSamplesInternal(AudioBufferList& buffer, size_t& sampleCount, uint64_t timeStamp, double /*hostTime*/, PullMode mode)
+bool AudioSampleDataSource::pullSamplesInternal(AudioBufferList& buffer, size_t sampleCount, uint64_t timeStamp, double /*hostTime*/, PullMode mode)
 {
     size_t byteCount = sampleCount * m_outputDescription->bytesPerFrame();
@@ -215 +215 @@
     if (buffer.mNumberBuffers != m_ringBuffer->channelCount()) {
         AudioSampleBufferList::zeroABL(buffer, byteCount);
-        sampleCount = 0;
         return false;
     }
@@ -221 +220 @@
     if (!m_ringBuffer || m_muted || m_inputSampleOffset == MediaTime::invalidTime()) {
         AudioSampleBufferList::zeroABL(buffer, byteCount);
-        sampleCount = 0;
         return false;
     }
@@ -233 +231 @@
         if (buffered < sampleCount * 2 || (m_endFrameWhenNotEnoughData && m_endFrameWhenNotEnoughData == endFrame)) {
             AudioSampleBufferList::zeroABL(buffer, byteCount);
-            sampleCount = 0;
             return false;
         }