container/mts: fixed conflicts

container/mts/mpegts.go

@@ -30,12 +30,14 @@ LICENSE
 package mts
 
 import (
-	"errors"
+	"fmt"
+
+	"github.com/Comcast/gots/packet"
+	"github.com/Comcast/gots/pes"
+	"github.com/pkg/errors"
 
 	"bitbucket.org/ausocean/av/container/mts/meta"
 	"bitbucket.org/ausocean/av/container/mts/psi"
-	"github.com/Comcast/gots/packet"
-	"github.com/Comcast/gots/pes"
 )
 
 const PacketSize = 188
@@ -324,17 +326,30 @@ func DiscontinuityIndicator(f bool) Option {
 	}
 }
 
+// Error used by GetPTSRange.
+var errNoPTS = errors.New("could not find PTS")
+
 // GetPTSRange retreives the first and last PTS of an MPEGTS clip.
 func GetPTSRange(clip []byte, pid uint16) (pts [2]uint64, err error) {
-	// Find the first packet with PID pidType.
+	var _pkt packet.Packet
-	pkt, _, err := FindPid(clip, pid)
+	// Find the first packet with PID pidType and PUSI.
+	var i int
+	for {
+		if i >= len(clip) {
+			return [2]uint64{}, errNoPTS
+		}
+		pkt, _i, err := FindPid(clip[i:], pid)
 		if err != nil {
-		return [2]uint64{}, err
+			return [2]uint64{}, errors.Wrap(err, fmt.Sprintf("could not find packet of PID: %d", pid))
+		}
+		copy(_pkt[:], pkt)
+		if _pkt.PayloadUnitStartIndicator() {
+			break
+		}
+		i += _i + PacketSize
 	}
 
 	// Get the payload of the packet, which will be the start of the PES packet.
-	var _pkt packet.Packet
-	copy(_pkt[:], pkt)
 	payload, err := packet.Payload(&_pkt)
 	if err != nil {
 		return [2]uint64{}, err
@@ -363,8 +378,7 @@ func GetPTSRange(clip []byte, pid uint16) (pts [2]uint64, err error) {
 			return
 		}
 	}
-
+	return
-	return [2]uint64{}, errors.New("could only find one access unit in mpegts clip")
 }
 
 var errNoMeta = errors.New("PMT does not contain meta")

container/mts/mpegts_test.go

@@ -42,8 +42,8 @@ import (
 )
 
 // TestGetPTSRange checks that GetPTSRange can correctly get the first and last
-// PTS in an MPEGTS clip.
+// PTS in an MPEGTS clip for a general case.
-func TestGetPTSRange(t *testing.T) {
+func TestGetPTSRange1(t *testing.T) {
 	const (
 		numOfFrames  = 20
 		maxFrameSize = 1000
@@ -160,6 +160,86 @@ func writeFrame(b *bytes.Buffer, frame []byte, pts uint64) error {
 	return nil
 }
 
+// TestGetPTSRange2 checks that GetPTSRange behaves correctly with cases where
+// the first instance of a PID is not a payload start, and also where there
+// are no payload starts.
+func TestGetPTSRange2(t *testing.T) {
+	const (
+		nPackets = 8 // The number of MTS packets we will generate.
+		wantPID  = 1 // The PID we want.
+	)
+	tests := []struct {
+		pusi []bool    // The value of PUSI for each packet.
+		pid  []uint16  // The PIDs for each packet.
+		pts  []uint64  // The PTS for each packet.
+		want [2]uint64 // The wanted PTS from GetPTSRange.
+		err  error     // The error we expect from GetPTSRange.
+	}{
+		{
+			[]bool{false, false, false, true, false, false, true, false},
+			[]uint16{0, 0, 1, 1, 1, 1, 1, 1},
+			[]uint64{0, 0, 0, 1, 0, 0, 2, 0},
+			[2]uint64{1, 2},
+			nil,
+		},
+		{
+			[]bool{false, false, false, true, false, false, false, false},
+			[]uint16{0, 0, 1, 1, 1, 1, 1, 1},
+			[]uint64{0, 0, 0, 1, 0, 0, 0, 0},
+			[2]uint64{1, 1},
+			nil,
+		},
+		{
+			[]bool{false, false, false, false, false, false, false, false},
+			[]uint16{0, 0, 1, 1, 1, 1, 1, 1},
+			[]uint64{0, 0, 0, 0, 0, 0, 0, 0},
+			[2]uint64{0, 0},
+			errNoPTS,
+		},
+	}
+
+	var clip bytes.Buffer
+
+	for i, test := range tests {
+		// Generate MTS packets for this test.
+		clip.Reset()
+		for j := 0; j < nPackets; j++ {
+			pesPkt := pes.Packet{
+				StreamID:     H264ID,
+				PDI:          hasPTS,
+				PTS:          test.pts[j],
+				Data:         []byte{},
+				HeaderLength: 5,
+			}
+			buf := pesPkt.Bytes(nil)
+
+			pkt := Packet{
+				PUSI: test.pusi[j],
+				PID:  test.pid[j],
+				RAI:  true,
+				CC:   0,
+				AFC:  hasAdaptationField | hasPayload,
+				PCRF: true,
+			}
+			pkt.FillPayload(buf)
+
+			_, err := clip.Write(pkt.Bytes(nil))
+			if err != nil {
+				t.Fatalf("did not expect clip write error: %v", err)
+			}
+		}
+
+		pts, err := GetPTSRange(clip.Bytes(), wantPID)
+		if err != test.err {
+			t.Errorf("did not get expected error for test: %v\nGot: %v\nWant: %v\n", i, err, test.err)
+		}
+
+		if pts != test.want {
+			t.Errorf("did not get expected result for test: %v\nGot: %v\nWant: %v\n", i, pts, test.want)
+		}
+	}
+}
+
 // TestBytes checks that Packet.Bytes() correctly produces a []byte
 // representation of a Packet.
 func TestBytes(t *testing.T) {