From patchwork Wed Oct 23 19:36: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: 52461 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:1c41:b0:48e:c0f8:d0de with SMTP id im1csp111179vqb; Wed, 23 Oct 2024 23:14:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUgLZeCRHIfhTjMQGpsxPvEMlAszhRpk6Da18waV2p2q0GL7XAHjwacJn8agtU6qFl5gFBjR73kTZpUP4gxGKUM@gmail.com X-Google-Smtp-Source: AGHT+IF1HT7QS1jf1sMOHML4Yf94uwry0qKGqVblWD8VBWauIM3q7UiA+P2k52d0NjW6MMLBjSAn X-Received: by 2002:a17:906:c14b:b0:a99:523d:2108 with SMTP id a640c23a62f3a-a9ad2737575mr58819266b.16.1729750446166; Wed, 23 Oct 2024 23:14:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729750446; cv=none; d=google.com; s=arc-20240605; b=XzJM9DcsUEtmNWzG/TkQDH8K0sodSneP2jVYaSjufAldM10wZ+F0XBBqtUknxcAAvp 0ekpwZe+ZPRsvzco5uT/ueFUoPZn09DAzbf4coYkcYDG2n0Wmb7IVOeAR5luRqHJEou7 0ODLA0bduU9TxCpc37RN1/vSydHnUL1cMvgnIradqqfQgCr/iDeO4YpoytRgWT50r5rG zFhUF4xVOfJrbYq9zoQ4rXT2KsIGhA7mhDBH/czhsWErxBJLNJ+NZNk6LFnMeJVz9MXs BEXN4gBbqMBwVu8oVzGO53FiEd9sufxnhuvmTSRsYpsoR/mlkMfNs6/D+9htLwJw972v Fnkw== 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=Q81uWpUNjrDK0OVEwNcBBZVKRKUhoMByhd+YD7jFqxo=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=SstVtbgySYXID1lvTefDOWmQ9Ey2xmGRu7VrKmqyWoMz1IlIqVUcOJQzZexwxrul81 sC5C4u+gxiuj3qmw+bmPPz2FQUy7r2Me885DSbefgi/p7y1c/sCYkh0p+SzfeFYlsPkp YhNGmQGnik6HpjBZUXYEQflG3WsKn+gvwMQBfLoe33ba4LzXB3fQ0R5JaKciZ0wFpoi7 /MzXxqbZgqclJ8UUFdV6/sk0f7ZScieiKZICLRrjd6hbL99R2lK2hGk7mof/r/W5P2om vE1AZWaGo3URmt/mwMNY0EPM8TVdbGuTgiIbd+VDOJg/MDPxT2YoIVTBHWVx2vqu8LBy If7w==; 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=b6vKtlk5; 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 a640c23a62f3a-a9a9134ae5bsi694879366b.498.2024.10.23.23.14.05; Wed, 23 Oct 2024 23:14: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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=b6vKtlk5; 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 A447268DAB1; Wed, 23 Oct 2024 22:37:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E4C568DA47 for ; Wed, 23 Oct 2024 22:36:58 +0300 (EEST) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-71e61b47c6cso134141b3a.2 for ; Wed, 23 Oct 2024 12:36:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729712216; x=1730317016; 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=ZnPHKHld2J3LleE0O7xuoK5Nuo2mxL284ExX9vJh2IE=; b=b6vKtlk5AVJzLmHVe0wofiChsbVyu665AApaWmLrLKNc/RAXuKjUgC2c1EwAvH8BCw u8wcVSDDy6ODE8gv4X/mgMJCfo2QGiGcKRrF10Jv3A6L104PzXrm0XFhX/zkBgc5OtCv Uv0tNix/fTgODO+qx3pNU+LZd3EW96cFxjQm1ZW8tJxZtSvgmJG5kRxr54jTz/RLQq7k nRaNP/96Br3jOaMs5ifA7uOLun36FRI1A9ql1Ch1LL6hTb+LBVK6dWg/qwanrECvYujM cCzQufAFyQTmdDc1aDZqvCHlKF0tvBWJ1rAbhExl4G25nxRv1vNAeBc7Ftsdpu8IoWKv PMUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729712216; x=1730317016; 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=ZnPHKHld2J3LleE0O7xuoK5Nuo2mxL284ExX9vJh2IE=; b=ZXrmiD0zYG3+YmV0Gd9yMEUFbk9GXpzY/bMFChsN+hmJS6QV8MYp+d+ioWpSwXnIEP AVtpcS3tgMwtSNLc6LzpBYVRgpYJ6QtQHDRGJMIQEpjaaOJU9OnH4one1FBQdiPESE5P Em+WkLDbT51YnDeJH7ZzM6J6QlE7ovJLH0EHWhIEDPfVsGHaFV9A/4/qSd7NwSa8KCtd xjBgh3tgtqnK5l6TbdzcHrpVLeREflWdXihr9i4k17dGeU3NKXULrZJTXWrmV6+T1ldE fgRB5V3B4z04a7rTapG4uhYP0DiU7IQQvDr8iQ1HRwVzFKIGVEjjFcy2iwR3yKjAke1g mTpA== X-Gm-Message-State: AOJu0YyKbHQo691E3k5oUBF8cjUBIBOQqFmUZQx9gHBdQMJSAgfKaqou 1b4BIZheSupaMXIVQCi8hJSpd3o4YzQI8I3y/ptdezBsPsJ0+neby3hIKA== X-Received: by 2002:a05:6a00:854:b0:71e:2a0:b0d0 with SMTP id d2e1a72fcca58-72030acacbemr5500356b3a.13.1729712215491; Wed, 23 Oct 2024 12:36:55 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71ec13eacefsm6655420b3a.153.2024.10.23.12.36.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 12:36:54 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Oct 2024 16:36:42 -0300 Message-ID: <20241023193648.57491-1-jamrial@gmail.com> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/7] avutil/pixfmt: add XV48 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: KTH0IItQyqgD Much like XV30 and XV36 in d75c4693fef51e8f0a1b88798530f4c5147ea906, XV48 is added to support 16bit 4:4:4 as defined by Microsoft. Signed-off-by: James Almer --- libavutil/pixdesc.c | 25 +++++++++++++++++++++++++ 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, 43 insertions(+), 1 deletion(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index ba96803e5b..e595c76232 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2771,6 +2771,31 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_BE, }, + [AV_PIX_FMT_XV48LE] = { + .name = "xv48le", + .nb_components = 3, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 8, 2, 0, 16 }, /* Y */ + { 0, 8, 0, 0, 16 }, /* U */ + { 0, 8, 4, 0, 16 }, /* V */ + { 0, 8, 6, 0, 16 }, /* X */ + }, + }, + [AV_PIX_FMT_XV48BE] = { + .name = "xv48be", + .nb_components = 3, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 8, 2, 0, 16 }, /* Y */ + { 0, 8, 0, 0, 16 }, /* U */ + { 0, 8, 4, 0, 16 }, /* V */ + { 0, 8, 6, 0, 16 }, /* X */ + }, + .flags = AV_PIX_FMT_FLAG_BE, + }, [AV_PIX_FMT_V30XLE] = { .name = "v30xle", .nb_components = 3, diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 0b6b69fdeb..3215266091 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -460,6 +460,9 @@ enum AVPixelFormat { 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_XV48BE, ///< packed XVYU 4:4:4, 64bpp, big-endian, variant of Y416 where alpha channel is left undefined + AV_PIX_FMT_XV48LE, ///< packed XVYU 4:4:4, 64bpp, little-endian, variant of Y416 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 }; @@ -555,6 +558,7 @@ enum AVPixelFormat { #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_XV48 AV_PIX_FMT_NE(XV48BE, XV48LE) #define AV_PIX_FMT_V30X AV_PIX_FMT_NE(V30XBE, V30XLE) #define AV_PIX_FMT_X2RGB10 AV_PIX_FMT_NE(X2RGB10BE, X2RGB10LE) #define AV_PIX_FMT_X2BGR10 AV_PIX_FMT_NE(X2BGR10BE, X2BGR10LE) diff --git a/libavutil/tests/pixfmt_best.c b/libavutil/tests/pixfmt_best.c index c853be0e34..fb16fe6f2f 100644 --- a/libavutil/tests/pixfmt_best.c +++ b/libavutil/tests/pixfmt_best.c @@ -47,6 +47,7 @@ static const enum AVPixelFormat semiplanar_list[] = { }; static const enum AVPixelFormat packed_list[] = { + AV_PIX_FMT_XV48, AV_PIX_FMT_XV36, AV_PIX_FMT_XV30, AV_PIX_FMT_VUYX, @@ -208,6 +209,7 @@ int main(void) TEST_PACKED(AV_PIX_FMT_YUV444P, AV_PIX_FMT_VUYX); TEST_PACKED(AV_PIX_FMT_YUV444P10, AV_PIX_FMT_XV30); TEST_PACKED(AV_PIX_FMT_YUV444P12, AV_PIX_FMT_XV36); + TEST_PACKED(AV_PIX_FMT_YUV444P16, AV_PIX_FMT_XV48); 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); diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils index 7fbb1fd902..b03e6c5824 100644 --- a/tests/ref/fate/imgutils +++ b/tests/ref/fate/imgutils @@ -282,6 +282,8 @@ rgb96be planes: 1, linesizes: 768 0 0 0, plane_sizes: 36864 0 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 +xv48be planes: 1, linesizes: 512 0 0 0, plane_sizes: 24576 0 0 0, plane_offsets: 0 0 0, total_size: 24576 +xv48le planes: 1, linesizes: 512 0 0 0, plane_sizes: 24576 0 0 0, plane_offsets: 0 0 0, total_size: 24576 image_fill_black tests yuv420p total_size: 4608, black_unknown_crc: 0xd00f6cc6, black_tv_crc: 0xd00f6cc6, black_pc_crc: 0x234969af @@ -511,3 +513,5 @@ rgb96be total_size: 36864, black_unknown_crc: 0x00000000, black_tv_cr 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 +xv48be total_size: 24576, black_unknown_crc: 0x6ba828bd, black_tv_crc: 0x6ba828bd, black_pc_crc: 0x5f450f41 +xv48le total_size: 24576, black_unknown_crc: 0xc3794950, black_tv_crc: 0xc3794950, black_pc_crc: 0x40874939 diff --git a/tests/ref/fate/pixfmt_best b/tests/ref/fate/pixfmt_best index 72560f5df9..90ced69245 100644 --- a/tests/ref/fate/pixfmt_best +++ b/tests/ref/fate/pixfmt_best @@ -1 +1 @@ -111 tests passed, 0 tests failed. +113 tests passed, 0 tests failed. diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query index a4bbc8bfcb..bc6a07959d 100644 --- a/tests/ref/fate/sws-pixdesc-query +++ b/tests/ref/fate/sws-pixdesc-query @@ -25,6 +25,8 @@ is16BPS: rgbaf16le rgbf16be rgbf16le + xv48be + xv48le y216be y216le ya16be @@ -194,6 +196,7 @@ isBE: x2rgb10be xv30be xv36be + xv48be xyz12be y210be y212be @@ -269,6 +272,8 @@ isYUV: xv30le xv36be xv36le + xv48be + xv48le xyz12be xyz12le y210be @@ -875,6 +880,8 @@ Packed: xv30le xv36be xv36le + xv48be + xv48le xyz12be xyz12le y210be