From patchwork Wed Oct 23 23:03:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52457 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:1c41:b0:48e:c0f8:d0de with SMTP id im1csp30235vqb; Wed, 23 Oct 2024 19:09:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVhH9AhwYPKu/muktjURFIXrpDKoDWRwnlU+pNGBnBQf280/saavHOzs8yAUmnqB0zB64JnJ+gxlJWZNZAr1zRZ@gmail.com X-Google-Smtp-Source: AGHT+IEg0Gwd+ZD7BiUiyY7ZzsXxY72ttdovUXhrsUuA9NkIYwLOpliywbZdwdIlF5LIR8dYt4c5 X-Received: by 2002:a05:6402:2547:b0:5cb:69de:2bca with SMTP id 4fb4d7f45d1cf-5cba22f3e6fmr276705a12.0.1729735744891; Wed, 23 Oct 2024 19:09:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729735744; cv=none; d=google.com; s=arc-20240605; b=eu1kNBZFXwwgFi/+95QMNaRE10U59tPaweAbXDUFIz3U3GhFKawytplpxD505EiTin HRwHgxupzG2pHo794EbeY/mDRt5MlvWFN1zlu14lU0KAegvjkcn5WxS7Pfa8dTPQ2XhL r2GocikHeWYfGNnMfN8RwenMIgvtvxQubJx1UIiw4T8n8Mnk1Ied5X7ETZRIrDoHoyjq 8sfvb46Ga9KWUBAK6Kj4IRxYaRa1331k6CGL/6SyZxm44lIrGWkeX1mJUGNfUnVxOwxx DdFD0xtRbItPz7nys7wO8vUqhhGtmrP5V85Vqeea9D+9nwN63TINfXpL5NDngNb/zEXr mgvg== 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=W04//s11Kcmre706peVaM+ZLtNBvcrJjJb1iqBWT1vI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=FrXwDraUxlAPrzS/Q76LuWwnO7JQxGNwGzCdgIe7rFjC3pgQ42Px/J8+b6s9VIiqCj 6OukSzU+MqoGdHVzeAETMyWLjsWOMqUAeZHaftF4I/PDOHmRvZMzdpbqBd0kRvZKgebM peprf8pUbBewpPCgJgevLWwDTHJn9sPzoFsMmSPpbMNOpT8U7DNz7l0jcuaY835BuPX3 v9YKxQHSzvrBi3hci06HBXZDUVtqNMOo3WlZQsIz7TJk6LhSFPl5FSkAFvEZxbmNUyoh LzTslfI5z+7tfYLgJrwiT7chunAP+0bx5O4QjZ/Vl6LuP7blnZ1LGMC1ZxBRjGYZviCH IZ0g==; 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=KZJoVhaH; 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-5cb66e74fe1si6842616a12.642.2024.10.23.19.09.04; Wed, 23 Oct 2024 19:09:04 -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=KZJoVhaH; 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 6291168DDD2; Thu, 24 Oct 2024 02:03:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB95268DBE9 for ; Thu, 24 Oct 2024 02:03:11 +0300 (EEST) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-71e681bc315so249001b3a.0 for ; Wed, 23 Oct 2024 16:03:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729724589; x=1730329389; 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=bq3wF3GgogvJP2lv3GVa1h5SVtDUwdp3jiHFlXgjEAw=; b=KZJoVhaHqKRSW4wLJ3sWPWrRt+9u7j2yi+L3BWBUOLEVv2cXqMoVRelMPEQFQTKdVe 42fGkVHjFQI4jWNzqtMpQ/EdcedTykmL6Vhukslm+inqCiTPL7ICXn5Dc/WvhSGtfABP m/+qE84GTr7jHtp9FTbq7urpNm3xAv7xpbQmP8FPgkpxb2RxBDHWN2P4WmxxGpwKXfu0 iFNyltcBYn7JjR5tku/RMY3uaD6uu63Yl0k/MjhXZFdQJb08MXoJgHr6k4KpdNC8+MM4 fIm0CC2w8oyqCpg91rbsJAZ2wlFDZlYWz20SvlhywBU+rcfkXrFPqcfUcXQpWny6pdW2 9gqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729724589; x=1730329389; 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=bq3wF3GgogvJP2lv3GVa1h5SVtDUwdp3jiHFlXgjEAw=; b=MGFbJY0dIopndu14/k4P5f4cMi18QjRXRAxC6ZFzVI/2F/aedOiq4Va6U5GTPhg3Io IiJsbXewP+E39nFZLa4AIGCGZ2ImfFZTnAaib5ltiFj/kyGNRwKwzdBcavJTllBHhGYD 3DN2RJgJvgB7O1gF0/nJhzy77OqFAdc1OqeHVwnkNl+Lm6PD5htGNYTS9BxQqEq87BaV r+JD7ebFCLVLHfJhB7H+w7mPGOi2AUskSzAUe0I+cjvJN0od+BWwIF7fbkcsn5vnxFm2 v6/h46YyTjd6MtAaGObgccMbSJPvHTaPMiZIEQe86uxEiSRLzCcMjIgCi0sc2/km0w/7 gk1g== X-Gm-Message-State: AOJu0YxupX7vDKRyzaWgOmwZgTmHlqqHh4PVYMaOzxle6JG6tToF2ITq 2hRvFj/MSQxPsm+epMfanmJhRjJyWjAHk/kdDGdxxIYZfrXYBS7n+5F/mQ== X-Received: by 2002:a05:6a00:859a:b0:71e:427e:e679 with SMTP id d2e1a72fcca58-720452a3b58mr185078b3a.4.1729724589122; Wed, 23 Oct 2024 16:03:09 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71ec13eafa7sm7041950b3a.177.2024.10.23.16.03.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 16:03:08 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Oct 2024 20:03:06 -0300 Message-ID: <20241023230308.59609-1-jamrial@gmail.com> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/vulkan_video: add proper maps for XV3{0, 6} 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: LdyFfxpksRwe Forgotten after fd8b0dcfed61ddf36b9523aa4ba1badc493b7707. Signed-off-by: James Almer --- libavcodec/vulkan_video.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c index 3a04d60d68..a97d224d55 100644 --- a/libavcodec/vulkan_video.c +++ b/libavcodec/vulkan_video.c @@ -33,7 +33,6 @@ static const struct FFVkFormatMapEntry { { VK_FORMAT_R32_SFLOAT, AV_PIX_FMT_GRAYF32, VK_IMAGE_ASPECT_COLOR_BIT }, /* RGB formats */ - { VK_FORMAT_R16G16B16A16_UNORM, AV_PIX_FMT_XV36, VK_IMAGE_ASPECT_COLOR_BIT }, { VK_FORMAT_B8G8R8A8_UNORM, AV_PIX_FMT_BGRA, VK_IMAGE_ASPECT_COLOR_BIT }, { VK_FORMAT_R8G8B8A8_UNORM, AV_PIX_FMT_RGBA, VK_IMAGE_ASPECT_COLOR_BIT }, { VK_FORMAT_R8G8B8_UNORM, AV_PIX_FMT_RGB24, VK_IMAGE_ASPECT_COLOR_BIT }, @@ -89,6 +88,10 @@ static const struct FFVkFormatMapEntry { { VK_FORMAT_B8G8R8G8_422_UNORM, AV_PIX_FMT_UYVY422, VK_IMAGE_ASPECT_COLOR_BIT }, { VK_FORMAT_G10X6B10X6G10X6R10X6_422_UNORM_4PACK16, AV_PIX_FMT_Y210, VK_IMAGE_ASPECT_COLOR_BIT }, { VK_FORMAT_G12X4B12X4G12X4R12X4_422_UNORM_4PACK16, AV_PIX_FMT_Y212, VK_IMAGE_ASPECT_COLOR_BIT }, + + /* Single plane 444 at 10 and 12 bits */ + { VK_FORMAT_A2R10G10B10_UNORM_PACK32, AV_PIX_FMT_XV30, VK_IMAGE_ASPECT_COLOR_BIT }, + { VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16, AV_PIX_FMT_XV36, VK_IMAGE_ASPECT_COLOR_BIT }, }; static const int nb_vk_format_map = FF_ARRAY_ELEMS(vk_format_map); From patchwork Wed Oct 23 23:03:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52455 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9990:0:b0:48e:c0f8:d0de with SMTP id g16csp129956vqn; Wed, 23 Oct 2024 16:59:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX2jDgmoijF3VxHx6KewYI43TpbeTPMpue7zBgOCyOJdR34SJ8KZreaPCMTIeQmU0cLtiI7IRU+mVqzyCtd8d83@gmail.com X-Google-Smtp-Source: AGHT+IFM7QSMsQvgKV/NGEZGvNUDR1B7325a9SE3FHZNgJavSr7ZNPjU2XscpEHBj5thBjH+hL+E X-Received: by 2002:a05:6512:234d:b0:539:fbfd:fc74 with SMTP id 2adb3069b0e04-53b1a36c429mr2485442e87.40.1729727949555; Wed, 23 Oct 2024 16:59:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729727949; cv=none; d=google.com; s=arc-20240605; b=HEKE4EHhpUnPB0Dt5X+nxE0Es+pWHzobBBbkyfbRPKLMug8cNANBzLPpS5CyVuPWY0 aOCOADgFNl3X6ArLs2W2f1VOyJ6yh2K70BjJJnNqWiZaar136JgU8xUJEDnUuIJVZZ63 oPxF8IDRUbj+tBzHDyqZvgEZb85sY02KcLz/NZagcEnzlGfybrFKDNqN2eMdKFcqQu5S MpKDWLM3PIcsZBfbIb+vStp/LA3uZ2vlX4nxq5erkn/4q4zrd007yrMWHq+vBLx2kOOr EVa9EL0QpjdehxGUGU9cJU7VV/ccqCJClVrRJe1dVj5dTsMMd/ZQP5ftPYKD8w18qaMm tbkg== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=LDmtWJQIzLsOERcwlcXN4sAgap0mGF510vI2sO53MjI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=UAEsGdTBfRtdtBCKjKBdMuMFi3KWGajF3E76I67FuXKXT+M8MHIiOr2UBfsXgF695/ H4r/RIlLais7EhVvueYuyt6d4iMOUF6r65ed/HsPTvpYvOh0SI2ogs5OMTZPydavbz8Q /8CMbE1v7zTp0vwzXm7F42gWaGKHTmCKi9Oh7zS9u89jjoidqV23B7cyj8nnpu7ziq6/ sj2TU545qsgzjy7VIrahnNna5vzxy014mUpEADe+bmMz5ffVxZMCBWtDT3IQoZQGgOX7 mXNaY6WuY301dMDCOBWLJgDBcYoivcrsw1Vf6eTMKqFPuunUhFs06ykV9Q1CymePw+d/ n3sg==; 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=RZNd4isz; 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 2adb3069b0e04-53b1684c315si1508152e87.568.2024.10.23.16.59.09; Wed, 23 Oct 2024 16:59: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=RZNd4isz; 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 E427368DD00; Thu, 24 Oct 2024 02:03:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E88368DDD2 for ; Thu, 24 Oct 2024 02:03:14 +0300 (EEST) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-71e592d7f6eso213107b3a.3 for ; Wed, 23 Oct 2024 16:03:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729724592; x=1730329392; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=StboOwGwb+T14rjsr054W1n8TwFN/mhPqvyAfrJErz8=; b=RZNd4iszUjCxV6v6fGO6pNS0hjrUDOk+eoXCbbDJWN5tMrFMQloSOqEv+OeVjrpOMO wBE1Sb2JYKOfdWrGVJHtUP/YvBXJqB/dVLkHteAsGU/HPlLLNFekwZ98bFUML6pJRlL6 XdjJ+RMntGMgqExHBhF7rYOYn9ajR0vnm41RhkIIjFTXzqenUwj1msg+liLdQPnlPIG/ cqZ0dZrHb7kEPFvjMjUVc2V/vGUpikScl/OhQA2916jXkkvsd3zaHE9UhNySYDGAbj7i cQW3sU5ex1XEwxpPTVwMB27+yJgNXovVM/KWJ2TexirAzVQvVksgWX+qbALgltJNUcmE HD+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729724592; x=1730329392; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=StboOwGwb+T14rjsr054W1n8TwFN/mhPqvyAfrJErz8=; b=PIkBz5Xin3jIQeqjCUnaxRaiiKoOEnjQ8OMy0R70LA72Ud/xiWyQ8yeg+OR1gqU++o COh5/18zYq4okBW424Ql3bSIBhw459IcpxF+NAT0r4Kq/x1sv9V+020bYZ1rKmLIB4Jm UQSvtLWKh/TZO5LhBEqus7oYCLUaOdQpb/iH6jQIxr5TrMAZKKH28bRd0kZAt416G5H3 ZvkaQyPxWeevJhbKEWJcvsmf2s45W78cDyN0pXgsmoZKA5fRPZJ8a/Xh/P0Ixkkv85ED GYisKlfhHHywPVd4DmsIoHIQnGTc24/BaX/bgUyFivjws1TMaIYT2HWe2dB4cVlm9S0E x3Ow== X-Gm-Message-State: AOJu0YxWfY48tLoOGviutTVnYcBKWtprcYhdub9fXyW2c3NkLitJ3jwe tsUOx3ck8huZy++/2bA2+O97QbXHZ4eTAOgBa0UEqrDtOraCcEd/NNvF1Q== X-Received: by 2002:a05:6a20:9f43:b0:1d8:f977:8cda with SMTP id adf61e73a8af0-1d978b2e4fbmr5403736637.27.1729724591968; Wed, 23 Oct 2024 16:03:11 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71ec13eafa7sm7041950b3a.177.2024.10.23.16.03.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 16:03:11 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Oct 2024 20:03:08 -0300 Message-ID: <20241023230308.59609-3-jamrial@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241023230308.59609-1-jamrial@gmail.com> References: <20241023230308.59609-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/vulkan_video: add mapping for AV_PIX_FMT_Y216 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: IRhoVqDcr/W4 Signed-off-by: James Almer --- libavcodec/vulkan_video.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c index a97d224d55..c58353246c 100644 --- a/libavcodec/vulkan_video.c +++ b/libavcodec/vulkan_video.c @@ -83,11 +83,12 @@ static const struct FFVkFormatMapEntry { { VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, AV_PIX_FMT_YUV444P12, ASPECT_3PLANE }, { VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, AV_PIX_FMT_YUV444P16, ASPECT_3PLANE }, - /* Single plane 422 at 8, 10 and 12 bits */ + /* Single plane 422 at 8, 10, 12 and 16 bits */ { VK_FORMAT_G8B8G8R8_422_UNORM, AV_PIX_FMT_YUYV422, VK_IMAGE_ASPECT_COLOR_BIT }, { VK_FORMAT_B8G8R8G8_422_UNORM, AV_PIX_FMT_UYVY422, VK_IMAGE_ASPECT_COLOR_BIT }, { VK_FORMAT_G10X6B10X6G10X6R10X6_422_UNORM_4PACK16, AV_PIX_FMT_Y210, VK_IMAGE_ASPECT_COLOR_BIT }, { VK_FORMAT_G12X4B12X4G12X4R12X4_422_UNORM_4PACK16, AV_PIX_FMT_Y212, VK_IMAGE_ASPECT_COLOR_BIT }, + { VK_FORMAT_G16B16G16R16_422_UNORM, AV_PIX_FMT_Y216, VK_IMAGE_ASPECT_COLOR_BIT }, /* Single plane 444 at 10 and 12 bits */ { VK_FORMAT_A2R10G10B10_UNORM_PACK32, AV_PIX_FMT_XV30, VK_IMAGE_ASPECT_COLOR_BIT },