From patchwork Thu Nov 3 04:00:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 39126 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp277892pzb; Wed, 2 Nov 2022 21:01:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7XyOsy+uL/0vOS2mq8YSwe5VwRlX80UYozCH+q0+8vQstB9YlSuVh+FTeluEyAUYrb/iQF X-Received: by 2002:a17:907:97d6:b0:7ad:b962:33e8 with SMTP id js22-20020a17090797d600b007adb96233e8mr25046254ejc.27.1667448066526; Wed, 02 Nov 2022 21:01:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667448066; cv=none; d=google.com; s=arc-20160816; b=KRMliQxGYbpAq/JemnzslPqkesYA2JS5l0eByzaMiEMdVjm+Z432HA7+8f2Hqx/tis QzPnDO7NpGjf7ETWSexQletHRlaUQRMY3cv8zQaNFeIBVlfVNQmuuX3HU3Qua8MjGsOL oM0DmVjL9F8j9/1/EfCMikT4W9opYbAXLwlEm2ixqTpIrq2kxcfcTumwRJoZs0xMdktK nSndLOW/Xx4/39uE/SvKab+Sn7u+xUPTOfcNIswZdPSNS24LFrxSakgXvzhK3raxnCmX e4bcDGtm93YF4q9WHHVBwQDyof9Y6TcJf+hD0G+UCPdqFYMdYJV5vS74ZlcbGB4lxAQ9 UeKg== 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=0jyiXQxkYU4nkZGyMF4PjtyWmNrDE/9Jnf2ZHktd/bhbYRm2SVARMgg8ymeAu+ZFlG BkbXzRolT9RVratw1Dkksa9YN8TYUWih8oTg9zxTacWAvaDzjXxxFwbnl7eu7M/Ec3Bt ZBef6WrOBEewu227/kwOdaXdWeTYPJ7UQJ71faS0qXo3l4jEg0hU/JfbN0b/rIIhL0qx zDvr4YFv2qkCynSXkxhyDJP+4rM8ZCFMH/4O9OVwHhkb+KRM7uZKAqQlMFiEA7SC77fw gIKpYEJ6lKJg+mMeawcMWmTL6pAXnRHIHVkCGeWD8sMgUCKhwYdKzbEbsSNBnqYK3otu tKMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=RF8uVoUc; 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 g2-20020a17090670c200b0078ddff4b3absi13253275ejk.423.2022.11.02.21.01.04; Wed, 02 Nov 2022 21:01:06 -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=RF8uVoUc; 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 0112768BE9A; Thu, 3 Nov 2022 06:00:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE5D368BE9A for ; Thu, 3 Nov 2022 06:00:30 +0200 (EET) Received: by mail-pg1-f181.google.com with SMTP id h193so597824pgc.10 for ; Wed, 02 Nov 2022 21:00:30 -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=RF8uVoUcnxiPlu1SS7n8fBO8Sld0YFZ8OwE+IbzzXRYCoD/HhfcEuRO/WJn66ALByy QdWMbZhGwFcBB8Lvjl8hEvHXm0RwZzP+Vja3JIGrTnMCJT37kHffEpUnBRMT9m8bgGAS p6t6XHWpYyx6ll9vUaJX484YpAb4BBAAwkT0/yJcy25yF+fkJ1KT8tAjQ01ZlMaxNurT AHzu3x+v0NMyz99M73e8ZYuEFG2sySu05/F8xfDHej1gnaEcfdbWlrpzwsOLMZPBMcY3 Ym10EYAk5tvOHbF5yJpL1XOw0jk3A8ulVYzt5XAyOhksP4wSLDT/9iUqeuI9RNkfu02c lt/A== 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=fcQz8mFcJXpp5LVXGappPcwnx4XdEbeWtE9+PotjJMJfoGymDX4DSxJ4jrDpp5CkkL kBlfiWJFHRZXAMuFoSKalLj0/l8VQ1RJkQtmeB+F9jWU/W65Ux7jNhztaCGP8B5TsJDk GToNqa3anbh7pWUM1iquPwVb0RKMTOU/q9TpnvY/+0NTpx+ecE8afPtbpB4IOt9dR7sF 2v3IzCPffjaKTxNfQQuBGqjsrtDNe4x9/8i44wgDaggZNV/j0u7ZlWLHj4TgFIjRm48j 2fOTI1/IL7GtZwvlvNLUJi1yZRN7PbMGsSEyUQQHilsekI1NnEo3cdTA9z/apMA34ksw +21Q== X-Gm-Message-State: ACrzQf3mPqyfAfCZMWvVtKXHvrL/UoyBBiPsnd511pF1DpCWrnHyTqde 1LKsGAY3FxG9KuT9lPdDt29xzEY6ZvI= X-Received: by 2002:a05:6a00:acb:b0:555:ac02:433e with SMTP id c11-20020a056a000acb00b00555ac02433emr28442789pfl.3.1667448028169; Wed, 02 Nov 2022 21:00:28 -0700 (PDT) Received: from localhost.localdomain (S0106bc4dfba470f3.vc.shawcable.net. [174.7.244.175]) by smtp.gmail.com with ESMTPSA id h18-20020aa79f52000000b00561b455267fsm9207960pfr.27.2022.11.02.21.00.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Nov 2022 21:00:26 -0700 (PDT) From: mindmark@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Nov 2022 21:00:09 -0700 Message-Id: <20221103040010.1134-4-mindmark@gmail.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20221103040010.1134-1-mindmark@gmail.com> References: <20221103040010.1134-1-mindmark@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: +dmWWlPBRHYz 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; } }