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 A9DE64BF24
for <ffmpegdev@gitmailbox.com>; Mon, 31 Mar 2025 17:49:11 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C8F3C687CDE;
Mon, 31 Mar 2025 20:49:06 +0300 (EEST)
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 A3F3F687AAD
for <ffmpeg-devel@ffmpeg.org>; Mon, 31 Mar 2025 20:49:00 +0300 (EEST)
Received: by mail-pl1-f182.google.com with SMTP id
d9443c01a7336-227aaa82fafso90000975ad.2
for <ffmpeg-devel@ffmpeg.org>; Mon, 31 Mar 2025 10:49:00 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1743443338; x=1744048138; 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=/SsCl1tYlnhFWnX6w61MvA+UlcK0mkCUTGIz8h2MfSg=;
b=U/0htbnigyAgt/u/gmMq4W95CYsPUQSo2vgJ3u4n/7ApkBRVRU1J1mo92QbLeJoIdQ
l6Mbn/HI0PYbHEIzByfxj7uXqfRo7I5M2Zj3IDfiRHTlZQKxqDxpZmsCKzOffauv7d6I
JxWc7kx3EMoupy+6oT1ZUaUUR6+0mYcWvgBqY+8nigBL7tBM3ZQGIjKCE8ocn5dCyUHa
nyAhvCpG4iEwWQM+vKlg17wW3ppMU8HxFYp+XPZtyKuusIN8VLAfwFwYYmiDxtLCdAK3
ZVkfFYtO0f3N6SFCjwqTGuKKof+n6Y+CrayOX+duW0ZhNJ4cYUuBZgiAe23rBLstcOdq
m1Fw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1743443338; x=1744048138;
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=/SsCl1tYlnhFWnX6w61MvA+UlcK0mkCUTGIz8h2MfSg=;
b=Jobe/J3OPw0D6VckiYkjCI1wppjaKLuHBX1V1Fv1S8C2g1NsR/GHFYVV1OapS2h9Fg
mkXw7dzhu6yT3xV4Bowe8BorZ4Xu9h9FRXnt36mRxDO0X6lcdpNwYjH2yZgTQb46qgzs
FuBSy1Fhzpb0kWTxpURMdh7XohkPQ5WNHW/VsfCvAPFLSjI6PNEy+X927BiKQv5GFLf0
KeuNpsQ9ax937WGCHK34Ts8LgvOf4rFcBnpKWiZNNDtkS2hbmHBVxuPEIkfrUoNDTUsX
Wgo1AqZOPkdXAyFo1wzyBpJx8dTeA1NC8JAVlrtIsdXt1XMO/5XdJS4o/d9OJCJRpV9j
yOzQ==
X-Gm-Message-State: AOJu0YwndpDSSW7wI7LksERqPZhcAVjVBQ/lVQam8qWkJGMZdQPa/cit
yqVg9xibU1sJoBprnJr8hkmE6Jv9RsJZ0+SqBdxRYN2HiChqhnH2e/5Bsw==
X-Gm-Gg: ASbGncsVHseTMhl+8KQR3tpG6EiYZpE1xY0voEOLjT2QS8wpmMbFCOkhSsLQqEZALv5
6XcjpB9j2umQ0IU+A9fNg/8+umJ1ePP732lXnPcRGrjPWSRDVyTjeyvbyV8LfP6+epppwbWpjrY
8xDr0xRVMmeQ2FxCNo+rmKhQY7jGSIXDHkvrooEqBcJiOKu2K6R8rBBR+j+f22t5P86btfdPih6
/Im3e0kOxzR3CexmewmDFRx6vrXfRcqMUwrIeITtW4xjCYa7ZTwOesd16Ra94bj0chcVU0wBqyq
kkysApOuKky1zMZDZNOL0pNpWGBQRJRLHm2bFzuWAKueObcy4DJkzzRjwv02evRw
X-Google-Smtp-Source: AGHT+IGSxnrHcvHTudp7Fed+uIFghXcYE5EkY0mre+aYOfqnjfykUixnL00r4vsDBRqPEV7jLMy2+w==
X-Received: by 2002:a05:6a00:18aa:b0:736:3c77:31fd with SMTP id
d2e1a72fcca58-73980473887mr13873946b3a.23.1743443337467;
Mon, 31 Mar 2025 10:48:57 -0700 (PDT)
Received: from localhost.localdomain ([2800:2121:b000:82e:9d0d:52b9:1c47:3c94])
by smtp.gmail.com with ESMTPSA id
d2e1a72fcca58-73970def120sm7200844b3a.7.2025.03.31.10.48.56
for <ffmpeg-devel@ffmpeg.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 31 Mar 2025 10:48:56 -0700 (PDT)
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Mon, 31 Mar 2025 14:48:42 -0300
Message-ID: <20250331174842.39486-1-jamrial@gmail.com>
X-Mailer: git-send-email 2.49.0
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH] avfilter/vsrc_testsrc: also fill alpha
planes with a test pattern in {rgb, yuv}testsrc
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/20250331174842.39486-1-jamrial@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
And add support for more formats.
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavfilter/vsrc_testsrc.c | 41 +++++++++++++++++++------
tests/ref/fate/filter-rgbtestsrc-rgba | 10 +++---
tests/ref/fate/filter-yuvtestsrc-ayuv | 10 +++---
tests/ref/fate/filter-yuvtestsrc-ayuv64 | 10 +++---
tests/ref/fate/filter-yuvtestsrc-vuya | 10 +++---
5 files changed, 52 insertions(+), 29 deletions(-)
diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c
index 36fffbade2..9016d02113 100644
--- a/libavfilter/vsrc_testsrc.c
+++ b/libavfilter/vsrc_testsrc.c
@@ -988,7 +988,7 @@ AVFILTER_DEFINE_CLASS(rgbtestsrc);
#define A 3
static void rgbtest_put_pixel(uint8_t *dstp[4], int dst_linesizep[4],
- int x, int y, unsigned r, unsigned g, unsigned b, enum AVPixelFormat fmt,
+ int x, int y, unsigned r, unsigned g, unsigned b, unsigned a, enum AVPixelFormat fmt,
uint8_t rgba_map[4])
{
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt);
@@ -1027,13 +1027,13 @@ static void rgbtest_put_pixel(uint8_t *dstp[4], int dst_linesizep[4],
*p16++ = v16 >> 32;
*p16++ = v16 >> 16;
*p16++ = v16;
- *p16++ = 0xffff;
+ *p16++ = a;
break;
case AV_PIX_FMT_RGBA:
case AV_PIX_FMT_BGRA:
case AV_PIX_FMT_ARGB:
case AV_PIX_FMT_ABGR:
- v = (r << (rgba_map[R]*8)) + (g << (rgba_map[G]*8)) + (b << (rgba_map[B]*8)) + (255U << (rgba_map[A]*8));
+ v = (r << (rgba_map[R]*8)) + (g << (rgba_map[G]*8)) + (b << (rgba_map[B]*8)) + (a << (rgba_map[A]*8));
p = dst + 4*x + y*dst_linesize;
AV_WL32A(p, v);
break;
@@ -1046,6 +1046,10 @@ static void rgbtest_put_pixel(uint8_t *dstp[4], int dst_linesizep[4],
p = dst + 4*x + y*dst_linesize;
AV_WL32A(p, v);
break;
+ case AV_PIX_FMT_GBRAP:
+ p = dstp[3] + x + y * dst_linesizep[3];
+ p[0] = a;
+ // fall-through
case AV_PIX_FMT_GBRP:
p = dstp[0] + x + y * dst_linesize;
p[0] = g;
@@ -1054,6 +1058,13 @@ static void rgbtest_put_pixel(uint8_t *dstp[4], int dst_linesizep[4],
p = dstp[2] + x + y * dst_linesizep[2];
p[0] = r;
break;
+ case AV_PIX_FMT_GBRAP10:
+ case AV_PIX_FMT_GBRAP12:
+ case AV_PIX_FMT_GBRAP14:
+ case AV_PIX_FMT_GBRAP16:
+ p16 = (uint16_t *)(dstp[3] + x*2 + y * dst_linesizep[3]);
+ p16[0] = a;
+ // fall-through
case AV_PIX_FMT_GBRP9:
case AV_PIX_FMT_GBRP10:
case AV_PIX_FMT_GBRP12:
@@ -1086,7 +1097,7 @@ static void rgbtest_fill_picture_complement(AVFilterContext *ctx, AVFrame *frame
else if (6*y < 5*h) b = c;
else r = c, g = c;
- rgbtest_put_pixel(frame->data, frame->linesize, x, y, r, g, b,
+ rgbtest_put_pixel(frame->data, frame->linesize, x, y, r, g, b, c,
ctx->outputs[0]->format, test->rgba_map);
}
}
@@ -1106,7 +1117,7 @@ static void rgbtest_fill_picture(AVFilterContext *ctx, AVFrame *frame)
else if (3*y < 2*h) g = c;
else b = c;
- rgbtest_put_pixel(frame->data, frame->linesize, x, y, r, g, b,
+ rgbtest_put_pixel(frame->data, frame->linesize, x, y, r, g, b, c,
ctx->outputs[0]->format, test->rgba_map);
}
}
@@ -1131,6 +1142,8 @@ static const enum AVPixelFormat rgbtest_pix_fmts[] = {
AV_PIX_FMT_RGBA64, AV_PIX_FMT_BGRA64,
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_X2RGB10LE, AV_PIX_FMT_X2BGR10LE,
AV_PIX_FMT_NONE
};
@@ -1180,7 +1193,7 @@ const FFFilter ff_vsrc_rgbtestsrc = {
#define A 3
static void yuvtest_put_pixel(uint8_t *dstp[4], int dst_linesizep[4],
- int i, int j, unsigned y, unsigned u, unsigned v, enum AVPixelFormat fmt,
+ int i, int j, unsigned y, unsigned u, unsigned v, unsigned a, enum AVPixelFormat fmt,
uint8_t ayuv_map[4])
{
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt);
@@ -1201,17 +1214,19 @@ static void yuvtest_put_pixel(uint8_t *dstp[4], int dst_linesizep[4],
break;
case AV_PIX_FMT_XV36:
case AV_PIX_FMT_XV48:
+ a = UINT16_MAX;
+ // fall-through
case AV_PIX_FMT_AYUV64:
AV_WN16A(&dstp[0][i*8 + ayuv_map[Y]*2 + j*dst_linesizep[0]], y << desc->comp[0].shift);
AV_WN16A(&dstp[0][i*8 + ayuv_map[U]*2 + j*dst_linesizep[0]], u << desc->comp[1].shift);
AV_WN16A(&dstp[0][i*8 + ayuv_map[V]*2 + j*dst_linesizep[0]], v << desc->comp[2].shift);
- AV_WN16A(&dstp[0][i*8 + ayuv_map[A]*2 + j*dst_linesizep[0]], UINT16_MAX << desc->comp[3].shift);
+ AV_WN16A(&dstp[0][i*8 + ayuv_map[A]*2 + j*dst_linesizep[0]], a << desc->comp[3].shift);
break;
case AV_PIX_FMT_UYVA:
case AV_PIX_FMT_VUYA:
case AV_PIX_FMT_VUYX:
case AV_PIX_FMT_AYUV:
- n = (y << (ayuv_map[Y]*8)) + (u << (ayuv_map[U]*8)) + (v << (ayuv_map[V]*8)) + (255U << (ayuv_map[A]*8));
+ n = (y << (ayuv_map[Y]*8)) + (u << (ayuv_map[U]*8)) + (v << (ayuv_map[V]*8)) + (a << (ayuv_map[A]*8));
AV_WL32A(&dstp[0][i*4 + j*dst_linesizep[0]], n);
break;
case AV_PIX_FMT_YUV444P:
@@ -1220,6 +1235,12 @@ static void yuvtest_put_pixel(uint8_t *dstp[4], int dst_linesizep[4],
dstp[1][i + j*dst_linesizep[1]] = u;
dstp[2][i + j*dst_linesizep[2]] = v;
break;
+ case AV_PIX_FMT_YUVA444P9:
+ case AV_PIX_FMT_YUVA444P10:
+ case AV_PIX_FMT_YUVA444P12:
+ case AV_PIX_FMT_YUVA444P16:
+ AV_WN16A(&dstp[3][i*2 + j*dst_linesizep[3]], a);
+ // fall-through
case AV_PIX_FMT_YUV444P9:
case AV_PIX_FMT_YUV444P10:
case AV_PIX_FMT_YUV444P12:
@@ -1266,7 +1287,7 @@ static void yuvtest_fill_picture(AVFilterContext *ctx, AVFrame *frame)
else if (3*j < 2*h) u = c;
else v = c;
- yuvtest_put_pixel(frame->data, frame->linesize, i, j, y, u, v,
+ yuvtest_put_pixel(frame->data, frame->linesize, i, j, y, u, v, c,
ctx->outputs[0]->format, test->ayuv_map);
}
}
@@ -1286,6 +1307,8 @@ static const enum AVPixelFormat yuvtest_pix_fmts[] = {
AV_PIX_FMT_YUV444P9, AV_PIX_FMT_YUV444P10,
AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV444P14,
AV_PIX_FMT_YUV444P16, AV_PIX_FMT_VYU444,
+ AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA444P10,
+ AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_YUVA444P16,
AV_PIX_FMT_AYUV, AV_PIX_FMT_UYVA, AV_PIX_FMT_AYUV64,
AV_PIX_FMT_VUYA, AV_PIX_FMT_VUYX, AV_PIX_FMT_XV48,
AV_PIX_FMT_XV30LE, AV_PIX_FMT_V30XLE, AV_PIX_FMT_XV36,
diff --git a/tests/ref/fate/filter-rgbtestsrc-rgba b/tests/ref/fate/filter-rgbtestsrc-rgba
index de1d9c7086..e93f24f7f6 100644
--- a/tests/ref/fate/filter-rgbtestsrc-rgba
+++ b/tests/ref/fate/filter-rgbtestsrc-rgba
@@ -3,8 +3,8 @@
#codec_id 0: rawvideo
#dimensions 0: 320x240
#sar 0: 1/1
-0, 0, 0, 1, 307200, 0xf238fe31
-0, 1, 1, 1, 307200, 0xf238fe31
-0, 2, 2, 1, 307200, 0xf238fe31
-0, 3, 3, 1, 307200, 0xf238fe31
-0, 4, 4, 1, 307200, 0xf238fe31
+0, 0, 0, 1, 307200, 0x546b3176
+0, 1, 1, 1, 307200, 0x546b3176
+0, 2, 2, 1, 307200, 0x546b3176
+0, 3, 3, 1, 307200, 0x546b3176
+0, 4, 4, 1, 307200, 0x546b3176
diff --git a/tests/ref/fate/filter-yuvtestsrc-ayuv b/tests/ref/fate/filter-yuvtestsrc-ayuv
index 91c15bebb9..a51ba097e9 100644
--- a/tests/ref/fate/filter-yuvtestsrc-ayuv
+++ b/tests/ref/fate/filter-yuvtestsrc-ayuv
@@ -3,8 +3,8 @@
#codec_id 0: rawvideo
#dimensions 0: 320x240
#sar 0: 1/1
-0, 0, 0, 1, 307200, 0xd4270fd4
-0, 1, 1, 1, 307200, 0xd4270fd4
-0, 2, 2, 1, 307200, 0xd4270fd4
-0, 3, 3, 1, 307200, 0xd4270fd4
-0, 4, 4, 1, 307200, 0xd4270fd4
+0, 0, 0, 1, 307200, 0xcffc430a
+0, 1, 1, 1, 307200, 0xcffc430a
+0, 2, 2, 1, 307200, 0xcffc430a
+0, 3, 3, 1, 307200, 0xcffc430a
+0, 4, 4, 1, 307200, 0xcffc430a
diff --git a/tests/ref/fate/filter-yuvtestsrc-ayuv64 b/tests/ref/fate/filter-yuvtestsrc-ayuv64
index 942ad1a1ba..c9b7b2a697 100644
--- a/tests/ref/fate/filter-yuvtestsrc-ayuv64
+++ b/tests/ref/fate/filter-yuvtestsrc-ayuv64
@@ -3,8 +3,8 @@
#codec_id 0: rawvideo
#dimensions 0: 320x240
#sar 0: 1/1
-0, 0, 0, 1, 614400, 0xcf4f8452
-0, 1, 1, 1, 614400, 0xcf4f8452
-0, 2, 2, 1, 614400, 0xcf4f8452
-0, 3, 3, 1, 614400, 0xcf4f8452
-0, 4, 4, 1, 614400, 0xcf4f8452
+0, 0, 0, 1, 614400, 0x8722610b
+0, 1, 1, 1, 614400, 0x8722610b
+0, 2, 2, 1, 614400, 0x8722610b
+0, 3, 3, 1, 614400, 0x8722610b
+0, 4, 4, 1, 614400, 0x8722610b
diff --git a/tests/ref/fate/filter-yuvtestsrc-vuya b/tests/ref/fate/filter-yuvtestsrc-vuya
index f91ef558d7..72c3d015d6 100644
--- a/tests/ref/fate/filter-yuvtestsrc-vuya
+++ b/tests/ref/fate/filter-yuvtestsrc-vuya
@@ -3,8 +3,8 @@
#codec_id 0: rawvideo
#dimensions 0: 320x240
#sar 0: 1/1
-0, 0, 0, 1, 307200, 0x4df60fd4
-0, 1, 1, 1, 307200, 0x4df60fd4
-0, 2, 2, 1, 307200, 0x4df60fd4
-0, 3, 3, 1, 307200, 0x4df60fd4
-0, 4, 4, 1, 307200, 0x4df60fd4
+0, 0, 0, 1, 307200, 0xb01a430a
+0, 1, 1, 1, 307200, 0xb01a430a
+0, 2, 2, 1, 307200, 0xb01a430a
+0, 3, 3, 1, 307200, 0xb01a430a
+0, 4, 4, 1, 307200, 0xb01a430a
--
2.49.0
_______________________________________________
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".