X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_colorspace.c;h=56621d15e26abc4bafea7f81aa2cdee05e520a59;hb=73d193d1d0ff62a029a905d1404c0fd357f4c880;hp=71ea08a20fe65e92ecb22ee075ba7ba8ecc985b9;hpb=d204b7ff610cb8dac1116e7a4fd3068733cb5adf;p=ffmpeg diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c index 71ea08a20fe..56621d15e26 100644 --- a/libavfilter/vf_colorspace.c +++ b/libavfilter/vf_colorspace.c @@ -33,6 +33,7 @@ #include "formats.h" #include "internal.h" #include "video.h" +#include "colorspace.h" enum DitherMode { DITHER_NONE, @@ -110,21 +111,13 @@ static const enum AVColorSpace default_csp[CS_NB + 1] = { struct ColorPrimaries { enum Whitepoint wp; - double xr, yr, xg, yg, xb, yb; + struct PrimaryCoefficients coeff; }; struct TransferCharacteristics { double alpha, beta, gamma, delta; }; -struct LumaCoefficients { - double cr, cg, cb; -}; - -struct WhitepointCoefficients { - double xw, yw; -}; - typedef struct ColorSpaceContext { const AVClass *class; @@ -286,57 +279,30 @@ static const struct WhitepointCoefficients whitepoint_coefficients[WP_NB] = { }; static const struct ColorPrimaries color_primaries[AVCOL_PRI_NB] = { - [AVCOL_PRI_BT709] = { WP_D65, 0.640, 0.330, 0.300, 0.600, 0.150, 0.060 }, - [AVCOL_PRI_BT470M] = { WP_C, 0.670, 0.330, 0.210, 0.710, 0.140, 0.080 }, - [AVCOL_PRI_BT470BG] = { WP_D65, 0.640, 0.330, 0.290, 0.600, 0.150, 0.060,}, - [AVCOL_PRI_SMPTE170M] = { WP_D65, 0.630, 0.340, 0.310, 0.595, 0.155, 0.070 }, - [AVCOL_PRI_SMPTE240M] = { WP_D65, 0.630, 0.340, 0.310, 0.595, 0.155, 0.070 }, - [AVCOL_PRI_SMPTE428] = { WP_E, 0.735, 0.265, 0.274, 0.718, 0.167, 0.009 }, - [AVCOL_PRI_SMPTE431] = { WP_DCI, 0.680, 0.320, 0.265, 0.690, 0.150, 0.060 }, - [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 }, + [AVCOL_PRI_BT709] = { WP_D65, { 0.640, 0.330, 0.300, 0.600, 0.150, 0.060 } }, + [AVCOL_PRI_BT470M] = { WP_C, { 0.670, 0.330, 0.210, 0.710, 0.140, 0.080 } }, + [AVCOL_PRI_BT470BG] = { WP_D65, { 0.640, 0.330, 0.290, 0.600, 0.150, 0.060 } }, + [AVCOL_PRI_SMPTE170M] = { WP_D65, { 0.630, 0.340, 0.310, 0.595, 0.155, 0.070 } }, + [AVCOL_PRI_SMPTE240M] = { WP_D65, { 0.630, 0.340, 0.310, 0.595, 0.155, 0.070 } }, + [AVCOL_PRI_SMPTE428] = { WP_E, { 0.735, 0.265, 0.274, 0.718, 0.167, 0.009 } }, + [AVCOL_PRI_SMPTE431] = { WP_DCI, { 0.680, 0.320, 0.265, 0.690, 0.150, 0.060 } }, + [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) { - const struct ColorPrimaries *coeffs; + const struct ColorPrimaries *p; if (prm >= AVCOL_PRI_NB) return NULL; - coeffs = &color_primaries[prm]; - if (!coeffs->xr) + p = &color_primaries[prm]; + if (!p->coeff.xr) return NULL; - return coeffs; -} - -static void invert_matrix3x3(const double in[3][3], double out[3][3]) -{ - double m00 = in[0][0], m01 = in[0][1], m02 = in[0][2], - m10 = in[1][0], m11 = in[1][1], m12 = in[1][2], - m20 = in[2][0], m21 = in[2][1], m22 = in[2][2]; - int i, j; - double det; - - out[0][0] = (m11 * m22 - m21 * m12); - out[0][1] = -(m01 * m22 - m21 * m02); - out[0][2] = (m01 * m12 - m11 * m02); - out[1][0] = -(m10 * m22 - m20 * m12); - out[1][1] = (m00 * m22 - m20 * m02); - out[1][2] = -(m00 * m12 - m10 * m02); - out[2][0] = (m10 * m21 - m20 * m11); - out[2][1] = -(m00 * m21 - m20 * m01); - out[2][2] = (m00 * m11 - m10 * m01); - - det = m00 * out[0][0] + m10 * out[0][1] + m20 * out[0][2]; - det = 1.0 / det; - - for (i = 0; i < 3; i++) { - for (j = 0; j < 3; j++) - out[i][j] *= det; - } + return p; } static int fill_gamma_table(ColorSpaceContext *s) @@ -379,49 +345,6 @@ static int fill_gamma_table(ColorSpaceContext *s) return 0; } -/* - * see e.g. http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html - */ -static void fill_rgb2xyz_table(const struct ColorPrimaries *coeffs, - double rgb2xyz[3][3]) -{ - const struct WhitepointCoefficients *wp = &whitepoint_coefficients[coeffs->wp]; - double i[3][3], sr, sg, sb, zw; - - rgb2xyz[0][0] = coeffs->xr / coeffs->yr; - rgb2xyz[0][1] = coeffs->xg / coeffs->yg; - rgb2xyz[0][2] = coeffs->xb / coeffs->yb; - rgb2xyz[1][0] = rgb2xyz[1][1] = rgb2xyz[1][2] = 1.0; - rgb2xyz[2][0] = (1.0 - coeffs->xr - coeffs->yr) / coeffs->yr; - rgb2xyz[2][1] = (1.0 - coeffs->xg - coeffs->yg) / coeffs->yg; - rgb2xyz[2][2] = (1.0 - coeffs->xb - coeffs->yb) / coeffs->yb; - invert_matrix3x3(rgb2xyz, i); - zw = 1.0 - wp->xw - wp->yw; - sr = i[0][0] * wp->xw + i[0][1] * wp->yw + i[0][2] * zw; - sg = i[1][0] * wp->xw + i[1][1] * wp->yw + i[1][2] * zw; - sb = i[2][0] * wp->xw + i[2][1] * wp->yw + i[2][2] * zw; - rgb2xyz[0][0] *= sr; - rgb2xyz[0][1] *= sg; - rgb2xyz[0][2] *= sb; - rgb2xyz[1][0] *= sr; - rgb2xyz[1][1] *= sg; - rgb2xyz[1][2] *= sb; - rgb2xyz[2][0] *= sr; - rgb2xyz[2][1] *= sg; - rgb2xyz[2][2] *= sb; -} - -static void mul3x3(double dst[3][3], const double src1[3][3], const double src2[3][3]) -{ - int m, n; - - for (m = 0; m < 3; m++) - for (n = 0; n < 3; n++) - dst[m][n] = src2[m][0] * src1[0][n] + - src2[m][1] * src1[1][n] + - src2[m][2] * src1[2][n]; -} - /* * See http://www.brucelindbloom.com/index.html?Eqn_ChromAdapt.html * This function uses the Bradford mechanism. @@ -448,7 +371,7 @@ static void fill_whitepoint_conv_table(double out[3][3], enum WhitepointAdaptati double mai[3][3], fac[3][3], tmp[3][3]; double rs, gs, bs, rd, gd, bd; - invert_matrix3x3(ma, mai); + ff_matrix_invert_3x3(ma, mai); rs = ma[0][0] * wp_src->xw + ma[0][1] * wp_src->yw + ma[0][2] * zw_src; gs = ma[1][0] * wp_src->xw + ma[1][1] * wp_src->yw + ma[1][2] * zw_src; bs = ma[2][0] * wp_src->xw + ma[2][1] * wp_src->yw + ma[2][2] * zw_src; @@ -459,8 +382,8 @@ static void fill_whitepoint_conv_table(double out[3][3], enum WhitepointAdaptati fac[1][1] = gd / gs; fac[2][2] = bd / bs; fac[0][1] = fac[0][2] = fac[1][0] = fac[1][2] = fac[2][0] = fac[2][1] = 0.0; - mul3x3(tmp, ma, fac); - mul3x3(out, tmp, mai); + ff_matrix_mul_3x3(tmp, ma, fac); + ff_matrix_mul_3x3(out, tmp, mai); } static void apply_lut(int16_t *buf[3], ptrdiff_t stride, @@ -661,20 +584,23 @@ static int create_filtergraph(AVFilterContext *ctx, sizeof(*s->in_primaries)); if (!s->lrgb2lrgb_passthrough) { double rgb2xyz[3][3], xyz2rgb[3][3], rgb2rgb[3][3]; + const struct WhitepointCoefficients *wp_out, *wp_in; - fill_rgb2xyz_table(s->out_primaries, rgb2xyz); - invert_matrix3x3(rgb2xyz, xyz2rgb); - fill_rgb2xyz_table(s->in_primaries, rgb2xyz); + wp_out = &whitepoint_coefficients[s->out_primaries->wp]; + wp_in = &whitepoint_coefficients[s->in_primaries->wp]; + ff_fill_rgb2xyz_table(&s->out_primaries->coeff, wp_out, rgb2xyz); + ff_matrix_invert_3x3(rgb2xyz, xyz2rgb); + ff_fill_rgb2xyz_table(&s->in_primaries->coeff, wp_in, rgb2xyz); if (s->out_primaries->wp != s->in_primaries->wp && s->wp_adapt != WP_ADAPT_IDENTITY) { double wpconv[3][3], tmp[3][3]; fill_whitepoint_conv_table(wpconv, s->wp_adapt, s->in_primaries->wp, s->out_primaries->wp); - mul3x3(tmp, rgb2xyz, wpconv); - mul3x3(rgb2rgb, tmp, xyz2rgb); + ff_matrix_mul_3x3(tmp, rgb2xyz, wpconv); + ff_matrix_mul_3x3(rgb2rgb, tmp, xyz2rgb); } else { - mul3x3(rgb2rgb, rgb2xyz, xyz2rgb); + ff_matrix_mul_3x3(rgb2rgb, rgb2xyz, xyz2rgb); } for (m = 0; m < 3; m++) for (n = 0; n < 3; n++) { @@ -799,7 +725,7 @@ static int create_filtergraph(AVFilterContext *ctx, for (n = 0; n < 8; n++) s->yuv_offset[0][n] = off; fill_rgb2yuv_table(s->in_lumacoef, rgb2yuv); - invert_matrix3x3(rgb2yuv, yuv2rgb); + ff_matrix_invert_3x3(rgb2yuv, yuv2rgb); bits = 1 << (in_desc->comp[0].depth - 1); for (n = 0; n < 3; n++) { for (in_rng = s->in_y_rng, m = 0; m < 3; m++, in_rng = s->in_uv_rng) { @@ -855,7 +781,7 @@ static int create_filtergraph(AVFilterContext *ctx, double yuv2yuv[3][3]; int in_rng, out_rng; - mul3x3(yuv2yuv, yuv2rgb, rgb2yuv); + ff_matrix_mul_3x3(yuv2yuv, yuv2rgb, rgb2yuv); for (out_rng = s->out_y_rng, m = 0; m < 3; m++, out_rng = s->out_uv_rng) { for (in_rng = s->in_y_rng, n = 0; n < 3; n++, in_rng = s->in_uv_rng) { s->yuv2yuv_coeffs[m][n][0] =