From patchwork Tue May 17 14:03:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 35807 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2056726pzb; Tue, 17 May 2022 07:04:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwV6v1uy9fL3P34mpyBQuprdlbhOoaCF0ybgqW6n82E3kW5jZlgVMlzyvlDMktGHNCzbFia X-Received: by 2002:a17:907:d0c:b0:6f4:a5b9:3799 with SMTP id gn12-20020a1709070d0c00b006f4a5b93799mr19657016ejc.732.1652796250160; Tue, 17 May 2022 07:04:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652796250; cv=none; d=google.com; s=arc-20160816; b=n2L5TYNBjjibscj/vq9KMSyAn0Ac1X63tw9Ja2OC1VSwa29qZaZlPC1mRoKUgw+sqR foTNPqMvMASb6E8eCSp7V62EFRusyQSTdhH8swC0bCpYUWLzx8zqGN+GwFwRN1jSszwS lKf0J6PQu5qxKpcAmHWvydDrSG4X/a+eV2TKUgLtwsfcPxoEzawx4Ol0KArxawK6b/nj wo67hGqTwdlRnrcOWtkR4AZeV9mxl53NkmqG5Lih5K3t+4lgVmklwFT81iS2By7HDPy7 zOImhbCkYrbWW4a3mm4RA7GiQd3YGW1MgrGA6uhjXTwaEPkzqqAzCVKgk3gaDpeLNwoy ucSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=8OLVhQg4rN29V7Bk+YtNQeATtAbTk2Rc6F72FQgb2Bc=; b=eOKiYSmD073DMKkgRDfODxhIe4xWyXT9zt0sUzZutTpHL3H3wRxpT8KcP3wlz7Mqi/ N4kkU3kVEbv/Khl/xwyDRzF9XjjFXjoYjWCxYbxm3BmyWAOpwqilvihV1tqRgUwO5lS4 ghQHQKd/spf2s/EDaVubZVMf0dszVnkxJV8ArJl6TFJXGNt7uqCQGAztZIo04W4ttyfs UvPYhKsmZk2evl9bXCHcARgfCP40KQFgV9tun8PalN/ND2ORAH4ZG9ACv41Jxlsa0WVz Lu0H221pb+xiarMvGZr1pHxGwDOZSwfVNH5yUmGpss/ecNWZCgC1jTRkeiSpx18R+01d 3w0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=GZpR8Jlv; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y26-20020a1709060a9a00b006f382c47ad9si2539323ejf.846.2022.05.17.07.04.09; Tue, 17 May 2022 07:04:10 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=GZpR8Jlv; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A3D568B3C6; Tue, 17 May 2022 17:04:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB54968B27E for ; Tue, 17 May 2022 17:03:57 +0300 (EEST) Received: by mail-qt1-f180.google.com with SMTP id p4so14321322qtq.12 for ; Tue, 17 May 2022 07:03:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9TCsUvqNjDtuFSOhwpgoTivvu7q/6vlQ87kWLWp8d9Y=; b=GZpR8JlvFnwhPVs4o2qYIznnKnEA3Q34CglTVcHT1Lp11SfkPhFynPc41XDrBq8tVm /DljfkfvkUgji4v7+lW+6fkY1YVXXdF6j0V/BrANDHIWdmQVCJAWkaBDNnqZqAXxFa6x qWIEuf68FZ1EPhRIUAsBPguT+FRiW5Rub1NhTgbdUtgbRwmGUtEHq+yH4BG6RAbiVugE 4TCAJ4CebGcpI3jCcJ2zGtxySTUKmggAAp6r0Bp+tVg8AT9oGb+YA4Vch9C7X2cZGbNm bTfko/z49tduPxbqQEq1G+cuC6t8HJ0vl6WWc1JACaUOJqCUN3bfC2wuACXZ34klqOnY uvvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9TCsUvqNjDtuFSOhwpgoTivvu7q/6vlQ87kWLWp8d9Y=; b=cJ5jhBf29ldfXN+tAdOtp6CszGZ54iGJp0ZC1oozBPS/IAMUhRNAClbK7tT7hNOjx9 9bKh4L/pIzVruq53ZqjFp8UDOtITgIjkzfl37Zmllu1WDXbxSluNhIEqew1efyLf2bPh +hDAXQ/ut8UJ6zaNHod88Z8tXMHWIIvfI4Qtj40TynJNkvo5BpAK5zfsN9vO49wlc8yo K94rgMtHgBO63GA203TdkuU3zgHnAuC0FrI01qRzKKhTCGY37EtJa3MM9TN/OSrHB7yB W1r3m2aGq/HZ18vJj2KuAMcfV/CPsUqFLVzQ9rdwSXC5yrF7rtg4fQa/h5Dnr5WpWV8M eCUQ== X-Gm-Message-State: AOAM530I2Ion/Dycd4q7X8QsfqbxC2BFFvTr5UalczVCgSLyBfNHjFeJ yVIAzTxNm/kl9rXCtm4MadHAH3/TLTo= X-Received: by 2002:ac8:5dd2:0:b0:2f3:dc62:c216 with SMTP id e18-20020ac85dd2000000b002f3dc62c216mr19799506qtx.12.1652796236100; Tue, 17 May 2022 07:03:56 -0700 (PDT) Received: from gauss.local (c-68-41-54-207.hsd1.mi.comcast.net. [68.41.54.207]) by smtp.gmail.com with ESMTPSA id x2-20020a376302000000b0069fc13ce1e8sm7620883qkb.25.2022.05.17.07.03.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 07:03:55 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 May 2022 10:03:35 -0400 Message-Id: <20220517140335.8567-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avutil/csp: create public API for colorspace structs X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xYqVltQnxT7J This commit moves some of the functionality from avfilter/colorspace into avutil/csp and exposes it as a public API so it can be used by libavcodec and/or libavformat. --- libavfilter/colorspace.c | 94 +----------------------------- libavfilter/colorspace.h | 31 ++-------- libavfilter/fflcms2.c | 11 ++-- libavfilter/fflcms2.h | 4 +- libavfilter/vf_colorspace.c | 19 +++--- libavfilter/vf_iccdetect.c | 5 +- libavfilter/vf_tonemap.c | 15 +---- libavutil/Makefile | 2 + libavutil/csp.c | 111 ++++++++++++++++++++++++++++++++++++ libavutil/csp.h | 49 ++++++++++++++++ libavutil/version.h | 4 +- 11 files changed, 195 insertions(+), 150 deletions(-) create mode 100644 libavutil/csp.c create mode 100644 libavutil/csp.h diff --git a/libavfilter/colorspace.c b/libavfilter/colorspace.c index 8d7b882375..d6de313a5c 100644 --- a/libavfilter/colorspace.c +++ b/libavfilter/colorspace.c @@ -65,8 +65,8 @@ void ff_matrix_mul_3x3(double dst[3][3], /* * see e.g. http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html */ -void ff_fill_rgb2xyz_table(const struct PrimaryCoefficients *coeffs, - const struct WhitepointCoefficients *wp, +void ff_fill_rgb2xyz_table(const AVPrimaryCoefficients *coeffs, + const AVWhitepointCoefficients *wp, double rgb2xyz[3][3]) { double i[3][3], sr, sg, sb, zw; @@ -107,95 +107,7 @@ static const double gbr_matrix[3][3] = { 0.5, -0.5, 0 }, }; -/* - * All constants explained in e.g. https://linuxtv.org/downloads/v4l-dvb-apis/ch02s06.html - * The older ones (bt470bg/m) are also explained in their respective ITU docs - * (e.g. https://www.itu.int/dms_pubrec/itu-r/rec/bt/R-REC-BT.470-5-199802-S!!PDF-E.pdf) - * whereas the newer ones can typically be copied directly from wikipedia :) - */ -static const struct LumaCoefficients luma_coefficients[AVCOL_SPC_NB] = { - [AVCOL_SPC_FCC] = { 0.30, 0.59, 0.11 }, - [AVCOL_SPC_BT470BG] = { 0.299, 0.587, 0.114 }, - [AVCOL_SPC_SMPTE170M] = { 0.299, 0.587, 0.114 }, - [AVCOL_SPC_BT709] = { 0.2126, 0.7152, 0.0722 }, - [AVCOL_SPC_SMPTE240M] = { 0.212, 0.701, 0.087 }, - [AVCOL_SPC_YCOCG] = { 0.25, 0.5, 0.25 }, - [AVCOL_SPC_RGB] = { 1, 1, 1 }, - [AVCOL_SPC_BT2020_NCL] = { 0.2627, 0.6780, 0.0593 }, - [AVCOL_SPC_BT2020_CL] = { 0.2627, 0.6780, 0.0593 }, -}; - -const struct LumaCoefficients *ff_get_luma_coefficients(enum AVColorSpace csp) -{ - const struct LumaCoefficients *coeffs; - - if (csp >= AVCOL_SPC_NB) - return NULL; - coeffs = &luma_coefficients[csp]; - if (!coeffs->cr) - return NULL; - - return coeffs; -} - -#define WP_D65 { 0.3127, 0.3290 } -#define WP_C { 0.3100, 0.3160 } -#define WP_DCI { 0.3140, 0.3510 } -#define WP_E { 1/3.0f, 1/3.0f } - -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 } }, -}; - -const struct ColorPrimaries *ff_get_color_primaries(enum AVColorPrimaries prm) -{ - const struct ColorPrimaries *p; - - if (prm >= AVCOL_PRI_NB) - return NULL; - p = &color_primaries[prm]; - if (!p->prim.xr) - return NULL; - - return p; -} - -enum AVColorPrimaries ff_detect_color_primaries(const struct ColorPrimaries *prm) -{ - double delta; - - for (enum AVColorPrimaries p = 0; p < AVCOL_PRI_NB; p++) { - const struct ColorPrimaries *ref = &color_primaries[p]; - if (!ref->prim.xr) - continue; - - delta = fabs(prm->prim.xr - ref->prim.xr) + - fabs(prm->prim.yr - ref->prim.yr) + - fabs(prm->prim.yg - ref->prim.yg) + - fabs(prm->prim.yg - ref->prim.yg) + - fabs(prm->prim.yb - ref->prim.yb) + - fabs(prm->prim.yb - ref->prim.yb) + - fabs(prm->wp.xw - ref->wp.xw) + - fabs(prm->wp.yw - ref->wp.yw); - - if (delta < 0.001) - return p; - } - - return AVCOL_PRI_UNSPECIFIED; -} - -void ff_fill_rgb2yuv_table(const struct LumaCoefficients *coeffs, +void ff_fill_rgb2yuv_table(const AVLumaCoefficients *coeffs, double rgb2yuv[3][3]) { double bscale, rscale; diff --git a/libavfilter/colorspace.h b/libavfilter/colorspace.h index 6959133a49..879518d242 100644 --- a/libavfilter/colorspace.h +++ b/libavfilter/colorspace.h @@ -20,43 +20,20 @@ #ifndef AVFILTER_COLORSPACE_H #define AVFILTER_COLORSPACE_H +#include "libavutil/csp.h" #include "libavutil/frame.h" #include "libavutil/pixfmt.h" #define REFERENCE_WHITE 100.0f -struct LumaCoefficients { - double cr, cg, cb; -}; - -struct PrimaryCoefficients { - double xr, yr, xg, yg, xb, yb; -}; - -struct WhitepointCoefficients { - double xw, yw; -}; - -struct ColorPrimaries { - struct WhitepointCoefficients wp; - struct PrimaryCoefficients prim; -}; - void ff_matrix_invert_3x3(const double in[3][3], double out[3][3]); void ff_matrix_mul_3x3(double dst[3][3], const double src1[3][3], const double src2[3][3]); -void ff_fill_rgb2xyz_table(const struct PrimaryCoefficients *coeffs, - const struct WhitepointCoefficients *wp, +void ff_fill_rgb2xyz_table(const AVPrimaryCoefficients *coeffs, + const AVWhitepointCoefficients *wp, double rgb2xyz[3][3]); - -/* Returns AVCOL_PRI_UNSPECIFIED if no clear match can be identified */ -enum AVColorPrimaries ff_detect_color_primaries(const struct ColorPrimaries *prm); - -const struct ColorPrimaries *ff_get_color_primaries(enum AVColorPrimaries prm); -const struct LumaCoefficients *ff_get_luma_coefficients(enum AVColorSpace csp); -void ff_fill_rgb2yuv_table(const struct LumaCoefficients *coeffs, +void ff_fill_rgb2yuv_table(const AVLumaCoefficients *coeffs, double rgb2yuv[3][3]); - double ff_determine_signal_peak(AVFrame *in); void ff_update_hdr_metadata(AVFrame *in, double peak); diff --git a/libavfilter/fflcms2.c b/libavfilter/fflcms2.c index efc7cb5189..6c4b6dedbe 100644 --- a/libavfilter/fflcms2.c +++ b/libavfilter/fflcms2.c @@ -18,6 +18,7 @@ */ #include "libavutil/color_utils.h" +#include "libavutil/csp.h" #include "fflcms2.h" @@ -148,10 +149,10 @@ int ff_icc_profile_generate(FFIccContext *s, cmsHPROFILE *out_profile) { cmsToneCurve *tonecurve; - const struct ColorPrimaries *prim; + const AVColorPrimariesDesc *prim; int ret; - if (!(prim = ff_get_color_primaries(color_prim))) + if (!(prim = av_get_color_primaries(color_prim))) return AVERROR_INVALIDDATA; if ((ret = get_curve(s, color_trc, &tonecurve)) < 0) return ret; @@ -202,7 +203,7 @@ static av_always_inline void XYZ_xy(cmsCIEXYZ XYZ, double *x, double *y) } int ff_icc_profile_read_primaries(FFIccContext *s, cmsHPROFILE profile, - struct ColorPrimaries *out_primaries) + AVColorPrimariesDesc *out_primaries) { static const uint8_t testprimaries[4][3] = { { 0xFF, 0, 0 }, /* red */ @@ -211,8 +212,8 @@ int ff_icc_profile_read_primaries(FFIccContext *s, cmsHPROFILE profile, { 0xFF, 0xFF, 0xFF }, /* white */ }; - struct WhitepointCoefficients *wp = &out_primaries->wp; - struct PrimaryCoefficients *prim = &out_primaries->prim; + AVWhitepointCoefficients *wp = &out_primaries->wp; + AVPrimaryCoefficients *prim = &out_primaries->prim; cmsFloat64Number prev_adapt; cmsHPROFILE xyz; cmsHTRANSFORM tf; diff --git a/libavfilter/fflcms2.h b/libavfilter/fflcms2.h index ad6c8c47cf..0d238c679f 100644 --- a/libavfilter/fflcms2.h +++ b/libavfilter/fflcms2.h @@ -25,9 +25,9 @@ #ifndef AVFILTER_FFLCMS2_H #define AVFILTER_FFLCMS2_H +#include "libavutil/csp.h" #include "libavutil/frame.h" #include "libavutil/pixfmt.h" -#include "colorspace.h" #include @@ -72,7 +72,7 @@ int ff_icc_profile_attach(FFIccContext *s, cmsHPROFILE profile, AVFrame *frame); * Returns 0 on success, or a negative error code. */ int ff_icc_profile_read_primaries(FFIccContext *s, cmsHPROFILE profile, - struct ColorPrimaries *out_primaries); + AVColorPrimariesDesc *out_primaries); /** * Attempt detecting the transfer characteristic that best approximates the diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c index 3c8b3b20eb..da2de2518a 100644 --- a/libavfilter/vf_colorspace.c +++ b/libavfilter/vf_colorspace.c @@ -24,6 +24,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/csp.h" #include "libavutil/mem_internal.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" @@ -126,7 +127,7 @@ typedef struct ColorSpaceContext { unsigned rgb_sz; int *dither_scratch[3][2], *dither_scratch_base[3][2]; - const struct ColorPrimaries *in_primaries, *out_primaries; + const AVColorPrimariesDesc *in_primaries, *out_primaries; int lrgb2lrgb_passthrough; DECLARE_ALIGNED(16, int16_t, lrgb2lrgb_coeffs)[3][3][8]; @@ -134,7 +135,7 @@ typedef struct ColorSpaceContext { int rgb2rgb_passthrough; int16_t *lin_lut, *delin_lut; - const struct LumaCoefficients *in_lumacoef, *out_lumacoef; + const AVLumaCoefficients *in_lumacoef, *out_lumacoef; int yuv2yuv_passthrough, yuv2yuv_fastmode; DECLARE_ALIGNED(16, int16_t, yuv2rgb_coeffs)[3][3][8]; DECLARE_ALIGNED(16, int16_t, rgb2yuv_coeffs)[3][3][8]; @@ -233,8 +234,8 @@ static int fill_gamma_table(ColorSpaceContext *s) * This function uses the Bradford mechanism. */ static void fill_whitepoint_conv_table(double out[3][3], enum WhitepointAdaptation wp_adapt, - const struct WhitepointCoefficients *wp_src, - const struct WhitepointCoefficients *wp_dst) + const AVWhitepointCoefficients *wp_src, + const AVWhitepointCoefficients *wp_dst) { static const double ma_tbl[NB_WP_ADAPT_NON_IDENTITY][3][3] = { [WP_ADAPT_BRADFORD] = { @@ -438,7 +439,7 @@ static int create_filtergraph(AVFilterContext *ctx, s->in_prm = default_prm[FFMIN(s->user_iall, CS_NB)]; if (s->user_iprm != AVCOL_PRI_UNSPECIFIED) s->in_prm = s->user_iprm; - s->in_primaries = ff_get_color_primaries(s->in_prm); + s->in_primaries = av_get_color_primaries(s->in_prm); if (!s->in_primaries) { av_log(ctx, AV_LOG_ERROR, "Unsupported input primaries %d (%s)\n", @@ -446,7 +447,7 @@ static int create_filtergraph(AVFilterContext *ctx, return AVERROR(EINVAL); } s->out_prm = out->color_primaries; - s->out_primaries = ff_get_color_primaries(s->out_prm); + s->out_primaries = av_get_color_primaries(s->out_prm); if (!s->out_primaries) { if (s->out_prm == AVCOL_PRI_UNSPECIFIED) { if (s->user_all == CS_UNSPECIFIED) { @@ -466,7 +467,7 @@ 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; + const AVWhitepointCoefficients *wp_out, *wp_in; wp_out = &s->out_primaries->wp; wp_in = &s->in_primaries->wp; @@ -551,7 +552,7 @@ static int create_filtergraph(AVFilterContext *ctx, s->in_rng = in->color_range; if (s->user_irng != AVCOL_RANGE_UNSPECIFIED) s->in_rng = s->user_irng; - s->in_lumacoef = ff_get_luma_coefficients(s->in_csp); + s->in_lumacoef = av_get_luma_coefficients(s->in_csp); if (!s->in_lumacoef) { av_log(ctx, AV_LOG_ERROR, "Unsupported input colorspace %d (%s)\n", @@ -564,7 +565,7 @@ static int create_filtergraph(AVFilterContext *ctx, if (!s->out_lumacoef) { s->out_csp = out->colorspace; s->out_rng = out->color_range; - s->out_lumacoef = ff_get_luma_coefficients(s->out_csp); + s->out_lumacoef = av_get_luma_coefficients(s->out_csp); if (!s->out_lumacoef) { if (s->out_csp == AVCOL_SPC_UNSPECIFIED) { if (s->user_all == CS_UNSPECIFIED) { diff --git a/libavfilter/vf_iccdetect.c b/libavfilter/vf_iccdetect.c index fb7871f035..a62c7cad47 100644 --- a/libavfilter/vf_iccdetect.c +++ b/libavfilter/vf_iccdetect.c @@ -24,6 +24,7 @@ #include +#include "libavutil/csp.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" @@ -69,7 +70,7 @@ static int iccdetect_filter_frame(AVFilterLink *inlink, AVFrame *frame) AVFilterContext *avctx = inlink->dst; IccDetectContext *s = avctx->priv; const AVFrameSideData *sd; - struct ColorPrimaries coeffs; + AVColorPrimariesDesc coeffs; cmsHPROFILE profile; int ret; @@ -98,7 +99,7 @@ static int iccdetect_filter_frame(AVFilterLink *inlink, AVFrame *frame) if (ret < 0) return ret; - s->profile_prim = ff_detect_color_primaries(&coeffs); + s->profile_prim = av_detect_color_primaries(&coeffs); done: if (s->profile_prim != AVCOL_PRI_UNSPECIFIED) { diff --git a/libavfilter/vf_tonemap.c b/libavfilter/vf_tonemap.c index 1285dbaa4d..94a4f1ab74 100644 --- a/libavfilter/vf_tonemap.c +++ b/libavfilter/vf_tonemap.c @@ -27,6 +27,7 @@ #include #include +#include "libavutil/csp.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" @@ -50,16 +51,6 @@ enum TonemapAlgorithm { TONEMAP_MAX, }; -static const struct LumaCoefficients luma_coefficients[AVCOL_SPC_NB] = { - [AVCOL_SPC_FCC] = { 0.30, 0.59, 0.11 }, - [AVCOL_SPC_BT470BG] = { 0.299, 0.587, 0.114 }, - [AVCOL_SPC_SMPTE170M] = { 0.299, 0.587, 0.114 }, - [AVCOL_SPC_BT709] = { 0.2126, 0.7152, 0.0722 }, - [AVCOL_SPC_SMPTE240M] = { 0.212, 0.701, 0.087 }, - [AVCOL_SPC_BT2020_NCL] = { 0.2627, 0.6780, 0.0593 }, - [AVCOL_SPC_BT2020_CL] = { 0.2627, 0.6780, 0.0593 }, -}; - typedef struct TonemapContext { const AVClass *class; @@ -68,7 +59,7 @@ typedef struct TonemapContext { double desat; double peak; - const struct LumaCoefficients *coeffs; + const AVLumaCoefficients *coeffs; } TonemapContext; static av_cold int init(AVFilterContext *ctx) @@ -249,7 +240,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) } /* load original color space even if pixel format is RGB to compute overbrights */ - s->coeffs = &luma_coefficients[in->colorspace]; + s->coeffs = av_get_luma_coefficients(in->colorspace); if (s->desat > 0 && (in->colorspace == AVCOL_SPC_UNSPECIFIED || !s->coeffs)) { if (in->colorspace == AVCOL_SPC_UNSPECIFIED) av_log(s, AV_LOG_WARNING, "Missing color space information, "); diff --git a/libavutil/Makefile b/libavutil/Makefile index 234de62a4b..74d21a8103 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -20,6 +20,7 @@ HEADERS = adler32.h \ common.h \ cpu.h \ crc.h \ + csp.h \ des.h \ detection_bbox.h \ dict.h \ @@ -113,6 +114,7 @@ OBJS = adler32.o \ color_utils.o \ cpu.o \ crc.o \ + csp.o \ des.o \ detection_bbox.o \ dict.o \ diff --git a/libavutil/csp.c b/libavutil/csp.c new file mode 100644 index 0000000000..deecefbffc --- /dev/null +++ b/libavutil/csp.c @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2016 Ronald S. Bultje + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "csp.h" +#include "frame.h" +#include "mastering_display_metadata.h" +#include "pixfmt.h" + +/* + * All constants explained in e.g. https://linuxtv.org/downloads/v4l-dvb-apis/ch02s06.html + * The older ones (bt470bg/m) are also explained in their respective ITU docs + * (e.g. https://www.itu.int/dms_pubrec/itu-r/rec/bt/R-REC-BT.470-5-199802-S!!PDF-E.pdf) + * whereas the newer ones can typically be copied directly from wikipedia :) + */ +static const struct AVLumaCoefficients luma_coefficients[AVCOL_SPC_NB] = { + [AVCOL_SPC_FCC] = { 0.30, 0.59, 0.11 }, + [AVCOL_SPC_BT470BG] = { 0.299, 0.587, 0.114 }, + [AVCOL_SPC_SMPTE170M] = { 0.299, 0.587, 0.114 }, + [AVCOL_SPC_BT709] = { 0.2126, 0.7152, 0.0722 }, + [AVCOL_SPC_SMPTE240M] = { 0.212, 0.701, 0.087 }, + [AVCOL_SPC_YCOCG] = { 0.25, 0.5, 0.25 }, + [AVCOL_SPC_RGB] = { 1, 1, 1 }, + [AVCOL_SPC_BT2020_NCL] = { 0.2627, 0.6780, 0.0593 }, + [AVCOL_SPC_BT2020_CL] = { 0.2627, 0.6780, 0.0593 }, +}; + +const struct AVLumaCoefficients *av_get_luma_coefficients(enum AVColorSpace csp) +{ + const AVLumaCoefficients *coeffs; + + if (csp >= AVCOL_SPC_NB) + return NULL; + coeffs = &luma_coefficients[csp]; + if (!coeffs->cr) + return NULL; + + return coeffs; +} + +#define WP_D65 { 0.3127, 0.3290 } +#define WP_C { 0.3100, 0.3160 } +#define WP_DCI { 0.3140, 0.3510 } +#define WP_E { 1/3.0f, 1/3.0f } + +static const AVColorPrimariesDesc 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 } }, +}; + +const AVColorPrimariesDesc *av_get_color_primaries(enum AVColorPrimaries prm) +{ + const AVColorPrimariesDesc *p; + + if (prm >= AVCOL_PRI_NB) + return NULL; + p = &color_primaries[prm]; + if (!p->prim.xr) + return NULL; + + return p; +} + +enum AVColorPrimaries av_detect_color_primaries(const AVColorPrimariesDesc *prm) +{ + double delta; + + for (enum AVColorPrimaries p = 0; p < AVCOL_PRI_NB; p++) { + const AVColorPrimariesDesc *ref = &color_primaries[p]; + if (!ref->prim.xr) + continue; + + delta = fabs(prm->prim.xr - ref->prim.xr) + + fabs(prm->prim.yr - ref->prim.yr) + + fabs(prm->prim.yg - ref->prim.yg) + + fabs(prm->prim.yg - ref->prim.yg) + + fabs(prm->prim.yb - ref->prim.yb) + + fabs(prm->prim.yb - ref->prim.yb) + + fabs(prm->wp.xw - ref->wp.xw) + + fabs(prm->wp.yw - ref->wp.yw); + + if (delta < 0.001) + return p; + } + + return AVCOL_PRI_UNSPECIFIED; +} diff --git a/libavutil/csp.h b/libavutil/csp.h new file mode 100644 index 0000000000..0b4ed0028e --- /dev/null +++ b/libavutil/csp.h @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2016 Ronald S. Bultje + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_CSP_H +#define AVUTIL_CSP_H + +#include "libavutil/frame.h" +#include "libavutil/pixfmt.h" + +typedef struct AVLumaCoefficients { + double cr, cg, cb; +} AVLumaCoefficients; + +typedef struct AVPrimaryCoefficients { + double xr, yr, xg, yg, xb, yb; +} AVPrimaryCoefficients; + +typedef struct AVWhitepointCoefficients { + double xw, yw; +} AVWhitepointCoefficients; + +typedef struct AVColorPrimariesDesc { + AVWhitepointCoefficients wp; + AVPrimaryCoefficients prim; +} AVColorPrimariesDesc; + +/* Returns AVCOL_PRI_UNSPECIFIED if no clear match can be identified */ +enum AVColorPrimaries av_detect_color_primaries(const AVColorPrimariesDesc *prm); + +const AVColorPrimariesDesc *av_get_color_primaries(enum AVColorPrimaries prm); +const AVLumaCoefficients *av_get_luma_coefficients(enum AVColorSpace csp); + +#endif /* AVUTIL_CSP_H */ diff --git a/libavutil/version.h b/libavutil/version.h index 6735c20090..dd7d20a9fa 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,8 +79,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 24 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 25 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \