From patchwork Wed Nov 23 19:35:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 39397 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4022960pzb; Wed, 23 Nov 2022 11:36:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf6zRIjOfQtWjqVI4Je7p+5/4IhThkr399wqxBZtgi/zEoW7f1ZZCW8zbxJbJOGcCX6kQ/Lw X-Received: by 2002:a17:906:7f07:b0:7ad:b216:f1ce with SMTP id d7-20020a1709067f0700b007adb216f1cemr24789092ejr.419.1669232196575; Wed, 23 Nov 2022 11:36:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669232196; cv=none; d=google.com; s=arc-20160816; b=yxkT5VXpLms3LWydxOAav7B+qMk/bSoRjQMAnJ/0wKj09XVnLWAHKrSdpPyTtz7UwN Wo/S20vYiUo6rCkbi09ofCYxuWfk9E4VKWggAC3n5BTT2yXffSxcqvQb+sFM4ZZ0AKSW VDXopDWNOHstkuszNP1d/qKyTulEgz5PBdK4kTTV/fknjWxFiNjy3+fD8YWUibVoSax3 gkD5/Bzf2iQb7W0GlHQJnzZ0u7pHyqIW/9J4atlQ3x3CyYzkwMuZDFp9KHYEGiUZiwFV Ipzg9tLnzSocPmsuRy2QvvU+J1i5JBfxdWITtlNnwfwxEFMK0bOWadYgmDJsRP1hgFXY dggA== 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=t4/njwzgATT9SkAmcrad3f1Xi/tFTfshzNMUKmROl+IhttZkx+hiRRIrydg76wnBPO XtYW8vZ5UV3SDm1chGh39RnHYxK0s/09R+F4jkX5WUP6xDkjKAAPePDSQhRdXoCYd7qW eJcxgjC9jJ8rSynMwUvEN5DYNyHltno20pxJ2n8uoxAjSNhRYyj/rRhR8mNzuu0FwBYH pr6Xv6dhrPrDmlG0Dt8IDmdplzuyNIaocwjvvwZnl6jiVFgzunyjF0d7FbsPI3DIVnpT YTIThJpmdXz3lOOqbozrxVcrmu5qbxPoio7SIuHEkzZXsRdQxfJWmDtLqPr2fBB5cKeH btMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="YVGg0U//"; 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 ia28-20020a170907a07c00b007940226fd21si12952914ejc.903.2022.11.23.11.36.36; Wed, 23 Nov 2022 11:36:36 -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=@gmail.com header.s=20210112 header.b="YVGg0U//"; 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 0BB2E68B7D5; Wed, 23 Nov 2022 21:36:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1CC968980E for ; Wed, 23 Nov 2022 21:36:04 +0200 (EET) Received: by mail-pl1-f174.google.com with SMTP id io19so17541091plb.8 for ; Wed, 23 Nov 2022 11:36:04 -0800 (PST) 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=YVGg0U//M0x3WEEIytKyj5gqdDY/Zho7NHsab+pFfPlGy1yzv6zwV6moI1q4Y4OPPW vG6BA8JL7D/EJ+xZKAwTxslpu5AvpyyjNqhRWp+Os/K4WWSGfUuXtmX9ElD13Ay7DH3Y 9+Gdk3mUhwEWkUQ9eJiw358iK2iPLTRat0U6gaCd7rLzM4dIVSSUmBQ49Mj3ziBeVex7 hAcsqo/oFm+NoIIjKPvsznJyDhWv4KNyuWKvC4hQH0lexP/Z4QTOrdwzaIsg68QiB7hR 9usWe8393ZbzdH0qhCAFC81gvDAtwL0IUE5uVFi+GKM4QBHGr9o9CffkT+3yJUA+I9ot jXqQ== 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=LRMZBuLfd3IVBDCqXXqKTcWkIVx1QSpmB0ltSbWBzhJqyv6XVzSULbEA2V7q9KVt0c m1/wX9WpcJLPVeFm2Ez5qbWang1CqSWyBD0J2P22dE79DEdshGiwg5I3PSJQ/g4+kMxQ B8S/c7Ff4BQpXdcx6gGai5ZzPzyN0dXRmXksouZFA7ibLu/1/u4Am6Y/oHLNfFG7ElMb qrhkD/DxfUIYnjsbNibZhaEWeplUZtxQ1f7g38ZjByz4tDrUVh1ITq96wzCVYMA0D0pw JjveHfMbTzo0dgNpDR6HElYqXU6VLPNuaRyJ134H29ik4SorA2CyQIDLUiMo/zs5UpIQ xtCA== X-Gm-Message-State: ANoB5pmp6TSInmRFsgB59I1gwFk2fk1cSIe+NpXUQ3IlTHypTpFvWPnt RnMcGj7F7oNThtziZjy9TIg3Firde+Y= X-Received: by 2002:a17:902:ec01:b0:186:a27d:8e81 with SMTP id l1-20020a170902ec0100b00186a27d8e81mr23116707pld.133.1669232162946; Wed, 23 Nov 2022 11:36:02 -0800 (PST) Received: from localhost.localdomain (S0106bc4dfba470f3.vc.shawcable.net. [174.7.244.175]) by smtp.gmail.com with ESMTPSA id a8-20020a63d408000000b00460fbe0d75esm11319276pgh.31.2022.11.23.11.36.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Nov 2022 11:36:02 -0800 (PST) From: mindmark@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Nov 2022 11:35:39 -0800 Message-Id: <20221123193540.741-4-mindmark@gmail.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20221123193540.741-1-mindmark@gmail.com> References: <20221123193540.741-1-mindmark@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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: Fv/0Pxj6tMt+ 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; } }