From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 1913E4E801
for <ffmpegdev@gitmailbox.com>; Mon, 17 Mar 2025 02:49:02 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3EC3368CF56;
Mon, 17 Mar 2025 04:48:58 +0200 (EET)
Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com
[209.85.216.47])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41A0B687B97
for <ffmpeg-devel@ffmpeg.org>; Mon, 17 Mar 2025 04:48:52 +0200 (EET)
Received: by mail-pj1-f47.google.com with SMTP id
98e67ed59e1d1-3011737dda0so1673837a91.1
for <ffmpeg-devel@ffmpeg.org>; Sun, 16 Mar 2025 19:48:52 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1742179730; x=1742784530; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:to
:from:from:to:cc:subject:date:message-id:reply-to;
bh=yfh8GgQTTwDhh0yejMP3cQhv6dea/BOGqYgM5iwk1zA=;
b=IFbZ1MLkLuYOxIrUt2uxShL11xujoAfhtnamiGC059LjM6welfHMpwg18bcNWOWwVI
XPPVfKm+pR+CDpScnx1bbYMz075Rr4EDvyC+VAknMnfOhjHf2A4AN99Wj0oYrU5BFLm7
+lOq1Y3IK9HHP7FzOdknkAuLB1WfSqboJCpfIJlObrCi2D5XVV/EEbUyBKiFNkAm7U+o
eBrH8WUoEjd9HP8+ayj2oqbT8Nh7onZ8CUQr0SkcepX4ZOcVCPbw2caZb2KzqyYD8CM0
27uKIuZddCItjbCA7MyeNZl3M2X3PCe0y5A8a/necXve5nZGHyFIjUk8MVCfWJoC236C
JUhg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742179730; x=1742784530;
h=content-transfer-encoding:mime-version:message-id:date:subject:to
:from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=yfh8GgQTTwDhh0yejMP3cQhv6dea/BOGqYgM5iwk1zA=;
b=Y0auVkBFvA+WaeJmlX4opUjNo/htDdVwGlrTjX3DFv5xWeluftBRVZv8Ivuy7ZCvmB
lkN5pt4i48IhYGwQDt3g1HTpk0U7BqIBJ24BpGs6BgaZ74u/e3m5dMv1MPxIqZIA4fx+
KXj/uxFw4Q961U5D+iWvvIjcZzq7X3AhnuJCmguE7mQnjsMhroaV4PcYWiJE8cuBhlq0
3Rqh4DLRZUUmxie8EIvI8ifSCZnYdRYFu9718Ft+baOzA9Uw0vZnyBIZnAn32co+5D1G
5T+IcEMOECJTUUPynVwLVp8rdmLkSNSLmHW4xbvTybVpvQf2ILKu2A4r60HqU27D5Cfd
DBIg==
X-Gm-Message-State: AOJu0Yzqr5M237a3CHmDFkmUDRih0j2X2Np678GQ4GKHgkhWmE584bZe
UnlTigh/ZhxlDW3LPsEDD9zgQ4e/oq7eCkF9ik/DWvTsrfyKmZB1U8XEcA==
X-Gm-Gg: ASbGncubCFCNHBi6onC6ls3E7fhsRgj0XTarrE9leEN+S/vcc/wd6u+wxlvnobMUCev
uTblzKCoJRO9w+mceQLQiMTjsRLQq3R7b9jGXoob25tKEXNwcSfrET1aX89m557tfLsXtQZP5O2
lieciZkM2FAyEmGmLPrXsvY9TtKKzeMPFuMDnIH1lh/yNn5mj4ZQ2rI2FJb7D5JMAPzQM+/2TgQ
Yc6SdPCGO5JUivSxiALFzKnP5vExcBqMxuL1KiL8ZtGX/IkXpZY2RsqXz27iZ6jgdGKmTHiyR2e
pVIwpU7dtjF5lWnVigO7JkPEiSP0lwCGGSbyDAEE9cfiCJQJ3YqIzswadcwv
X-Google-Smtp-Source: AGHT+IEBknO4EoIUPYtdTFF97ZYRgh7zdLzcxweuu5EDH7/VfafbCf5ETeepOsItzVFIn2gprni+6Q==
X-Received: by 2002:a17:90b:2742:b0:2ff:7331:18bc with SMTP id
98e67ed59e1d1-30151d575admr10787653a91.26.1742179729665;
Sun, 16 Mar 2025 19:48:49 -0700 (PDT)
Received: from localhost.localdomain ([2800:2121:b040:c:e90b:1e6c:4204:7ac9])
by smtp.gmail.com with ESMTPSA id
98e67ed59e1d1-301534f49a1sm4871484a91.10.2025.03.16.19.48.48
for <ffmpeg-devel@ffmpeg.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 16 Mar 2025 19:48:49 -0700 (PDT)
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Sun, 16 Mar 2025 23:48:33 -0300
Message-ID: <20250317024833.1242-1-jamrial@gmail.com>
X-Mailer: git-send-email 2.48.1
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH] avfilter/vf_zscale: add support for half
precision float RGB formats
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250317024833.1242-1-jamrial@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavfilter/vf_zscale.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c
index 7e66c3d6e2..5fe6e555e7 100644
--- a/libavfilter/vf_zscale.c
+++ b/libavfilter/vf_zscale.c
@@ -209,6 +209,7 @@ static int query_formats(const AVFilterContext *ctx,
AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10,
AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRP16,
AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP14, AV_PIX_FMT_GBRAP16,
+ AV_PIX_FMT_GBRPF16, AV_PIX_FMT_GBRAPF16,
AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32,
AV_PIX_FMT_NONE
};
@@ -582,7 +583,8 @@ static void format_init(zimg_image_format *format, AVFrame *frame, const AVPixFm
format->subsample_w = desc->log2_chroma_w;
format->subsample_h = desc->log2_chroma_h;
format->depth = desc->comp[0].depth;
- format->pixel_type = (desc->flags & AV_PIX_FMT_FLAG_FLOAT) ? ZIMG_PIXEL_FLOAT : desc->comp[0].depth > 8 ? ZIMG_PIXEL_WORD : ZIMG_PIXEL_BYTE;
+ format->pixel_type = (desc->flags & AV_PIX_FMT_FLAG_FLOAT) ? (desc->comp[0].depth > 16 ? ZIMG_PIXEL_FLOAT : ZIMG_PIXEL_HALF)
+ : (desc->comp[0].depth > 8 ? ZIMG_PIXEL_WORD : ZIMG_PIXEL_BYTE);
format->color_family = (desc->flags & AV_PIX_FMT_FLAG_RGB) ? ZIMG_COLOR_RGB : ZIMG_COLOR_YUV;
format->matrix_coefficients = (desc->flags & AV_PIX_FMT_FLAG_RGB) ? ZIMG_MATRIX_RGB : colorspace == -1 ? convert_matrix(frame->colorspace) : colorspace;
format->color_primaries = primaries == -1 ? convert_primaries(frame->color_primaries) : primaries;
@@ -861,11 +863,13 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
s->alpha_src_format.width = in->width;
s->alpha_src_format.height = in->height;
s->alpha_src_format.depth = desc->comp[0].depth;
- s->alpha_src_format.pixel_type = (desc->flags & AV_PIX_FMT_FLAG_FLOAT) ? ZIMG_PIXEL_FLOAT : desc->comp[0].depth > 8 ? ZIMG_PIXEL_WORD : ZIMG_PIXEL_BYTE;
+ s->alpha_src_format.pixel_type = (desc->flags & AV_PIX_FMT_FLAG_FLOAT) ? (desc->comp[0].depth > 16 ? ZIMG_PIXEL_FLOAT : ZIMG_PIXEL_HALF)
+ : (desc->comp[0].depth > 8 ? ZIMG_PIXEL_WORD : ZIMG_PIXEL_BYTE);
s->alpha_src_format.color_family = ZIMG_COLOR_GREY;
s->alpha_dst_format.depth = odesc->comp[0].depth;
- s->alpha_dst_format.pixel_type = (odesc->flags & AV_PIX_FMT_FLAG_FLOAT) ? ZIMG_PIXEL_FLOAT : odesc->comp[0].depth > 8 ? ZIMG_PIXEL_WORD : ZIMG_PIXEL_BYTE;
+ s->alpha_dst_format.pixel_type = (odesc->flags & AV_PIX_FMT_FLAG_FLOAT) ? (odesc->comp[0].depth > 16 ? ZIMG_PIXEL_FLOAT : ZIMG_PIXEL_HALF)
+ : (odesc->comp[0].depth > 8 ? ZIMG_PIXEL_WORD : ZIMG_PIXEL_BYTE);
s->alpha_dst_format.color_family = ZIMG_COLOR_GREY;
}
@@ -909,8 +913,14 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
if ((!(desc->flags & AV_PIX_FMT_FLAG_ALPHA)) && (odesc->flags & AV_PIX_FMT_FLAG_ALPHA) ){
int x, y;
if (odesc->flags & AV_PIX_FMT_FLAG_FLOAT) {
+ const uint16_t h_one = 0x3C00; // float2half(1.0f)
for (y = 0; y < out->height; y++) {
const ptrdiff_t row = y * out->linesize[3];
+ if (odesc->comp[0].depth == 16)
+ for (x = 0; x < out->width; x++) {
+ AV_WN16(out->data[3] + x * odesc->comp[3].step + row, h_one);
+ }
+ else
for (x = 0; x < out->width; x++) {
AV_WN32(out->data[3] + x * odesc->comp[3].step + row,
av_float2int(1.0f));
--
2.48.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".