diff mbox

[FFmpeg-devel,1/3] vf_colorspace: Add support for iec61966-2.4 (xvYCC) transfer

Message ID 20161030070746.37115-1-vittorio.giovara@gmail.com
State Accepted
Commit 5a123f1424feb7299d9e5138112cdcea80a48cb7
Headers show

Commit Message

Vittorio Giovara Oct. 30, 2016, 7:07 a.m. UTC
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
---
As described in http://www.color.org/chardata/rgb/xvycc.xalter
Please CC.
Vittorio

 libavfilter/vf_colorspace.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Ronald S. Bultje Oct. 30, 2016, 1:14 p.m. UTC | #1
Hi,

On Sun, Oct 30, 2016 at 3:07 AM, Vittorio Giovara <
vittorio.giovara@gmail.com> wrote:

> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
> ---
> As described in http://www.color.org/chardata/rgb/xvycc.xalter
> Please CC.
> Vittorio
>
>  libavfilter/vf_colorspace.c | 3 +++
>  1 file changed, 3 insertions(+)


OK.

Ronald
Michael Niedermayer Oct. 31, 2016, 8:16 p.m. UTC | #2
On Sun, Oct 30, 2016 at 09:14:47AM -0400, Ronald S. Bultje wrote:
> Hi,
> 
> On Sun, Oct 30, 2016 at 3:07 AM, Vittorio Giovara <
> vittorio.giovara@gmail.com> wrote:
> 
> > Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
> > ---
> > As described in http://www.color.org/chardata/rgb/xvycc.xalter
> > Please CC.
> > Vittorio
> >
> >  libavfilter/vf_colorspace.c | 3 +++
> >  1 file changed, 3 insertions(+)
> 
> 
> OK.

applied

thx

PS: the other patches seemed not to apply cleanly so i applied just
    this one.

[...]
diff mbox

Patch

diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c
index 930aa95..d26f658 100644
--- a/libavfilter/vf_colorspace.c
+++ b/libavfilter/vf_colorspace.c
@@ -232,6 +232,7 @@  static const struct TransferCharacteristics transfer_characteristics[AVCOL_TRC_N
     [AVCOL_TRC_SMPTE170M] = { 1.099,  0.018,  0.45, 4.5 },
     [AVCOL_TRC_SMPTE240M] = { 1.1115, 0.0228, 0.45, 4.0 },
     [AVCOL_TRC_IEC61966_2_1] = { 1.055, 0.0031308, 1.0 / 2.4, 12.92 },
+    [AVCOL_TRC_IEC61966_2_4] = { 1.099, 0.018, 0.45, 4.5 },
     [AVCOL_TRC_BT2020_10] = { 1.099,  0.018,  0.45, 4.5 },
     [AVCOL_TRC_BT2020_12] = { 1.0993, 0.0181, 0.45, 4.5 },
 };
@@ -1078,6 +1079,8 @@  static const AVOption colorspace_options[] = {
     ENUM("smpte240m",    AVCOL_TRC_SMPTE240M,    "trc"),
     ENUM("srgb",         AVCOL_TRC_IEC61966_2_1, "trc"),
     ENUM("iec61966-2-1", AVCOL_TRC_IEC61966_2_1, "trc"),
+    ENUM("xvycc",        AVCOL_TRC_IEC61966_2_4, "trc"),
+    ENUM("iec61966-2-4", AVCOL_TRC_IEC61966_2_4, "trc"),
     ENUM("bt2020-10",    AVCOL_TRC_BT2020_10,    "trc"),
     ENUM("bt2020-12",    AVCOL_TRC_BT2020_12,    "trc"),