make chanLen exported

Author: dudk

float32.go

@@ -175,11 +175,14 @@ func FloatingAsFloating(src Floating, dst Floating) int {
 	mustSameChannels(src.Channels(), dst.Channels())
 	// cap length to destination capacity.
 	length := min(src.Len(), dst.Len())
+	if length == 0 {
+		return 0
+	}
 	// determine the multiplier for bit depth conversion
 	for pos := 0; pos < length; pos++ {
 		dst.SetSample(pos, src.Sample(pos))
 	}
-	return chanLen(length, dst.Channels())
+	return min(src.Length(), dst.Length())
 }
 
 // FloatingAsSigned converts floating-point samples into signed fixed-point
@@ -204,7 +207,7 @@ func FloatingAsSigned(src Floating, dst Signed) int {
 			dst.SetSample(pos, int64(sample)*(msv+1))
 		}
 	}
-	return chanLen(length, dst.Channels())
+	return min(src.Length(), dst.Length())
 }
 
 // FloatingAsUnsigned converts floating-point samples into unsigned
@@ -228,7 +231,7 @@ func FloatingAsUnsigned(src Floating, dst Unsigned) int {
 			dst.SetSample(pos, uint64(sample)*(msv+1)+(msv+1))
 		}
 	}
-	return chanLen(length, dst.Channels())
+	return min(src.Length(), dst.Length())
 }
 
 // SignedAsFloating converts signed fixed-point samples into floating-point
@@ -252,7 +255,7 @@ func SignedAsFloating(src Signed, dst Floating) int {
 			dst.SetSample(pos, float64(sample)/(msv+1))
 		}
 	}
-	return chanLen(length, dst.Channels())
+	return min(src.Length(), dst.Length())
 }
 
 // SignedAsSigned appends signed fixed-point samples to the signed
@@ -273,7 +276,7 @@ func SignedAsSigned(src Signed, dst Signed) int {
 		for pos := 0; pos < length; pos++ {
 			dst.SetSample(pos, src.Sample(pos)/scale)
 		}
-		return chanLen(length, dst.Channels())
+		return min(src.Length(), dst.Length())
 	}
 
 	// upscale
@@ -285,7 +288,7 @@ func SignedAsSigned(src Signed, dst Signed) int {
 			dst.SetSample(pos, src.Sample(pos)*scale)
 		}
 	}
-	return chanLen(length, dst.Channels())
+	return min(src.Length(), dst.Length())
 }
 
 // SignedAsUnsigned converts signed fixed-point samples into unsigned
@@ -309,7 +312,7 @@ func SignedAsUnsigned(src Signed, dst Unsigned) int {
 		for pos := 0; pos < length; pos++ {
 			dst.SetSample(pos, uint64(src.Sample(pos)/scale)+msv+1)
 		}
-		return chanLen(length, dst.Channels())
+		return min(src.Length(), dst.Length())
 	}
 
 	// upscale
@@ -321,7 +324,7 @@ func SignedAsUnsigned(src Signed, dst Unsigned) int {
 			dst.SetSample(pos, uint64(src.Sample(pos)*scale)+msv+1)
 		}
 	}
-	return chanLen(length, dst.Channels())
+	return min(src.Length(), dst.Length())
 }
 
 // UnsignedAsFloating converts unsigned fixed-point samples into
@@ -344,7 +347,7 @@ func UnsignedAsFloating(src Unsigned, dst Floating) int {
 			dst.SetSample(pos, (float64(sample)-(msv+1))/(msv+1))
 		}
 	}
-	return chanLen(length, dst.Channels())
+	return min(src.Length(), dst.Length())
 }
 
 // UnsignedAsSigned converts unsigned fixed-point samples into signed
@@ -367,7 +370,7 @@ func UnsignedAsSigned(src Unsigned, dst Signed) int {
 		for pos := 0; pos < length; pos++ {
 			dst.SetSample(pos, int64(src.Sample(pos)-(msv+1))/scale)
 		}
-		return chanLen(length, dst.Channels())
+		return min(src.Length(), dst.Length())
 	}
 
 	// upscale
@@ -379,7 +382,7 @@ func UnsignedAsSigned(src Unsigned, dst Signed) int {
 			dst.SetSample(pos, sample*scale)
 		}
 	}
-	return chanLen(length, dst.Channels())
+	return min(src.Length(), dst.Length())
 }
 
 // UnsignedAsUnsigned appends unsigned fixed-point samples to the unsigned
@@ -400,7 +403,7 @@ func UnsignedAsUnsigned(src, dst Unsigned) int {
 		for pos := 0; pos < length; pos++ {
 			dst.SetSample(pos, src.Sample(pos)/scale)
 		}
-		return chanLen(length, dst.Channels())
+		return min(src.Length(), dst.Length())
 	}
 
 	// upscale
@@ -414,7 +417,7 @@ func UnsignedAsUnsigned(src, dst Unsigned) int {
 			dst.SetSample(pos, sample*scale)
 		}
 	}
-	return chanLen(length, dst.Channels())
+	return min(src.Length(), dst.Length())
 }
 
 // BitDepth returns bit depth of the buffer.
@@ -427,12 +430,6 @@ func (c channels) Channels() int {
 	return int(c)
 }
 
