From patchwork Thu Mar 16 14:44:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40699 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp4366821pzb; Thu, 16 Mar 2023 07:45:14 -0700 (PDT) X-Google-Smtp-Source: AK7set/xKhwjyn07xMVLph9RCbRQuN0vylTK9VLmPA00n3F67pbiTNNt5f+dHVggSbAfHl7Mutwe X-Received: by 2002:a17:906:1355:b0:930:e53e:759b with SMTP id x21-20020a170906135500b00930e53e759bmr1221290ejb.11.1678977913922; Thu, 16 Mar 2023 07:45:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678977913; cv=none; d=google.com; s=arc-20160816; b=ntWnOxlZdA001EStbtGOHTCRZABgVv07v37PuYtWHPTrqfTzCwh7Qxnel/hvAsgg5o g+I4tXyh7lKJFDDu9kT+mRYacyKOLY5vnFITW0GDDMsaRl26lAWyDQq1HWenzaIsAkxS 4bdpNG84POp1V21fAdtZ3CwHPFJXhDc9cOORTtIM23WG7PJdVrrg4ObZW5T37tFTerqJ zJLCRp/+zAzUl4c60mn49/d5DgdlTcg7l6RXU9IkHE3KXzoxXuJZF78/Ya2PLhtUPvCZ gWTUW+EDU/DgjTc8h4eEGWKsoIIZ/+ifQZ5uwV4qoSOwWbL0BvpqkvBGS4iyIjn7NtfH VppQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=pSmWWnWvhngJCfSC59M+ZVTWzAXXq7ktALTqJpjz52I=; b=kctNHmmu0lJ6tmcyQ0QrzoAK7IAIEqbhS53AsFrKwfpK/MDOPhzy9P6y/gsZ7dUfjk 77gZxXju6ObWoBYx2agJomFIlBfKTgZ879x+z0C0jud1bjsNsl7PvOTBc1EN7JttnkSB DFYUFxdf18zEpb/wqIcsOvQW5A8Ek2Iv0PESYS6wBun5Fu+iuWNvjxmCgDjKe497LULw 2MdK+R5mFtfqFq5EuET5aa1tyBaFeOZzWIS3tCFX6I0jP9qhTpjcAHzPovqNKwpwnLMm /X/izDJntgG1c4LPq2gBF7l7PpjbPNg0sNgtMbviAZmt2/Xe1Mw59Vule6QSOk7qffJ4 8BXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ZpZGJrSf; 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 sc10-20020a1709078a0a00b00930af710ea9si2001885ejc.664.2023.03.16.07.45.12; Thu, 16 Mar 2023 07:45:13 -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=ZpZGJrSf; 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 8DAEE68BF1E; Thu, 16 Mar 2023 16:45:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4903468BBA2 for ; Thu, 16 Mar 2023 16:45:03 +0200 (EET) Received: by mail-ot1-f53.google.com with SMTP id f19-20020a9d5f13000000b00693ce5a2f3eso1088091oti.8 for ; Thu, 16 Mar 2023 07:45:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678977901; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=udTmCuIKEwy8Wdhew8h/pZhgTVd3BW157BpdOWum2bA=; b=ZpZGJrSfIwvZf8+7tu4FYw2Q27YJzh92kZ+7oP4u/bT2QwT17497+VKF/OCQKrtK7u VZeAGeBoNadD0b4A/OF250GNlT0/3pN70y039As4FrR0LIMc3F71Ogr/mf2mnqvPMFZh OJEXB7ooPENE9Ji6cmxQ/clseV5k97yNobryP9iYPCEBRyPWLw9HqYxhpd9CaZc+hnAw w3E4sJgBIkSXSsDrAxe5pp/klWLomyx4PxXc+l3P57D+75n3/ENhvnD14BZtsou6tJmV npSM9+ouSBSWecID50UfVPLTdunrEFzqKpqy1QrPdVsDYULMBNF4iVJvwhFa0kK40sJC YLig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678977901; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=udTmCuIKEwy8Wdhew8h/pZhgTVd3BW157BpdOWum2bA=; b=51tcJP540KvkzCRdqNRWkTr4d5402XrcEAQhhL30PmcFTInep2j/6q3nkLqr9UlyK1 HSRrUN9pBmlfh2ElKpC6BUhZY9/hi2BFantWDgpMSVmc97/m/PEQGirw1m+tMu8leFya aevHSL4j+NeC/7JqFjaAM4MkcGpN1YSZOJ7JiNKyEVd4vL2TQBKdCBY1dgWtd9fLXss0 aQc0mIusG/6YO/58GPMafX9r+/8vVG2zKVeFqPPKvHiP4jrK7ZXV6Gqq4EzIVbHLDrpd ANx4AiRsjqRMJCFLTsvmDAlDn/UjiWWGKhVq6BzSENhPxoY381Wr9oanRatAN2r0rZBZ RgJw== X-Gm-Message-State: AO0yUKX6eommcJY/Qc4g7BI4VsZhTsu2zXTAmv701n4sL2bxzunc1b47 AReQXWEpjSrtl3yOiCl/sVQIoK57fgQ= X-Received: by 2002:a9d:1ac:0:b0:698:ee0a:d42c with SMTP id e41-20020a9d01ac000000b00698ee0ad42cmr4031812ote.5.1678977901147; Thu, 16 Mar 2023 07:45:01 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id n5-20020a4a8485000000b005252d376caesm3387888oog.22.2023.03.16.07.44.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 07:45:00 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Mar 2023 11:44:16 -0300 Message-Id: <20230316144417.3634-1-jamrial@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avfilter/vf_untile: swap the chroma shift values used for plane offsets 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: u1aKDvh8MG9A Fixes ticket #10265 Signed-off-by: James Almer --- libavfilter/vf_untile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_untile.c b/libavfilter/vf_untile.c index 5d7709d68c..c8dafd1e60 100644 --- a/libavfilter/vf_untile.c +++ b/libavfilter/vf_untile.c @@ -134,8 +134,8 @@ static int activate(AVFilterContext *ctx) if (!(s->desc->flags & AV_PIX_FMT_FLAG_PAL)) { for (i = 1; i < 3; i ++) { if (out->data[i]) { - out->data[i] += (y >> s->desc->log2_chroma_w) * out->linesize[i]; - out->data[i] += (x >> s->desc->log2_chroma_h) * s->max_step[i]; + out->data[i] += (y >> s->desc->log2_chroma_h) * out->linesize[i]; + out->data[i] += (x >> s->desc->log2_chroma_w) * s->max_step[i]; } } } From patchwork Thu Mar 16 14:44:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40700 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp4366911pzb; Thu, 16 Mar 2023 07:45:23 -0700 (PDT) X-Google-Smtp-Source: AK7set/MN4cbJAuEctW8HdCESk+gfR4JcrGxgWVESzzB/F6qikvNHOrYw/+J5zJ4sRZjMJcm4BLu X-Received: by 2002:aa7:da90:0:b0:4ad:1e35:771f with SMTP id q16-20020aa7da90000000b004ad1e35771fmr6384647eds.35.1678977922861; Thu, 16 Mar 2023 07:45:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678977922; cv=none; d=google.com; s=arc-20160816; b=eS9VBeBYpLPd8mzW3/CL/iTnIZUU57/XdTglRKPPE6XNEiMntloqv45702Qq6wrKea 9A36kiIhOkMYRq4VoqsvFkQclzaWnfaBlByiDI9ic/21HOxJ/Fn8JqS0uOtUPP8nsZC+ pvyWqipt3NfI5YeCLTPns/+ieGfGIjCS2m55w/1IN00XVEkUXo+itrMK8Vne/gGkeY/2 kN2yiFx2VbauBEVYMAvT3IU46x6X6t4Txwkgi1LyENxjj4Jfb7yTlwy+ZobbykcN55Ck NN4GuAfxbPaj0E2NkJ1ELMCwWPditOH7ZdTaNdCSWjrb6FVNbPoMQ4ZiYp/HeY1OrGuk SB3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=yRgqKjo5jxpgG6mNxIGTYHv09WctWSmrbvEcBlaxSpo=; b=N4x53rjjJPnA2atwXXT84HCC6hqR4csF/6d9JfaFOu2ydDKAocbw1+b1cHdSxHWsRD OWE6G+jGMNwqVwfsnt3rtAi0qU1HbJdtldPYXwsaNUTaK8kPIctN27bq2JeOd9/SVIeY LH14prtfFABiuNBw2epX0TIfMVoCBpNyvMklmj1Qxpub+Q4jNOKThSjo056yfpVEJMtt qL7dnqm35hpUCoTVizuoZBWJE1ggUCqASAQzFzlNe1vFAOi+GC+GQap8Z97RnyFVlQzD pO6jAZKyls93hXbaA2hko8ZTy2wzTZUYZQd6T6ogyOv+qElGqzKt4x5AnfnQeRtJqISk wRAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=B10Y2CqT; 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 h13-20020a50ed8d000000b004faf6a08e25si8453089edr.246.2023.03.16.07.45.22; Thu, 16 Mar 2023 07:45:22 -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=B10Y2CqT; 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 8FB3268BDDD; Thu, 16 Mar 2023 16:45:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f41.google.com (mail-ot1-f41.google.com [209.85.210.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA66968BBA2 for ; Thu, 16 Mar 2023 16:45:03 +0200 (EET) Received: by mail-ot1-f41.google.com with SMTP id t10-20020a9d774a000000b00698d7d8d512so1082885otl.10 for ; Thu, 16 Mar 2023 07:45:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678977902; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=fwPULITYIloLtyXcULg8aetrrIaeWtRGTnBuILQcqDM=; b=B10Y2CqTe9yNqEOZlbTUQwEYtPzHBzfVKLaM9EYRemOeGomihGYwkfGyPQ+D2SApYs r29vBRBgrZCd6zg9YqX1iEivs1V42ZTWUq9yFlG1wjxbQmyj1R7no1pC99nW45wmfGUA OWrYfUwhXtHBsRNSAU8CJxMcPGLV8BPL2npETQo8pBu6hwTQKxlQFDmi4G60BGyxVSBR EywZM++0Uu0MY3SdjE6Ezl4M9zij23/Cv29gvVXXOnWHHphpQAAy6lpo13T0CH1BUF9r v0E0BJFZsBR9iDu/fpqI5w/txdHSUOviwijOL9jN2VUqmdL02ZNdrX65yuAk+7EhRkFt oVjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678977902; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fwPULITYIloLtyXcULg8aetrrIaeWtRGTnBuILQcqDM=; b=Whx0PjguB73mp3Wq7GczD4afFXGT8uNw8eeSC7Je0PUyMnPz1J6sFGDQtEnKhLZzQt /VCwLUUIxp4Y2h/1Zouk2hHpdP32duhh/k7rxUkVl18hLj6IIZrrr7q7UFdot7ePIrIM vejkU6+oC8JUr4mHos78HMBwJAhI5+Wh80gih7qHhKjaU8RDFjepfd0un8PkbXN77gx0 7dLvC70OGSBB4oItniGxpIqq9jZ4ri/XGSJDgh/J+MCXH666lXqHWbKH4vq4OmnRKOWt ebKWmzkkOmIlWfAZWNB8CC5UN+0r5LiWcKAi6oGsnNnX6vM5RNVFk/eeaIVMs1oB6tJM EmCQ== X-Gm-Message-State: AO0yUKXc+z0Be58EziiaQUFc9i03S8g3KqZTmkQyH9mAW16Azj0Q8uDi qYwW1chvrVNxl8u5wlXV/LrlOzKqN44= X-Received: by 2002:a05:6830:3687:b0:68b:dfc9:c41c with SMTP id bk7-20020a056830368700b0068bdfc9c41cmr26283678otb.9.1678977902337; Thu, 16 Mar 2023 07:45:02 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id n5-20020a4a8485000000b005252d376caesm3387888oog.22.2023.03.16.07.45.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 07:45:02 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Mar 2023 11:44:17 -0300 Message-Id: <20230316144417.3634-2-jamrial@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230316144417.3634-1-jamrial@gmail.com> References: <20230316144417.3634-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] fate: add a yuv422p test for the untile filter 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: a6gEEr9X8g1W Signed-off-by: James Almer --- tests/fate/filter-video.mak | 3 +++ tests/ref/fate/filter-untile-yuv422p | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 tests/ref/fate/filter-untile-yuv422p diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 704087b835..444adc6be6 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -314,6 +314,9 @@ FATE_FILTER_VSYNTH-$(call FILTERDEMDEC, TRIM, IMAGE2, PGM) += $(FATE_TRIM) FATE_FILTER-$(call FILTERFRAMECRC, TESTSRC2 UNTILE) += fate-filter-untile fate-filter-untile: CMD = framecrc -lavfi testsrc2=d=1:r=2,untile=2x2 +FATE_FILTER-$(call FILTERFRAMECRC, TESTSRC2 UNTILE) += fate-filter-untile-yuv422p +fate-filter-untile-yuv422p: CMD = framecrc -lavfi testsrc2=d=1:r=2,format=yuv422p,untile=2x2 + FATE_FILTER_VSYNTH_PGMYUV-$(CONFIG_UNSHARP_FILTER) += fate-filter-unsharp fate-filter-unsharp: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf unsharp=11:11:-1.5:11:11:-1.5 diff --git a/tests/ref/fate/filter-untile-yuv422p b/tests/ref/fate/filter-untile-yuv422p new file mode 100644 index 0000000000..b212ccd8ca --- /dev/null +++ b/tests/ref/fate/filter-untile-yuv422p @@ -0,0 +1,13 @@ +#tb 0: 1/8 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 160x120 +#sar 0: 1/1 +0, 0, 0, 1, 38400, 0xaadbf3e0 +0, 1, 1, 1, 38400, 0x02c882d1 +0, 2, 2, 1, 38400, 0xc246dcaa +0, 3, 3, 1, 38400, 0x4503b0df +0, 4, 4, 1, 38400, 0x3ed4a056 +0, 5, 5, 1, 38400, 0x374a85a6 +0, 6, 6, 1, 38400, 0xb03343d6 +0, 7, 7, 1, 38400, 0x188e8b4b