revid: mtsSender_test.go passing segmenting and discontinuity tests

revid/mtsSender_test.go

@@ -59,6 +59,8 @@ type testSender struct {
 
 func (ts *testSender) send(d []byte) error {
 	if ts.tstDiscon && ts.curPktNo == ts.disconAt {
+		fmt.Println("SendFailed")
+		ts.curPktNo++
 		return errors.New("could not send")
 	}
 	cpy := make([]byte, len(d))
@@ -103,7 +105,7 @@ func TestSegment(t *testing.T) {
 	mts.Meta = meta.New()
 	// Create ringbuffer tst sender, loadsender and the mpegts encoder
 	rb := ring.NewBuffer(rbSize, rbElementSize, wTimeout)
-	tstSender := &testSender{Buf: make([][]byte, 0)}
+	tstSender := &testSender{}
 	loadSender := newMtsSender(tstSender, log)
 	packer := &tstPacker{rb: rb}
 	encoder := mts.NewEncoder(packer, 25)
@@ -141,6 +143,7 @@ func TestSegment(t *testing.T) {
 	result := tstSender.Buf
 	expectData := 0
 	for clipNo, clip := range result {
+		t.Logf("Checking clip: %v\n", clipNo)
 		// Check that the clip is the right length
 		clipLen := len(clip)
 		if clipLen != psiSendCount*mts.PacketSize {
@@ -208,9 +211,10 @@ func TestSendFailDiscontinuity(t *testing.T) {
 		encoder.Encode([]byte{byte(i)})
 		rb.Flush()
 
+		for {
 			next, err := rb.Next(rTimeout)
 			if err != nil {
-			t.Fatalf("Unexpected err: %v\n", err)
+				break
 			}
 
 			err = loadSender.load(next)
@@ -222,11 +226,12 @@ func TestSendFailDiscontinuity(t *testing.T) {
 
 			loadSender.release()
 		}
+	}
 
 	result := tstSender.Buf
 
 	// First check that we have less clips
-	expectedLen := ((noOfPacketsToWrite / psiSendCount) - 1)
+	expectedLen := (((noOfPacketsToWrite/psiSendCount)*2 + noOfPacketsToWrite) / psiSendCount) - 1
 	gotLen := len(result)
 	if gotLen != expectedLen {
 		t.Errorf("We don't have one less clip as we should. Got: %v, want: %v\n", gotLen, expectedLen)

revid/senders.go

@@ -134,9 +134,10 @@ func (s *fileSender) close() error {
 type mtsSender struct {
 	sender    sender
 	buf       []byte
+	next      []byte
 	pkt       [mts.PacketSize]byte
-	fail     bool
-	discard  bool
+	failed    bool
+	discarded bool
 	repairer  *mts.DiscontinuityRepairer
 	chunk     *ring.Chunk
 }
@@ -158,50 +159,29 @@ func (s *mtsSender) load(c *ring.Chunk) error {
 // send checks the most recently loaded packet and if it is a PAT then the clip
 // in s.buf is sent, otherwise the packet is added to s.buf.
 func (s *mtsSender) send() error {
-	copy(s.pkt[:], s.chunk.Bytes())
+	if s.next != nil {
+		s.buf = append(s.buf, s.next...)
+	}
+	bytes := s.chunk.Bytes()
+	cpy := make([]byte, len(bytes))
+	copy(cpy, bytes)
+	s.next = cpy
+
+	copy(s.pkt[:], cpy)
 	p := (*packet.Packet)(&s.pkt)
 	pid := p.PID()
-	cc := p.ContinuityCounter()
-
-	if s.discard {
-		if pid != mts.PatPid {
-			return nil
-		}
-		s.discard = false
-	}
-	if pid == mts.VideoPid {
-		expect, exists := s.repairer.ExpectedCC(pid)
-		s.repairer.IncExpectedCC(pid)
-		if !exists {
-			s.repairer.SetExpectedCC(pid, cc)
-			s.repairer.IncExpectedCC(pid)
-		} else if cc != expect {
-			s.repairer.SetExpectedCC(pid, cc)
-			s.discard = true
-			s.buf = s.buf[:0]
-			return nil
-		}
-	}
-	if s.fail || (pid == mts.PatPid && len(s.buf) != 0) {
+	if pid == mts.PatPid && len(s.buf) > 0 {
 		err := s.fixAndSend()
 		if err != nil {
-			s.failed()
+			s.failed = true
+			s.repairer.Failed()
 			return err
 		}
-		s.fail = false
 		s.buf = s.buf[:0]
 	}
-	s.buf = append(s.buf, s.chunk.Bytes()...)
 	return nil
 }
 
-// failed sets the s.fail flag to true, and let's the discontinuity
-// repairer know that there has been a failed send.
-func (s *mtsSender) failed() {
-	s.fail = true
-	s.repairer.Failed()
-}
-
 // fixAndSend uses the discontinuity repairer to ensure there is not a
 // discontinuity, and if so sets the discontinuity indicator of the PAT packet.
 func (ms *mtsSender) fixAndSend() error {
@@ -221,9 +201,9 @@ func (s *mtsSender) close() error { return nil }
 // release will set the s.fail flag to fals and clear the buffer if
 // the previous send was a fail.
 func (s *mtsSender) release() {
-	if s.fail {
-		s.fail = false
+	if s.failed {
 		s.buf = s.buf[:0]
+		s.failed = false
 	}
 	s.chunk.Close()
 	s.chunk = nil