-// ChannelPos calculates sample position in the buffer based on channel and
-// postition in the channel.
-func (c channels) ChannelPos(channel, pos int) int {
-	return int(c)*pos + channel
-}
-
 func capFloat(v float64) float64 {
 	if v > 1 {
 		return 1
@@ -468,18 +465,26 @@ func mustSameCapacity(c1, c2 int) {
 	}
 }
 
-func chanLen(sliceLen, channels int) int {
+// ChannelLength calculates a channel length for provided buffer length and
+// number of channels.
+func ChannelLength(sliceLen, channels int) int {
 	return int(math.Ceil(float64(sliceLen) / float64(channels)))
 }
 
+// ChannelPos calculates sample position in the buffer based on channel and
+// postition in the channel.
+func (c channels) ChannelPos(channel, pos int) int {
+	return int(c)*pos + channel
+}
+
 // WriteInt writes values from provided slice into the buffer.
 // Returns a number of samples written per channel.
 func WriteInt(src []int, dst Signed) int {
 	length := min(dst.Len(), len(src))
 	for pos := 0; pos < length; pos++ {
 		dst.SetSample(pos, int64(src[pos]))
 	}
-	return chanLen(length, dst.Channels())
+	return ChannelLength(length, dst.Channels())
 }
 
 // WriteStripedInt writes values from provided slice into the buffer.
@@ -516,7 +521,7 @@ func WriteUint(src []uint, dst Unsigned) int {
 	for pos := 0; pos < length; pos++ {
 		dst.SetSample(pos, uint64(src[pos]))
 	}
-	return chanLen(length, dst.Channels())
+	return ChannelLength(length, dst.Channels())
 }
 
 // WriteStripedUint writes values from provided slice into the buffer.
@@ -553,7 +558,7 @@ func ReadInt(src Signed, dst []int) int {
 	for pos := 0; pos < length; pos++ {
 		dst[pos] = int(src.Sample(pos))
 	}
-	return chanLen(length, src.Channels())
+	return ChannelLength(length, src.Channels())
 }
 
 // ReadStripedInt reads values from the buffer into provided slice. The
@@ -581,7 +586,7 @@ func ReadUint(src Unsigned, dst []uint) int {
 	for pos := 0; pos < length; pos++ {
 		dst[pos] = uint(src.Sample(pos))
 	}
-	return chanLen(length, src.Channels())
+	return ChannelLength(length, src.Channels())
 }
 
 // ReadStripedUint reads values from the buffer into provided slice. The

float64.go

@@ -343,14 +343,15 @@ func TestWrite(t *testing.T) {
 	allocator := signal.Allocator{
 		Capacity: 1,
 		Length:   1,
-		Channels: 2,
+		Channels: 3,
 	}
 	t.Run("striped int 8-bits overflow", func() func(t *testing.T) {
 		buf := allocator.Int64(signal.BitDepth8)
 		length := signal.WriteStripedInt(
 			[][]int{
 				{math.MaxInt32},
 				{math.MinInt32},
+				{},
 			},
 			buf)
 		return testOk(
@@ -361,6 +362,7 @@ func TestWrite(t *testing.T) {
 				data: [][]int64{
 					{math.MaxInt8},
 					{math.MinInt8},
+					{0},
 				},
 			},
 		)
@@ -382,6 +384,7 @@ func TestWrite(t *testing.T) {
 				data: [][]int64{
 					{math.MaxInt8},
 					{math.MinInt8},
+					{0},
 				},
 			},
 		)
@@ -392,6 +395,7 @@ func TestWrite(t *testing.T) {
 			[][]uint{
 				{math.MaxUint32},
 				{0},
+				{},
 			},
 			buf,
 		)
@@ -403,6 +407,7 @@ func TestWrite(t *testing.T) {
 				data: [][]uint64{
 					{math.MaxUint8},
 					{0},
+					{0},
 				},
 			},
 		)
@@ -424,6 +429,7 @@ func TestWrite(t *testing.T) {
 				data: [][]uint64{
 					{math.MaxUint8},
 					{0},
+					{0},
 				},
 			},
 		)

int16.go

@@ -85,7 +85,7 @@ func Read{{ .Name }}(src {{ .Interface }}, dst []{{ .Builtin }}) int {
 	for pos := 0; pos < length; pos++ {
 		dst[pos] = {{if eq .Interface "Floating"}}{{ .Builtin }}(src.Sample(pos)){{else}}{{ .Builtin }}({{ .MaxBitDepth }}.{{ .Interface }}Value(src.Sample(pos))){{end}}
 	}
-	return chanLen(length, src.Channels())
+	return ChannelLength(length, src.Channels())
 }
 
 // ReadStriped{{ .Name }} reads values from the buffer into provided slice. The
@@ -114,7 +114,7 @@ func Write{{ .Name }}(src []{{ .Builtin }}, dst {{ .Interface }}) int {
 	for pos := 0; pos < length; pos++ {
 		dst.SetSample(pos, {{ .SampleType }}(src[pos]))
 	}
-	return chanLen(length, dst.Channels())
+	return ChannelLength(length, dst.Channels())
 }
 
 // WriteStriped{{ .Name }} writes values from provided slice into the buffer.