HEVC Encryption support

CHANGELOG.md

@@ -21,10 +21,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Support for SMPTE-2086 Mastering Display Metadata Box (SmDm)
 - Support for Content Light Level Box (CoLL)
 - Better test coverage for VisualSampleEntryBox
+- IsVideoNaluType functions in both avc and hevc packages
 
 ### Fixed
 
 - support short ESDS without SLConfig descriptor (issue #393)
+- HEVC Slice Header CollocatedFromL0Flag should be true by default
 
 ## [0.47.0] - 2024-11-12
 

avc/avc_test.go

@@ -118,3 +118,46 @@ func TestGetParameterSets(t *testing.T) {
 		}
 	}
 }
+
+func TestIsVideoNaluType(t *testing.T) {
+	testCases := []struct {
+		name     string
+		naluType NaluType
+		want     bool
+	}{
+		{
+			name:     "video type - NALU_NON_IDR (1)",
+			naluType: NALU_NON_IDR,
+			want:     true,
+		},
+		{
+			name:     "video type - NALU_IDR (5)",
+			naluType: NALU_IDR,
+			want:     true,
+		},
+		{
+			name:     "non-video type - NALU_SEI (6)",
+			naluType: NALU_SEI,
+			want:     false,
+		},
+		{
+			name:     "non-video type - NALU_SPS (7)",
+			naluType: NALU_SPS,
+			want:     false,
+		},
+		{
+			name:     "non-video type - NALU_AUD (9)",
+			naluType: NALU_AUD,
+			want:     false,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			got := IsVideoNaluType(tc.naluType)
+			if got != tc.want {
+				t.Errorf("IsVideoNaluType(%d) = %v; want %v", tc.naluType, got, tc.want)
+			}
+		})
+	}
+}

cmd/mp4ff-decrypt/doc.go

@@ -8,10 +8,10 @@ mp4ff-decrypt [options] infile outfile
 options:
 
 	-init string
-	  	Path to init file with encryption info (scheme, kid, pssh)
+	      Path to init file with encryption info (scheme, kid, pssh)
 	-key string
-	  	Required: key (32 hex or 24 base64 chars)
+	      Required: key (32 hex or 24 base64 chars)
 	-version
-	  	Get mp4ff version
+	      Get mp4ff version
 */
 package main

cmd/mp4ff-decrypt/main.go

