From patchwork Mon Oct 31 00:32:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 39071 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8e01:b0:a3:a294:714c with SMTP id y1csp619832pzj; Sun, 30 Oct 2022 17:33:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM57oaBGkehFhayYQlwIK6QCQVxJzG1jNYNaEdKQw2EskY9ESEQfH4WVGiaVCLUHty9kbFUY X-Received: by 2002:a05:6402:158d:b0:463:2343:b980 with SMTP id c13-20020a056402158d00b004632343b980mr6400495edv.150.1667176413223; Sun, 30 Oct 2022 17:33:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667176413; cv=none; d=google.com; s=arc-20160816; b=str/4r+9NiBKZ/BsNLY2G57UGbqoVSaAO/cLW4Mb6MRYY8rVifL/PaDVxoq2iAC4Nt AZeTp5bREyRpG06J1SVde5Nj6z3b8+k9I603jbWZ74Gjvm4H9W7lsOs2RdMYxk8P4TWC ciN9oUhoExWGdsfglTOrnCdPIze+AsgYaBcDZrGOoVvc396kcdwGVf/zf4EhaQEkudTe HTjuHahwNc0tf2r+uf53hYm4Hj1G2DsNTWmJMvkXcnTiXRSLw2QBSbEWutINOaFs2NEs IFpFYz/pX5nlaNsvRton32Su8JaWLdntsbA/sdXnWYRddxaqnW5w78zhhSVk+0RGPs6U 3pUA== 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=boMg8rZ0alfHDA3iE/A2krjQnDhL41J8Bi73ikJeBbs=; b=IMAjO3mygK4j6X+et+md9PxSq5s0+srm52LA1nIRHIYk8RNIbln+GF/TJJjChe0Fbz GEHQZbQ3/AQPdqLytG2FXwicEiVlifhd/uWT6aZqOq/PuXMH08mJ69y4nLNfd65zDsAx /6an/1+k92KWfXZD1w7Ew7Ip3oGP1+dRzkN4KXy9HCN/6D4iYp3BFdY7y7CtxHqrDojs ESV5dW5xdn/6BPMACBqfcr2Z1L/27AxeSzXr3d8YULTwAi8EcNLREXP5IS9InRb1hQD2 SqC5GonqRI79RpVNMMwjTJ5wu+Rb5E3222UKakN4Mrmr57FsVN4J4aqpCmoJql1xwAAo ALwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=MGKRUhFw; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cr17-20020a170906d55100b0078db8fe2834si6760272ejc.245.2022.10.30.17.33.32; Sun, 30 Oct 2022 17:33:33 -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=20210112 header.b=MGKRUhFw; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 902B968BDAC; Mon, 31 Oct 2022 02:33:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1653E68BD36 for ; Mon, 31 Oct 2022 02:33:04 +0200 (EET) Received: by mail-pg1-f169.google.com with SMTP id e129so9377366pgc.9 for ; Sun, 30 Oct 2022 17:33:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LksnUiNcu42gqrIrPD1I6aZ/atWUfj86EsUXolhc2Qk=; b=MGKRUhFwOk8NutKSN0Z1vI4t1ocYN7GAUT5RL7Mb7CpuAWcL3mRGIXtQ95PdTpjbPe /iV0HxXrP5kyxCPLC6I9fgM9OnhRKofKYrFMXHCRlGinYsIsh/bpa33cflHfU9n3jCUe N7V9Js+EDicdsOi2T9V0J/pccJ/6ayPy5VxsvzykO4Y17rXafTI6PY9Tasq5YoIg5lnG 9gSjxHjmgN+p7BmMfD+7pOfKZMeVEIJb+wYqpRRQiYw2BjhtTrpumb1OUrSwGenYMxlq v3/r6kBf+kTnLKTY3doBfCJuiaeV+Pn3CWVpXIeDnW8tdSYPUHWPYLjAG10n6Rr1djmf jvJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LksnUiNcu42gqrIrPD1I6aZ/atWUfj86EsUXolhc2Qk=; b=ijbjqIODwBtMQrSCVNKgmrjRqtB1awwr/SYQOiynG5tjasp+B3zqQF3qB3lpvPGO53 vpdPIwCRLPD8SGG56DN0PotpC4D/1bdgxKFo0ctinTi0mmqNsOyMEyk19Ho7d7lKIlas XEx7y7zaWnV6paDGqBsEOUFKtunk9nrMFJsvkM4xUMM8Wefo0gIhOE5F318C0VpYo++S f3TjylqqT0jA7+H9hyCwsRE80/nf9IxGnaad8WA3spnNDyDU+FXVDbur35cmY191/b59 JdpHDC50SN0LjVBqHKOTnVowQdrOg7GXOMynBzwUNMceE+4OUTssqJvmF6vHk3cXcXPW e28Q== X-Gm-Message-State: ACrzQf2cJYJo0XobW3S3t5GNQOnSny/kBBEGQkkhLcFg251VCZ9TSPAx dDXUCoh12H6HaUyHcPtskLrR2U+ZxEQ= X-Received: by 2002:a63:ee43:0:b0:46e:ffdb:5628 with SMTP id n3-20020a63ee43000000b0046effdb5628mr10247958pgk.463.1667176381789; Sun, 30 Oct 2022 17:33:01 -0700 (PDT) Received: from localhost.localdomain (S0106bc4dfba470f3.vc.shawcable.net. [174.7.244.175]) by smtp.gmail.com with ESMTPSA id m18-20020a62a212000000b0056bd737fdf3sm3175699pff.123.2022.10.30.17.33.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Oct 2022 17:33:00 -0700 (PDT) From: mindmark@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Oct 2022 17:32:34 -0700 Message-Id: <20221031003235.348-4-mindmark@gmail.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20221031003235.348-1-mindmark@gmail.com> References: <20221031003235.348-1-mindmark@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/4] avfilter/vf_transpose: add support for packed rgb float formats 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: Mark Reid Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DE3IILJKSUkq From: Mark Reid --- libavfilter/vf_transpose.c | 44 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c index 469e66729f..1023d6fe82 100644 --- a/libavfilter/vf_transpose.c +++ b/libavfilter/vf_transpose.c @@ -174,6 +174,46 @@ static void transpose_8x8_64_c(uint8_t *src, ptrdiff_t src_linesize, transpose_block_64_c(src, src_linesize, dst, dst_linesize, 8, 8); } +static inline void transpose_block_96_c(uint8_t *src, ptrdiff_t src_linesize, + uint8_t *dst, ptrdiff_t dst_linesize, + int w, int h) +{ + int x, y; + for (y = 0; y < h; y++, dst += dst_linesize, src += 12) { + for (x = 0; x < w; x++) { + *((uint32_t *)(dst+0 + 12*x)) = *((uint32_t *)(src+0 + x*src_linesize)); + *((uint32_t *)(dst+4 + 12*x)) = *((uint32_t *)(src+4 + x*src_linesize)); + *((uint32_t *)(dst+8 + 12*x)) = *((uint32_t *)(src+8 + x*src_linesize)); + } + } +} + +static void transpose_8x8_96_c(uint8_t *src, ptrdiff_t src_linesize, + uint8_t *dst, ptrdiff_t dst_linesize) +{ + transpose_block_96_c(src, src_linesize, dst, dst_linesize, 8, 8); +} + + +static inline void transpose_block_128_c(uint8_t *src, ptrdiff_t src_linesize, + uint8_t *dst, ptrdiff_t dst_linesize, + int w, int h) +{ + int x, y; + for (y = 0; y < h; y++, dst += dst_linesize, src += 16) { + for (x = 0; x < w; x++) { + *((uint64_t *)(dst+0 + 16*x)) = *((uint64_t *)(src+0 + x*src_linesize)); + *((uint64_t *)(dst+8 + 16*x)) = *((uint64_t *)(src+8 + x*src_linesize)); + } + } +} + +static void transpose_8x8_128_c(uint8_t *src, ptrdiff_t src_linesize, + uint8_t *dst, ptrdiff_t dst_linesize) +{ + transpose_block_128_c(src, src_linesize, dst, dst_linesize, 8, 8); +} + static int config_props_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; @@ -232,6 +272,10 @@ static int config_props_output(AVFilterLink *outlink) v->transpose_8x8 = transpose_8x8_48_c; break; case 8: v->transpose_block = transpose_block_64_c; v->transpose_8x8 = transpose_8x8_64_c; break; + case 12: v->transpose_block = transpose_block_96_c; + v->transpose_8x8 = transpose_8x8_96_c; break; + case 16: v->transpose_block = transpose_block_128_c; + v->transpose_8x8 = transpose_8x8_128_c; break; } }