fix: add test for VVC Annex B

Author: tobbee

cmd/mp4ff-nallister/main.go

@@ -491,12 +491,9 @@ func printSEINALus(w io.Writer, seiNALUs [][]byte, codec string, seiLevel int, a
 	case "avc":
 		seiCodec = sei.AVC
 		hdrLen = 1
-	case "hevc":
+	case "hevc", "vvc": // VVC uses same SEI format as HEVC
 		seiCodec = sei.HEVC
 		hdrLen = 2
-	case "vvc":
-		seiCodec = sei.HEVC // VVC uses same SEI format as HEVC
-		hdrLen = 2
 	}
 	if len(seiNALUs) > 0 {
 		for _, seiNALU := range seiNALUs {

cmd/mp4ff-nallister/main_test.go

@@ -4,6 +4,9 @@ import (
 	"bytes"
 	"os"
 	"testing"
+
+	"github.com/Eyevinn/mp4ff/avc"
+	"github.com/Eyevinn/mp4ff/mp4"
 )
 
 func TestOptions(t *testing.T) {
@@ -13,8 +16,6 @@ func TestOptions(t *testing.T) {
 		expectedErr bool
 		goldenOut   string
 	}{
-		{desc: "vvc 2s", args: []string{appName, "../../mp4/testdata/vvc_400kbps_2s.mp4"}, expectedErr: false,
-			goldenOut: "testdata/golden_vvc_2s.txt"},
 		{desc: "no args", args: []string{appName}, expectedErr: true},
 		{desc: "unknown args", args: []string{appName, "-x"}, expectedErr: true},
 		{desc: "non-existing file", args: []string{appName, "infile.mp4"}, expectedErr: true},
@@ -40,7 +41,10 @@ func TestOptions(t *testing.T) {
 			goldenOut: "testdata/golden_h264_frag_raw.txt", expectedErr: false},
 		{desc: "avcSeiTime", args: []string{appName, "-sei", "2", "-annexb", "testdata/4pics.264"},
 			goldenOut: "testdata/golden_4pic_sei_264.txt", expectedErr: false},
-
+		{desc: "vvc 2s", args: []string{appName, "../../mp4/testdata/vvc_400kbps_2s.mp4"}, expectedErr: false,
+			goldenOut: "testdata/golden_vvc_2s.txt"},
+		{desc: "vvc annexB", args: []string{appName, "-annexb", "-c", "vvc", "testdata/annexB.vvc"}, expectedErr: false,
+			goldenOut: "testdata/golden_vvc_annexb.txt"},
 		{desc: "version", args: []string{appName, "-version"}, expectedErr: false},
 		{desc: "help", args: []string{appName, "-h"}, expectedErr: false},
 	}
@@ -78,3 +82,29 @@ func getExpected(t *testing.T, filename string) string {
 	r := bytes.ReplaceAll(b, []byte("\r\n"), []byte("\n"))
 	return string(r)
 }
+
+func MakeByteStream(t *testing.T, inFile, outFile string) {
+	t.Helper()
+	ifd, err := os.Open(inFile)
+	if err != nil {
+		t.Fatalf("could not open file %s: %s", inFile, err)
+	}
+	d, err := mp4.DecodeFile(ifd)
+	if err != nil {
+		t.Fatalf("could not decode file %s: %s", inFile, err)
+	}
+	fullSamples, err := d.Segments[0].Fragments[0].GetFullSamples(nil)
+	if err != nil {
+		t.Fatalf("could not get full samples: %s", err)
+	}
+	byteStream := make([]byte, 0, 1024)
+	for i := 0; i <= 5; i++ {
+		fs := fullSamples[i]
+		bs := avc.ConvertSampleToByteStream(fs.Data)
+		byteStream = append(byteStream, bs...)
+	}
+	err = os.WriteFile(outFile, byteStream, 0644)
+	if err != nil {
+		t.Fatalf("could not write file %s: %s", outFile, err)
+	}
+}

cmd/mp4ff-nallister/testdata/annexb.vvc

@@ -0,0 +1,6 @@
+Sample 1, pts=0 (11051B): AUD_20 (3B), SPS_15 (176B), PPS_16 (13B), PREFIX_APS_17 (118B), IDR_W_RADL_7 (10721B)
+Sample 2, pts=0 (2192B): AUD_20 (3B), PREFIX_APS_17 (62B), RADL_2 (2115B)
+Sample 3, pts=0 (1846B): AUD_20 (3B), PREFIX_APS_17 (21B), RADL_2 (1810B)
+Sample 4, pts=0 (1404B): AUD_20 (3B), PREFIX_APS_17 (41B), RADL_2 (1348B)
+Sample 5, pts=0 (683B): AUD_20 (3B), PREFIX_APS_17 (19B), RADL_2 (649B)
+Sample 6, pts=0 (655B): AUD_20 (3B), PREFIX_APS_17 (53B), RADL_2 (587B)

cmd/mp4ff-nallister/testdata/golden_vvc_annexb.txt

@@ -152,18 +152,15 @@ func parseProgressiveMp4(f *mp4.File, w io.Writer, trackID uint32, maxNrSamples
 		}
 		size := stbl.Stsz.GetSampleSize(sampleNr)
 		decTime, dur := stbl.Stts.GetDecodeTime(uint32(sampleNr))
-		var cto int64 = 0
-		if stbl.Ctts != nil {
-			cto = int64(stbl.Ctts.GetCompositionTimeOffset(uint32(sampleNr)))
-		}
+		// Skip checking compositionTimeOffset since not uset for subtitles
 		// Next find sample bytes as slice in mdat
 		offsetInMdatData := uint64(offset) - mdatPayloadStart
 		sample := mdat.Data[offsetInMdatData : offsetInMdatData+uint64(size)]
 		switch subsTrak.variant {
 		case "wvtt":
-			err = printWvttSample(w, sample, sampleNr, int64(decTime)+cto, dur)
+			err = printWvttSample(w, sample, sampleNr, int64(decTime), dur)
 		case "stpp":
-			err = printStppSample(w, sample, sampleNr, int64(decTime)+cto, dur)
+			err = printStppSample(w, sample, sampleNr, int64(decTime), dur)
 		}
 		if err != nil {
 			return err