Bug 1863799 return a Span from AudioChunk::ChannelData() to forbid ns…

…TArray::Clone() r=padenot Clone() often allocates unnecessarily, so this prevents copying of a Clone() pattern to a caller. An alternative might be to return CopyableAutoTArray& where Clone() is deleted, but that could still be implicitly cast to a base class where Clone() is available. The reinterpret_cast on the channel pointer array pointer feels a little less precarious than on the CopyableAutoTArray. Explicit template arguments are added because they are not deduced with the implicit nsTArray to Span conversions. Differential Revision: https://phabricator.services.mozilla.com/D193167 UltraBlame original commit: 5fcc529533b87c657e0dd95ea8cdd37f7cbac5c0
marco-c · Nov 10, 2023 · 25387fc · 25387fc
1 parent ba9616d
commit 25387fc
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 39 deletions.
diff --git a/dom/media/AudibilityMonitor.h b/dom/media/AudibilityMonitor.h
@@ -303,14 +303,13 @@ GetDuration
 void
 ProcessPlanar
 (
-const
-nsTArray
+Span
 <
 const
 float
 *
+const
 >
-&
 aPlanar
 TrackTime
 aFrames

diff --git a/dom/media/AudioSegment.h b/dom/media/AudioSegment.h
@@ -787,14 +787,13 @@ DestT
 void
 DownmixAndInterleave
 (
-const
-nsTArray
+Span
 <
 const
 SrcT
 *
+const
 >
-&
 aChannelData
 int32_t
 aDuration
@@ -1634,14 +1633,13 @@ template
 typename
 T
 >
-const
-nsTArray
+Span
 <
 const
 T
 *
+const
 >
-&
 ChannelData
 (
 )
@@ -1662,22 +1660,28 @@ mBufferFormat
 )
 ;
 return
-*
+Span
+(
 reinterpret_cast
 <
 const
-AutoTArray
-<
-const
 T
 *
-GUESS_AUDIO_CHANNELS
->
+const
 *
 >
 (
-&
 mChannelData
+.
+Elements
+(
+)
+)
+mChannelData
+.
+Length
+(
+)
 )
 ;
 }
@@ -3737,6 +3741,9 @@ Down
 mix
 .
 DownmixAndInterleave
+<
+SrcT
+>
 (
 channelData
 aChunk

diff --git a/dom/media/driftcontrol/DynamicResampler.cpp b/dom/media/driftcontrol/DynamicResampler.cpp
@@ -1524,14 +1524,13 @@ DynamicResampler
 :
 AppendInput
 (
-const
-nsTArray
+Span
 <
 const
 float
 *
+const
 >
-&
 aInBuffer
 uint32_t
 aInFrames
@@ -1558,14 +1557,13 @@ DynamicResampler
 :
 AppendInput
 (
-const
-nsTArray
+Span
 <
 const
 int16_t
 *
+const
 >
-&
 aInBuffer
 uint32_t
 aInFrames

diff --git a/dom/media/driftcontrol/DynamicResampler.h b/dom/media/driftcontrol/DynamicResampler.h
@@ -547,14 +547,13 @@ place
 void
 AppendInput
 (
-const
-nsTArray
+Span
 <
 const
 float
 *
+const
 >
-&
 aInBuffer
 uint32_t
 aInFrames
@@ -563,14 +562,13 @@ aInFrames
 void
 AppendInput
 (
-const
-nsTArray
+Span
 <
 const
 int16_t
 *
+const
 >
-&
 aInBuffer
 uint32_t
 aInFrames
@@ -1027,12 +1025,12 @@ T
 void
 AppendInputInternal
 (
-const
-nsTArray
+Span
 <
 const
 T
 *
+const
 >
 &
 aInBuffer

diff --git a/dom/media/encoder/TrackEncoder.h b/dom/media/encoder/TrackEncoder.h
@@ -1222,6 +1222,9 @@ aOutputChannels
 )
 {
 DownmixAndInterleave
+<
+T
+>
 (
 aInput
 aDuration

diff --git a/dom/media/webaudio/AudioNodeExternalInputTrack.cpp b/dom/media/webaudio/AudioNodeExternalInputTrack.cpp
@@ -401,14 +401,7 @@ blockChannels
 }
 else
 {
-const
-nsTArray
-<
-const
-T
-*
->
-&
+Span
 inputChannels
 =
 aInput

diff --git a/dom/media/webaudio/DelayBuffer.cpp b/dom/media/webaudio/DelayBuffer.cpp
@@ -1492,7 +1492,15 @@ mLastReadChunk
 aNewReadChunk
 ;
 mUpmixChannels
-=
+.
+ClearAndRetainStorage
+(
+)
+;
+mUpmixChannels
+.
+AppendElements
+(
 mChunks
 [
 aNewReadChunk
@@ -1504,6 +1512,7 @@ float
 >
 (
 )
+)
 ;
 MOZ_ASSERT
 (

diff --git a/dom/media/webaudio/blink/Reverb.cpp b/dom/media/webaudio/blink/Reverb.cpp
@@ -626,6 +626,10 @@ float
 4
 >
 irChannels
+;
+irChannels
+.
+AppendElements
 (
 impulseResponse
 .