diff --git a/audio/packetizer/flac.go b/audio/packetizer/flac.go index d5c0d64..5885e7e 100644 --- a/audio/packetizer/flac.go +++ b/audio/packetizer/flac.go @@ -365,11 +365,7 @@ func readFlacFrame(hdr *FLACHeaderPacket, br *bitio.Reader, bfr *cachedBitReader wastedBits = 0 } - //_ = bw.WriteBits(padding, 1) - //_ = bw.WriteBits(subframeType, 6) - //_ = bw.WriteBits(wastedBitsFlag, 1) if wastedBitsFlag == 1 { - //_ = writeUnary(bw, wastedBits) bps -= uint8(wastedBits) + 1 } @@ -381,13 +377,11 @@ func readFlacFrame(hdr *FLACHeaderPacket, br *bitio.Reader, bfr *cachedBitReader if _, err = br.ReadBits(bps); err != nil { return nil } - //_ = bw.WriteBits(constantSample, bps) case subframeType == 1: //Verbatim //var verbatimData []byte if _, err = readManyBits(br, blockSize*int(bps)); err != nil { return nil } - //_ = writeManyBits(bw, verbatimData, blockSize*int(bps)) case subframeType < 8: //reserved return nil case subframeType < 16: //Fixed @@ -401,7 +395,6 @@ func readFlacFrame(hdr *FLACHeaderPacket, br *bitio.Reader, bfr *cachedBitReader if _, err = readManyBits(br, order*int(bps)); err != nil { return nil } - //_ = writeManyBits(bw, warmupData, order*int(bps)) if err = decodeResidual(br, blockSize, order); err != nil { return nil @@ -414,13 +407,11 @@ func readFlacFrame(hdr *FLACHeaderPacket, br *bitio.Reader, bfr *cachedBitReader if _, err = readManyBits(br, order*int(bps)); err != nil { return nil } - //_ = writeManyBits(bw, warmupData, order*int(bps)) var coefficientPrecisionLen uint64 if coefficientPrecisionLen, err = br.ReadBits(4); err != nil { return nil } - //_ = bw.WriteBits(coefficientPrecisionLen, 4) if coefficientPrecisionLen == 0xF { return nil @@ -432,13 +423,11 @@ func readFlacFrame(hdr *FLACHeaderPacket, br *bitio.Reader, bfr *cachedBitReader if _, err = br.ReadBits(5); err != nil { return nil } - //_ = bw.WriteBits(quantizationLevel, 5) //var coefficientData []byte if _, err = readManyBits(br, order*precision); err != nil { return nil } - //_ = writeManyBits(bw, coefficientData, order*precision) if err = decodeResidual(br, blockSize, order); err != nil { return nil @@ -465,7 +454,6 @@ func decodeResidual(br *bitio.Reader, blockSize, predictorOrder int) (err error) if entropyCodingMethod, err = br.ReadBits(2); err != nil { return err } - //_ = bw.WriteBits(entropyCodingMethod, 2) paramSize := 0 @@ -481,7 +469,6 @@ func decodeResidual(br *bitio.Reader, blockSize, predictorOrder int) (err error) if partitionOrder, err = br.ReadBits(4); err != nil { return err } - //_ = bw.WriteBits(partitionOrder, 4) partitions := 1 << partitionOrder @@ -490,7 +477,6 @@ func decodeResidual(br *bitio.Reader, blockSize, predictorOrder int) (err error) if riceParameter, err = br.ReadBits(uint8(paramSize)); err != nil { return err } - //_ = bw.WriteBitsUnsafe(riceParameter, uint8(paramSize)) var nsamples int if partition != 0 { @@ -507,14 +493,12 @@ func decodeResidual(br *bitio.Reader, blockSize, predictorOrder int) (err error) if riceParameter2, err = br.ReadBits(5); err != nil { return err } - //_ = bw.WriteBitsUnsafe(riceParameter2, 5) if riceParameter2 > 0 { //var sampleData []byte if _, err = readManyBits(br, nsamples*int(riceParameter2)); err != nil { return err } - //_ = writeManyBits(bw, sampleData, nsamples*int(riceParameter2)) } } else { @@ -525,18 +509,15 @@ func decodeResidual(br *bitio.Reader, blockSize, predictorOrder int) (err error) if _, err = readUnary(br); err != nil { return err } - //_ = writeUnary(bw, high) } } else { for j := 0; j < nsamples; j++ { if _, err = readUnary(br); err != nil { return err } - //_ = writeUnary(bw, high) if _, err = br.ReadBits(uint8(riceParameter)); err != nil { return err } - //_ = bw.WriteBitsUnsafe(low, uint8(riceParameter)) } } } @@ -569,20 +550,6 @@ func readManyBits(br *bitio.Reader, bits int) (data []byte, err error) { return } -func writeManyBits(bw *bitio.Writer, data []byte, bits int) (err error) { - for i := 0; i < (bits / 8); i++ { - if err = bw.WriteByte(data[i]); err != nil { - return err - } - } - if (bits % 8) != 0 { - if err = bw.WriteBitsUnsafe(uint64(data[(bits/8)]), uint8(bits%8)); err != nil { - return err - } - } - return -} - func readUnary(br *bitio.Reader) (x uint64, err error) { var bit uint64 for {