From patchwork Thu Sep 29 18:08:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 38464 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1163610pzh; Thu, 29 Sep 2022 11:09:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4YgJ7SLxqIj4wkFK16k8sv7vvMyzD4pn3TNRQVNyXUCPqqS3cJj4bw6yZ1c446KlF7qhv4 X-Received: by 2002:a05:6402:40c2:b0:44f:963d:1ab4 with SMTP id z2-20020a05640240c200b0044f963d1ab4mr4558505edb.319.1664474977363; Thu, 29 Sep 2022 11:09:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664474977; cv=none; d=google.com; s=arc-20160816; b=e6Wsk0Ex6LFq+9vPW13PCFYgzrcxqWGhBkpt9MGV3E7XBvslFFWLCBS7Vy8MI0zRJy BYNjOxIaHmkeSP/UF0c+Tvf/Coe6wYOt76YdJgM5dpZ1KUSt7qZzzQwhgDEF5oVZXTF6 t39Prq2NiCsHA8g3tb1JHtWcTw+eaHPb0oV9qoXTAv8L/XZk5gcuFI5S31FMzwoCoGma TNS9V7l/H0ocdlzKaQB8bIv2RNfNdP5uHe+TcEGkhNqXgA8HOqKksNweMZlQ0fMO+a/u iIeNXYAPecFi51Ni5Li4WjqNCA1MhEuYYLmT0BXcaABUz+jwMGG8MRCSJr0Zf7MdhUgn RTdw== 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=XNYO8bp74ddXqvuhxGBqCkdAoAWj/YYiZEIKnq6Sus/KrZVbtB7vrUi9m1gnKYYGO2 s76wwBXdSS6gpcI7YeGn5ZtliFM9WHfiKPAYW8OP6+FuMWzczH0KbTmOC6dDZYWf9Bes TVhFJpEZQDoSZzYIU2M/1dGIlI38/vF+RqnqRFOhqjGt1v+Bo8HJsL4ndgyRzCA+BKnk nVCIaRGpGGMTYXyp3T/n44H0gxBqNOl5agwMhtf5zobEUPDgBQNQAy3KXsQWiUu7aAj0 MM/HwvVnm+kPZp6qa9wE1K+xVzJVI1WN0KmRyevKCF7cmbfdp++r4OaCMfcRfkz+UDN4 lVlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=hB0Hx6IF; 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 hs14-20020a1709073e8e00b007417c6edb0asi8146813ejc.402.2022.09.29.11.09.36; Thu, 29 Sep 2022 11:09:37 -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=hB0Hx6IF; 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 04B0B68BA9D; Thu, 29 Sep 2022 21:09:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 08CFE68BA9D for ; Thu, 29 Sep 2022 21:09:06 +0300 (EEST) Received: by mail-pl1-f180.google.com with SMTP id v1so1912509plo.9 for ; Thu, 29 Sep 2022 11:09:05 -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; bh=LksnUiNcu42gqrIrPD1I6aZ/atWUfj86EsUXolhc2Qk=; b=hB0Hx6IFyB2S+YaIPC++I72saLokTfxfoLCtqexqNdMh8uiaT8pINPqcSQiEdKMGCl 2X0ahimswFO6TeK211Vqls0EAOBWlZM9mtyvNoBjlUcKPu/ZcfUHOca2Pr5zMdZGmnlp 1SVsuHKKvVL8yB17uXMBykHJCqwCZxdSCNAWJMa+SYeP6eQW/lgt/706QLpvS2cKqk7G gfcsDnW/q/C2IGEcb2njqiAk/mA0jZWHm56cNMpcdVnkqAAxrLHV1g5ADpnu7egEdm0R DHraVctxZmFvnSoPLNJNw2bZY1XpZT08ZCob72vnm0gF2I1l2Fn/W/F7yX2WCLypUDgf nD+Q== 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; bh=LksnUiNcu42gqrIrPD1I6aZ/atWUfj86EsUXolhc2Qk=; b=cXm1W6Ill9dHoJ3H1ywXKl9QMz5nx2RuvWpTdKUAmh6S1Vc9HMhTCHEQQWSC1MiLel WI9u6qZWrcBMpcgZhUhPm+OSPCC+YkV44eQwbUevgoQQmuEMpv5ef8aFguO4MvT8wpwb Z50evVwqHPb287XnSBLP0sGcUBDSuJrihqgExQZ2KtlVC0FblR2v+OkwIbquYJ950Nuj O6WRwHRfWgRC6wkamrfO8i3QT3uW4u0R9uptDU+22CIxv/GcywdlKswUMnQ78e+lmG3j 7ECKJavyavumSVSqkwlTnsUYkUZJzg+YrZV4xlfk0n/q3jX9cF3a+CtTFQCdW7iooWst JQ1Q== X-Gm-Message-State: ACrzQf1V7j6pqTOERcAGcZgZDWniuoAfxaTJQnl43T3a098yBaIQzJzt 34WpEirlplKU7Fguge/q4LQE478wQ1Q= X-Received: by 2002:a17:902:ecd2:b0:178:3b53:ec0d with SMTP id a18-20020a170902ecd200b001783b53ec0dmr4696178plh.167.1664474943384; Thu, 29 Sep 2022 11:09:03 -0700 (PDT) Received: from localhost.localdomain (S0106bc4dfba470f3.vc.shawcable.net. [174.7.244.175]) by smtp.gmail.com with ESMTPSA id i2-20020a17090332c200b0016f8e8032c4sm185689plr.129.2022.09.29.11.09.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 11:09:02 -0700 (PDT) From: mindmark@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Sep 2022 11:08:40 -0700 Message-Id: <20220929180841.614-4-mindmark@gmail.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20220929180841.614-1-mindmark@gmail.com> References: <20220929180841.614-1-mindmark@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: r3hYuuBv4Nex 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; } }