diff mbox

[FFmpeg-devel] vf_colorspace: Add support for jedec p22 primaries

Message ID 20170608034113.25524-1-vittorio.giovara@gmail.com
State Accepted
Commit f7f60749e0c9b539dc4da73f808112f0a6735996
Headers show

Commit Message

Vittorio Giovara June 8, 2017, 3:41 a.m. UTC 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
---
Refreshing an old patch from last November...

After this, vf_colorspace supports *all* the primaries recognized
by libavutil.
Vittorio

 doc/filters.texi            | 3 +++
 libavfilter/vf_colorspace.c | 2 ++
 2 files changed, 5 insertions(+)

Comments

Ronald S. Bultje June 8, 2017, 10:47 a.m. UTC | #1 
Hi,

On Wed, Jun 7, 2017 at 11:41 PM, Vittorio Giovara <
vittorio.giovara@gmail.com> wrote:

> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
> ---
> Refreshing an old patch from last November...
>
> After this, vf_colorspace supports *all* the primaries recognized
> by libavutil.


LGTM.

Ronald
diff mbox

Patch

diff --git a/doc/filters.texi b/doc/filters.texi
index 65eef89d07..ba9247d29e 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 b0bc4d9a3b..d1e9a1c609 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 },