Rewrite AnnexB/AVCC parsers

pkg/h264/avc.go

@@ -3,46 +3,12 @@ package h264
 import (
 	"bytes"
 	"encoding/binary"
-	"github.com/AlexxIT/go2rtc/pkg/core"
-	"github.com/pion/rtp"
 )
 
-func AnnexB2AVC(b []byte) []byte {
-	for i := 0; i < len(b); {
-		if i+4 >= len(b) {
-			break
-		}
-
-		size := bytes.Index(b[i+4:], []byte{0, 0, 0, 1})
-		if size < 0 {
-			size = len(b) - (i + 4)
-		}
-
-		binary.BigEndian.PutUint32(b[i:], uint32(size))
-
-		i += size + 4
-	}
-
-	return b
-}
-
-func AVCtoAnnexB(b []byte) []byte {
-	b = bytes.Clone(b)
-	for i := 0; i < len(b); {
-		size := int(binary.BigEndian.Uint32(b[i:]))
-		b[i] = 0
-		b[i+1] = 0
-		b[i+2] = 0
-		b[i+3] = 1
-		i += 4 + size
-	}
-	return b
-}
-
 const forbiddenZeroBit = 0x80
 const nalUnitType = 0x1F
 
-// DecodeStream - find and return first AU in AVC format
+// Deprecated: DecodeStream - find and return first AU in AVC format
 // useful for processing live streams with unknown separator size
 func DecodeStream(annexb []byte) ([]byte, int) {
 	startPos := -1
@@ -154,70 +120,3 @@ func IndexFrom(b []byte, sep []byte, from int) int {
 
 	return bytes.Index(b, sep)
 }
-
-func EncodeAVC(nals ...[]byte) (avc []byte) {
-	var i, n int
-
-	for _, nal := range nals {
-		if i = len(nal); i > 0 {
-			n += 4 + i
-		}
-	}
-
-	avc = make([]byte, n)
-
-	n = 0
-	for _, nal := range nals {
-		if i = len(nal); i > 0 {
-			binary.BigEndian.PutUint32(avc[n:], uint32(i))
-			n += 4 + copy(avc[n+4:], nal)
-		}
-	}
-
-	return
-}
-
-func RepairAVC(codec *core.Codec, handler core.HandlerFunc) core.HandlerFunc {
-	sps, pps := GetParameterSet(codec.FmtpLine)
-	ps := EncodeAVC(sps, pps)
-
-	return func(packet *rtp.Packet) {
-		if NALUType(packet.Payload) == NALUTypeIFrame {
-			packet.Payload = Join(ps, packet.Payload)
-		}
-		handler(packet)
-	}
-}
-
-func SplitAVC(data []byte) [][]byte {
-	var nals [][]byte
-	for {
-		// get AVC length
-		size := int(binary.BigEndian.Uint32(data)) + 4
-
-		// check if multiple items in one packet
-		if size < len(data) {
-			nals = append(nals, data[:size])
-			data = data[size:]
-		} else {
-			nals = append(nals, data)
-			break
-		}
-	}
-	return nals
-}
-
-func Types(data []byte) []byte {
-	var types []byte
-	for {
-		types = append(types, NALUType(data))
-
-		size := 4 + int(binary.BigEndian.Uint32(data))
-		if size < len(data) {
-			data = data[size:]
-		} else {
-			break
-		}
-	}
-	return types
-}