From patchwork Tue Oct 22 12:48:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52447 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8dc2:0:b0:48e:c0f8:d0de with SMTP id j2csp45138vqs; Tue, 22 Oct 2024 10:04:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWCDPmEcfdG1NtWWeE0YFsNp2yGgVTg+R9zmvqH/wkB+0A55oMcAH6eAnjv6zlN/ArjgrXBJnJY+eVtEoy5KA0g@gmail.com X-Google-Smtp-Source: AGHT+IFMAu6MErUwPtYwViP219Fl+sXxcSeALoDtM2Fx5duiVFeOnEfb1AGUk6u7JjRY9B/CDB0e X-Received: by 2002:a05:6402:26cc:b0:5c9:893e:30d2 with SMTP id 4fb4d7f45d1cf-5ca0ac50df1mr18722206a12.8.1729616649932; Tue, 22 Oct 2024 10:04:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729616649; cv=none; d=google.com; s=arc-20240605; b=QB+7RX2ywqg5TUEMmKsy8z3PbQu8DoxqC9M8mul8AKZzoPYs1Xqw/t6wgGg1a/qxoM vV1LdQRfWiyof0FCgrIJuZYvO6+G1F7DMxYg2BOMYyEdX/5QE0yGGGPBaq2bu+KsVNyw Dtz3zN7uB4P9QXxbzzlalfrO/TpU5PCBgkCc+PYitLAQawDC9g/98yKZpoKWWj54dEi3 GAleFti0IMGr69u1KcULihmUCVUlnN5tKRMZfZIIOwCA7Egy1Phsvf21tTC09kCFpeg/ s3bFt1EI5u1cwchCZcT3CWoGnZE8r9x8bR4b110sO0dBkgtYqPG8TyQmSdzNfARubhx+ 5UYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding: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=bf7ripkS/XGRoXJcI8E3AmzsGLy0qhtwjlY2nNxfICM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=CdTzwDFtDk1vGTviK0CPGe2tl73TukGepAybCZvb3SVOlsgY/P4DcR3Pt4W3L45k2n a/xQraeQbiwbHgouYKuTFxgpQ1KxwXHSZb9rl3ONWU/0eMc3xb7L7X/1nCt+abPR56ZV httoYYCEEqaUGsOu8qC0pscM2VUK5RINssybt4Nm0JvnAkaJOIrDXgcXjH+9wet+ZbuA IQKDmkqvn5OnLl+2mbED9bj4rvc2P8uu9R1dMAieEJibem4Pb37xGwaAqtjFidCFFHNz 4K7bKyTU9HfZn0FGkQR9sbfyGtzCrvTPtQ8eyfJchiDTbDSbNot7CiNDUfMAWikQtBay wwyQ==; 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=Qbxcl9vy; 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-5cb66e70c6dsi4342557a12.579.2024.10.22.10.04.09; Tue, 22 Oct 2024 10:04:09 -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=Qbxcl9vy; 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 3B33168DB20; Tue, 22 Oct 2024 15:49:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0999768D744 for ; Tue, 22 Oct 2024 15:48:58 +0300 (EEST) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-20b5affde14so38638455ad.3 for ; Tue, 22 Oct 2024 05:48:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729601335; x=1730206135; 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=WwYbEidChOtimekkEZfgoI04Hv7HnoUM0sRYN+NlDuw=; b=Qbxcl9vyQlMOc9turnOIuw0gjLE1CZE0S0KOZ4Khzy6xIFgMp2tH6t8XymB49Q0Tep d6OqaHlugATz0DJvYuiD0zUvMdUEQHQyArSFrfQKgvm/PC3SRepYIs6zKHSokR8ZeAZC vNGLKYgFsjA6oeK9F3qQlhFG2XUbo4KU+lVV9z+ui14JoSDn9RiDg/9i2WtQpxoiOg0v pBWkYGdZZyMUO1RKXgHS7I2qBZw9XDTPM/oqtuHp2ZgSS85Fo5a9reVm+cCcvI659EGX r9jh4dQvcOtDe5BYeYcb6Vbop0TIZGwqyMZ1dC0LKAmMtCcZq5ZU4d8Jft3HW56/Op6s lsaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729601335; x=1730206135; 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=WwYbEidChOtimekkEZfgoI04Hv7HnoUM0sRYN+NlDuw=; b=adWicNhDqjKfZTGbSUFnENVANRQysBQ0fZ8tSLULCV8h09/NedkBoZML84pxCuCo3I wjkxqgESwxjLUHt5+JDwOOZZLBjXRM4aqcJ6df1lc8ibkM161bqko0VMPFRwggmtggKr 8C/Fg4lhU3t31DBSVnfcKDzen6yhiqcVNAWhbu+SjE0jygurNAedu7ndPcUrjhQGaNZA 3utyw/ULnAtvnNkoARLSXm8HJKYNy5ls2Cj6zuGWel9EJHkqF1haoO2J2sD6P/+5AhiG LQ0sWoXOBqIncuLefunNHXxJqb8KL8+q0uQKu4+tmzKQAVwyajQRr7vw94H3pdPxAXGW tfUw== X-Gm-Message-State: AOJu0YyP2nGroITx1/Iyv1EBPgvqUj4kHWUDgt+n3NYJ4pxbQCmu/fcu 4LFypHrViDTYqXC4qiO9Bh8VHNpbyRHNK4iZMWB9Ub+bvjJA8MqACpJ9Tg== X-Received: by 2002:a05:6a21:9206:b0:1d8:ef1b:63c with SMTP id adf61e73a8af0-1d92c5abfc1mr18257201637.45.1729601335061; Tue, 22 Oct 2024 05:48:55 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71ec13ea0e8sm4802456b3a.145.2024.10.22.05.48.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 05:48:54 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Oct 2024 09:48:42 -0300 Message-ID: <20241022124847.14314-1-jamrial@gmail.com> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6] avutil/pixfmt: add Y216 pixel format 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uJWKMMUqpWbx Signed-off-by: James Almer --- libavutil/pixdesc.c | 23 +++++++++++++++++++++++ libavutil/pixfmt.h | 4 ++++ libavutil/tests/pixfmt_best.c | 2 ++ tests/ref/fate/imgutils | 4 ++++ tests/ref/fate/pixfmt_best | 2 +- tests/ref/fate/sws-pixdesc-query | 7 +++++++ 6 files changed, 41 insertions(+), 1 deletion(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index e15105e9f4..ba96803e5b 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2948,6 +2948,29 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, + [AV_PIX_FMT_Y216LE] = { + .name = "y216le", + .nb_components = 3, + .log2_chroma_w = 1, + .log2_chroma_h = 0, + .comp = { + { 0, 4, 0, 0, 16 }, /* Y */ + { 0, 8, 2, 0, 16 }, /* U */ + { 0, 8, 6, 0, 16 }, /* V */ + }, + }, + [AV_PIX_FMT_Y216BE] = { + .name = "y216be", + .nb_components = 3, + .log2_chroma_w = 1, + .log2_chroma_h = 0, + .comp = { + { 0, 4, 0, 0, 16 }, /* Y */ + { 0, 8, 2, 0, 16 }, /* U */ + { 0, 8, 6, 0, 16 }, /* V */ + }, + .flags = AV_PIX_FMT_FLAG_BE, + }, }; static const char * const color_range_names[] = { diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 0dc4abc972..0b6b69fdeb 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -457,6 +457,9 @@ enum AVPixelFormat { AV_PIX_FMT_RGB96BE, ///< packed RGBA 32:32:32, 96bpp, RGBRGB..., big-endian AV_PIX_FMT_RGB96LE, ///< packed RGBA 32:32:32, 96bpp, RGBRGB..., little-endian + AV_PIX_FMT_Y216BE, ///< packed YUV 4:2:2 like YUYV422, 32bpp, big-endian + AV_PIX_FMT_Y216LE, ///< packed YUV 4:2:2 like YUYV422, 32bpp, little-endian + AV_PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions }; @@ -549,6 +552,7 @@ enum AVPixelFormat { #define AV_PIX_FMT_Y210 AV_PIX_FMT_NE(Y210BE, Y210LE) #define AV_PIX_FMT_Y212 AV_PIX_FMT_NE(Y212BE, Y212LE) +#define AV_PIX_FMT_Y216 AV_PIX_FMT_NE(Y216BE, Y216LE) #define AV_PIX_FMT_XV30 AV_PIX_FMT_NE(XV30BE, XV30LE) #define AV_PIX_FMT_XV36 AV_PIX_FMT_NE(XV36BE, XV36LE) #define AV_PIX_FMT_V30X AV_PIX_FMT_NE(V30XBE, V30XLE) diff --git a/libavutil/tests/pixfmt_best.c b/libavutil/tests/pixfmt_best.c index fe04e26689..c853be0e34 100644 --- a/libavutil/tests/pixfmt_best.c +++ b/libavutil/tests/pixfmt_best.c @@ -50,6 +50,7 @@ static const enum AVPixelFormat packed_list[] = { AV_PIX_FMT_XV36, AV_PIX_FMT_XV30, AV_PIX_FMT_VUYX, + AV_PIX_FMT_Y216, AV_PIX_FMT_Y212, AV_PIX_FMT_Y210, AV_PIX_FMT_YUYV422, @@ -210,6 +211,7 @@ int main(void) TEST_PACKED(AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUYV422); TEST_PACKED(AV_PIX_FMT_YUV422P10, AV_PIX_FMT_Y210); TEST_PACKED(AV_PIX_FMT_YUV422P12, AV_PIX_FMT_Y212); + TEST_PACKED(AV_PIX_FMT_YUV422P16, AV_PIX_FMT_Y216); #define TEST_SUBSAMPLED(input, expected) \ test(input, expected, &pass, &fail, find_best_subsampled) diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils index 8639baa550..7fbb1fd902 100644 --- a/tests/ref/fate/imgutils +++ b/tests/ref/fate/imgutils @@ -280,6 +280,8 @@ rgba128be planes: 1, linesizes: 1024 0 0 0, plane_sizes: 49152 0 rgba128le planes: 1, linesizes: 1024 0 0 0, plane_sizes: 49152 0 0 0, plane_offsets: 0 0 0, total_size: 49152 rgb96be planes: 1, linesizes: 768 0 0 0, plane_sizes: 36864 0 0 0, plane_offsets: 0 0 0, total_size: 36864 rgb96le planes: 1, linesizes: 768 0 0 0, plane_sizes: 36864 0 0 0, plane_offsets: 0 0 0, total_size: 36864 +y216be planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 +y216le planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 image_fill_black tests yuv420p total_size: 4608, black_unknown_crc: 0xd00f6cc6, black_tv_crc: 0xd00f6cc6, black_pc_crc: 0x234969af @@ -507,3 +509,5 @@ rgba128be total_size: 49152, black_unknown_crc: 0x59ef499b, black_tv_cr rgba128le total_size: 49152, black_unknown_crc: 0x59ef499b, black_tv_crc: 0x59ef499b, black_pc_crc: 0x59ef499b rgb96be total_size: 36864, black_unknown_crc: 0x00000000, black_tv_crc: 0x00000000, black_pc_crc: 0x00000000 rgb96le total_size: 36864, black_unknown_crc: 0x00000000, black_tv_crc: 0x00000000, black_pc_crc: 0x00000000 +y216be total_size: 12288, black_unknown_crc: 0x5483d935, black_tv_crc: 0x5483d935, black_pc_crc: 0x06397bf3 +y216le total_size: 12288, black_unknown_crc: 0x5d8e1cf6, black_tv_crc: 0x5d8e1cf6, black_pc_crc: 0x8fceec45 diff --git a/tests/ref/fate/pixfmt_best b/tests/ref/fate/pixfmt_best index 72486587c6..72560f5df9 100644 --- a/tests/ref/fate/pixfmt_best +++ b/tests/ref/fate/pixfmt_best @@ -1 +1 @@ -109 tests passed, 0 tests failed. +111 tests passed, 0 tests failed. diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query index aa2edcfcb0..a4bbc8bfcb 100644 --- a/tests/ref/fate/sws-pixdesc-query +++ b/tests/ref/fate/sws-pixdesc-query @@ -25,6 +25,8 @@ is16BPS: rgbaf16le rgbf16be rgbf16le + y216be + y216le ya16be ya16le yuv420p16be @@ -195,6 +197,7 @@ isBE: xyz12be y210be y212be + y216be ya16be yuv420p10be yuv420p12be @@ -272,6 +275,8 @@ isYUV: y210le y212be y212le + y216be + y216le ya16be ya16le ya8 @@ -876,6 +881,8 @@ Packed: y210le y212be y212le + y216be + y216le ya16be ya16le ya8