From patchwork Sat Aug 20 02:14:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Langdale X-Patchwork-Id: 37363 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp115974pzh; Fri, 19 Aug 2022 19:15:08 -0700 (PDT) X-Google-Smtp-Source: AA6agR771LzrrK7NGWdK2eQMwIkMF+NZijXAxf4U1pRR1VomNaPpWW49qAl3ySMM09q+giopEL2Y X-Received: by 2002:aa7:dc13:0:b0:443:3f15:8440 with SMTP id b19-20020aa7dc13000000b004433f158440mr7725453edu.274.1660961708257; Fri, 19 Aug 2022 19:15:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660961708; cv=none; d=google.com; s=arc-20160816; b=jPgSH2PMxW/KyYLj0KkjXgXo3evd/2orrlnjU160Vm5h5pMRu4Pcc5rSC6OyOLA6cx PW/4npj7wXLkcuO59r/RDDCNX+zUEBpsug/02Ws5bQU/sdBvxKpgv3HIgbauQJ/Q1V8a PDT5hIN9TzrSqgSFm889IllmgGz09RByw4DjeZR6Uyug3E0ZlbTPWspuIg3tzPx+3jQx zOHF++hz6fwJvHbQAVgGuR3dKEgPIf1INupj3T9Ghy/NZRrUMIeM7SMijLV+F1u4W/hT 7tfZ1BuDN6lm21JB55BO1xo2F8AFrbUek8IzyI4AKQaC68nTxZCZpmf8ojE63GE1UrWL 5gsw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=ZnC+GUd6dhlpt3L1Jo4dY4YtAGY5JRJrZSYTTVfbkW0=; b=yUpTZ00Lo2o5USaunWANWtzVxXvBqc+qtWRAYeuRgo8ZPc2kFNO73mwq8W6yWQeYZF Jqi6AEWgG5dFjAUt5BGBzu7ngxBRJtT9nZv1V+AcVWafgANIe8VfTe01BWehtG1udqcX 8eU9SPL3dcqgvHDYdd9jgzz2mf6xct1KLUSI0fURD2dFalz98SRGyFO4zI5+VeR4AFfC zROz/fKDCoKTUv1/9LmwhVIqWwCfzqS0gDDARjUc5zZW6iN1IV5HqBItbTmzgoTRVeiY Q9G383oou5ZKCw15Key9fuMK54gu8E6gOvxVXdbcjaw6bSee7rDBgYDi3WQzilZwpz0z xn9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@overt.org header.s=mail header.b=Zx1VHU5t; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=overt.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h20-20020a170906855400b0072f3efb9687si3429643ejy.242.2022.08.19.19.15.05; Fri, 19 Aug 2022 19:15:08 -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=@overt.org header.s=mail header.b=Zx1VHU5t; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=overt.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E51AB68B988; Sat, 20 Aug 2022 05:14:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.overt.org (mail.overt.org [157.230.92.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 772EE68B556 for ; Sat, 20 Aug 2022 05:14:46 +0300 (EEST) Received: from authenticated-user (mail.overt.org [157.230.92.47]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by mail.overt.org (Postfix) with ESMTPSA id 1723F3F22B; Fri, 19 Aug 2022 21:14:45 -0500 (CDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=overt.org; s=mail; t=1660961685; bh=+KY3pOLwJCoq9BeVirGgGpakldhUK+wQti6Mv2gqMS0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zx1VHU5tPbSyjv0rpJqC1FndoqaJY1KbN3TqjEUq+knPoH9H4L0JyZATniqdtWoTy ohI1gvDjqRxZmgl33q6UDoFqNZ6N3ygLD6L0t+PsydrXYbx0mU9TYWUAGMTuCfsShI knXApH28nILdDCdNFELQfGnVAg864Kk7HBD0hTMVIFsOMTxOcHnGLC3GpWMaw/gUsJ 0Rsa4+2Imd3hO9u27cYrX1F++MFlhVStr4EffVkmRX1jcAK1pPqukk7FtfA/3fsMNI LdEjqpUGf22XO/G1/87zp8k7hA3Bcni74VaiMppn4WZ9/y/KJk4bWV7I2vi9i7JQHd 6kccgRmxpKbtQ== From: Philip Langdale To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Aug 2022 19:14:34 -0700 Message-Id: <20220820021436.1224908-2-philipl@overt.org> In-Reply-To: <20220820021436.1224908-1-philipl@overt.org> References: <20220820021436.1224908-1-philipl@overt.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavu/pixfmt: Introduce VUYX 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 Cc: Philip Langdale Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bFMy6RbJFtzP This is the alphaless version of VUYA that I introduced recently. After further discussion and noting that the Intel vaapi driver explicitly lists XYUV as a support format for encoding and decoding 8bit 444 content, we decided to switch our usage and avoid the overhead of having a declared alpha channel around. Note that I am not removing VUYA, as this turned out to have another use, which was to replace the need for v408enc/dec when dealing with the format. The vaapi switching will happen in the next change Signed-off-by: Philip Langdale --- libavutil/pixdesc.c | 12 ++++++++++++ libavutil/pixfmt.h | 2 ++ libavutil/tests/pixfmt_best.c | 1 + tests/ref/fate/imgutils | 1 + tests/ref/fate/pixfmt_best | 2 +- tests/ref/fate/sws-pixdesc-query | 3 +++ 6 files changed, 20 insertions(+), 1 deletion(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index f7558ff8b9..a7aadc18cc 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2504,6 +2504,18 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_ALPHA, }, + [AV_PIX_FMT_VUYX] = { + .name = "vuyx", + .nb_components = 3, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 4, 2, 0, 8 }, /* Y */ + { 0, 4, 1, 0, 8 }, /* U */ + { 0, 4, 0, 0, 8 }, /* V */ + }, + .flags = AV_PIX_FMT_FLAG_ALPHA, + }, [AV_PIX_FMT_RGBAF16BE] = { .name = "rgbaf16be", .nb_components = 4, diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 86c9bdefeb..7d45561395 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -372,6 +372,8 @@ enum AVPixelFormat { AV_PIX_FMT_RGBAF16BE, ///< IEEE-754 half precision packed RGBA 16:16:16:16, 64bpp, RGBARGBA..., big-endian AV_PIX_FMT_RGBAF16LE, ///< IEEE-754 half precision packed RGBA 16:16:16:16, 64bpp, RGBARGBA..., little-endian + AV_PIX_FMT_VUYX, ///< packed VUYX 4:4:4, 32bpp, Variant of VUYA where alpha channel is left 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 }; diff --git a/libavutil/tests/pixfmt_best.c b/libavutil/tests/pixfmt_best.c index de53baf092..0542af494f 100644 --- a/libavutil/tests/pixfmt_best.c +++ b/libavutil/tests/pixfmt_best.c @@ -84,6 +84,7 @@ int main(void) TEST(AV_PIX_FMT_GBRP, AV_PIX_FMT_RGB24); TEST(AV_PIX_FMT_0RGB, AV_PIX_FMT_RGB24); TEST(AV_PIX_FMT_GBRP16, AV_PIX_FMT_RGB48); + TEST(AV_PIX_FMT_VUYX, AV_PIX_FMT_YUV444P); // Formats additionally containing alpha (here ignored). TEST(AV_PIX_FMT_YA8, AV_PIX_FMT_GRAY8); diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils index 01c9877de5..47b73b1b64 100644 --- a/tests/ref/fate/imgutils +++ b/tests/ref/fate/imgutils @@ -249,3 +249,4 @@ p416le planes: 2, linesizes: 128 256 0 0, plane_sizes: 6144 12288 vuya planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 rgbaf16be planes: 1, linesizes: 512 0 0 0, plane_sizes: 24576 0 0 0, plane_offsets: 0 0 0, total_size: 24576 rgbaf16le planes: 1, linesizes: 512 0 0 0, plane_sizes: 24576 0 0 0, plane_offsets: 0 0 0, total_size: 24576 +vuyx 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/pixfmt_best b/tests/ref/fate/pixfmt_best index 1da1846275..783c5fe640 100644 --- a/tests/ref/fate/pixfmt_best +++ b/tests/ref/fate/pixfmt_best @@ -1 +1 @@ -74 tests passed, 0 tests failed. +75 tests passed, 0 tests failed. diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query index f79d99e513..045f751831 100644 --- a/tests/ref/fate/sws-pixdesc-query +++ b/tests/ref/fate/sws-pixdesc-query @@ -219,6 +219,7 @@ isYUV: uyvy422 uyyvyy411 vuya + vuyx xyz12be xyz12le y210be @@ -665,6 +666,7 @@ ALPHA: rgbaf16be rgbaf16le vuya + vuyx ya16be ya16le ya8 @@ -753,6 +755,7 @@ Packed: uyvy422 uyyvyy411 vuya + vuyx x2bgr10be x2bgr10le x2rgb10be