From patchwork Mon Nov 21 22:11:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 39379 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2560436pzb; Mon, 21 Nov 2022 14:12:52 -0800 (PST) X-Google-Smtp-Source: AA0mqf7OsltowRJT82RfJUfnQsLHFA7ySmtUCO8c/4PK3D5bla/z/OQITC7VDPhgq/h06hAQiYxt X-Received: by 2002:aa7:cb8d:0:b0:467:bc1f:ca16 with SMTP id r13-20020aa7cb8d000000b00467bc1fca16mr18724498edt.269.1669068771921; Mon, 21 Nov 2022 14:12:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669068771; cv=none; d=google.com; s=arc-20160816; b=VDbLfLAxW5LOlZIZv/HUB6AznEwu12LeZNM5VYWgyakmZBSaXe8b61/rtBnAPKwX6C v2GUMGwkeU6ZQjM38RfDFATBY1SMZ/lcNjImfEL+9Uu4MRQgsIvHMzE4cuZozhACVtRx 2DarS0J1uMvseIvnJEtvhT1Xity+36mxCzfVPrTceHskIiWwgkGyKYap8zDKeaPUyWrg gHVFlN8L1p7FIZHMSu+Y5eXirfu5lJfSbjhSylBCGJIV72e/XFYooNmJlVoeQJbkuvJu OwZbqPoozMg7/f406POCwKs2Nr7v+PXplykcKkX3K/L28rRcVP0mkKvX+efOl9KY+aSD UuYg== 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=nBCp1ga2OaTngt670uS5L/8RLKlYcVbLYt0EeDWNfKGHMfcxnTwCTyWG7vbZMbVO3y 9xLhZiuKcPXRMXoiPi1ufMcTI2fhFXA7mq4RhvHePUemdQcxklxl9Oz1+ZHTx4T+NZKU 2yFjIQJrv99cSWVhnrEx3ld/Ptbyy5+dpZfceVjoAgMEhpXarbdX+OzUaiZwM6DlNQX6 qwBxTyJtdLCtRTo9QjUNXTh9WwfrPy51rxGyExZR1IjybOHPu+Josp7EoflNxZwT63ls PThL2wxqhVn/hcEUs/jIMSrtHT2DSJ4CchCC6HFvn5V0cvjEMV/Aye4fZCmQ8XQF0Pgr PdBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=GajLJiXY; 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 sd9-20020a1709076e0900b007826e727aeasi11329621ejc.44.2022.11.21.14.12.51; Mon, 21 Nov 2022 14:12:51 -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=GajLJiXY; 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 972B568BA8D; Tue, 22 Nov 2022 00:12:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CFEE68BA14 for ; Tue, 22 Nov 2022 00:12:21 +0200 (EET) Received: by mail-pj1-f41.google.com with SMTP id a22-20020a17090a6d9600b0021896eb5554so6555130pjk.1 for ; Mon, 21 Nov 2022 14:12:21 -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=GajLJiXY6czn7Yqqz7Xuc4lM1TTtIuJCNmZ9rT2eyWeZdEYDUXztoCdPc6IEd5Zmfn 9t06X3nKEOApVg+3m0QamV0x3f2i7ArsStzx7anVjrPdtpJYilNQ1p04TfRWbpImJqpa QRaMCbiF+5gUHvpmfp0TqmkRvUJLO/zZ/ofGiq7dF5UQRsef7L/zKAedtwzwpJvHSK7r Xk+2vB8GP/6WdzqlIivdgKZ5Ai5wXuNHbNjk5dUd+5yb7lnz2q03LN/fC/RKdfsefOcD p3ydAjchZ/zA8tuhrvruRuHNdeTYbAbAQDwBVWQb0cJFyi5B6bpoaP49jqkqor/HWNEE +Mzw== 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=69YmblHN+dRxoHtDiAl71xcR4SH16lngu5qblGNZHLzpZb8UBk5eC6X2t9JBA5SV1C eJ3Bw9tl4We+GNmV0ZVB4DEFhvXKj8mXTAF4ttFj4SMYGpgmJ7Wz91XfRWo5qp99mHVN kUtuiJz6KAOBBIaovc8OJWE+3fUP+uacKyq1Iq7nBsxKQjeimh1cOF4Udf/v8u4+fauy wiszLTh6dAoSBOQG5eKm3cIaC9jRen4n1T9NYTvm3ewuhfGInJFsmdFU36FboON0Tj9F CgoVR7K3CrPY5ef0gX7BBM4voyImeigCjnTXbBGtnPZmHE5VX06rKi2V/1p1S9RL2hfn 6WpQ== X-Gm-Message-State: ANoB5plufLFmK+LCrXS5tV09eVo1UCi/0ARAOnwk74F+4CzyZE9MoJWZ BoLYxAANYSSqUTQKYcd32A2uw10A3Uw= X-Received: by 2002:a17:902:e849:b0:17a:aca0:e295 with SMTP id t9-20020a170902e84900b0017aaca0e295mr13993233plg.3.1669068739425; Mon, 21 Nov 2022 14:12:19 -0800 (PST) Received: from localhost.localdomain (S0106bc4dfba470f3.vc.shawcable.net. [174.7.244.175]) by smtp.gmail.com with ESMTPSA id b8-20020aa78ec8000000b0056b8b17f914sm9111095pfr.216.2022.11.21.14.12.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Nov 2022 14:12:18 -0800 (PST) From: mindmark@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Nov 2022 14:11:45 -0800 Message-Id: <20221121221146.426-4-mindmark@gmail.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20221121221146.426-1-mindmark@gmail.com> References: <20221121221146.426-1-mindmark@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: 0DEXdZpjFGFn 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; } }