[FFmpeg-devel] [PATCH] libavcodec/options_table: Add missing colorspace options

Harry Mallon harry.mallon at codex.online
Wed Aug 19 21:36:05 EEST 2020


* chroma-derived-nc / chroma-derived-c and ictcp

Signed-off-by: Harry Mallon <harry.mallon at codex.online>
---
 doc/codecs.texi            |  6 ++++++
 libavcodec/options_table.h | 33 ++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/doc/codecs.texi b/doc/codecs.texi
index c092aadc0e..1da2590795 100644
--- a/doc/codecs.texi
+++ b/doc/codecs.texi
@@ -1110,6 +1110,12 @@ BT.2020 NCL
 BT.2020 CL
 @item smpte2085
 SMPTE 2085
+ at item chroma-derived-nc
+Chroma-derived NCL
+ at item chroma-derived-c
+Chroma-derived CL
+ at item ictcp
+ICtCp
 @end table

 @item color_range @var{integer} (@emph{decoding/encoding,video})
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 1d0db1b5a4..66bda42663 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -381,21 +381,24 @@ static const AVOption avcodec_options[] = {
 {"bt2020_12bit", "BT.2020 - 12 bit", 0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_TRC_BT2020_12 },    INT_MIN, INT_MAX, V|E|D, "color_trc_type"},
 {"smpte428_1",   "SMPTE 428-1",      0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_TRC_SMPTE428 },     INT_MIN, INT_MAX, V|E|D, "color_trc_type"},
 {"colorspace", "color space", OFFSET(colorspace), AV_OPT_TYPE_INT,
{.i64 = AVCOL_SPC_UNSPECIFIED }, 0, INT_MAX, V|E|D,
"colorspace_type"},
-{"rgb",         "RGB",         0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_SPC_RGB },         INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
-{"bt709",       "BT.709",      0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_SPC_BT709 },       INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
-{"unknown",     "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_SPC_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
-{"fcc",         "FCC",         0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_SPC_FCC },         INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
-{"bt470bg",     "BT.470 BG",   0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_SPC_BT470BG },     INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
-{"smpte170m",   "SMPTE 170 M", 0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_SPC_SMPTE170M },   INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
-{"smpte240m",   "SMPTE 240 M", 0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_SPC_SMPTE240M },   INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
-{"ycgco",       "YCGCO",       0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_SPC_YCGCO },       INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
-{"bt2020nc",    "BT.2020 NCL", 0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_SPC_BT2020_NCL },  INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
-{"bt2020c",     "BT.2020 CL",  0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_SPC_BT2020_CL },   INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
-{"smpte2085",   "SMPTE 2085",  0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_SPC_SMPTE2085 },   INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
-{"unspecified", "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_SPC_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
-{"ycocg",       "YCGCO",       0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_SPC_YCGCO },       INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
-{"bt2020_ncl",  "BT.2020 NCL", 0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_SPC_BT2020_NCL },  INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
-{"bt2020_cl",   "BT.2020 CL",  0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_SPC_BT2020_CL },   INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
+{"rgb",               "RGB",                0, AV_OPT_TYPE_CONST,
{.i64 = AVCOL_SPC_RGB },                INT_MIN, INT_MAX, V|E|D,
"colorspace_type"},
+{"bt709",             "BT.709",             0, AV_OPT_TYPE_CONST,
{.i64 = AVCOL_SPC_BT709 },              INT_MIN, INT_MAX, V|E|D,
"colorspace_type"},
+{"unknown",           "Unspecified",        0, AV_OPT_TYPE_CONST,
{.i64 = AVCOL_SPC_UNSPECIFIED },        INT_MIN, INT_MAX, V|E|D,
"colorspace_type"},
+{"fcc",               "FCC",                0, AV_OPT_TYPE_CONST,
{.i64 = AVCOL_SPC_FCC },                INT_MIN, INT_MAX, V|E|D,
"colorspace_type"},
+{"bt470bg",           "BT.470 BG",          0, AV_OPT_TYPE_CONST,
{.i64 = AVCOL_SPC_BT470BG },            INT_MIN, INT_MAX, V|E|D,
"colorspace_type"},
+{"smpte170m",         "SMPTE 170 M",        0, AV_OPT_TYPE_CONST,
{.i64 = AVCOL_SPC_SMPTE170M },          INT_MIN, INT_MAX, V|E|D,
"colorspace_type"},
+{"smpte240m",         "SMPTE 240 M",        0, AV_OPT_TYPE_CONST,
{.i64 = AVCOL_SPC_SMPTE240M },          INT_MIN, INT_MAX, V|E|D,
"colorspace_type"},
+{"ycgco",             "YCGCO",              0, AV_OPT_TYPE_CONST,
{.i64 = AVCOL_SPC_YCGCO },              INT_MIN, INT_MAX, V|E|D,
"colorspace_type"},
+{"bt2020nc",          "BT.2020 NCL",        0, AV_OPT_TYPE_CONST,
{.i64 = AVCOL_SPC_BT2020_NCL },         INT_MIN, INT_MAX, V|E|D,
"colorspace_type"},
+{"bt2020c",           "BT.2020 CL",         0, AV_OPT_TYPE_CONST,
{.i64 = AVCOL_SPC_BT2020_CL },          INT_MIN, INT_MAX, V|E|D,
"colorspace_type"},
+{"smpte2085",         "SMPTE 2085",         0, AV_OPT_TYPE_CONST,
{.i64 = AVCOL_SPC_SMPTE2085 },          INT_MIN, INT_MAX, V|E|D,
"colorspace_type"},
+{"chroma-derived-nc", "Chroma-derived NCL", 0, AV_OPT_TYPE_CONST,
{.i64 = AVCOL_SPC_CHROMA_DERIVED_NCL }, INT_MIN, INT_MAX, V|E|D,
"colorspace_type"},
+{"chroma-derived-c",  "Chroma-derived CL",  0, AV_OPT_TYPE_CONST,
{.i64 = AVCOL_SPC_CHROMA_DERIVED_CL },  INT_MIN, INT_MAX, V|E|D,
"colorspace_type"},
+{"ictcp",             "ICtCp",              0, AV_OPT_TYPE_CONST,
{.i64 = AVCOL_SPC_ICTCP },              INT_MIN, INT_MAX, V|E|D,
"colorspace_type"},
+{"unspecified",       "Unspecified",        0, AV_OPT_TYPE_CONST,
{.i64 = AVCOL_SPC_UNSPECIFIED },        INT_MIN, INT_MAX, V|E|D,
"colorspace_type"},
+{"ycocg",             "YCGCO",              0, AV_OPT_TYPE_CONST,
{.i64 = AVCOL_SPC_YCGCO },              INT_MIN, INT_MAX, V|E|D,
"colorspace_type"},
+{"bt2020_ncl",        "BT.2020 NCL",        0, AV_OPT_TYPE_CONST,
{.i64 = AVCOL_SPC_BT2020_NCL },         INT_MIN, INT_MAX, V|E|D,
"colorspace_type"},
+{"bt2020_cl",         "BT.2020 CL",         0, AV_OPT_TYPE_CONST,
{.i64 = AVCOL_SPC_BT2020_CL },          INT_MIN, INT_MAX, V|E|D,
"colorspace_type"},
 {"color_range", "color range", OFFSET(color_range), AV_OPT_TYPE_INT,
{.i64 = AVCOL_RANGE_UNSPECIFIED }, 0, INT_MAX, V|E|D,
"color_range_type"},
 {"unknown", "Unspecified",     0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_RANGE_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D,
"color_range_type"},
 {"tv", "MPEG (219*2^(n-8))",   0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_RANGE_MPEG },        INT_MIN, INT_MAX, V|E|D,
"color_range_type"},
-- 
2.28.0


More information about the ffmpeg-devel mailing list