Merged in feature/105 (pull request #211)

Feature/105

Approved-by: Saxon Milton <saxon.milton@gmail.com>
Approved-by: Alan Noble <anoble@gmail.com>

container/mts/mpegts.go

@@ -33,7 +33,6 @@ import (
 	"fmt"
 
 	"github.com/Comcast/gots/packet"
-	"github.com/Comcast/gots/pes"
 	"github.com/pkg/errors"
 
 	"bitbucket.org/ausocean/av/container/mts/meta"
@@ -379,8 +378,8 @@ var errNoPTS = errors.New("could not find PTS")
 // GetPTSRange retreives the first and last PTS of an MPEGTS clip.
 // If there is only one PTS, it is included twice in the pts return value.
 func GetPTSRange(clip []byte, pid uint16) (pts [2]uint64, err error) {
-	var _pkt packet.Packet
+	var _pts int64
-	// Find the first packet with PID pidType and PUSI.
+	// Get the first PTS for the given PID.
 	var i int
 	for {
 		if i >= len(clip) {
@@ -390,25 +389,14 @@ func GetPTSRange(clip []byte, pid uint16) (pts [2]uint64, err error) {
 		if err != nil {
 			return pts, errors.Wrap(err, fmt.Sprintf("could not find packet of PID: %d", pid))
 		}
-		copy(_pkt[:], pkt)
+		_pts, err = GetPTS(pkt)
-		if _pkt.PayloadUnitStartIndicator() {
+		if err == nil {
 			break
 		}
 		i += _i + PacketSize
 	}
 
-	// Get the payload of the packet, which will be the start of the PES packet.
+	pts[0] = uint64(_pts)
-	payload, err := packet.Payload(&_pkt)
-	if err != nil {
-		return pts, err
-	}
-
-	// Get the the first PTS from the PES header.
-	_pes, err := pes.NewPESHeader(payload)
-	if err != nil {
-		return pts, err
-	}
-	pts[0] = _pes.PTS()
 	pts[1] = pts[0] // Until we have find a second PTS.
 
 	// Get the last PTS searching in reverse from end of the clip.
@@ -419,31 +407,59 @@ func GetPTSRange(clip []byte, pid uint16) (pts [2]uint64, err error) {
 		if err != nil || i <= first {
 			return pts, nil
 		}
-
+		_pts, err = GetPTS(pkt)
-		copy(_pkt[:], pkt)
+		if err == nil {
-		if packet.PayloadUnitStartIndicator(&_pkt) {
 			break
 		}
-
 		i = _i
 	}
 
-	// Get the payload of the packet.
+	pts[1] = uint64(_pts)
-	payload, err = packet.Payload(&_pkt)
-	if err != nil {
-		return
-	}
-
-	// Get the the last PTS from the PES header.
-	_pes, err = pes.NewPESHeader(payload)
-	if err != nil {
-		return
-	}
-	pts[1] = _pes.PTS()
 
 	return
 }
 
+var errNoPesPayload = errors.New("no PES payload")
+var errNoPesPTS = errors.New("no PES PTS")
+var errInvalidPesHeader = errors.New("invalid PES header")
+var errInvalidPesPayload = errors.New("invalid PES payload")
+
+// GetPTS returns a PTS from a packet that has PES payload, or an error otherwise.
+func GetPTS(pkt []byte) (pts int64, err error) {
+	// Check the Payload Unit Start Indicator.
+	if pkt[1]&0x040 == 0 {
+		err = errNoPesPayload
+		return
+	}
+
+	// Compute start of PES payload and check its length.
+	start := HeadSize
+	if pkt[3]&0x20 != 0 {
+		// Adaptation field is present, so adjust start of payload accordingly.
+		start += 1 + int(pkt[4])
+	}
+	pes := pkt[start:]
+
+	if len(pes) < 14 {
+		err = errInvalidPesHeader
+		return
+	}
+
+	// Check the PTS DTS indicator.
+	if pes[7]&0xc0 == 0 {
+		err = errNoPesPTS
+		return
+	}
+
+	pts = extractPTS(pes[9:14])
+	return
+}
+
+// extractTime extracts a PTS from the given data.
+func extractPTS(d []byte) int64 {
+	return (int64((d[0]>>1)&0x07) << 30) | (int64(d[1]) << 22) | (int64((d[2]>>1)&0x7f) << 15) | (int64(d[3]) << 7) | int64((d[4]>>1)&0x7f)
+}
+
 var errNoMeta = errors.New("PMT does not contain meta")
 
 // ExtractMeta returns a map of metadata from the first PMT's metaData
@@ -460,7 +476,7 @@ func ExtractMeta(d []byte) (map[string]string, error) {
 // metaFromPMT returns metadata, if any, from a PMT.
 func metaFromPMT(d []byte) (m map[string]string, err error) {
 	// Get as PSI type, skipping the MTS header.
-	pmt := psi.PSIBytes(d[4:])
+	pmt := psi.PSIBytes(d[HeadSize:])
 
 	// Get the metadata descriptor.
 	_, desc := pmt.HasDescriptor(psi.MetadataTag)