From patchwork Fri Dec 10 19:05:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 32258 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2205028iog; Fri, 10 Dec 2021 11:05:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJwjnQEQih515bZLu89tWZGJXKbPd1il0jS8nStwfmSAEOHuWHvdvJBsMhO+vBc3fSx81pff X-Received: by 2002:a17:907:2a8c:: with SMTP id fl12mr25649018ejc.569.1639163135343; Fri, 10 Dec 2021 11:05:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639163135; cv=none; d=google.com; s=arc-20160816; b=fDk8dumslQiLM/InqJmwYdmfu9MHlczhJClHYG9G4xfcbfv701jmdo6AdypkWbSm7D bt0y456SSsgoE3IkBdD3by3hjevVPGHJPZ0p4zAkPoCs0rCAF8DBLhELGJuPeiBnJfLY tc4JbDyyK2SAd08XH6fspWpQlyEpqRt1iLzy+ewCYtWz2hb75JKnEC09rHTeujplHBHp qGNfi7kGHCCdxFIF2wza42pM4IBH31aKgMm+1PjVMZO6j7ndoPCO9w+CLMkZ49X61YFG wztMX6s2C/ILeKfdvNzequEHcIsOkciGm2hV0kLX+Btn9LyTFm17yJtQwerZxbeJkCoy lOaQ== 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 :dkim-signature:delivered-to; bh=fLh7p7IWbsspFEIEsdN5+1o7vJMbTeOi3WXEMwsToLI=; b=W4cyxugasNCve05OBGiXb9uEYSSYdFGO/sabqg0UJOmAhhjhiNJr4q4RbLITOt6vv/ D9eI0lah2ouWWbROCfQKbZF8lRctFVL8XD/NBfswYgkJQGDaJuM2l+/orCe3Su8XLmNG TIAr0x79mkqpnqX4A7WqGGXz1G7ecj9SfxhMvpsx/JsSjW/gMtaMIqN4vVudIWAq9lEE hunm/5pWscw2gsZic3uJMR/jBX9TKv4TJRW1SJ10AXpXTETzC78MZ2stIzeaInPF0xqo V5Xea25SeuhYJGe8yfvTJzKnTA27oLS5WdZFURRacUDF0o9erAfq0/v+QY5v0h8R7C/p aDGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=DS7zMZfj; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j7si8084774edw.84.2021.12.10.11.05.21; Fri, 10 Dec 2021 11:05:35 -0800 (PST) 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=@intel.com header.s=Intel header.b=DS7zMZfj; 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=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E43868AE9B; Fri, 10 Dec 2021 21:05:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE2C9680BA3 for ; Fri, 10 Dec 2021 21:05:11 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639163116; x=1670699116; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=xxJgvIeehf3+p0mUXwZu4sw2bmlmYxXX7kMz4C61tKY=; b=DS7zMZfjVG/YGqe2jZPQIxh7ZRpAPHvcSFmGMRWB+r1HKWvxRU19Ww18 rD9NQJeomEfxfkR/ul6BE7YtvF+pn//BWJO6GD9JE2U4Y2UNYbo8YAt/h WB67D62d4NKI7XdUSWSeeuPAUA79hSxnDhPVdWJHN7a3P7kptvmDSo32z LEzPL8EaAn9be4HBVeveDjuxYBeZxi/JSQkZ08vIWMdclStru2m3bXN+W MkR1h8Gq+YIVj5ou7n293tDNuU6bpiRACQQyZpF0KXIz8ZqTgIJZwT7tk VllJgJOJ2IsdFzoAIuKMSv/PWMJ7VCLJXXxKQPNNgArZ6vkgT3guy7JNO Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10194"; a="238362993" X-IronPort-AV: E=Sophos;i="5.88,196,1635231600"; d="scan'208";a="238362993" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Dec 2021 11:05:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,196,1635231600"; d="scan'208";a="463772298" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga006.jf.intel.com with ESMTP; 10 Dec 2021 11:05:08 -0800 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Dec 2021 03:05:00 +0800 Message-Id: <20211210190503.4015128-1-jianhua.wu@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avfilter/vf_transpose_vulkan: add cclock option 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: Wu Jianhua Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rcYxMjzW1xfJ The following command is on how to apply cclock option: ffmpeg -init_hw_device vulkan -i input.264 -vf \ hwupload=extra_hw_frames=16,transpose_vulkan=dir=cclock,hwdownload,format=yuv420p \ output.264 Signed-off-by: Wu Jianhua --- libavfilter/vf_transpose_vulkan.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_transpose_vulkan.c b/libavfilter/vf_transpose_vulkan.c index c9bae413c3..59a548a12f 100644 --- a/libavfilter/vf_transpose_vulkan.c +++ b/libavfilter/vf_transpose_vulkan.c @@ -21,6 +21,7 @@ #include "libavutil/opt.h" #include "vulkan_filter.h" #include "internal.h" +#include "transpose.h" #define CGS 32 @@ -33,6 +34,7 @@ typedef struct TransposeVulkanContext { VkDescriptorImageInfo input_images[3]; VkDescriptorImageInfo output_images[3]; + int dir; int initialized; } TransposeVulkanContext; @@ -89,10 +91,13 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in) GLSLC(1, const ivec2 pos = ivec2(gl_GlobalInvocationID.xy); ); for (int i = 0; i < planes; i++) { GLSLC(0, ); - GLSLF(1, size = imageSize(output_images[%i]); ,i); + GLSLF(1, size = imageSize(output_images[%i]); ,i); GLSLC(1, if (IS_WITHIN(pos, size)) { ); - GLSLF(2, vec4 res = texture(input_images[%i], pos.yx); ,i); - GLSLF(2, imageStore(output_images[%i], pos, res); ,i); + if (s->dir == TRANSPOSE_CCLOCK) + GLSLF(2, vec4 res = texture(input_images[%i], ivec2(size.y - pos.y, pos.x)); ,i); + else + GLSLF(2, vec4 res = texture(input_images[%i], pos.yx); ,i); + GLSLF(2, imageStore(output_images[%i], pos, res); ,i); GLSLC(1, } ); } GLSLC(0, } ); @@ -279,7 +284,13 @@ fail: return err; } +#define OFFSET(x) offsetof(TransposeVulkanContext, x) +#define FLAGS (AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM) + static const AVOption transpose_vulkan_options[] = { + { "dir", "set transpose direction", OFFSET(dir), AV_OPT_TYPE_INT, { .i64 = TRANSPOSE_CCLOCK_FLIP }, 0, 7, FLAGS, "dir" }, + { "cclock_flip", "rotate counter-clockwise with vertical flip", 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK_FLIP }, .flags=FLAGS, .unit = "dir" }, + { "cclock", "rotate counter-clockwise", 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK }, .flags=FLAGS, .unit = "dir" }, { NULL } }; From patchwork Fri Dec 10 19:05:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 32257 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2204962iog; Fri, 10 Dec 2021 11:05:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJzBHqb3n99nqz1tGVqJ1uYTQ9hxU5cSmfNc6L2TRrP0+ndaD/xkNIb7zopY1FlajMzxVyCe X-Received: by 2002:a17:906:d187:: with SMTP id c7mr27405861ejz.477.1639163132870; Fri, 10 Dec 2021 11:05:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639163132; cv=none; d=google.com; s=arc-20160816; b=F6Nvno6ighdeSMVaboJGwGZvTnHMLEya4xJNojhKjjSdp5C1HX+SLl2UNZ+JQ7z96y I+O1YAfdZKwwOGX4jjC3hYWLHVjixYM/xL+I0MYO4NVo8jWi8jfRYABm/s+H6iy0xF27 nKxyTJeoUM+twFkSc21MXQQxKrYDKqj+YBp/RFdzikh61XsZXfbTUF8o4PrzduNWM1iC P1LV+YyvQBldw1kHkfE1VBF/rJenxjJryyhB7dWkEW4OiodY6nSN/nYDxjFl2ubMPEZ8 KzGi9oapqPdXz6KjnKdj2buHQzgaCNkq3H4PZTmntQ0hOt1QTyjRpuqvaeLNCduFD4HT B3bg== 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=N1dDaNmWWZNIaINJtBgzthCNkOy+sNBIysCpP0p1K10=; b=aEjKZ20n5BGLTEDwFlGVC63tI2StNxhlV/tWEWO1bkeJHoUVFjmoGGbTbNq2LbrM0F 2l9L8ATnTuFjC9ME/b13jz713Nr23PDhgFO+BmkjC2zavCbXR4+Sir12OyrzDK0q88vH uAhP9j51m4RF7pawWIgfAjlLbnsVSL83z+pHsCLyk/dKCe2liJcIio7WC0xjf2qvreI5 dwMD6+FPvq0iHLDuOKDDngGyfGOWjPykLYlXSEi3XHi/QAhedWpmoPdmlqOvDe4DtNm4 WIiL9Op+4ieABMT6vkQaGsojQn1gRatEGqPt4Sg/KZiJTrphgPnM9zToBrmnpmSUPKy8 7isw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=E8rZ7FhU; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sc2si7527087ejc.218.2021.12.10.11.05.32; Fri, 10 Dec 2021 11:05:32 -0800 (PST) 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=@intel.com header.s=Intel header.b=E8rZ7FhU; 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=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 92F2A68AED4; Fri, 10 Dec 2021 21:05:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F96D68A576 for ; Fri, 10 Dec 2021 21:05:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639163119; x=1670699119; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LqtFUYSaZY9JvzPz5iJwkJL5jFGG+L+vLkJs8OT2j14=; b=E8rZ7FhUMcCemnHaGPtvgdw1m/no9jg0GdsG2sGCE/RKKIA4mSYc9BG8 +omNAfUT6R+D9uX8rrJKSH0YFVOGQ1Mey7q5yUzwxkWPYy5bChy17na0e Z1FUCPl1mkQxf+tZp4Om8fnMfi5qBDnbKWC6DQZff3LkWJm/KYPwuX8Bx McdA+xz1DmYwsFOdvpJ9/MGQfwWuiI3z66vdOwLojoT9r0pSE3fpDfrjr fNAw3Uh/CCgeDKlfvth63cQoUsTnSSup9KuaFu6qyT6HimZE4Z0hCZXfq hpFxmM64Wcapl98tgbom4L2eTCR6Seu88TFaorGdt7E9DDmYlALnhckRs g==; X-IronPort-AV: E=McAfee;i="6200,9189,10194"; a="238362998" X-IronPort-AV: E=Sophos;i="5.88,196,1635231600"; d="scan'208";a="238362998" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Dec 2021 11:05:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,196,1635231600"; d="scan'208";a="463772306" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga006.jf.intel.com with ESMTP; 10 Dec 2021 11:05:10 -0800 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Dec 2021 03:05:01 +0800 Message-Id: <20211210190503.4015128-2-jianhua.wu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211210190503.4015128-1-jianhua.wu@intel.com> References: <20211210190503.4015128-1-jianhua.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avfilter/vf_transpose_vulkan: add clock_flip option 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: Wu Jianhua Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: are8pzX/kMzZ The following command is on how to apply clock_flip option: ffmpeg -init_hw_device vulkan -i input.264 -vf \ hwupload=extra_hw_frames=16,transpose_vulkan=dir=clock_flip,hwdownload,format=yuv420p \ output.264 Signed-off-by: Wu Jianhua --- libavfilter/vf_transpose_vulkan.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavfilter/vf_transpose_vulkan.c b/libavfilter/vf_transpose_vulkan.c index 59a548a12f..4c20becb5c 100644 --- a/libavfilter/vf_transpose_vulkan.c +++ b/libavfilter/vf_transpose_vulkan.c @@ -95,6 +95,8 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in) GLSLC(1, if (IS_WITHIN(pos, size)) { ); if (s->dir == TRANSPOSE_CCLOCK) GLSLF(2, vec4 res = texture(input_images[%i], ivec2(size.y - pos.y, pos.x)); ,i); + else if (s->dir == TRANSPOSE_CLOCK_FLIP) + GLSLF(2, vec4 res = texture(input_images[%i], ivec2(size.yx - pos.yx)); ,i); else GLSLF(2, vec4 res = texture(input_images[%i], pos.yx); ,i); GLSLF(2, imageStore(output_images[%i], pos, res); ,i); @@ -291,6 +293,7 @@ static const AVOption transpose_vulkan_options[] = { { "dir", "set transpose direction", OFFSET(dir), AV_OPT_TYPE_INT, { .i64 = TRANSPOSE_CCLOCK_FLIP }, 0, 7, FLAGS, "dir" }, { "cclock_flip", "rotate counter-clockwise with vertical flip", 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK_FLIP }, .flags=FLAGS, .unit = "dir" }, { "cclock", "rotate counter-clockwise", 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK }, .flags=FLAGS, .unit = "dir" }, + { "clock_flip", "rotate clockwise with vertical flip", 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK_FLIP }, .flags=FLAGS, .unit = "dir" }, { NULL } }; From patchwork Fri Dec 10 19:05:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 32259 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2205196iog; Fri, 10 Dec 2021 11:05:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJxNMaemGgJdnQjfr7/8hTpBshTXXgzAdv9ZQ3U0GR24/p/pr0oxUsO3rbiRQHWQzC38dTVV X-Received: by 2002:a05:6402:1388:: with SMTP id b8mr41265228edv.171.1639163144416; Fri, 10 Dec 2021 11:05:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639163144; cv=none; d=google.com; s=arc-20160816; b=eg/PFehhNEJ/eJy2veF8BlRB+iYfwzHmUm+xWal0Lsi224U0zr4HwpiZiaLgsCYdvz WeVQcTIUF3yTAeV0pKNK0sBJx0CwuTWWAdMceAeEnZnqBUCw9SaTCPH5GWdTIQsTU5Pj ykeE0wbZEEek3T2hoRF9MLdMi8L1nq/+tfkBGwVZmWpYnf2C4r5aGdSUGG7H22rEpHNI R8AK1kn2LzZdX735cX2xWl6kmZlqNwi0HQqttkDl1gl/NA1I6+iNmOPwK8vZdMZ4lTNh 3oUB5aQuNYp54Fx/WaqxNRUBN4aye3ZZwBDOOpUlurLsv5raUBb3Zm4TQ29mGvDYsBXz PSxQ== 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=z2VJTUia4Ro2FS3Dubz6n7puMAoPCq1jE1OFs53S00M=; b=NDBWAsSNP9Dxbayf09+Jy+1baxxNSjURjjTGK3Z8u3S05TvovzZKKvy3RcH8gLCamP kUHK+Px6LUnCwv6cSwtr5hooiKL6eeoSE+QuuoZw5SRNsbmSPnW1wipmNGJrWKrS0XeV 9H4CreME6Wrj/mZiHhf4fOh9VvpFZW5feoV7MCUvd76vsQgRRHvutdNpV7MSsjEE7hta RyqroBD+U7tXwNu6t3iHOkd+njSF1HiwPWcDwTnXozkQZCrp+WmDBNIHjPnJLA265dik a5J6/fg8c7KMyczMSASJZJKcwLT+eluQu6mPzsNmRUY7giPvD+EQ7RIgZIBIKu3qhoLK +jMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Zkw3qs4Y; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x12si5478215edl.278.2021.12.10.11.05.43; Fri, 10 Dec 2021 11:05:44 -0800 (PST) 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=@intel.com header.s=Intel header.b=Zkw3qs4Y; 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=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7BC4F6897E2; Fri, 10 Dec 2021 21:05:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A93BC68AECA for ; Fri, 10 Dec 2021 21:05:17 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639163122; x=1670699122; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BwqW9gnkJQBymyKnc3GSSVj+u2eVXLxccRMdQ/pNKYo=; b=Zkw3qs4YeGZQpNiC6zT1drU3vaW5Cwv6L1tqxCh8RRchFpB0/maqgmZH jdLro3r95RvUhgH8I71nAozA1pJCvkXLYA1m3xdp2uwp7//7IyTB+Z3kf sv1YtoeHN0T+B/TRPz3sWVM+A7B3FrF3S0IdtMIOrDMwzQwtu/u56SCGX 9DeX7bRQsX04Du1etkh+Hxk4YR4E4Hqw1O3U38MFdQay+mnvSP54yjLyk /x9/BLAUmFEVsega85CtFVdxxk8hwDfhB2DoTmp3Lm3F/KLvP4Xr/HXS5 uAc4HHS/GzOKBHqxAvYzmDR0m4dlID5AyjWRQKk8UoO/TmLLaMtor5fJa A==; X-IronPort-AV: E=McAfee;i="6200,9189,10194"; a="238363002" X-IronPort-AV: E=Sophos;i="5.88,196,1635231600"; d="scan'208";a="238363002" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Dec 2021 11:05:12 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,196,1635231600"; d="scan'208";a="463772316" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga006.jf.intel.com with ESMTP; 10 Dec 2021 11:05:11 -0800 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Dec 2021 03:05:02 +0800 Message-Id: <20211210190503.4015128-3-jianhua.wu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211210190503.4015128-1-jianhua.wu@intel.com> References: <20211210190503.4015128-1-jianhua.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avfilter/vf_transpose_vulkan: add clock option 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: Wu Jianhua Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gwi3NcjPhqq0 The following command is on how to apply clock option: ffmpeg -init_hw_device vulkan -i input.264 -vf \ hwupload=extra_hw_frames=16,transpose_vulkan=dir=clock,hwdownload,format=yuv420p \ output.264 Signed-off-by: Wu Jianhua --- libavfilter/vf_transpose_vulkan.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_transpose_vulkan.c b/libavfilter/vf_transpose_vulkan.c index 4c20becb5c..eceb9b9011 100644 --- a/libavfilter/vf_transpose_vulkan.c +++ b/libavfilter/vf_transpose_vulkan.c @@ -88,16 +88,18 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in) GLSLC(0, void main() ); GLSLC(0, { ); GLSLC(1, ivec2 size; ); - GLSLC(1, const ivec2 pos = ivec2(gl_GlobalInvocationID.xy); ); + GLSLC(1, ivec2 pos = ivec2(gl_GlobalInvocationID.xy); ); for (int i = 0; i < planes; i++) { GLSLC(0, ); GLSLF(1, size = imageSize(output_images[%i]); ,i); GLSLC(1, if (IS_WITHIN(pos, size)) { ); if (s->dir == TRANSPOSE_CCLOCK) GLSLF(2, vec4 res = texture(input_images[%i], ivec2(size.y - pos.y, pos.x)); ,i); - else if (s->dir == TRANSPOSE_CLOCK_FLIP) + else if (s->dir == TRANSPOSE_CLOCK_FLIP || s->dir == TRANSPOSE_CLOCK) { GLSLF(2, vec4 res = texture(input_images[%i], ivec2(size.yx - pos.yx)); ,i); - else + if (s->dir == TRANSPOSE_CLOCK) + GLSLC(2, pos = ivec2(pos.x, size.y - pos.y); ); + } else GLSLF(2, vec4 res = texture(input_images[%i], pos.yx); ,i); GLSLF(2, imageStore(output_images[%i], pos, res); ,i); GLSLC(1, } ); @@ -292,6 +294,7 @@ fail: static const AVOption transpose_vulkan_options[] = { { "dir", "set transpose direction", OFFSET(dir), AV_OPT_TYPE_INT, { .i64 = TRANSPOSE_CCLOCK_FLIP }, 0, 7, FLAGS, "dir" }, { "cclock_flip", "rotate counter-clockwise with vertical flip", 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK_FLIP }, .flags=FLAGS, .unit = "dir" }, + { "clock", "rotate clockwise", 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK }, .flags=FLAGS, .unit = "dir" }, { "cclock", "rotate counter-clockwise", 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK }, .flags=FLAGS, .unit = "dir" }, { "clock_flip", "rotate clockwise with vertical flip", 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK_FLIP }, .flags=FLAGS, .unit = "dir" }, { NULL } From patchwork Fri Dec 10 19:05:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 32260 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2205455iog; Fri, 10 Dec 2021 11:05:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJwWITBSZmGhK1WQom1YJSVJ4Rn3/ZMko64NPtqBbceNIT2sV25mQ3DhFzujML2tBwpJc+pH X-Received: by 2002:a17:907:98f6:: with SMTP id ke22mr26004306ejc.500.1639163158904; Fri, 10 Dec 2021 11:05:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639163158; cv=none; d=google.com; s=arc-20160816; b=OJaPxTi8dqh2YIKrQBzsfPzXNdSz0i+3wcXGgdZSMp1wZ8UxiOK2+/DkKZI7cw16wM 75HCZ4qrsSzdmnUzItuPhf7ieYVzO3F3tnTNErxy5xQTESsKug8qI+XJuZq0okSOrQZs aRmdZNfQx1E5nVbl5y6mmW6zamcJ5KI+AeaMG3GOUzFK4qDTRRr+FLR8vDQ5lz9D0u+i 1UAmfMh9N9w7bdsPXdY+zQdMNN2w0nBBnEgncq7pXFtvHIOGoPP7KV2DCpo0R+9Gp3Pm jX6XgDFlrGvI5QRvVQF8nnpsPtlpQftM9DuL9MFUtpFW4w8bb9XglChFuwqwWLga/A1m G3mg== 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=FFWSSKxlVUlDUeORijr6bh3FtSXrkKXToniJxrNYDaY=; b=msPVOxQnVG5UIqZve3dxBfiO7/zv1sDFeFR7v5VYhTUlhjdaGBnVBJmJT2GipJGkpN Y9uWODmoj58u4GLm22BhOMkx7EVI3fAub9T5b9vbAO1ixljLZ36kW4OOZ5tdTAYuNFDy FUZj+8+0FYtXfLCDbdNDcPoIAJqQjLvNhlkF7EsrAI0RIipb875uBftogTIbwWjB33Xq COMzDJV8ZU51H8SPdEueMT3+kv6+3ISo7SVY08AIdltUePMPG5sdCUJlYyFzD6OMBHnP AkJVZIWtFsyk4tDbd8hoRfJqLfndBeJUZY71xCGhAtRSWCRWjixkdMsjatBXBZZGnKpj u0mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=JA8HtDWD; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r18si6898745edd.401.2021.12.10.11.05.55; Fri, 10 Dec 2021 11:05:58 -0800 (PST) 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=@intel.com header.s=Intel header.b=JA8HtDWD; 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=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6792868AF10; Fri, 10 Dec 2021 21:05:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 012A568AECE for ; Fri, 10 Dec 2021 21:05:18 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639163124; x=1670699124; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0pPXAHKvhRxByxhft/0K0Eior5BVVOOE7Jl2btxCviY=; b=JA8HtDWDNqtWfOhkBBfTri34Olmie2I+N/LIdT6EWlB5WDEFl1LQxT2e sDUkyLrCCg3mKiTWdvVGOZQVdh0gQmMQ7rrCs7jFKzqIztjtm6pIASzr9 z+MAO1LB4+K3kQ0t7iLLfV7SzBhT4BnCjzR0o71wRfu1IFVdTcprng9F5 BYeiwpcsb7Oprgg3NyylYx8siLMSeB2PZNefd2cNLs0xbMpO+asAFTltM 9Ewxo+OxHPB0AtE0JHN71EIYTEvdhG5ucWeBMe100/bUwtXQHn5o8bQn4 V6aqZDUsrz4Kqly+x0Qt6uAKQ1LvsfFv5NiggxRP9nEqv7jsbqT3o0A3s A==; X-IronPort-AV: E=McAfee;i="6200,9189,10194"; a="238363006" X-IronPort-AV: E=Sophos;i="5.88,196,1635231600"; d="scan'208";a="238363006" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Dec 2021 11:05:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,196,1635231600"; d="scan'208";a="463772322" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga006.jf.intel.com with ESMTP; 10 Dec 2021 11:05:12 -0800 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Dec 2021 03:05:03 +0800 Message-Id: <20211210190503.4015128-4-jianhua.wu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211210190503.4015128-1-jianhua.wu@intel.com> References: <20211210190503.4015128-1-jianhua.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avfilter/vf_transpose_vulkan: simplify config_props_output function 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: Wu Jianhua Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xDZx2eyAoGzu It's no need to assign outlink here, which has been done in ff_vk_filter_config_output already. Signed-off-by: Wu Jianhua --- libavfilter/vf_transpose_vulkan.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/libavfilter/vf_transpose_vulkan.c b/libavfilter/vf_transpose_vulkan.c index eceb9b9011..ce83cf0fd7 100644 --- a/libavfilter/vf_transpose_vulkan.c +++ b/libavfilter/vf_transpose_vulkan.c @@ -262,7 +262,6 @@ static av_cold void transpose_vulkan_uninit(AVFilterContext *avctx) static int config_props_output(AVFilterLink *outlink) { - int err = 0; AVFilterContext *avctx = outlink->src; TransposeVulkanContext *s = avctx->priv; FFVulkanContext *vkctx = &s->vkctx; @@ -271,21 +270,13 @@ static int config_props_output(AVFilterLink *outlink) vkctx->output_width = inlink->h; vkctx->output_height = inlink->w; - RET(ff_vk_filter_config_output(outlink)); - - outlink->w = inlink->h; - outlink->h = inlink->w; - if (inlink->sample_aspect_ratio.num) outlink->sample_aspect_ratio = av_div_q((AVRational) { 1, 1 }, inlink->sample_aspect_ratio); else outlink->sample_aspect_ratio = inlink->sample_aspect_ratio; - err = 0; - -fail: - return err; + return ff_vk_filter_config_output(outlink); } #define OFFSET(x) offsetof(TransposeVulkanContext, x)