codec/h264/h264dec: added TestNewNALUnit but broken, need to fix

codec/h264/h264dec/nalunit.go

@@ -260,6 +260,7 @@ func NewNALUnit(br *bits.BitReader) (*NALUnit, error) {
 	}
 
 	for moreRBSPData(br) {
+		fmt.Println("here")
 		next3Bytes, err := br.PeekBits(24)
 
 		// If PeekBits cannot get 3 bytes, but there still might be 2 bytes left in

codec/h264/h264dec/nalunit_test.go

@@ -143,3 +143,116 @@ func TestSVCExtension(t *testing.T) {
 		}
 	}
 }
+
+func TestNewNALUnit(t *testing.T) {
+	tests := []struct {
+		in   string
+		want NALUnit
+		err  error
+	}{
+		{
+			in: "0" + // f(1) forbidden_zero_bit = 0
+				"01" + // u(2) nal_ref_idc = 1
+				"0 1110" + // u(5) nal_unit_type = 14
+				"1" + // u(1) svc_extension_flag = true
+
+				// svc extension
+				"0" + // u(1) idr_flag = false
+				"10 0000" + // u(6) priority_id = 32
+				"0" + // u(1) no_inter_layer_pred_flag = false
+				"001" + // u(3) dependency_id = 1
+				"1000" + // u(4) quality_id = 8
+				"010" + // u(3) temporal_id = 2
+				"1" + // u(1) use_ref_base_pic_flag = true
+				"0" + // u(1) discardable_flag = false
+				"0" + // u(1) output_flag = false
+				"11" + // ReservedThree2Bits
+
+				// rbsp bytes
+				"0000 0001" +
+				"0000 0010" +
+				"0000 0100" +
+				"0000 1000" +
+				"1000 0000",
+
+			want: NALUnit{
+				ForbiddenZeroBit: 0,
+				RefIdc:           1,
+				Type:             14,
+				SVCExtensionFlag: true,
+				SVCExtension: &SVCExtension{
+					IdrFlag:              false,
+					PriorityID:           32,
+					NoInterLayerPredFlag: false,
+					DependencyID:         1,
+					QualityID:            8,
+					TemporalID:           2,
+					UseRefBasePicFlag:    true,
+					DiscardableFlag:      false,
+					OutputFlag:           false,
+					ReservedThree2Bits:   3,
+				},
+
+				RBSP: []byte{
+					0x01,
+					0x02,
+					0x04,
+					0x08,
+					0x80,
+				},
+			},
+		},
+	}
+
+	for i, test := range tests {
+		inBytes, err := binToSlice(test.in)
+		if err != nil {
+			t.Fatalf("did not expect error %v from binToSlice for test %d", err, i)
+		}
+
+		got, err := NewNALUnit(bits.NewBitReader(bytes.NewReader(inBytes)))
+		if err != test.err {
+			t.Errorf("did not get expected error for test %d\nGot: %v\nWant: %v\n", i, err, test.err)
+		}
+
+		if !nalEqual(*got, test.want) {
+			t.Errorf("did not get expected result for test %d\nGot: %v\nWant: %v\n", i, *got, test.want)
+		}
+	}
+}
+
+func nalEqual(a, b NALUnit) bool {
+	aCopy := a
+	bCopy := b
+	for _, n := range [](*NALUnit){&aCopy, &bCopy} {
+		n.SVCExtension = nil
+		n.MVCExtension = nil
+		n.ThreeDAVCExtension = nil
+	}
+
+	if !reflect.DeepEqual(aCopy, bCopy) {
+		return false
+	}
+
+	if (a.SVCExtension == nil || b.SVCExtension == nil) &&
+		(a.SVCExtension != b.SVCExtension) {
+		return false
+	}
+
+	if (a.MVCExtension == nil || b.MVCExtension == nil) &&
+		(a.MVCExtension != b.MVCExtension) {
+		return false
+	}
+
+	if (a.ThreeDAVCExtension == nil || b.ThreeDAVCExtension == nil) &&
+		(a.ThreeDAVCExtension != b.ThreeDAVCExtension) {
+		return false
+	}
+
+	if !reflect.DeepEqual(a.SVCExtension, b.SVCExtension) ||
+		!reflect.DeepEqual(a.MVCExtension, b.MVCExtension) ||
+		!reflect.DeepEqual(a.ThreeDAVCExtension, b.ThreeDAVCExtension) {
+		return false
+	}
+	return true
+}