From patchwork Fri Aug 23 09:07:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rajiv Harlalka X-Patchwork-Id: 51118 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b3c7:0:b0:48e:c0f8:d0de with SMTP id g7csp199331vqt; Fri, 23 Aug 2024 02:07:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU+VknWic9D5yOdFwBwuRZN+RmUUWea3p8B5LT/7RAVXrKKHkW0FZe+Nm7ZX6Av5a/ZZPVDHnQLHk9cIIhvozcY@gmail.com X-Google-Smtp-Source: AGHT+IFwVi9WQB84L40syAtczDO3rDk7hs6fanHB8KXmLXgMqRtwyU2MkycB3s4izaObKe1CehkK X-Received: by 2002:a05:6402:40c4:b0:5a1:1ce3:9b58 with SMTP id 4fb4d7f45d1cf-5c08910fbb7mr587496a12.0.1724404079536; Fri, 23 Aug 2024 02:07:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1724404079; cv=none; d=google.com; s=arc-20160816; b=JlQgJCs/NaIqx8m20Otla1e5uBkGQlJGKI/YOgbF8ovGVu8yOXdbV6qWRgxCQJ3TSw j2mAddml/HZAHV+5bCKqUAGYISBo+ipZ6o4xsbGQORRKud7aUotZ48L3/9ossApfWBU1 wgeJkma9snMSf/qeqxvSO7Np0MEg6cLRsVYnhFUjmWExT0gOLw1BCt2nbdZJQBCoXVxG njfnsw0LUSP7oTfraV/sVfqargYLhSUhkbcbN3q/pkEWqrJ2XKcLSLnxZAKswLK21lg1 FkQcCKv/+VYq80LYBIriMVoqMt+oaM+P+88rdcCFW8MHoWXvbt/USWsFCqrcxnn8MaWN UblQ== 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=Jm8NqwzaJzsNsfmO7gAO5Yga5tYaqonU5pvLaWC0bHA=; fh=vDofb6Cb0l/WrMMHuTNW0kjJ61Koc7sAjaBtezdxdu8=; b=DTXqJo5JBFob/xbsigoajcdQ8gpbjngdFJQ6wuDrcuLH3SvYaUacYQ2JlNM7xpijnS JpJ+K4sizljwMCTSDcL6ak6Llw0sH+W/lnUSo1SBG1gVozxjfefHzlopohktbYsURqNi s3UczRkKroHCMDaWPv9Eab820wtE6HqbFk28xNCZ8s0kQjaHE8/CZi+spDKCWVJ0S65x qM2LJw5NY5opJ/eIl6djprA2w+77IxXtLE29Q845aeVwf1GpEfViBzaMI38XrRXo2SMk rSxS7IHU01WCS77rmtu1bZ1y4sJ5re6ZUH6oHcWTpwLS1cuhHQ5OALibVS1azTo8dvaK 8EpA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=AS62DHFh; 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; dara=fail header.i=@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 4fb4d7f45d1cf-5c0515fd56csi2282405a12.498.2024.08.23.02.07.58; Fri, 23 Aug 2024 02:07:59 -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=20230601 header.b=AS62DHFh; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 574DD68D925; Fri, 23 Aug 2024 12:07:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E38ED68DAEF for ; Fri, 23 Aug 2024 12:07:47 +0300 (EEST) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2023dd9b86aso13745895ad.1 for ; Fri, 23 Aug 2024 02:07:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724404066; x=1725008866; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=9o0HGFH2sPqJR/Vfbqr3GQ6aOSbw2xc9pp9bTBW8u/c=; b=AS62DHFhfMV5009VCwcHDvQ3YSxTL+gRWpNUI3SARexWmNN8FbYG9jzRqHZzT3vYhF nc9NNpY3cknsUFES7hqc5Rfz8DF0cFzS3C3kmcwZXm7wno5K3D7phThQ0SH2j/a7d0dv PLQ5VNAFDIPNv6Qfp2GTWAlPsP1Fy8JIkGpX1yU0XiegQLqVaN/YlyzLRC4bz9lYvKV0 5HrVd2VcTANRVMY86+cVz+/lstBQUySfpJp8kNQni3mnbqKHZ3dImJC+xgQd7fQzDtjx sXRy8ix3TjY7qQzjMSpOZNj1U+1lLCzUt/BRUvyyiZjVYd+47VuttNE3ZQTFpC9Tj5bn OFMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724404066; x=1725008866; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9o0HGFH2sPqJR/Vfbqr3GQ6aOSbw2xc9pp9bTBW8u/c=; b=Ljm1+XyAfNzI5E3BP8tHaFunjNqxnSaKuSoJ0uT/Vnp3DJHP5ey8S70QoIQMPcC/dp S6sA01HXtC9t4aBiYZfFTOtHYrirgkrcjnlkSQpb+gzAlwoRZciBZMrgV0dJxFNBqK2T lkiVHySWdFqTSUIw6rrU+Z6ZkyVg95ySS8XVZDzkSS/XH3vZ8fohDLDlrbzJLpsUeQ6b EnUMFd8yYiWNpUGaxuSGb4MBNOASX6QnhTnU7zwulez8797+JM70TFbXySPvsrB5vkRk gH6baPhyKpibOIvdde66svUEKWiwhbNmz/chLOkaQORysqILoOdfKfq6c/vPrXDmuYw3 ErtA== X-Gm-Message-State: AOJu0Yxf4QgmC2x5+ytqz8ONkwGMBR1svtFEVJywuP8iTPIttP7u9zLY WaEz/pdht22e8YxOn8L0oA2Ot1aUSj60/dhsDH/TySvl3ZjoPMrFWAmRIaVEiZ2LKA== X-Received: by 2002:a17:902:c406:b0:203:a0ea:6269 with SMTP id d9443c01a7336-203a0ea6d57mr12171705ad.9.1724404065337; Fri, 23 Aug 2024 02:07:45 -0700 (PDT) Received: from KOSS-server.0xgdoau1yfnebo2q4ljtgdjnrd.rx.internal.cloudapp.net ([20.197.21.123]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2038556646csm24297245ad.61.2024.08.23.02.07.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Aug 2024 02:07:44 -0700 (PDT) From: Rajiv Harlalka To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Aug 2024 09:07:39 +0000 Message-Id: <20240823090739.43591-1-rajivharlalka009@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avfilter: add pu21 filter 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: Rajiv Harlalka , cosmin@cosmin.at, thilo.borgmann@googlemail.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hsz2tslfyY7Q Adds the PU21 encoding filter for high dynamic range images and video quality assessment Mantiuk, R., & Azimi, M. PU21: A novel perceptually uniform encoding for adapting existing quality metrics for HDR https://github.com/gfxdisp/pu21 --- Changelog | 1 + libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/version.h | 4 +- libavfilter/vf_pu21.c | 210 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 215 insertions(+), 2 deletions(-) create mode 100644 libavfilter/vf_pu21.c diff --git a/Changelog b/Changelog index 571b27ad98..552aa6028a 100644 --- a/Changelog +++ b/Changelog @@ -18,6 +18,7 @@ version : - D3D12VA HEVC encoder - Cropping metadata parsing and writing in Matroska and MP4/MOV de/muxers - Intel QSV-accelerated VVC decoding +- Addition of vf_pu21 encoding filter version 7.0: diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 63088e9286..102315f5bf 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -121,6 +121,7 @@ OBJS-$(CONFIG_AXCORRELATE_FILTER) += af_axcorrelate.o OBJS-$(CONFIG_AZMQ_FILTER) += f_zmq.o OBJS-$(CONFIG_BANDPASS_FILTER) += af_biquads.o OBJS-$(CONFIG_BANDREJECT_FILTER) += af_biquads.o +OBJS-$(CONFIG_PU21_FILTER) += vf_pu21.o OBJS-$(CONFIG_BASS_FILTER) += af_biquads.o OBJS-$(CONFIG_BIQUAD_FILTER) += af_biquads.o OBJS-$(CONFIG_BS2B_FILTER) += af_bs2b.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 63600e9b58..ced076626c 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -231,6 +231,7 @@ extern const AVFilter ff_vf_convolution_opencl; extern const AVFilter ff_vf_convolve; extern const AVFilter ff_vf_copy; extern const AVFilter ff_vf_coreimage; +extern const AVFilter ff_vf_pu21; extern const AVFilter ff_vf_corr; extern const AVFilter ff_vf_cover_rect; extern const AVFilter ff_vf_crop; diff --git a/libavfilter/version.h b/libavfilter/version.h index d8cd8a2cfb..7e0eb9af97 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,8 +31,8 @@ #include "version_major.h" -#define LIBAVFILTER_VERSION_MINOR 2 -#define LIBAVFILTER_VERSION_MICRO 102 +#define LIBAVFILTER_VERSION_MINOR 3 +#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ diff --git a/libavfilter/vf_pu21.c b/libavfilter/vf_pu21.c new file mode 100644 index 0000000000..c3b56f9c1b --- /dev/null +++ b/libavfilter/vf_pu21.c @@ -0,0 +1,210 @@ + +#include "libavfilter/avfilter.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "libavutil/mem.h" +#include "libavutil/imgutils.h" +#include "libavfilter/formats.h" +#include "libavutil/internal.h" +#include "video.h" + +static enum pu21_mode { + BANDING, + BANDING_GLARE, + PEAKS, + PEAKS_GLARE +}; + +typedef struct PU21Context { + const AVClass* class; + double L_min, L_max; + int multiplier; + int mode; + + int depth; + int nb_planes; +} PU21Context; + +const float pu21_params[4][7] = { + // Reference: "PU21: A novel perceptually uniform encoding for adapting existing quality metrics for HDR" + // Rafał K. Mantiuk and M. Azimi, Picture Coding Symposium 2021 + // https://github.com/gfxdisp/pu21 + {1.070275272f, 0.4088273932f, 0.153224308f, 0.2520326168f, 1.063512885f, 1.14115047f, 521.4527484f}, // BANDING + {0.353487901f, 0.3734658629f, 8.277049286e-05f, 0.9062562627f, 0.09150303166f, 0.9099517204f, 596.3148142f}, // BANDING_GLARE + {1.043882782f, 0.6459495343f, 0.3194584211f, 0.374025247f, 1.114783422f, 1.095360363f, 384.9217577f}, // PEAKS + {816.885024f, 1479.463946f, 0.001253215609f, 0.9329636822f, 0.06746643971f, 1.573435413f, 419.6006374f} // PEAKS_GLARE +}; + + +#define OFFSET(x) offsetof(PU21Context, x) +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM +static const AVOption pu21_options[] = { + { "L_min", "Set the minimum luminance value", OFFSET(L_min), AV_OPT_TYPE_DOUBLE, {.dbl = 0.005}, 0.005, 10000, FLAGS }, + { "L_max", "Set the maximum luminance value", OFFSET(L_max), AV_OPT_TYPE_DOUBLE, {.dbl = 10000}, 0.005, 10000, FLAGS }, + { "multiplier", "Set the parameters for the encoding", OFFSET(multiplier), AV_OPT_TYPE_INT, {.i64 = 1}, 1, 10000, FLAGS}, + { "mode", "Set the mode of the PU21 encoding", OFFSET(mode), AV_OPT_TYPE_INT, {.i64 = BANDING_GLARE}, BANDING, PEAKS_GLARE, FLAGS}, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(pu21); + +static av_cold int pu21_init(AVFilterContext* ctx) { + PU21Context* pu21 = ctx->priv; + + pu21->L_max = 300; + pu21->L_min = 0.005; + pu21->multiplier = 1; + pu21->mode = BANDING_GLARE; + return 0; +} + +static float apply_pu21(float pixel_val, PU21Context* pu21) { + float Y, V; + Y = pixel_val * (pu21->multiplier); + V = fmax(pu21_params[pu21->mode][6] * (pow((pu21_params[pu21->mode][0] + pu21_params[pu21->mode][1] * pow(Y, pu21_params[pu21->mode][3])) / (1 + pu21_params[pu21->mode][2] * pow(Y, pu21_params[pu21->mode][3])), pu21_params[pu21->mode][4]) - pu21_params[pu21->mode][5]), 0); + return V; +} + +static void pu21_encode8(AVFilterContext* ctx, AVFrame* in, AVFrame* out) { + PU21Context* pu21 = ctx->priv; + const int height = in->height; + const int width = in->width; + + int plane; + for (plane = 0; plane < pu21->nb_planes; plane++) { + const uint8_t* src8 = in->data[plane]; + uint8_t* dst8 = out->data[plane]; + + int linesize = in->linesize[plane]; + + uint8_t pixel_val; + for (int y = 0; y < height; y++) { + for (int x = 0; x < width; x++) { + pixel_val = src8[y * linesize + x]; + dst8[y * linesize + x] = (uint8_t)apply_pu21(pixel_val, pu21); + } + } + } +} + +static void pu21_encode16(AVFilterContext* ctx, AVFrame* in, AVFrame* out) { + PU21Context* pu21 = ctx->priv; + const int height = in->height; + const int width = in->width; + + int plane; + for (plane = 0; plane < pu21->nb_planes; plane++) { + const uint16_t* src16 = (uint16_t*)in->data[plane]; + uint16_t* dst16 = (uint16_t*)out->data[plane]; + + int linesize = in->linesize[plane] / 2; + + uint16_t pixel_val; + for (int y = 0; y < height; y++) { + for (int x = 0; x < width; x++) { + pixel_val = src16[y * linesize + x]; + dst16[y * linesize + x] = (uint16_t)apply_pu21(pixel_val, pu21); + } + } + } +} + +static void pu21_encode32(AVFilterContext* ctx, AVFrame* in, AVFrame* out) { + PU21Context* pu21 = ctx->priv; + const int height = in->height; + const int width = in->width; + + int plane; + for (plane = 0; plane < pu21->nb_planes; plane++) { + const float* src32 = (float*)in->data[plane]; + float* dst32 = (float*)out->data[plane]; + + int linesize = in->linesize[plane] / 4; + + float pixel_val; + for (int y = 0; y < height; y++) { + for (int x = 0; x < width; x++) { + pixel_val = src32[y * linesize + x]; + dst32[y * linesize + x] = (float)apply_pu21(pixel_val, pu21); + } + } + } +} + +static int filter_frame(AVFilterLink* inlink, AVFrame* input) { + AVFilterContext* ctx = inlink->dst; + PU21Context* pu21 = ctx->priv; + + AVFilterLink* outlink = ctx->outputs[0]; + AVFrame* out; + + if (av_frame_is_writable(input)) { + out = input; + } + else { + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) { + av_frame_free(&input); + return AVERROR(ENOMEM); + } + av_frame_copy_props(out, input); + } + + if (pu21->depth <= 8) { + pu21_encode8(ctx, input, out); + } + else if (pu21->depth <= 16) { + pu21_encode16(ctx, input, out); + } + else { + pu21_encode32(ctx, input, out); + } + + if (out != input) + av_frame_free(&input); + return ff_filter_frame(outlink, out); +} + +static av_cold void uninit(AVFilterContext* ctx) { + PU21Context* s = ctx->priv; +} + +static int config_input(AVFilterLink* inlink) { + const AVPixFmtDescriptor* desc = av_pix_fmt_desc_get(inlink->format); + PU21Context* s = inlink->dst->priv; + + uninit(inlink->dst); + + s->depth = desc->comp[0].depth; + s->nb_planes = av_pix_fmt_count_planes(inlink->format); + + return 0; +} + +static const AVFilterPad pu21_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_input, + .filter_frame = filter_frame, + } +}; + +static const AVFilterPad pu21_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + } +}; + +const AVFilter ff_vf_pu21 = { + .name = "pu21", + .description = NULL_IF_CONFIG_SMALL("Convert HDR linear values to PU values using PU21 transform"), + .priv_size = sizeof(PU21Context), + .init = pu21_init, + .uninit = uninit, + FILTER_INPUTS(pu21_inputs), + FILTER_OUTPUTS(pu21_outputs), + .priv_class = &pu21_class, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, +};