From e335094c99feb2a0de51e0aaae05deb88673f842 Mon Sep 17 00:00:00 2001 From: nareix Date: Fri, 4 Dec 2015 19:31:30 +0800 Subject: [PATCH] reader checksum complete --- checksum.go | 95 ++++++++ example/test.go | 9 +- reader.go | 610 ++++++++++++++++++++++++++++++++++++++++++++++++ ts.go | 458 ++---------------------------------- writer.go | 12 + 5 files changed, 740 insertions(+), 444 deletions(-) create mode 100644 checksum.go create mode 100644 reader.go create mode 100644 writer.go diff --git a/checksum.go b/checksum.go new file mode 100644 index 0000000..ae73093 --- /dev/null +++ b/checksum.go @@ -0,0 +1,95 @@ + +package ts + +import ( + "io" + "fmt" + "encoding/hex" +) + +var ieeeCrc32Tbl = []uint32 { + 0x00000000, 0xB71DC104, 0x6E3B8209, 0xD926430D, 0xDC760413, 0x6B6BC517, + 0xB24D861A, 0x0550471E, 0xB8ED0826, 0x0FF0C922, 0xD6D68A2F, 0x61CB4B2B, + 0x649B0C35, 0xD386CD31, 0x0AA08E3C, 0xBDBD4F38, 0x70DB114C, 0xC7C6D048, + 0x1EE09345, 0xA9FD5241, 0xACAD155F, 0x1BB0D45B, 0xC2969756, 0x758B5652, + 0xC836196A, 0x7F2BD86E, 0xA60D9B63, 0x11105A67, 0x14401D79, 0xA35DDC7D, + 0x7A7B9F70, 0xCD665E74, 0xE0B62398, 0x57ABE29C, 0x8E8DA191, 0x39906095, + 0x3CC0278B, 0x8BDDE68F, 0x52FBA582, 0xE5E66486, 0x585B2BBE, 0xEF46EABA, + 0x3660A9B7, 0x817D68B3, 0x842D2FAD, 0x3330EEA9, 0xEA16ADA4, 0x5D0B6CA0, + 0x906D32D4, 0x2770F3D0, 0xFE56B0DD, 0x494B71D9, 0x4C1B36C7, 0xFB06F7C3, + 0x2220B4CE, 0x953D75CA, 0x28803AF2, 0x9F9DFBF6, 0x46BBB8FB, 0xF1A679FF, + 0xF4F63EE1, 0x43EBFFE5, 0x9ACDBCE8, 0x2DD07DEC, 0x77708634, 0xC06D4730, + 0x194B043D, 0xAE56C539, 0xAB068227, 0x1C1B4323, 0xC53D002E, 0x7220C12A, + 0xCF9D8E12, 0x78804F16, 0xA1A60C1B, 0x16BBCD1F, 0x13EB8A01, 0xA4F64B05, + 0x7DD00808, 0xCACDC90C, 0x07AB9778, 0xB0B6567C, 0x69901571, 0xDE8DD475, + 0xDBDD936B, 0x6CC0526F, 0xB5E61162, 0x02FBD066, 0xBF469F5E, 0x085B5E5A, + 0xD17D1D57, 0x6660DC53, 0x63309B4D, 0xD42D5A49, 0x0D0B1944, 0xBA16D840, + 0x97C6A5AC, 0x20DB64A8, 0xF9FD27A5, 0x4EE0E6A1, 0x4BB0A1BF, 0xFCAD60BB, + 0x258B23B6, 0x9296E2B2, 0x2F2BAD8A, 0x98366C8E, 0x41102F83, 0xF60DEE87, + 0xF35DA999, 0x4440689D, 0x9D662B90, 0x2A7BEA94, 0xE71DB4E0, 0x500075E4, + 0x892636E9, 0x3E3BF7ED, 0x3B6BB0F3, 0x8C7671F7, 0x555032FA, 0xE24DF3FE, + 0x5FF0BCC6, 0xE8ED7DC2, 0x31CB3ECF, 0x86D6FFCB, 0x8386B8D5, 0x349B79D1, + 0xEDBD3ADC, 0x5AA0FBD8, 0xEEE00C69, 0x59FDCD6D, 0x80DB8E60, 0x37C64F64, + 0x3296087A, 0x858BC97E, 0x5CAD8A73, 0xEBB04B77, 0x560D044F, 0xE110C54B, + 0x38368646, 0x8F2B4742, 0x8A7B005C, 0x3D66C158, 0xE4408255, 0x535D4351, + 0x9E3B1D25, 0x2926DC21, 0xF0009F2C, 0x471D5E28, 0x424D1936, 0xF550D832, + 0x2C769B3F, 0x9B6B5A3B, 0x26D61503, 0x91CBD407, 0x48ED970A, 0xFFF0560E, + 0xFAA01110, 0x4DBDD014, 0x949B9319, 0x2386521D, 0x0E562FF1, 0xB94BEEF5, + 0x606DADF8, 0xD7706CFC, 0xD2202BE2, 0x653DEAE6, 0xBC1BA9EB, 0x0B0668EF, + 0xB6BB27D7, 0x01A6E6D3, 0xD880A5DE, 0x6F9D64DA, 0x6ACD23C4, 0xDDD0E2C0, + 0x04F6A1CD, 0xB3EB60C9, 0x7E8D3EBD, 0xC990FFB9, 0x10B6BCB4, 0xA7AB7DB0, + 0xA2FB3AAE, 0x15E6FBAA, 0xCCC0B8A7, 0x7BDD79A3, 0xC660369B, 0x717DF79F, + 0xA85BB492, 0x1F467596, 0x1A163288, 0xAD0BF38C, 0x742DB081, 0xC3307185, + 0x99908A5D, 0x2E8D4B59, 0xF7AB0854, 0x40B6C950, 0x45E68E4E, 0xF2FB4F4A, + 0x2BDD0C47, 0x9CC0CD43, 0x217D827B, 0x9660437F, 0x4F460072, 0xF85BC176, + 0xFD0B8668, 0x4A16476C, 0x93300461, 0x242DC565, 0xE94B9B11, 0x5E565A15, + 0x87701918, 0x306DD81C, 0x353D9F02, 0x82205E06, 0x5B061D0B, 0xEC1BDC0F, + 0x51A69337, 0xE6BB5233, 0x3F9D113E, 0x8880D03A, 0x8DD09724, 0x3ACD5620, + 0xE3EB152D, 0x54F6D429, 0x7926A9C5, 0xCE3B68C1, 0x171D2BCC, 0xA000EAC8, + 0xA550ADD6, 0x124D6CD2, 0xCB6B2FDF, 0x7C76EEDB, 0xC1CBA1E3, 0x76D660E7, + 0xAFF023EA, 0x18EDE2EE, 0x1DBDA5F0, 0xAAA064F4, 0x738627F9, 0xC49BE6FD, + 0x09FDB889, 0xBEE0798D, 0x67C63A80, 0xD0DBFB84, 0xD58BBC9A, 0x62967D9E, + 0xBBB03E93, 0x0CADFF97, 0xB110B0AF, 0x060D71AB, 0xDF2B32A6, 0x6836F3A2, + 0x6D66B4BC, 0xDA7B75B8, 0x035D36B5, 0xB440F7B1, 0x00000001, +} + +func updateIeeeCrc32(crc uint32, data []byte) uint32 { + for _, b := range data { + crc = ieeeCrc32Tbl[b^byte(crc)]^(crc>>8) + } + return crc +} + +type Crc32Reader struct { + R io.Reader + Crc32 uint32 +} + +var debugCrc32 = false + +func NewCrc32Reader(r io.Reader) *Crc32Reader { + return &Crc32Reader{R: r, Crc32: 0xffffffff} +} + +func (self *Crc32Reader) Read(b []byte) (n int, err error) { + if n, err = self.R.Read(b); err != nil { + return + } + if debugCrc32 { + fmt.Println("crc32: update", hex.EncodeToString(b)) + } + self.Crc32 = updateIeeeCrc32(self.Crc32, b) + return +} + +func (self *Crc32Reader) ReadCrc32UIntAndCheck() (err error) { + if err = ReadDummy(self, 4); err != nil { + return + } + if self.Crc32 != 0 { + err = fmt.Errorf("crc32 != 0") + return + } + return +} + diff --git a/example/test.go b/example/test.go index 01d9273..24203a8 100644 --- a/example/test.go +++ b/example/test.go @@ -74,12 +74,13 @@ func main() { if header, n, err = ts.ReadTSPacket(file, data[:]); err != nil { return } - //fmt.Println(header, n) + fmt.Println(header, n) payload = data[:n] + pr := bytes.NewReader(payload) if header.PID == 0 { - if pat, err = ts.ReadPAT(bytes.NewReader(payload)); err != nil { + if pat, err = ts.ReadPAT(pr); err != nil { return } } @@ -87,11 +88,11 @@ func main() { for _, entry := range(pat.Entries) { if entry.ProgramMapPID == header.PID { //fmt.Println("matchs", entry) - if pmt, err = ts.ReadPMT(bytes.NewReader(payload)); err != nil { + if pmt, err = ts.ReadPMT(pr); err != nil { return } //fmt.Println("pmt", pmt) - if false { + if true { fmt.Println(hex.Dump(payload)) } } diff --git a/reader.go b/reader.go new file mode 100644 index 0000000..96cc43b --- /dev/null +++ b/reader.go @@ -0,0 +1,610 @@ + +package ts + +import ( + "fmt" + "io" + "io/ioutil" +) + +func ReadUInt(r io.Reader, n int) (res uint, err error) { + var b [4]byte + if _, err = r.Read(b[0:n]); err != nil { + return + } + for i := 0; i < n; i++ { + res <<= 8 + res |= uint(b[i]) + } + return +} + +func ReadDummy(r io.Reader, n int) (err error) { + _, err = io.CopyN(ioutil.Discard, r, int64(n)) + return +} + +func ReadUInt64(r io.Reader, n int) (res uint64, err error) { + var res32 uint + if n > 4 { + if res32, err = ReadUInt(r, n-4); err != nil { + return + } + res |= uint64(res32)<<(uint(n-4)*8) + n = 4 + } + if res32, err = ReadUInt(r, n); err != nil { + return + } + res |= uint64(res32) + return +} + +func ReadTSHeader(r io.Reader) (self TSHeader, err error) { + var flags uint + + // sync(8) + // transport_error_indicator(1) + // payload_unit_start_indicator(1) + // transport_priority(1) + // pid(13) + // Scrambling control(2) + // Adaptation field flag(1) + // Continuity counter(4) + if flags, err = ReadUInt(r, 4); err != nil { + return + } + + if debug { + fmt.Printf("ts: %s\n", FieldsDumper{ + Fields: []struct{ + Length int + Desc string + }{ + {8, "sync"}, + {1, "transport_error_indicator"}, + {1, "payload_unit_start_indicator"}, + {1, "transport_priority"}, + {13, "pid"}, + {2, "scrambling_control"}, + {1, "adaptation_field_flag"}, + {4, "continuity_counter"}, + }, + Val: flags, + Length: 32, + }) + } + + if flags & 0x400000 != 0 { + self.PayloadUnitStart = true + } + + if (flags & 0xff000000) >> 24 != 0x47 { + err = fmt.Errorf("invalid sync") + return + } + + self.PID = (flags & 0x1fff00) >> 8 + self.ContinuityCounter = flags & 0xf + + if flags & 0x20 != 0 { + var flags, length uint + if length, err = ReadUInt(r, 1); err != nil { + return + } + lr := &io.LimitedReader{R: r, N: int64(length)} + if flags, err = ReadUInt(lr, 1); err != nil { + return + } + + if debug { + fmt.Printf("ts: %s\n", FieldsDumper{ + Fields: []struct{ + Length int + Desc string + }{ + {1, "discontinuity_indicator"}, + {1, "random_access_indicator"}, + {1, "elementary_stream_priority_indicator"}, + {1, "pcr_flag"}, + {1, "opcr_flag"}, + {1, "splicing_point_flag"}, + {1, "transport_private_data_flag"}, + {1, "adaptation_field_extension_flag"}, + }, + Val: flags, + Length: 8, + }) + } + + // PCR + if flags & 0x10 != 0 { + if self.PCR, err = ReadUInt64(lr, 6); err != nil { + return + } + } + + // OPCR + if flags & 0x08 != 0 { + if self.OPCR, err = ReadUInt64(lr, 6); err != nil { + return + } + } + + // Splice countdown + if flags & 0x04 != 0 { + if _, err = ReadUInt(lr, 1); err != nil { + return + } + } + + // Transport private data + if flags & 0x02 != 0 { + var length uint + if length, err = ReadUInt(lr, 1); err != nil { + return + } + + b := make([]byte, length) + if _, err = lr.Read(b); err != nil { + return + } + } + + // Adaptation extension + if lr.N > 0 { + data := make([]byte, lr.N) + if _, err = lr.Read(data); err != nil { + return + } + + if debug { + // rubish + //fmt.Println("ts: ", data) + } + } + } + + return +} + +func ReadTSPacket(r io.Reader, data []byte) (self TSHeader, n int, err error) { + lr := &io.LimitedReader{R: r, N: 188} + if self, err = ReadTSHeader(lr); err != nil { + return + } + if n, err = lr.Read(data[:lr.N]); err != nil { + return + } + return +} + +func ReadPSI(r io.Reader) (self PSI, lr *io.LimitedReader, cr *Crc32Reader, err error) { + var flags, pointer, length uint + + // pointer field + if pointer, err = ReadUInt(r, 1); err != nil { + return + } + if pointer != 0 { + if err = ReadDummy(r, int(pointer)); err != nil { + return + } + } + + cr = NewCrc32Reader(r) + + // table_id + if self.TableId, err = ReadUInt(cr, 1); err != nil { + return + } + + // reserved(4)=0xb + // section_length(10) + if flags, err = ReadUInt(cr, 2); err != nil { + return + } + length = flags & 0x3FF + + if debug { + fmt.Printf("psi: %s\n", FieldsDumper{ + Fields: []struct{ + Length int + Desc string + }{ + {4, "reserved"}, + }, + Val: flags, + Length: 16, + }) + } + + lr = &io.LimitedReader{R: cr, N: int64(length)} + + // Table ID extension(16) + if self.TableIdExtension, err = ReadUInt(lr, 2); err != nil { + return + } + + // resverd(2)=3 + // version(5) + // Current_next_indicator(1) + if flags, err = ReadUInt(lr, 1); err != nil { + return + } + + if debug { + fmt.Printf("psi: %s\n", FieldsDumper{ + Fields: []struct{ + Length int + Desc string + }{ + {2, "resverd"}, + {5, "version"}, + {1, "current_next_indicator"}, + }, + Val: flags, + Length: 8, + }) + } + + // section_number(8) + if self.SecNum, err = ReadUInt(lr, 1); err != nil { + return + } + + // last_section_number(8) + if self.LastSecNum, err = ReadUInt(lr, 1); err != nil { + return + } + + if debug { + fmt.Printf("psi: table_id=%x table_extension=%x secnum=%x lastsecnum=%x\n", + self.TableId, + self.TableIdExtension, + self.SecNum, + self.LastSecNum, + ) + } + + lr.N -= 4 + return +} + +func ReadPMT(r io.Reader) (self PMT, err error) { + var lr *io.LimitedReader + var cr *Crc32Reader + //var psi PSI + + if _, lr, cr, err = ReadPSI(r); err != nil { + return + } + + var flags, length uint + + // 111(3) + // PCRPID(13) + if flags, err = ReadUInt(lr, 2); err != nil { + return + } + self.PCRPID = flags & 0x1fff + + if debug { + fmt.Printf("pmt: %s\n", FieldsDumper{ + Fields: []struct{ + Length int + Desc string + }{ + {3, "reserved"}, + {13, "pcrpid"}, + }, + Val: flags, + Length: 16, + }) + } + + // Reserved(6) + // Program info length(10) + if flags, err = ReadUInt(lr, 2); err != nil { + return + } + length = flags & 0x3ff + + readDescs := func(lr *io.LimitedReader) (res []Descriptor, err error) { + var desc Descriptor + for lr.N > 0 { + if desc.Tag, err = ReadUInt(lr, 1); err != nil { + return + } + var length uint + if length, err = ReadUInt(lr, 1); err != nil { + return + } + desc.Data = make([]byte, length) + if _, err = lr.Read(desc.Data); err != nil { + return + } + res = append(res, desc) + } + return + } + + if length > 0 { + lr := &io.LimitedReader{R: lr, N: int64(length)} + if self.ProgramDescriptors, err = readDescs(lr); err != nil { + return + } + } + + for lr.N > 0 { + var info ElementaryStreamInfo + if info.StreamType, err = ReadUInt(lr, 1); err != nil { + return + } + + // Reserved(3) + // Elementary PID(13) + if flags, err = ReadUInt(lr, 2); err != nil { + return + } + info.ElementaryPID = flags & 0x1fff + + // Reserved(6) + // ES Info length length(10) + if flags, err = ReadUInt(lr, 2); err != nil { + return + } + length = flags & 0x3ff + + if length > 0 { + lr := &io.LimitedReader{R: lr, N: int64(length)} + if info.Descriptors, err = readDescs(lr); err != nil { + return + } + } + self.ElementaryStreamInfos = append(self.ElementaryStreamInfos, info) + } + + if debug { + fmt.Printf("pmt: ElementaryStreamInfos %v\n", self.ElementaryStreamInfos) + + } + + if err = cr.ReadCrc32UIntAndCheck(); err != nil { + return + } + + return +} + +func ReadPAT(r io.Reader) (self PAT, err error) { + var lr *io.LimitedReader + var cr *Crc32Reader + //var psi PSI + + if _, lr, cr, err = ReadPSI(r); err != nil { + return + } + + for lr.N > 0 { + entry := PATEntry{} + if entry.ProgramNumber, err = ReadUInt(lr, 2); err != nil { + return + } + if entry.ProgramNumber == 0 { + if entry.NetworkPID, err = ReadUInt(lr, 2); err != nil { + return + } + entry.NetworkPID &= 0x1fff + } else { + if entry.ProgramMapPID, err = ReadUInt(lr, 2); err != nil { + return + } + entry.ProgramMapPID &= 0x1fff + } + self.Entries = append(self.Entries, entry) + } + + if err = cr.ReadCrc32UIntAndCheck(); err != nil { + return + } + + return +} + +func ReadPESHeader(r io.Reader) (res *PESHeader, err error) { + var flags, length uint + self := &PESHeader{} + + // http://dvd.sourceforge.net/dvdinfo/pes-hdr.html + + // start code 000001 + if flags, err = ReadUInt(r, 3); err != nil { + return + } + if flags != 0x000001 { + err = fmt.Errorf("invalid PES header") + return + } + + if self.StreamId, err = ReadUInt(r, 1); err != nil { + return + } + + if length, err = ReadUInt(r, 2); err != nil { + return + } + lrAll := &io.LimitedReader{R: r, N: int64(length)} + lr := lrAll + + // 10(2) + // PES scrambling control(2) + // PES priority(1) + // data alignment indicator(1) + // copyright(1) + // original or copy(1) + if _, err = ReadUInt(lr, 1); err != nil { + return + } + + if debug { + fmt.Printf("pes: %s\n", FieldsDumper{ + Fields: []struct{ + Length int + Desc string + }{ + {2, "PES_scrambling_control"}, + {1, "PES_priority"}, + {1, "data_alignment_indicator"}, + {1, "copyright"}, + {1, "original_or_copy"}, + }, + Val: flags, + Length: 6, + }) + } + + // PTS DTS flags(2) + // ESCR flag(1) + // ES rate flag(1) + // DSM trick mode flag(1) + // additional copy info flag(1) + // PES CRC flag(1) + // PES extension flag(1) + if flags, err = ReadUInt(lr, 1); err != nil { + return + } + + if debug { + fmt.Printf("pes: %s\n", FieldsDumper{ + Fields: []struct{ + Length int + Desc string + }{ + {2, "pts_dts_flags"}, + {1, "escr_flag"}, + {1, "es_rate_flag"}, + {1, "dsm_trick_mode_flag"}, + {1, "additional_copy_info_flag"}, + {1, "pes_crc_flag"}, + {1, "pes_extension_flag"}, + }, + Val: flags, + Length: 8, + }) + } + + // PES header data length(8) + if length, err = ReadUInt(lr, 1); err != nil { + return + } + lr = &io.LimitedReader{R: lr, N: int64(length)} + + if flags & 0x80 != 0 { + var v uint64 + if v, err = ReadUInt64(lr, 5); err != nil { + return + } + self.PTS = PESUIntToTs(v) + } + + if flags & 0x40 != 0 && flags & 0x80 != 0 { + var v uint64 + if v, err = ReadUInt64(lr, 5); err != nil { + return + } + self.DTS = PESUIntToTs(v) + } + + // ESCR flag + if flags & 0x20 != 0 { + if _, err = ReadUInt64(lr, 6); err != nil { + return + } + } + + // ES rate flag + if flags & 0x10 != 0 { + if _, err = ReadUInt64(lr, 3); err != nil { + return + } + } + + // additional copy info flag + if flags & 0x04 != 0 { + if _, err = ReadUInt(lr, 1); err != nil { + return + } + } + + // PES CRC flag + if flags & 0x02 != 0 { + if _, err = ReadUInt(lr, 2); err != nil { + return + } + } + + // PES extension flag + if flags & 0x01 != 0 { + var flags uint + + // PES private data flag(1) + // pack header field flag(1) + // program packet sequence counter flag(1) + // P-STD buffer flag(1) + // 111(3) + // PES extension flag 2(1) + if flags, err = ReadUInt(lr, 1); err != nil { + return + } + + // PES private data flag(1) + if flags & 0x80 != 0 { + // if set to 1 16 bytes of user defined data is appended to the header data field + if err = ReadDummy(lr, 16); err != nil { + return + } + } + + // pack header field flag(1) + if flags & 0x40 != 0 { + // if set to 1 the 8-bit pack field length value is appended to the header data field + if err = ReadDummy(lr, 1); err != nil { + return + } + } + + // program packet sequence counter flag(1) + if flags & 0x20 != 0 { + if err = ReadDummy(lr, 2); err != nil { + return + } + } + + // P-STD buffer flag(1) + if flags & 0x10 != 0 { + if err = ReadDummy(lr, 2); err != nil { + return + } + } + + // PES extension flag 2(1) + if flags & 0x01 != 0 { + if err = ReadDummy(lr, 2); err != nil { + return + } + } + } + + if lr.N > 0 { + if err = ReadDummy(lr, int(lr.N)); err != nil { + return + } + } + + self.DataLength = uint(lrAll.N) + + res = self + return +} + diff --git a/ts.go b/ts.go index a1388dc..06c9c75 100644 --- a/ts.go +++ b/ts.go @@ -2,11 +2,11 @@ package ts import ( - "io" - "io/ioutil" "fmt" ) +const debug = true + type TSHeader struct { PID uint PCR uint64 @@ -15,50 +15,6 @@ type TSHeader struct { PayloadUnitStart bool } -func ReadUInt(r io.Reader, n int) (res uint, err error) { - var b [4]byte - if _, err = r.Read(b[0:n]); err != nil { - return - } - for i := 0; i < n; i++ { - res <<= 8 - res |= uint(b[i]) - } - return -} - -func ReadDummy(r io.Reader, n int) (err error) { - _, err = io.CopyN(ioutil.Discard, r, int64(n)) - return -} - -func ReadUInt64(r io.Reader, n int) (res uint64, err error) { - var res32 uint - if n > 4 { - if res32, err = ReadUInt(r, n-4); err != nil { - return - } - res |= uint64(res32)<<(uint(n-4)*8) - n = 4 - } - if res32, err = ReadUInt(r, n); err != nil { - return - } - res |= uint64(res32) - return -} - -func ReadTSPacket(r io.Reader, data []byte) (self TSHeader, n int, err error) { - lr := &io.LimitedReader{R: r, N: 188} - if self, err = ReadTSHeader(lr); err != nil { - return - } - if n, err = lr.Read(data[:lr.N]); err != nil { - return - } - return -} - const ( ElementaryStreamTypeH264 = 0x1B ElementaryStreamTypeAdtsAAC = 0x0F @@ -94,250 +50,8 @@ type ElementaryStreamInfo struct { type PSI struct { TableIdExtension uint TableId uint -} - -func ReadPSI(r io.Reader) (self PSI, lr *io.LimitedReader, err error) { - var flags, pointer, length uint - - // pointer field - if pointer, err = ReadUInt(r, 1); err != nil { - return - } - if pointer != 0 { - if err = ReadDummy(r, int(pointer)); err != nil { - return - } - } - - // table_id - if self.TableId, err = ReadUInt(r, 1); err != nil { - return - } - - // reserved(4) - // section_length(10) - if flags, err = ReadUInt(r, 2); err != nil { - return - } - length = flags & 0x3FF - lr = &io.LimitedReader{R: r, N: int64(length)} - - // Table ID extension(16) - if _, err = ReadUInt(lr, 2); err != nil { - return - } - - // _(2) - // version(5) - // Current_next_indicator(1) - if _, err = ReadUInt(lr, 1); err != nil { - return - } - - // section_number(8) - if _, err = ReadUInt(lr, 1); err != nil { - return - } - - // last_section_number(8) - if _, err = ReadUInt(lr, 1); err != nil { - return - } - - lr.N -= 4 - return -} - -func ReadPMT(r io.Reader) (self PMT, err error) { - var lr *io.LimitedReader - //var psi PSI - - if _, lr, err = ReadPSI(r); err != nil { - return - } - - var flags, length uint - - // Reserved(3) - // PCRPID(13) - if flags, err = ReadUInt(lr, 2); err != nil { - return - } - self.PCRPID = flags & 0x1fff - - // Reserved(6) - // Program info length(10) - if flags, err = ReadUInt(lr, 2); err != nil { - return - } - length = flags & 0x3ff - - readDescs := func(lr *io.LimitedReader) (res []Descriptor, err error) { - var desc Descriptor - for lr.N > 0 { - if desc.Tag, err = ReadUInt(lr, 1); err != nil { - return - } - var length uint - if length, err = ReadUInt(lr, 1); err != nil { - return - } - desc.Data = make([]byte, length) - if _, err = lr.Read(desc.Data); err != nil { - return - } - res = append(res, desc) - } - return - } - - if length > 0 { - lr := &io.LimitedReader{R: lr, N: int64(length)} - if self.ProgramDescriptors, err = readDescs(lr); err != nil { - return - } - } - - for lr.N > 0 { - var info ElementaryStreamInfo - if info.StreamType, err = ReadUInt(lr, 1); err != nil { - return - } - - // Reserved(3) - // Elementary PID(13) - if flags, err = ReadUInt(lr, 2); err != nil { - return - } - info.ElementaryPID = flags & 0x1fff - - // Reserved(6) - // ES Info length length(10) - if flags, err = ReadUInt(lr, 2); err != nil { - return - } - length = flags & 0x3ff - - if length > 0 { - lr := &io.LimitedReader{R: lr, N: int64(length)} - if info.Descriptors, err = readDescs(lr); err != nil { - return - } - } - self.ElementaryStreamInfos = append(self.ElementaryStreamInfos, info) - } - - return -} - -func ReadPAT(r io.Reader) (self PAT, err error) { - var lr *io.LimitedReader - //var psi PSI - - if _, lr, err = ReadPSI(r); err != nil { - return - } - - for lr.N > 0 { - entry := PATEntry{} - if entry.ProgramNumber, err = ReadUInt(lr, 2); err != nil { - return - } - if entry.ProgramNumber == 0 { - if entry.NetworkPID, err = ReadUInt(lr, 2); err != nil { - return - } - entry.NetworkPID &= 0x1fff - } else { - if entry.ProgramMapPID, err = ReadUInt(lr, 2); err != nil { - return - } - entry.ProgramMapPID &= 0x1fff - } - self.Entries = append(self.Entries, entry) - } - - return -} - -func ReadTSHeader(r io.Reader) (self TSHeader, err error) { - var flags uint - - // sync(8) - // transport_error_indicator(1) - // payload_unit_start_indicator(1) - // transport_priority(1) - // pid(13) - // Scrambling control(2) - // Adaptation field flag(1) - // Continuity counter(4) - if flags, err = ReadUInt(r, 4); err != nil { - return - } - - if flags & 0x400000 != 0 { - self.PayloadUnitStart = true - } - - if (flags & 0xff000000) >> 24 != 0x47 { - err = fmt.Errorf("invalid sync") - return - } - - self.PID = (flags & 0x1fff00) >> 8 - self.ContinuityCounter = flags & 0xf - - if flags & 0x20 != 0 { - var flags, length uint - if length, err = ReadUInt(r, 1); err != nil { - return - } - lr := &io.LimitedReader{R: r, N: int64(length)} - if flags, err = ReadUInt(lr, 1); err != nil { - return - } - - // PCR - if flags & 0x10 != 0 { - if self.PCR, err = ReadUInt64(lr, 6); err != nil { - return - } - } - - // OPCR - if flags & 0x08 != 0 { - if self.OPCR, err = ReadUInt64(lr, 6); err != nil { - return - } - } - - // Splice countdown - if flags & 0x04 != 0 { - if _, err = ReadUInt(lr, 1); err != nil { - return - } - } - - // Transport private data - if flags & 0x02 != 0 { - var length uint - if length, err = ReadUInt(lr, 1); err != nil { - return - } - - b := make([]byte, length) - if _, err = lr.Read(b); err != nil { - return - } - } - - // Adaptation extension - if err = ReadDummy(lr, int(lr.N)); err != nil { - return - } - } - - return + SecNum uint + LastSecNum uint } type PESHeader struct { @@ -353,160 +67,24 @@ func PESUIntToTs(v uint64) (ts uint64) { return (((v>>33)&0x7)<<30) | (((v>>17)&0xef)<<15) | ((v>>1)&0xef) } -func ReadPESHeader(r io.Reader) (res *PESHeader, err error) { - var flags, length uint - self := &PESHeader{} - - // start code 000001 - if flags, err = ReadUInt(r, 3); err != nil { - return - } - if flags != 0x000001 { - err = fmt.Errorf("invalid PES header") - return +type FieldsDumper struct { + Fields []struct { + Length int + Desc string } + Val uint + Length uint +} - if self.StreamId, err = ReadUInt(r, 1); err != nil { - return - } - - if length, err = ReadUInt(r, 2); err != nil { - return - } - lrAll := &io.LimitedReader{R: r, N: int64(length)} - lr := lrAll - - // PES scrambling control - // PES priority - // data alignment indicator - // copyright - // original or copy - if _, err = ReadUInt(lr, 1); err != nil { - return - } - - // PTS DTS flags(2) - // ESCR flag(1) - // ES rate flag(1) - // DSM trick mode flag(1) - // additional copy info flag(1) - // PES CRC flag(1) - // PES extension flag(1) - if flags, err = ReadUInt(lr, 1); err != nil { - return - } - - // PES header data length(8) - if length, err = ReadUInt(lr, 1); err != nil { - return - } - lr = &io.LimitedReader{R: lr, N: int64(length)} - - if flags & 0x80 != 0 { - var v uint64 - if v, err = ReadUInt64(lr, 5); err != nil { - return - } - self.PTS = PESUIntToTs(v) - } - - if flags & 0x40 != 0 && flags & 0x80 != 0 { - var v uint64 - if v, err = ReadUInt64(lr, 5); err != nil { - return - } - self.DTS = PESUIntToTs(v) - } - - // ESCR flag - if flags & 0x20 != 0 { - if _, err = ReadUInt64(lr, 6); err != nil { - return +func (self FieldsDumper) String() (res string) { + pos := uint(self.Length) + for _, field := range self.Fields { + pos -= uint(field.Length) + val := (self.Val>>pos)&(1< 0 { - if err = ReadDummy(lr, int(lr.N)); err != nil { - return - } - } - - self.DataLength = uint(lrAll.N) - - res = self return } diff --git a/writer.go b/writer.go new file mode 100644 index 0000000..9b7bfd3 --- /dev/null +++ b/writer.go @@ -0,0 +1,12 @@ + +package ts + +import ( + _ "fmt" + "io" +) + +type SimpleH264Writer struct { + W io.Writer +} +