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 912B34E80F
for <ffmpegdev@gitmailbox.com>; Mon, 17 Mar 2025 03:32:21 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 59E7F68C497;
Mon, 17 Mar 2025 05:32:16 +0200 (EET)
Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com
[209.85.214.182])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C6602687C2D
for <ffmpeg-devel@ffmpeg.org>; Mon, 17 Mar 2025 05:32:09 +0200 (EET)
Received: by mail-pl1-f182.google.com with SMTP id
d9443c01a7336-2235189adaeso64343375ad.0
for <ffmpeg-devel@ffmpeg.org>; Sun, 16 Mar 2025 20:32:09 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1742182327; x=1742787127; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:from:to:cc:subject:date:message-id
:reply-to; bh=hQqvmkV3JAZgX7zbJk4uundj+EsocLYIEG9qc87xEFY=;
b=QYbyEgAH74+PSWSmahR+ktofpq5cHl9zgtvat/R3tsGGg9DzkEaBJaM7vXzsfHvWKU
ThYFhdCVtOIpb6dKmZCT+YE+J4FISwF/gMWhsF196djRz2Lk7xk3n60ZpZwJxtYPj+/q
GDUR6ArOX02FYPz3S6iD+hguSldrWqqYGXGecaw0em60C6p2yWNGyVUbilXW7v8SD69h
u29a6+1tPfS1pAlgMPsj9lheiKCnx19do6V7G/8leKqN6yJsZPuBiEeAmvHHkLOUoIeC
waFSWfeFuuPcIfma4jLBOH5r5cHwzxPrMk9WHBmDH3hxG8cxUTuMEmqWLlP1wsi9vXEj
yBfg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742182327; x=1742787127;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=hQqvmkV3JAZgX7zbJk4uundj+EsocLYIEG9qc87xEFY=;
b=IuOycxbfS2XJ8Amot2AynWjvrL15SgewgBOVSNyUpeTlXMvLlGlI6kDwSVt35tcBDk
6eQhMLJs1KEvwC8R+wZK8Kbi1EZJAoy7afBvDT83/tTCNN/ytpJ3ZopfS9kkVK1B/y5F
VkRFRWTX3RojuQCf35pG5q82ikFT8DVqH4eeuLTTkdNW+WvxFN74s9Lej9LfqOLkf/O7
sTL7UOJzVAdglCLxTDPug4OBhwKC80xv67kewfIrNHkl5NRiYY8vk62aWLLQlCWWIRWK
QUqUFpxw5FK8Av8FcbL6dFxVh1BPTX9ttIWl9sdq37sP91EQzhb6J5x91ON2pmfanEiM
u1VQ==
X-Gm-Message-State: AOJu0Yx7qn12i/Dk1rr+Y3keKMo/uWPDh7PWPNGZ5imGMCARYyfdsxLB
tq5a9sS2ILq/LC/syp0wLb1UL8NnmwQF7rn00Jp2VZAcY68dLdOoUy5szg==
X-Gm-Gg: ASbGncvu83L8xmK0kmVfCIWGxMcvioxD8tPVjmuWK26wZ42xkPRvCC8M7rh84vPR5JO
fOyYPPlaOa9EWiDJ87o2eEEagKzqLWYk2ylacXzOLrSS196NwPUckjLclF8DRTqf9w5lkrEjFMG
V6X9u3Z10H93J5NkFgduYEJJdCqOgggfLMMcpwv9i463mXzcHLFrcgofBjv+3hThq3jsP//Nk8i
j5cDj+njn6D6J3N7dr+S2JhDa5oRn7N7JXpE2pUVitRni3mOYy16RAtUonnkeBD1WYkZKa2zPGy
CvmTbw6jiI62CrNthwN4e1+sByd6aWsZBZIvWKkqLrqbz63Z/wgIy74Py1B1
X-Google-Smtp-Source: AGHT+IGz6Auc4QoKw5VMY2F78JPQhgBCw2TgGYiY20dATCpFneosYe5kcCopCy0EUEpqYd4PAHhJJg==
X-Received: by 2002:a17:902:f681:b0:21f:6f33:f96 with SMTP id
d9443c01a7336-225c651f518mr176389165ad.6.1742182327079;
Sun, 16 Mar 2025 20:32:07 -0700 (PDT)
Received: from localhost.localdomain ([2800:2121:b040:c:e90b:1e6c:4204:7ac9])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-225c68a448fsm64525225ad.72.2025.03.16.20.32.05
for <ffmpeg-devel@ffmpeg.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 16 Mar 2025 20:32:06 -0700 (PDT)
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Mon, 17 Mar 2025 00:31:44 -0300
Message-ID: <20250317033144.1861-1-jamrial@gmail.com>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <20250317024833.1242-1-jamrial@gmail.com>
References: <20250317024833.1242-1-jamrial@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_zscale: add support for
grayscale 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/20250317033144.1861-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 | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c
index 5fe6e555e7..d913f7d99c 100644
--- a/libavfilter/vf_zscale.c
+++ b/libavfilter/vf_zscale.c
@@ -206,11 +206,12 @@ static int query_formats(const AVFilterContext *ctx,
AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA444P10,
AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_YUVA422P12,
AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA444P16,
+ AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10,
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_GRAYF16, AV_PIX_FMT_GBRPF16, AV_PIX_FMT_GBRAPF16,
+ AV_PIX_FMT_GRAYF32, AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32,
AV_PIX_FMT_NONE
};
int ret;
@@ -585,7 +586,8 @@ static void format_init(zimg_image_format *format, AVFrame *frame, const AVPixFm
format->depth = desc->comp[0].depth;
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->color_family = (desc->flags & AV_PIX_FMT_FLAG_RGB) ? ZIMG_COLOR_RGB
+ : (desc->nb_components > 1 ? ZIMG_COLOR_YUV : ZIMG_COLOR_GREY);
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;
format->transfer_characteristics = transfer == -1 ? convert_trc(frame->color_trc) : transfer;
@@ -738,14 +740,18 @@ static int filter_slice(AVFilterContext *ctx, void *data, int job_nr, int n_jobs
p = td->desc->comp[i].plane;
+ if (i < td->desc->nb_components) {
src_buf.plane[i].data = td->in->data[p];
src_buf.plane[i].stride = td->in->linesize[p];
src_buf.plane[i].mask = -1;
+ }
p = td->odesc->comp[i].plane;
+ if (i < td->odesc->nb_components) {
dst_buf.plane[i].data = td->out->data[p] + td->out->linesize[p] * (out_slice_start >> vsamp);
dst_buf.plane[i].stride = td->out->linesize[p];
dst_buf.plane[i].mask = -1;
+ }
}
if (!s->graph[job_nr])
return AVERROR(EINVAL);
--
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".