From patchwork Sat Sep 18 18:55:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manuel Stoeckl X-Patchwork-Id: 30360 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp120066iob; Sat, 18 Sep 2021 11:56:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyk8R/q8X78rWHJrM5IYTCexpa2PmZkDR1CqUZf0P4ekgDvQ8m3LtD+4AY9KABM6+c0VW6M X-Received: by 2002:a17:907:628d:: with SMTP id nd13mr19885416ejc.7.1631991366418; Sat, 18 Sep 2021 11:56:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631991366; cv=none; d=google.com; s=arc-20160816; b=FxFYEkC0OWBRGw0oP66J6uPqIzyHq4sKjSOR4+n1s7V2k6eQX1z6X/tIZc0IGGvYJy 7IVbVlo9DQbLF3Ibv41f6GiEfDUGp2FNbfyKFclZO1rVX9VgElxZZ4DIhCA38EV5NtSB 6NEJ93Jm3D9j7SGCD1aHEhDH6KiIgwWh/aWT8FlRx3HJXaJ91NFxgKs4cD9uucO21YXb W05LxwzV2YqYu5V3RQH2Ayva0V0u54QmmeRTMV3FYe31nBWSLZ6fxj4iJojWTE39BM9J GBN6gQGr9ry6j86zC+bFg1aC2JXD1vySIY3+z/QqVwPiiOFl5QhBIj7ai60+qz34jZPm g9fw== 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 :delivered-to; bh=RUvrTha9f9XQtm9JZKQSQvKEayX9ax/8PavnL0xo9OA=; b=nXPBC6nAKUurKUgBgaE+yDorileU+TyoVBX8l5/Bq/TN7dCu11c/zhZR1UhlGRQ2ax Qw/RBAJ8Y2EBuv2K40kbLKAYccPj4rH6b4VMinP5zD5GenCZVT7CE9H+rZAzAYoUAm5x r06CY8kY0+UYbYlxk+9UfsIdZBqbU7JMtrMQAfTHhxBx3f0x7uIabSiMMv6G0Ft4o9ms ax+qjD/txppz/73aE9Akv6Q/qAHZjbTT0lwatpLckDnopk9Pq2FSjeXLsIgafOYG2bMi DdLhgmV3l4P0z9sM15B/M8fwu3oGvcMmMbLFM0Celjj78wB27GiqacWrAhpXjM/ZpQgh OO3w== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 30si11979785eji.702.2021.09.18.11.56.06; Sat, 18 Sep 2021 11:56:06 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BAE3968AEAE; Sat, 18 Sep 2021 21:55:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1786968AEAE for ; Sat, 18 Sep 2021 21:55:47 +0300 (EEST) Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4HBg4y54ZWzQkBD; Sat, 18 Sep 2021 20:55:46 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de From: Manuel Stoeckl To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Sep 2021 14:55:33 -0400 Message-Id: <20210918185534.50715-1-code@mstoeckl.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 899461838 Subject: [FFmpeg-devel] [PATCH 1/2] lavu/pix_fmt: add pixel format for x2bgr10 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: Manuel Stoeckl Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gAlwjJ4wiKZP The new format (given in big/little endian forms) matches the existing X2RGB10 format, except with B and R channels switched. AV_PIX_FMT_X2BGR10 data often is created by OpenGL programs whose buffers use the GL_RGB10 internal format. Signed-off-by: Manuel Stoeckl --- doc/APIchanges | 3 +++ libavutil/pixdesc.c | 24 ++++++++++++++++++++++++ libavutil/pixfmt.h | 3 +++ libavutil/version.h | 4 ++-- tests/ref/fate/imgutils | 2 ++ tests/ref/fate/sws-pixdesc-query | 11 +++++++++++ 6 files changed, 45 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index cf6105c99e..0ae6495b4d 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-09-18 - xxxxxxxxxx - lavu 57.6.100 - pixfmt.h + Add AV_PIX_FMT_X2BGR10. + 2021-09-17 - xxxxxxxxxx - lavu 57.5.101 - buffer.h Constified the input parameters in av_buffer_replace(), av_buffer_ref(), and av_buffer_pool_buffer_get_opaque(). diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 2346138d04..69cb198646 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -272,6 +272,30 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_BE, }, + [AV_PIX_FMT_X2BGR10LE] = { + .name = "x2bgr10le", + .nb_components= 3, + .log2_chroma_w= 0, + .log2_chroma_h= 0, + .comp = { + { 0, 4, 0, 0, 10 }, /* R */ + { 0, 4, 1, 2, 10 }, /* G */ + { 0, 4, 2, 4, 10 }, /* B */ + }, + .flags = AV_PIX_FMT_FLAG_RGB, + }, + [AV_PIX_FMT_X2BGR10BE] = { + .name = "x2bgr10be", + .nb_components= 3, + .log2_chroma_w= 0, + .log2_chroma_h= 0, + .comp = { + { 0, 4, 2, 0, 10 }, /* R */ + { 0, 4, 1, 2, 10 }, /* G */ + { 0, 4, 0, 4, 10 }, /* B */ + }, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_BE, + }, [AV_PIX_FMT_YUV422P] = { .name = "yuv422p", .nb_components = 3, diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 5814f3f3da..53bdecfcb7 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -350,6 +350,8 @@ enum AVPixelFormat { AV_PIX_FMT_X2RGB10LE, ///< packed RGB 10:10:10, 30bpp, (msb)2X 10R 10G 10B(lsb), little-endian, X=unused/undefined AV_PIX_FMT_X2RGB10BE, ///< packed RGB 10:10:10, 30bpp, (msb)2X 10R 10G 10B(lsb), big-endian, X=unused/undefined + AV_PIX_FMT_X2BGR10LE, ///< packed BGR 10:10:10, 30bpp, (msb)2X 10B 10G 10R(lsb), little-endian, X=unused/undefined + AV_PIX_FMT_X2BGR10BE, ///< packed BGR 10:10:10, 30bpp, (msb)2X 10B 10G 10R(lsb), big-endian, X=unused/undefined 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 }; @@ -440,6 +442,7 @@ enum AVPixelFormat { #define AV_PIX_FMT_Y210 AV_PIX_FMT_NE(Y210BE, Y210LE) #define AV_PIX_FMT_X2RGB10 AV_PIX_FMT_NE(X2RGB10BE, X2RGB10LE) +#define AV_PIX_FMT_X2BGR10 AV_PIX_FMT_NE(X2BGR10BE, X2BGR10LE) /** * Chromaticity coordinates of the source primaries. diff --git a/libavutil/version.h b/libavutil/version.h index 1e6a80f86e..2b5ac540a4 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,8 +79,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 5 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 6 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils index f510150ea1..495bbd46f0 100644 --- a/tests/ref/fate/imgutils +++ b/tests/ref/fate/imgutils @@ -236,3 +236,5 @@ y210be planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 y210le planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 x2rgb10le planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 x2rgb10be planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 +x2bgr10le planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 +x2bgr10be planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query index c3cccfa492..a74109c3d7 100644 --- a/tests/ref/fate/sws-pixdesc-query +++ b/tests/ref/fate/sws-pixdesc-query @@ -57,6 +57,8 @@ isNBPS: nv20le p010be p010le + x2bgr10be + x2bgr10le x2rgb10be x2rgb10le xyz12be @@ -143,6 +145,7 @@ isBE: rgb555be rgb565be rgba64be + x2bgr10be x2rgb10be xyz12be y210be @@ -439,6 +442,8 @@ isRGB: rgb8 rgba64be rgba64le + x2bgr10be + x2bgr10le x2rgb10be x2rgb10le @@ -587,6 +592,8 @@ AnyRGB: rgb8 rgba64be rgba64le + x2bgr10be + x2bgr10le x2rgb10be x2rgb10le @@ -696,6 +703,8 @@ Packed: rgba64le uyvy422 uyyvyy411 + x2bgr10be + x2bgr10le x2rgb10be x2rgb10le xyz12be @@ -862,6 +871,8 @@ PackedRGB: rgb8 rgba64be rgba64le + x2bgr10be + x2bgr10le x2rgb10be x2rgb10le