From 5d520f0d72705c2f1530f829506b333b4d48ea7d Mon Sep 17 00:00:00 2001
From: nareix <hi.nareix@gmail.com>
Date: Sun, 6 Dec 2015 10:38:14 +0800
Subject: [PATCH] bugfix: read samples

---
 example/test.go | 11 ++++++++---
 reader.go       |  8 +++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/example/test.go b/example/test.go
index b279abc..22ade5e 100644
--- a/example/test.go
+++ b/example/test.go
@@ -16,8 +16,7 @@ type Stream struct {
 	Title string
 	Data bytes.Buffer
 	Type uint
-	PTS uint
-	PCR uint
+	PCR uint64
 }
 
 type Sample struct {
@@ -77,6 +76,7 @@ func readSamples(ch chan Sample) {
 			if stream.Header, err = ts.ReadPESHeader(lr); err != nil {
 				return
 			}
+			stream.PCR = header.PCR
 		}
 		if _, err = io.CopyN(&stream.Data, lr, lr.N); err != nil {
 			return
@@ -89,6 +89,9 @@ func readSamples(ch chan Sample) {
 			ch <- Sample{
 				Type: stream.Type,
 				Data: stream.Data.Bytes(),
+				PTS: stream.Header.PTS,
+				DTS: stream.Header.DTS,
+				PCR: stream.PCR,
 			}
 		}
 		return
@@ -134,7 +137,7 @@ func readSamples(ch chan Sample) {
 }
 
 func main() {
-	ch := make(chan Sample)
+	ch := make(chan Sample, 0)
 	go readSamples(ch)
 
 	for {
@@ -144,6 +147,8 @@ func main() {
 			break
 		}
 		if sample.Type == ts.ElementaryStreamTypeH264 {
+			fmt.Println("sample", len(sample.Data), "PCR", sample.PCR)
+			fmt.Print(hex.Dump(sample.Data))
 		}
 	}
 }
diff --git a/reader.go b/reader.go
index 06426e5..b24f1cb 100644
--- a/reader.go
+++ b/reader.go
@@ -419,6 +419,10 @@ func ReadPAT(r io.Reader) (self PAT, err error) {
 		return
 	}
 
+	if debug {
+		fmt.Printf("pat: %v\n", self)
+	}
+
 	return
 }
 
@@ -529,7 +533,9 @@ func ReadPESHeader(r io.Reader) (res *PESHeader, err error) {
 			return
 		}
 		self.DTS = PESUIntToTs(v)
-		fmt.Printf("pes: dts %d\n", self.PTS)
+		if debug {
+			fmt.Printf("pes: dts %d\n", self.PTS)
+		}
 	}
 
 	// ESCR flag