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

ts: fix FillPSI BUG and ParsePSI datalen bug

Browse Source
This commit is contained in:
nareix 2016-07-17 15:35:08 +08:00
parent 4ad20c8a65
commit e2fb4a644f
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
format/ts/muxer.go
View File

@ -102,6 +102,7 @@ func (self *Muxer) WritePATPMT() (err error) {
}, },
} }
patlen := pat.Marshal(self.psidata[tsio.PSIHeaderLength:]) patlen := pat.Marshal(self.psidata[tsio.PSIHeaderLength:])
tsio.FillPSI(self.psidata, tsio.TableIdPAT, tsio.TableExtPAT, patlen)
self.datav[0] = self.psidata[:tsio.PSIHeaderLength+patlen] self.datav[0] = self.psidata[:tsio.PSIHeaderLength+patlen]
if err = self.tswpat.WritePackets(self.w, self.datav[:1], 0, false, true); err != nil { if err = self.tswpat.WritePackets(self.w, self.datav[:1], 0, false, true); err != nil {
return return
@ -133,6 +134,7 @@ func (self *Muxer) WritePATPMT() (err error) {
return return
} }
pmt.Marshal(self.psidata[tsio.PSIHeaderLength:]) pmt.Marshal(self.psidata[tsio.PSIHeaderLength:])
tsio.FillPSI(self.psidata, tsio.TableIdPMT, tsio.TableExtPMT, pmtlen)
self.datav[0] = self.psidata[:tsio.PSIHeaderLength+pmtlen] self.datav[0] = self.psidata[:tsio.PSIHeaderLength+pmtlen]
if err = self.tswpmt.WritePackets(self.w, self.datav[:1], 0, false, true); err != nil { if err = self.tswpmt.WritePackets(self.w, self.datav[:1], 0, false, true); err != nil {
return return

12
format/ts/tsio/tsio.go
View File

@ -306,6 +306,11 @@ func ParsePSI(h []byte) (tableid uint8, tableext uint16, hdrlen int, datalen int
datalen = int(pio.U16BE(h[hdrlen:]))&0x3ff - 9 datalen = int(pio.U16BE(h[hdrlen:]))&0x3ff - 9
hdrlen += 2 hdrlen += 2
if datalen < 0 {
err = ErrPSIHeader
return
}
// Table ID extension(16) // Table ID extension(16)
tableext = pio.U16BE(h[hdrlen:]) tableext = pio.U16BE(h[hdrlen:])
hdrlen += 2 hdrlen += 2
@ -330,7 +335,7 @@ func ParsePSI(h []byte) (tableid uint8, tableext uint16, hdrlen int, datalen int
const PSIHeaderLength = 9 const PSIHeaderLength = 9
func FillPSI(h []byte, tableid uint8, tableext uint16, data []byte) (n int) { func FillPSI(h []byte, tableid uint8, tableext uint16, datalen int) (n int) {
// pointer(8) // pointer(8)
h[n] = 0 h[n] = 0
n++ n++
@ -340,7 +345,7 @@ func FillPSI(h []byte, tableid uint8, tableext uint16, data []byte) (n int) {
n++ n++
// section_syntax_indicator(1)=1,private_bit(1)=0,reserved(2)=3,unused(2)=0,section_length(10) // section_syntax_indicator(1)=1,private_bit(1)=0,reserved(2)=3,unused(2)=0,section_length(10)
pio.PutU16BE(h[n:], uint16(0xa<<12 | 2+3+4+len(data))) pio.PutU16BE(h[n:], uint16(0xa<<12 | 2+3+4+datalen))
n += 2 n += 2
// Table ID extension(16) // Table ID extension(16)
@ -359,8 +364,7 @@ func FillPSI(h []byte, tableid uint8, tableext uint16, data []byte) (n int) {
h[n] = 0 h[n] = 0
n++ n++
copy(h[n:], data) n += datalen
n += len(data)
crc := calcCRC32(0xffffffff, h[1:n]) crc := calcCRC32(0xffffffff, h[1:n])
pio.PutU32LE(h[n:], crc) pio.PutU32LE(h[n:], crc)