Change: Rename and consolidate all bits readers and writers.

CHANGELOG.md

@@ -10,6 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - InitSegment.TweakSingleTrakLive changes an init segment to fit live streaming
+- Made bits.Mask() function public
+
+### Changed
+
+- All readers and writers in bits package now stop working at first error and provides the first error as AccError()
+- Renamed bits.AccErrReader, bits.AccErrEBSPReader, bits.AccErrWriter to corresponiding names without AccErr
+- Renamed bits.SliceWriterError to bits.ErrSliceWrite
 
 ## [0.42.0] - 2024-01-26
 

aac/aac.go

@@ -76,7 +76,7 @@ var ReverseFrequencies = map[int]byte{
 
 // DecodeAudioSpecificConfig -
 func DecodeAudioSpecificConfig(r io.Reader) (*AudioSpecificConfig, error) {
-	br := bits.NewAccErrReader(r)
+	br := bits.NewReader(r)
 
 	asc := &AudioSpecificConfig{}
 	audioObjectType := byte(br.Read(5))
@@ -150,11 +150,11 @@ func (a *AudioSpecificConfig) Encode(w io.Writer) error {
 	}
 	bw.Write(0x00, 3) // GASpecificConfig
 	bw.Flush()
-	return bw.Error()
+	return bw.AccError()
 }
 
 // getFrequency - either from 4-bit index or 24-bit value
-func getFrequency(br *bits.AccErrReader) (frequency int, ok bool) {
+func getFrequency(br *bits.Reader) (frequency int, ok bool) {
 	frequencyIndex := br.Read(4)
 	if frequencyIndex == 0x0f {
 		f := br.Read(24)

aac/adts.go

@@ -59,7 +59,7 @@ func (a ADTSHeader) Encode() []byte {
 
 // DecodeADTSHeader by first looking for sync word
 func DecodeADTSHeader(r io.Reader) (header *ADTSHeader, offset int, err error) {
-	br := bits.NewAccErrReader(r)
+	br := bits.NewReader(r)
 	tsPacketSize := 188 // Find sync 0xfff in first 188 bytes (MPEG-TS related)
 	syncFound := false
 	offset = 0

avc/pps.go

@@ -52,7 +52,7 @@ func ParsePPSNALUnit(data []byte, spsMap map[uint32]*SPS) (*PPS, error) {
 	pps := &PPS{}
 
 	rd := bytes.NewReader(data)
-	reader := bits.NewAccErrEBSPReader(rd)
+	reader := bits.NewEBSPReader(rd)
 	// Note! First byte is NAL Header
 
 	naluHdr := reader.Read(8)

avc/slice.go

@@ -66,16 +66,11 @@ func GetSliceTypeFromNALU(data []byte) (sliceType SliceType, err error) {
 	r := bits.NewEBSPReader(bytes.NewReader((data[1:])))
 
 	// first_mb_in_slice
-	if _, err = r.ReadExpGolomb(); err != nil {
-		return
-	}
-
-	// slice_type
-	var st uint
-	if st, err = r.ReadExpGolomb(); err != nil {
-		return
+	_ = r.ReadExpGolomb()
+	sliceType = SliceType(r.ReadExpGolomb())
+	if r.AccError() != nil {
+		err = r.AccError()
 	}
-	sliceType = SliceType(st)
 	if sliceType > 9 {
 		err = ErrInvalidSliceType
 		return
@@ -134,7 +129,7 @@ type SliceHeader struct {
 func ParseSliceHeader(nalu []byte, spsMap map[uint32]*SPS, ppsMap map[uint32]*PPS) (*SliceHeader, error) {
 	sh := SliceHeader{}
 	buf := bytes.NewBuffer(nalu)
-	r := bits.NewAccErrEBSPReader(buf)
+	r := bits.NewEBSPReader(buf)
 	nalHdr := r.Read(8)
 	naluType := GetNaluType(byte(nalHdr))
 	switch naluType {

avc/sps.go

@@ -117,7 +117,7 @@ func ParseSPSNALUnit(data []byte, parseVUIBeyondAspectRatio bool) (*SPS, error)
 	sps := &SPS{}
 
 	rd := bytes.NewReader(data)
-	reader := bits.NewAccErrEBSPReader(rd)
+	reader := bits.NewEBSPReader(rd)
 	// Note! First byte is NAL Header
 
 	nalHdr := reader.Read(8)
@@ -271,7 +271,7 @@ func (s *SPS) ChromaArrayType() byte {
 
 // parseVUI - parse VUI (Visual Usability Information)
 // if parseVUIBeyondAspectRatio is false, stop after AspectRatio has been parsed
-func parseVUI(reader *bits.AccErrEBSPReader, parseVUIBeyondAspectRatio bool) *VUIParameters {
+func parseVUI(reader *bits.EBSPReader, parseVUIBeyondAspectRatio bool) *VUIParameters {
 	vui := &VUIParameters{}
 	var err error
 	aspectRatioInfoPresentFlag := reader.ReadFlag()
@@ -342,7 +342,7 @@ func parseVUI(reader *bits.AccErrEBSPReader, parseVUIBeyondAspectRatio bool) *VU
 	return vui
 }
 
-func parseHrdParameters(r *bits.AccErrEBSPReader) *HrdParameters {
+func parseHrdParameters(r *bits.EBSPReader) *HrdParameters {
 	hp := &HrdParameters{}
 	hp.CpbCountMinus1 = r.ReadExpGolomb()
 
@@ -380,7 +380,7 @@ func GetSARfromIDC(index uint) (uint, uint, error) {
 	return aspectRatioTable[index-1][0], aspectRatioTable[index-1][1], nil
 }
 
-func readScalingList(reader *bits.AccErrEBSPReader, sizeOfScalingList int) ScalingList {
+func readScalingList(reader *bits.EBSPReader, sizeOfScalingList int) ScalingList {
 	scalingList := make([]int, sizeOfScalingList)
 	lastScale := 8
 	nextScale := 8