thefoxon/joy4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move golomb reader to other packet

Browse Source
This commit is contained in:
nareix 2016-04-18 14:24:50 +08:00
parent 15a2ce0a4e
commit 897221b6a6
1 changed files with 13 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
atom/otherStruct.go
View File

@ -7,66 +7,6 @@ import (
"github.com/nareix/bits"
)
type GolombBitReader struct {
R io.Reader
buf [1]byte
left byte
}
func (self *GolombBitReader) ReadBit() (res uint, err error) {
if self.left == 0 {
if _, err = self.R.Read(self.buf[:]); err != nil {
return
}
self.left = 8
}
self.left--
res = uint(self.buf[0]>>self.left) & 1
return
}
func (self *GolombBitReader) ReadBits(n int) (res uint, err error) {
for i := 0; i < n; i++ {
var bit uint
if bit, err = self.ReadBit(); err != nil {
return
}
res |= bit << uint(n-i-1)
}
return
}
func (self *GolombBitReader) ReadExponentialGolombCode() (res uint, err error) {
i := 0
for {
var bit uint
if bit, err = self.ReadBit(); err != nil {
return
}
if !(bit == 0 && i < 32) {
break
}
i++
}
if res, err = self.ReadBits(i); err != nil {
return
}
res += (1 << uint(i)) - 1
return
}
func (self *GolombBitReader) ReadSE() (res uint, err error) {
if res, err = self.ReadExponentialGolombCode(); err != nil {
return
}
if res&0x01 != 0 {
res = (res + 1) / 2
} else {
res = -res / 2
}
return
}
type H264SPSInfo struct {
ProfileIdc uint
LevelIdc uint
@ -84,7 +24,7 @@ type H264SPSInfo struct {
}
func ParseH264SPS(data []byte) (res *H264SPSInfo, err error) {
r := &GolombBitReader{
r := &bits.GolombBitReader{
R: bytes.NewReader(data),
}
@ -285,18 +225,6 @@ type AVCDecoderConfRecord struct {
PPS [][]byte
}
func WriteSampleByNALU(w io.Writer, nalu []byte) (size int, err error) {
if err = WriteInt(w, len(nalu), 4); err != nil {
return
}
size += 4
if _, err = w.Write(nalu); err != nil {
return
}
size += len(nalu)
return
}
func CreateAVCDecoderConfRecord(
SPS []byte,
PPS []byte,
@ -412,6 +340,18 @@ func ReadAVCDecoderConfRecord(r *io.LimitedReader) (self AVCDecoderConfRecord, e
return
}
func WriteSampleByNALU(w io.Writer, nalu []byte) (size int, err error) {
if err = WriteInt(w, len(nalu), 4); err != nil {
return
}
size += 4
if _, err = w.Write(nalu); err != nil {
return
}
size += len(nalu)
return
}
const (
TFHD_BASE_DATA_OFFSET = 0x01
TFHD_STSD_ID = 0x02