Skip to content

Commit a79f7c3

Browse files
committed
chore(ringbuf): rename to ring
1 parent ed390eb commit a79f7c3

3 files changed

Lines changed: 16 additions & 16 deletions

File tree

mixer/mixer.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/frostbyte73/core"
2525
msdk "github.com/livekit/media-sdk"
2626

27-
"github.com/livekit/media-sdk/ringbuf"
27+
"github.com/livekit/media-sdk/ring"
2828
)
2929

3030
const (
@@ -55,7 +55,7 @@ type Input struct {
5555
m *Mixer
5656
sampleRate int
5757
mu sync.Mutex
58-
buf *ringbuf.Buffer[int16]
58+
buf *ring.Buffer[int16]
5959
buffering bool
6060
}
6161

@@ -237,7 +237,7 @@ func (m *Mixer) NewInput() *Input {
237237
inp := &Input{
238238
m: m,
239239
sampleRate: m.sampleRate,
240-
buf: ringbuf.New[int16](len(m.mixBuf) * m.inputBufferFrames),
240+
buf: ring.NewBuffer[int16](len(m.mixBuf) * m.inputBufferFrames),
241241
buffering: true, // buffer some data initially
242242
}
243243
m.inputs = append(m.inputs, inp)

ringbuf/buffer.go renamed to ring/buffer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package ringbuf
15+
package ring
1616

1717
import (
1818
"io"
1919
)
2020

2121
// New creates a new ring buffer with s specified size.
22-
func New[T any](sz int) *Buffer[T] {
22+
func NewBuffer[T any](sz int) *Buffer[T] {
2323
return &Buffer[T]{
2424
buf: make([]T, sz),
2525
}
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package ringbuf
15+
package ring
1616

1717
import (
1818
"io"
@@ -28,7 +28,7 @@ var (
2828
func TestBuffer(t *testing.T) {
2929
t.Run("push and pop", func(t *testing.T) {
3030
t.Run("empty return zero", func(t *testing.T) {
31-
b := New[int](3)
31+
b := NewBuffer[int](3)
3232
require.Equal(t, int(0), b.Peek())
3333
v, ok := b.TryPop()
3434
require.False(t, ok)
@@ -37,7 +37,7 @@ func TestBuffer(t *testing.T) {
3737
})
3838
t.Run("populate and drain", func(t *testing.T) {
3939
const size = 3
40-
b := New[int](size)
40+
b := NewBuffer[int](size)
4141
for i := 0; i < size; i++ {
4242
ok := b.TryPush(i + 1)
4343
require.True(t, ok)
@@ -58,7 +58,7 @@ func TestBuffer(t *testing.T) {
5858
})
5959
t.Run("populate and drain no check", func(t *testing.T) {
6060
const size = 3
61-
b := New[int](size)
61+
b := NewBuffer[int](size)
6262
for i := 0; i < size; i++ {
6363
b.Push(i + 1)
6464
require.Equal(t, i+1, b.Len())
@@ -77,14 +77,14 @@ func TestBuffer(t *testing.T) {
7777
})
7878
t.Run("write and read", func(t *testing.T) {
7979
t.Run("empty return EOF", func(t *testing.T) {
80-
b := New[int](5)
80+
b := NewBuffer[int](5)
8181
buf := make([]int, 6)
8282
n, err := b.Read(buf)
8383
require.Equal(t, io.EOF, err)
8484
require.Equal(t, 0, n)
8585
})
8686
t.Run("full", func(t *testing.T) {
87-
b := New[int](5)
87+
b := NewBuffer[int](5)
8888
n, err := b.Write([]int{1, 2, 3, 4, 5})
8989
require.NoError(t, err)
9090
require.Equal(t, 5, n)
@@ -96,7 +96,7 @@ func TestBuffer(t *testing.T) {
9696
require.Equal(t, []int{1, 2, 3, 4, 5}, buf[:n])
9797
})
9898
t.Run("full via parts", func(t *testing.T) {
99-
b := New[int](5)
99+
b := NewBuffer[int](5)
100100
n, err := b.Write([]int{1, 2, 3})
101101
require.NoError(t, err)
102102
require.Equal(t, 3, n)
@@ -115,7 +115,7 @@ func TestBuffer(t *testing.T) {
115115
require.Equal(t, []int{1, 2, 3, 4, 5}, buf[:5])
116116
})
117117
t.Run("too large", func(t *testing.T) {
118-
b := New[int](5)
118+
b := NewBuffer[int](5)
119119
n, err := b.Write([]int{1, 2, 3, 4, 5, 6, 7})
120120
require.NoError(t, err)
121121
require.Equal(t, 7, n)
@@ -127,7 +127,7 @@ func TestBuffer(t *testing.T) {
127127
require.Equal(t, []int{3, 4, 5, 6, 7}, buf[:n])
128128
})
129129
t.Run("too large with existing", func(t *testing.T) {
130-
b := New[int](5)
130+
b := NewBuffer[int](5)
131131
n, err := b.Write([]int{1, 2, 3})
132132
require.NoError(t, err)
133133
require.Equal(t, 3, n)
@@ -142,7 +142,7 @@ func TestBuffer(t *testing.T) {
142142
require.Equal(t, []int{3, 4, 5, 6, 7}, buf[:n])
143143
})
144144
t.Run("interleaved", func(t *testing.T) {
145-
b := New[int](6)
145+
b := NewBuffer[int](6)
146146
buf := make([]int, 6)
147147

148148
n, err := b.Write([]int{1, 2, 3, 4})
@@ -162,7 +162,7 @@ func TestBuffer(t *testing.T) {
162162
require.Equal(t, []int{4, 5, 6, 10, 11, 12}, buf[:n])
163163
})
164164
t.Run("interleaved drop", func(t *testing.T) {
165-
b := New[int](6)
165+
b := NewBuffer[int](6)
166166
buf := make([]int, 6)
167167

168168
n, err := b.Write([]int{1, 2, 3, 4})

0 commit comments

Comments
 (0)