Skip to content

Commit 34f44c9

Browse files
committed
SampleBuilder: Remove WithPartitionHeadChecker
Deprecated by #1928 BREAKING CHANGE: samplebuilder.WithPartitionHeadChecker option is removed.
1 parent c431838 commit 34f44c9

File tree

2 files changed

+9
-15
lines changed

2 files changed

+9
-15
lines changed

pkg/media/samplebuilder/samplebuilder.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -357,12 +357,6 @@ func timestampDistance(x, y uint32) uint32 {
357357
// An Option configures a SampleBuilder.
358358
type Option func(o *SampleBuilder)
359359

360-
// WithPartitionHeadChecker is obsolete, it does nothing.
361-
func WithPartitionHeadChecker(interface{}) Option {
362-
return func(o *SampleBuilder) {
363-
}
364-
}
365-
366360
// WithPacketReleaseHandler set a callback when the builder is about to release
367361
// some packet.
368362
func WithPacketReleaseHandler(h func(*rtp.Packet)) Option {

pkg/media/samplebuilder/samplebuilder_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ type sampleBuilderTest struct {
2727
type fakeDepacketizer struct {
2828
headChecker bool
2929
headBytes []byte
30+
alwaysHead bool
3031
}
3132

3233
func (f *fakeDepacketizer) Unmarshal(r []byte) ([]byte, error) {
@@ -45,6 +46,10 @@ func (f *fakeDepacketizer) IsPartitionHead(payload []byte) bool {
4546
return false
4647
}
4748

49+
if f.alwaysHead {
50+
return true
51+
}
52+
4853
for _, b := range f.headBytes {
4954
if payload[0] == b {
5055
return true
@@ -490,16 +495,11 @@ func TestSampleBuilderWithPacketHeadHandler(t *testing.T) {
490495
assert.Equal(t, 2, headCount, "two sample heads should have been inspected")
491496
}
492497

493-
type truePartitionHeadChecker struct{}
494-
495-
func (f *truePartitionHeadChecker) IsPartitionHead([]byte) bool {
496-
return true
497-
}
498-
499498
func TestSampleBuilderData(t *testing.T) {
500-
s := New(10, &fakeDepacketizer{}, 1,
501-
WithPartitionHeadChecker(&truePartitionHeadChecker{}),
502-
)
499+
s := New(10, &fakeDepacketizer{
500+
headChecker: true,
501+
alwaysHead: true,
502+
}, 1)
503503
j := 0
504504
for i := 0; i < 0x20000; i++ {
505505
p := rtp.Packet{

0 commit comments

Comments
 (0)