summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2016-11-30 13:16:25 -0500
committerVittorio Giovara <vittorio.giovara@gmail.com>2017-06-07 23:39:31 -0400
commitf7f60749e0c9b539dc4da73f808112f0a6735996 (patch)
tree9bddf6f95f5c94059009fbc3be395cae65cdc1cc
parent35c76f2e138b713928a77a8aa5734bf5c8f9368f (diff)
downloadffmpeg-streaming-f7f60749e0c9b539dc4da73f808112f0a6735996.zip
ffmpeg-streaming-f7f60749e0c9b539dc4da73f808112f0a6735996.tar.gz
vf_colorspace: Add support for jedec p22 primaries
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
-rw-r--r--doc/filters.texi3
-rw-r--r--libavfilter/vf_colorspace.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index 65eef89..ba9247d 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -5606,6 +5606,9 @@ SMPTE-432
@item bt2020
BT.2020
+@item jedec-p22
+JEDEC P22 phosphors
+
@end table
@anchor{range}
diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c
index b0bc4d9..d1e9a1c 100644
--- a/libavfilter/vf_colorspace.c
+++ b/libavfilter/vf_colorspace.c
@@ -296,6 +296,7 @@ static const struct ColorPrimaries color_primaries[AVCOL_PRI_NB] = {
[AVCOL_PRI_SMPTE432] = { WP_D65, 0.680, 0.320, 0.265, 0.690, 0.150, 0.060 },
[AVCOL_PRI_FILM] = { WP_C, 0.681, 0.319, 0.243, 0.692, 0.145, 0.049 },
[AVCOL_PRI_BT2020] = { WP_D65, 0.708, 0.292, 0.170, 0.797, 0.131, 0.046 },
+ [AVCOL_PRI_JEDEC_P22] = { WP_D65, 0.630, 0.340, 0.295, 0.605, 0.155, 0.077 },
};
static const struct ColorPrimaries *get_color_primaries(enum AVColorPrimaries prm)
@@ -1112,6 +1113,7 @@ static const AVOption colorspace_options[] = {
ENUM("smpte431", AVCOL_PRI_SMPTE431, "prm"),
ENUM("smpte432", AVCOL_PRI_SMPTE432, "prm"),
ENUM("bt2020", AVCOL_PRI_BT2020, "prm"),
+ ENUM("jedec-p22", AVCOL_PRI_JEDEC_P22, "prm"),
{ "trc", "Output transfer characteristics",
OFFSET(user_trc), AV_OPT_TYPE_INT, { .i64 = AVCOL_TRC_UNSPECIFIED },
OpenPOWER on IntegriCloud