Add BT.2111 HDR bars

Support HLG and PQ with the new "hdr" parameter.
Also rename "pixelformat" to "format" to be consistent with the core VS resize functions.

README.md

@@ -1,15 +1,15 @@
-
 Description
 ===========
 
-ColorBars is a filter for generating test signals.  The output is a single frame of color bars according to SMPTE RP 219-1 and 219-2.  For NTSC, the pattern is described in SMPTE EG 1.  For PAL, EBU bars are generated.
+ColorBars is a filter for generating test signals.  The output is a single frame of color bars according to SMPTE RP 219-1, 219-2, or ITU-R BT.2111-0.  For NTSC, the bar pattern is described in SMPTE EG 1.  For PAL, EBU bars are generated.
+
+SMPTE RP 219-2 gives explicit color bar values in 10-bit and 12-bit Y'Cb'Cr'.  ITU BT.2111-0 gives explicit color bar values in 10-bit and 12-bit R'G'B'.  These values are used directly instead of being generated at runtime.
 
-SMPTE RP 219-2 gives explicit color bar values in 10-bit and 12-bit.  These are used directly instead of generating values at runtime.
 
 Usage
 =====
 
-    colorbars.ColorBars([int resolution=3, int pixelformat=vs.YUV444P12, int wcg=0, int compatability=2, int subblack=1, int superwhite=1, int iq=1])
+    colorbars.ColorBars([int resolution=3, int format=vs.YUV444P12, int hdr=0, int wcg=0, int compatability=2, int subblack=1, int superwhite=1, int iq=1])
 
 * resolution: Eight different systems are supported as follows
    * 0 - NTSC
@@ -20,11 +20,18 @@ Usage
    * 5 - UHDTV1/UHD
    * 6 - 4K
    * 7 - UHDTV2/8K
-* pixelformat: Either vs.YUV444P10 or vs.YUV444P12 are supported.
 
-* wcg: Enable ITU-R BT.2020, aka wide color gamut.  Only valid with UHD and higher resolutions.  Required for 8K, although ColorBars does not enforce this and will generate 8K Rec.709 with a warning.
+* format: Either vs.YUV444P10 or vs.YUV444P12 are supported in SDR mode. Either vs.RGB30 or vs.RGB48 are supported in HDR mode. This is because SMPTE defines bar values in terms of Y'Cb'Cr' and ITU uses R'G'B'.  VapourSynth does not support 12-bit RGB, so 16-bit is used (vs.RGB48).
+
+* hdr: Non-zero values enable BT.2111 HDR mode as follows
+   * 0 - SDR
+   * 1 - HLG
+   * 2 - PQ
+   * 3 - PQ (full range)
 
-* compatability: Controls how pedantic you want to be, especially for legacy NTSC/PAL systems.
+* wcg: Enable ITU-R BT.2020, aka wide color gamut.  Only valid with UHD and higher resolutions.  Required for 8K, although ColorBars does not enforce this and will generate 8K Rec.709 with a warning.  No effect when hdr > 0.
+
+* compatability: Controls how pedantic you want to be, especially for legacy NTSC/PAL systems.  No effect when hdr > 0.
    * 0 - Use bar dimensions that are nearest integer values to the ideal.  Bar widths are specified as fractions of the active picture.  They can therefore be odd and can cause problems with later chroma subsampling (conversions to YUV420 or YUV422 may be problematic).
    * 1 - Round dimensions to be even to work around the reality of chroma subsampling.
    * 2 - For NTSC and PAL, assume an active image of 720x480 and 720x576 respectively.  For HD and higher resolutions, use dimensions that are compatible with chroma subsampling and with 4:3 center-cut downconversion.  For UHD/4K and 8K, use multiples of four and eight respectively for 2SI compatibility.
@@ -33,11 +40,11 @@ NTSC and PAL are commonly 720 or 704 pixels wide due to MPEG-2 mod16 considerati
 525-line NTSC is 710.85x484 with two half lines. 712x486 is used in modes 0 and 1 with 4 black pixels on each side.
 625-line PAL is 702x574 with two half lines.  702x576 is used in mode 0, with 9 black pixels on each side.  704x576 is used in mode 1, with 8 black pixels on each side.
 