@@ -74,6 +74,7 @@ func run(args []string) error {
 	var outFilePath = fs.Arg(1)
 
 	if opts.keyStr == "" {
+		fs.Usage()
 		return fmt.Errorf("no key specified")
 	}
 

cmd/mp4ff-encrypt/doc.go

@@ -2,6 +2,8 @@
 mp4ff-encrypt encrypts a fragmented mp4 file using Common Encryption with cenc or cbcs scheme.
 A combined fragmented file with init segment and media segment(s) will be encrypted.
 For a pure media segment, an init segment with encryption information is needed.
+For video, only AVC with avc1 and HEVC with hvc1 sample entries are currently supported.
+For audio, all supported audio codecs should work.
 
 Usage of mp4ff-encrypt:
 
@@ -10,18 +12,18 @@ mp4ff-encrypt [options] infile outfile
 options:
 
 	-init string
-	  	Path to init file with encryption info (scheme, kid, pssh)
+	      Path to init file with encryption info (scheme, kid, pssh)
 	-iv string
-	  	Required: iv (16 or 32 hex chars)
+	      Required: iv (16 or 32 hex chars)
 	-key string
-	  	Required: key (32 hex or 24 base64 chars)
+	      Required: key (32 hex or 24 base64 chars)
 	-kid string
-	  	key id (32 hex or 24 base64 chars). Required if initFilePath empty
+	      key id (32 hex or 24 base64 chars). Required if initFilePath empty
 	-pssh string
-	  	file with one or more pssh box(es) in binary format. Will be added at end of moov box
+	      file with one or more pssh box(es) in binary format. Will be added at end of moov box
 	-scheme string
-	  	cenc or cbcs. Required if initFilePath empty (default "cenc")
+	      cenc or cbcs. Required if initFilePath empty (default "cenc")
 	-version
-	  	Get mp4ff version
+	      Get mp4ff version
 */
 package main

cmd/mp4ff-encrypt/main.go

@@ -19,6 +19,8 @@ const (
 var usg = `%s encrypts a fragmented mp4 file using Common Encryption with cenc or cbcs scheme.
 A combined fragmented file with init segment and media segment(s) will be encrypted.
 For a pure media segment, an init segment with encryption information is needed.
+For video, only AVC with avc1 and HEVC with hvc1 sample entries are currently supported.
+For audio, all supported audio codecs should work.
 
 Usage of %s:
 `

hevc/hevc.go

@@ -122,13 +122,18 @@ func FindNaluTypesUpToFirstVideoNalu(sample []byte) []NaluType {
 		naluType := GetNaluType(sample[pos])
 		naluList = append(naluList, naluType)
 		pos += naluLength
-		if naluType <= highestVideoNaluType {
+		if IsVideoNaluType(naluType) {
 			break // Video has started
 		}
 	}
 	return naluList
 }
 
+// IsVideoNaluType returns true if NaluType is a video type (<= 31)
+func IsVideoNaluType(naluType NaluType) bool {
+	return naluType <= highestVideoNaluType
+}
+
 // ContainsNaluType - is specific NaluType present in sample
 func ContainsNaluType(sample []byte, specificNaluType NaluType) bool {
 	var pos uint32 = 0

hevc/hevc_test.go

@@ -165,3 +165,51 @@ func TestNaluTypeStrings(t *testing.T) {
 		t.Errorf("got %d named instead of 22", named)
 	}
 }
+
+func TestIsVideoNaluType(t *testing.T) {
+	testCases := []struct {
+		name     string
+		naluType NaluType
+		want     bool
+	}{
+		{
+			name:     "video type - NALU_TRAIL_N (0)",
+			naluType: NALU_TRAIL_N,
+			want:     true,
+		},
+		{
+			name:     "video type - NALU_TRAIL_R (1)",
+			naluType: NALU_TRAIL_R,
+			want:     true,
+		},
+		{
+			name:     "video type - NALU_IDR_W_RADL (19)",
+			naluType: NALU_IDR_W_RADL,
+			want:     true,
+		},
+		{
+			name:     "video type - highest (31)",
+			naluType: 31,
+			want:     true,
+		},
+		{
+			name:     "non-video type - VPS (32)",
+			naluType: NALU_VPS,
+			want:     false,
+		},
+		{
+			name:     "non-video type - SPS (33)",
+			naluType: NALU_SPS,
+			want:     false,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			got := IsVideoNaluType(tc.naluType)
+			if got != tc.want {
+				t.Errorf("IsVideoNaluType(%d) = %v; want %v", tc.naluType, got, tc.want)
+			}
+		})
+	}
+}

hevc/slice.go

@@ -109,7 +109,9 @@ type WeightingFactors struct {
 }
 
 func ParseSliceHeader(nalu []byte, spsMap map[uint32]*SPS, ppsMap map[uint32]*PPS) (*SliceHeader, error) {
-	sh := &SliceHeader{}
+	sh := &SliceHeader{
+		CollocatedFromL0Flag: true, // Default according to Section 7.4.7.1
+	}
 
 	buf := bytes.NewBuffer(nalu)
 	r := bits.NewEBSPReader(buf)

hevc/slice_test.go

@@ -20,6 +20,7 @@ func TestParseSliceHeader(t *testing.T) {
 			LoopFilterAcrossSlicesEnabledFlag: true,
 			NumEntryPointOffsets:              1,
 			OffsetLenMinus1:                   3,
+			CollocatedFromL0Flag:              true,
 			EntryPointOffsetMinus1:            []uint32{12},
 			Size:                              6},
 		NALU_TRAIL_N: {
@@ -46,6 +47,7 @@ func TestParseSliceHeader(t *testing.T) {
 			LoopFilterAcrossSlicesEnabledFlag: true,
 			NumEntryPointOffsets:              1,
 			OffsetLenMinus1:                   1,
+			CollocatedFromL0Flag:              false,
 			EntryPointOffsetMinus1:            []uint32{1},
 			Size:                              10,
 		},
@@ -74,6 +76,7 @@ func TestParseSliceHeader(t *testing.T) {
 					},
 				},
 			},
+			CollocatedFromL0Flag:     true,
 			FiveMinusMaxNumMergeCand: 2,
 			QpDelta:                  7,
 			NumEntryPointOffsets:     1,
@@ -113,6 +116,6 @@ func TestParseSliceHeader(t *testing.T) {
 		}
 	}
 	if diff := deep.Equal(wantedHdr, gotHdr); diff != nil {
-		t.Errorf("Got Slice Header: %+v\n Diff is %v", gotHdr, diff)
+		t.Errorf("Got Slice Headers: %+v\n Diff is %v", gotHdr, diff)
 	}
 }