vpx_ccr: Add color names

wader · Nov 28, 2021 · 646f902 · 646f902
1 parent 3bf1a57
commit 646f902
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/format/mp4/testdata/vp9.fqtest b/format/mp4/testdata/vp9.fqtest
@@ -212,9 +212,9 @@ $ fq -d mp4 verbose /vp9.mp4
 0x1770|   86                                          | .              |                                    bit_depth: 8 0x1771-0x1771.3 (0.4)
 0x1770|   86                                          | .              |                                    chroma_subsampling: "4:4:4" (3) 0x1771.4-0x1771.6 (0.3)
 0x1770|   86                                          | .              |                                    video_full_range_flag: 0 0x1771.7-0x1771.7 (0.1)
-0x1770|      02                                       |  .             |                                    colour_primaries: 2 0x1772-0x1772.7 (1)
-0x1770|         02                                    |   .            |                                    transfer_characteristics: 2 0x1773-0x1773.7 (1)
-0x1770|            02                                 |    .           |                                    matrix_coefficients: 2 0x1774-0x1774.7 (1)
+0x1770|      02                                       |  .             |                                    colour_primaries: "unspecified" (2) (Unspecified) 0x1772-0x1772.7 (1)
+0x1770|         02                                    |   .            |                                    transfer_characteristics: "unspecified" (2) (Unspecified) 0x1773-0x1773.7 (1)
+0x1770|            02                                 |    .           |                                    matrix_coefficients: "unspecified" (2) (Unspecified) 0x1774-0x1774.7 (1)
 0x1770|               00 00                           |     ..         |                                    codec_initialization_data_size: 0 0x1775-0x1776.7 (2)
       |                                               |                |                                [1]: box {} 0x1777-0x1780.7 (10)
 0x1770|                     00 00 00 0a               |       ....     |                                  size: 10 0x1777-0x177a.7 (4)

diff --git a/format/vpx/vpx_ccr.go b/format/vpx/vpx_ccr.go
@@ -22,9 +22,9 @@ func vpxCCRDecode(d *decode.D, in interface{}) interface{} {
 	d.FieldU4("bit_depth")
 	d.FieldU3("chroma_subsampling", d.MapUToStrSym(vpxChromeSubsamplingNames))
 	d.FieldU1("video_full_range_flag")
-	d.FieldU8("colour_primaries")
-	d.FieldU8("transfer_characteristics")
-	d.FieldU8("matrix_coefficients")
+	d.FieldU8("colour_primaries", d.MapUToScalar(format.ISO_23091_2_ColourPrimariesMap))
+	d.FieldU8("transfer_characteristics", d.MapUToScalar(format.ISO_23091_2_TransferCharacteristicMap))
+	d.FieldU8("matrix_coefficients", d.MapUToScalar(format.ISO_23091_2_MatrixCoefficients))
 	_ = d.FieldU16("codec_initialization_data_size")
 	// d.FieldRawLen("codec_initialization_data", int64(initDataSize)*8)