-* subblack: Controls whether to generate the below black ramp in the middle third of the first 0% black patch on the bottom row.  Only valid with HD and higher resolutions.
+* subblack: Controls whether to generate the below black ramp in the middle third of the first 0% black patch on the bottom row.  Only valid with HD and higher resolutions.  No effect when hdr > 0.
 
-* superwhite: Controls whether to generate an above white ramp the middle third of the 100% white chip on the bottom row.  Only valid with HD and higher resolutions.
+* superwhite: Controls whether to generate an above white ramp the middle third of the 100% white chip on the bottom row.  Only valid with HD and higher resolutions.  No effect when hdr > 0.
 
-* iq: Controls the second patch of rows 2 and 3.  Only valid with HD and higher resolutions.  Mode 1 and 2 are not valid if wcg=1.
+* iq: Controls the second patch of rows 2 and 3.  Only valid with HD and higher resolutions.  No effect when hdr > 0.  Mode 1 and 2 are not valid if wcg=1.
    * 0 - 75% white and 0% black
    * 1 - -I and +Q
    * 2 - +I and 0% black
@@ -50,15 +57,15 @@ Examples
 Note that bar transitions are not instant.  RP 219 requires proper shaping.  Rise and fall times are 4 samples (10% to 90%) and +/-10% of the nominal value and the shape is recommended to be an integrated sine-squared pulse.  Shaping may be integrated into ColorBars later, but for now you can apply a horizontal blur.
 
     # Generate 30 seconds of 1080i HD bars
-    c = core.colorbars.ColorBars(pixelformat=vs.YUV444P10)
+    c = core.colorbars.ColorBars(format=vs.YUV444P10)
     c = core.std.SetFrameProp(clip=c, prop="_FieldBased", intval=2) # top field first
     c = core.std.Convolution(c,mode="h",matrix=[1,2,4,2,1])
     c = core.resize.Point(clip=c,format=vs.YUV422P10)
     c = c * (30 * 30000 // 1001)
     c = core.std.AssumeFPS(clip=c, fpsnum=30000, fpsden=1001)
 
     # Generate 60 seconds of annoyingly "correct" NTSC bars
-    c = core.colorbars.ColorBars(pixelformat=vs.YUV444P12, resolution=0, compatability=0)
+    c = core.colorbars.ColorBars(format=vs.YUV444P12, resolution=0, compatability=0)
     c = core.std.SetFrameProp(clip=c, prop="_FieldBased", intval=1) # bottom field first
     c = core.std.Crop(c, 4, 4)
     c = core.std.Convolution(c,mode="h",matrix=[1,2,4,2,1])
@@ -67,11 +74,16 @@ Note that bar transitions are not instant.  RP 219 requires proper shaping.  Ris
     c = core.std.AssumeFPS(clip=c, fpsnum=30000, fpsden=1001)
 
     # Generate UHD Bars with Rec.2020 primaries
-    c = core.colorbars.ColorBars(pixelformat=vs.YUV444P12, resolution=5, wcg=1)
+    c = core.colorbars.ColorBars(format=vs.YUV444P12, resolution=5, wcg=1)
     c = core.std.Convolution(c,mode="h",matrix=[1,2,4,2,1])
     c = core.resize.Point(clip=c,format=vs.YUV422P10)
     c = core.std.AssumeFPS(clip=c, fpsnum=50, fpsden=1)
 
+    # Generate HLG UHD Bars
+    c = core.colorbars.ColorBars(format=vs.RGB30, resolution=5, hdr=1)
+    c = core.std.Convolution(c,mode="h",matrix=[1,2,4,2,1])
+    c = core.resize.Point(clip=c,format=vs.YUV422P10,matrix_s="2020ncl")
+
 Compilation
 ===========
 The usual autotools method: