From patchwork Tue Apr 19 12:46:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 35346 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp328345pzh; Tue, 19 Apr 2022 05:47:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxosdoYcuQqBbbSv9mSZLIvQvBhbTyPn6JOLNqDTs877fK6s1I49ZfI5KTQ2XHVcSjx2irz X-Received: by 2002:a17:906:4fc8:b0:6d8:5059:f998 with SMTP id i8-20020a1709064fc800b006d85059f998mr13819639ejw.487.1650372475392; Tue, 19 Apr 2022 05:47:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650372475; cv=none; d=google.com; s=arc-20160816; b=PL5BtpOjzSIdU7a/PeB9srglYeUzEd+0tz9ncOpmxCnVZquRTvtQdrYoyhdAfhQOeJ 1U9fs8bjBFT+fsbggQX6QxAxDxUHUIJ6f9yvKKnDO/Fju7qg9vYcKGVKVBN0R+7GTOPO XyTMFoq5PigvG9vDY9bzgMrcp1s3C+lDfIi94HEeFLXXaHy5nzW6vInOO5+FFEHO8Tei n24gKtI54hlh0fAIjdld5LEA7zr7VhJ49c+8ofXwksTmKsg/ozEOJj36sD9TsqtoCQSa 7zSqUPNoGkxVFK+E2mVfwu4tV4ND/4u3rlzMVPQLDTQ61OP8SyC6ZDEI0D0Rpt4Mb7rD Latg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=+UPYwho+ZEyXk3swgaSjbwtsaYNduufS3c8UgviD/I0=; b=nd5++VYcg/33HJSjD0O9jDsQqGEr53SndEGs/lQmVeR64LO3lJmvdMcPUcigjGHKY1 du3W6XoPjDTOgPEOum6p6bC5wHfBjGEUuSvQhmEdQFsb8l4N5rJVlmOFMMzmn6BQ7EL+ QjRmSukbgqW5lEffgh/GLJ6z3waaCSXwlJboGSVewR1YwvSQG6r42ZQ7n3+BtObVJOgM QjJpKRLfds+PuwTHhcBKRMvZSg4b5ZG78Kv/OhSngqCGo+KdtJOih4fZUFOXS+IiqVaW uT+RyUU83sG87Oj0uQOqqtByK7hd2NZJSTTvMQi3+Sq8youjnGXgvInShYMnWyDKKM+M jQ1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=Gvtod5rp; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id br4-20020a170906d14400b006dfe7bc2fafsi8097613ejb.56.2022.04.19.05.47.55; Tue, 19 Apr 2022 05:47:55 -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=@haasn.xyz header.s=mail header.b=Gvtod5rp; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5C41A68B36F; Tue, 19 Apr 2022 15:47:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E46868B2DC for ; Tue, 19 Apr 2022 15:47:32 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id B7F6249CCB; Tue, 19 Apr 2022 14:47:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1650372451; bh=uHH7Ig+OyV2t/yoH7eeQ050z5rJHljVxxX91dh+mEVo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gvtod5rpfJiDRgflYuTCurpSpVf0PsWZYHjHr8DGpeVcvff4gqSrnY0sbxiZARNs3 0Ic1BXchDM12QDJkxs7KCp1KhpVguz2ETRm33qaV809ABdalTESSywShAgiTXBm5XY W+EA6lSr6RzMlIda9QORTYQ4j2eoYZFwD1uhjgv8= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Apr 2022 14:46:54 +0200 Message-Id: <20220419124656.121638-2-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220419124656.121638-1-ffmpeg@haasn.xyz> References: <20220419124656.121638-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/5] lavfi: add ff_detect_color_primaries helper 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gLB6R+musdy5 From: Niklas Haas Related to #9673, this helper exists to facilitate "guessing" the right primary tags from a given set of raw primary coefficients. The cutoff value of 0.001 was chosen by experimentation. The smallest "false positive" delta observed in practice was 0.023329, while the largest "false negative" delta was 0.00016. So, a value of 0.001 sits comfortably in the middle. Signed-off-by: Niklas Haas --- libavfilter/colorspace.c | 25 +++++++++++++++++++++++++ libavfilter/colorspace.h | 3 +++ 2 files changed, 28 insertions(+) diff --git a/libavfilter/colorspace.c b/libavfilter/colorspace.c index 25e99f4759..8d7b882375 100644 --- a/libavfilter/colorspace.c +++ b/libavfilter/colorspace.c @@ -170,6 +170,31 @@ const struct ColorPrimaries *ff_get_color_primaries(enum AVColorPrimaries prm) 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, double rgb2yuv[3][3]) { diff --git a/libavfilter/colorspace.h b/libavfilter/colorspace.h index fc415fed05..6959133a49 100644 --- a/libavfilter/colorspace.h +++ b/libavfilter/colorspace.h @@ -49,6 +49,9 @@ void ff_fill_rgb2xyz_table(const struct PrimaryCoefficients *coeffs, const struct WhitepointCoefficients *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,