From patchwork Sat Sep 10 01:07:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37815 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1245459pzh; Fri, 9 Sep 2022 18:08:17 -0700 (PDT) X-Google-Smtp-Source: AA6agR5cFXQSIRFNf7GAW4GAobr+2d3yLxA6bV9hso+agqu6RTwIL3VV6GU22/hagIPopCscy7TE X-Received: by 2002:a17:907:2d23:b0:770:86f3:aafe with SMTP id gs35-20020a1709072d2300b0077086f3aafemr10772530ejc.400.1662772096996; Fri, 09 Sep 2022 18:08:16 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k20-20020a170906579400b007771bc8dbb4si1526667ejq.781.2022.09.09.18.08.16; Fri, 09 Sep 2022 18:08:16 -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=@outlook.com header.s=selector1 header.b=d7O9rUme; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CA5D368BB1D; Sat, 10 Sep 2022 04:08:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2089.outbound.protection.outlook.com [40.92.89.89]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFB2B68BAA4 for ; Sat, 10 Sep 2022 04:07:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l6aOlV/6wy8SfLaorPfEjm9RJrNYmOxveV2SlLIIS2nZDFrxteDaNkSifns1GotDq4G77+7dwEjSkLwKaD7psmYr0qlCp0QF8SqLQ2ED51PpU1ceVH8pJ/f+Ad/R4G4h+9lkA23v4I1PxfSJAc+B/p/rGfxR0HvbT1ZAQgeUb2I2kwycXK+HIKAmDvSNXDu8SKAsRaYQsZ1DdtDsJMoRo55XNeehLyJZpMM9eTr0jc8ZmWc35ieQJdlbWiiyIJtAgFE+0sEdFX6pKh9k4Skt69x7P/uzCgVe4c7riRb6VY2Z/cp9LKQPSbfjjzZ/RiRTnnLc9mnYCYfGL475G/w3lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sKC8Pfrvv0HuGOBKGIRBQDx1k5/YXH13+8GemEXPfD0=; b=GJaAfLTJB4CWZQu7yhVs5LF3U8OBsx/ixUXZjEa5/XASzE5W3EEM7Jl3w/jisYSMt91pwiB2VUCmVWtxxjizEyB/msdT8YNph6rdLVomTQ0jFm0mutFSrqhU+vlaXStu6kqRJuGxZ6qNLYJdiOmjCfaxtJxrI1kWsVLj0z1JkgNuAubaTBFb6qlN3mPDMk4pO8za/0o8FECDOf24ilb/TtNonnx/6V7LiPBCFbozByQ5qUSeacmk78Jau/2b5GWQEwlPRcC+bY/Q+zgZHe4tLvEpEOsv6ND+rWqA2JRaKFcmHiAiWBldT5RxUAMm5179SJVVnrt4s7RiKrgMyuVY1A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sKC8Pfrvv0HuGOBKGIRBQDx1k5/YXH13+8GemEXPfD0=; b=d7O9rUmeJ6MALje3+EaXeULbmQs1Tm87R9i4D+GBmAVuN/jy++GlqRZB85OtyWh+pn7teuaiWp67xx+MRefbHHiYgMHMLh0/4HASu6va29BIRfbsFlIr/S4NqFLUv77pCrbqJOgUofMtfzAxI50tmOz+iIfqrDJhd+QRAbdW3PZEyEIIS6xdAROKCd2B/QnCNMXmpFKinxzbQRExnWE2vy2IOEmoDQN1uHqN4/2jLp+oEBLi/DOzpKAVcG5/j7WfwG7lg/gPODtz06XtTOo27EoBK4ElFnUp7eF929PwrE1KrzRr9FPnyxxZyz0VnAvBXp2zYZUjF+DLRTZg8RTfMw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0242.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Sat, 10 Sep 2022 01:07:52 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::611e:1608:45cb:b58a]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::611e:1608:45cb:b58a%4]) with mapi id 15.20.5612.019; Sat, 10 Sep 2022 01:07:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Sep 2022 03:07:16 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [6/a5psH+gAOXQrrw2O3Kn6taN9lDv7i2nFfyUoY/naQ=] X-ClientProxiedBy: FR0P281CA0102.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220910010729.2961339-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0242:EE_ X-MS-Office365-Filtering-Correlation-Id: c4322bf1-58b9-4d00-8698-08da92c8e2df X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmqc989vEjNQgjm661f4SJJ4poxq2B1EyBcOsVAtB8gLUbXGNNmWejVxxZp3UIulfCybHiYBRByNf/bgS4z1uwlt4ec8p1O8oDcz5JH/RkjiTOiKinEvz74Peo6jaAVIE2tnmo1GUwvSuBkmoSTXKD2iHJOwxCCz+UFy81kcFSzujaIq37dirTWLXRswnKuM/QryZSpfFWUEwD37EeLGMdOrDBKVkEGlvcN53GOuIkqeZW8phcSAn2g5SIllLCn6g2UJfeJ7s7c8+krLAM6kQqUw1rNXm99em5qxEdXly1/Zj1zvM20I/itbxR4h1rnw5xhk5dfCLlM7tdM2IA37n4+40/i8NGnnysIdMcf5lN8NLC32HhG6XL54FdFmeGOofflWI++yET6ADZhyPWJatBmHkkAZXs+RylMuEH1L7Mov7TxjHcYp8H6RNP+nfB4hmiQWMFS9Gsxcn9KMY+sRAahRbs2IU6qaHmdNCpS+xNzduW7K8z79XgTXwsqrYNL0Ce+NmcCrSqc3hTv4CRtevFjph2VVs2QmEus4fkjcoGgXADQPWxrYYp6qKBT3O4zbvH66zJ9vwlDPFbzOndZ6VK9x5F+LOEUCZuNiIW5fYSspuzDrkVTZxmDocxuq2zSAKbKiBvmpbuGAAX3BUVzmmQ2fZ4vxJYVcaWxdhj9sZlfTWnoIs2cD8IlF+ZMh6fHqRqZXGJ510N3s2Ib7HM+k6w35N78g6qgFvy00gKgryEHkKDJzgP7EHSP/rj9kyvqisY4= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gdmkqo6lzK2B+GXesC1AzA5+Brx4jE68akmFzf/Hrk6y4ObyslfZJLqGBp/zmokb0Te2QzHiVCLZF938U7g7/uQyOVtt8lQu8XAPfa8eGXh7oxVN9AwVEDSpXco/T2pNpec519TNTu5/P4GxkQ0uLxm0e+qq+nCEKjPJ0xrZ+cGgUZy+NZSKAMIvFJaxrXNpjQhgVwLu1YhBDw/RAUJcspHNcHhmic5+XZgSIG9/a4c8Pb8iuZ2/2aMZPxCHbNe6ZGUZDgepuQQkXVPP9BjfOBl1qw2/cKkyDctb/6MsHSUUrHZgJcK5wFWUuq9BUZpYGcJALec2R99pjZkhcjHXmlDey+d5+1MlWCyAE689aI8SDshTttzkZPJM4QJq3tgG5hJu/IqAzKtNLW5N170QPkya5hE7RYLyAQdH1abbcFgohqimzN5BMFpfEHa6XyZ6BuuPYZOWxYWOnZe8Cb/RVvm7SO9ab59fzqoRAZFvWXOSmU0qna5vr1o5ODmyX6r8JvwT5bO/kCpYn7YEvap/ks+8/WMjBdF+XmOMIRJkK1Y7inkkopJ2bja2E2DMphrfaicHuXRDXDut0ngkxeY/Zi0bhsSsuG059btZIMmZ8WccUldEiSSkL8b3A006wQWX91JS55o7d0u6Wpakx/MPaA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NrOk1m1JHmxzTao/Yl87DqrEX8dnnGgjjZ86/Eyscj8KQgxvrulYqr8/XdduW06XfglbebehLmaL6upHaICyOD2Fi+DBN5LIcbQ3tapq9YULxOGqFcsBCXFv0JR8YCLHBKCcDsaCNkoC8D5dfQ++x990HKGfzYEzQO2m3WXmscaK1elkP7//FAre6d6dJNDXDu81TJQqaJN54sSBRsb5ybdwSWbc4yGX8opshzZVQ43O2UFEyxGM7Gpmiuy6RbP5ubIh+Syk/mdE4orYff5tVayB5FPNwvdO4EcB5L+xd83yQDjFlEgiiAoLDVtOMSwg5gQA1vTPOuSpA1mfbYNEPbMI0OhKycmqBaJXF5lFH12/v/0fRxiiwvveRRSJ+DlGbCFJBZkL888knXROoXklAdDL+InLzVQ/moQoI3r3zFASawsVPXOQvdjqeVY3bkye90cykNFATSPcAT79FbUVv/yJtkxFJV8we8rsSfIWrr+RdUwQKEZ3MKehoSaiuGHn/an2NkGufn5hkLSpJb2wF3mApSmYZBwuvELSZxQlzcaRWAL8zZ04XWk6Pxj2JXW3a9HU29uqiECMQ8OLivvjXH+Fe3NllRZVUW39EP5o7ABaO80sEsGvJ+53MWlK6kkF5bTBmu5WWqWWByT2jOSDcVnnUzoMrYCokUFGxO+3w5B+zkPhEIizywgbQviopIdA91lB8olkMLci5LwZ2pfrikVwr8FOSW27w9Lx2L/l39AfKp0zEyM3jVkUcU4KjrbVX0UI4Wx7tZVfFnVq5NRg7cQjaL70KuWci0DZoxj5ej/1BWebgMaZMTDAqB1YaWcPEwVUqP33fS6jNC0RcJ7JgTuX9dqibdqLm6qLkMwsMsk0DR7tXoXvZBwZ9BS4zh+OI5USaQOPU7JGBu+AZKKDO/k2bAiUdsWteEwdW5vskQSLo0ZbkHqR+qOeSL69qGctL7uY7o32bgy1U2gP/fTIU/vvIshwywOCp7IYWTkIYVa1AaI4tteIT3Na6rhMveU5EyqLGfu3QR36d+a8Tl8rsf9ymtE0ew4OfUuQmIQz6KY92HQN44N2R9tz2bxgRSIm0zyqQc5F9qOZwujaT4UCn8k0fZROXAeOYfdCOMbGhNhY3QT/YlY2h6bth4pPRI21VYKSvJ+Cn0AZ/IfNvaTIOuuPT3vV6C+RvWun6PjYUhDV0weuaLEna/Gvs4QnuuDDB6DVHTSMEQDkGDBYEi/626BixxRmxfMUGvBDIrO34FPuv5dp4Hxb7ZyLXE+NawXRb8Fg/1z1nq5i3BJpYqmTprXrb/eWPm4JaE1gzFzJfU+8WCjY3c+61K64DIf4xmMK X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4322bf1-58b9-4d00-8698-08da92c8e2df X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2022 01:07:52.5479 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P250MB0242 Subject: [FFmpeg-devel] [PATCH 05/18] avcodec/vp8: Inline inner_filter for VP7 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: JBL7QrTH3CFb It is always true for VP7. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp8.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 635e45f87e..35d75170f1 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2223,7 +2223,7 @@ void filter_mb(VP8Context *s, uint8_t *dst[3], VP8FilterStrength *f, } #define H_LOOP_FILTER_16Y_INNER(cond) \ - if (cond && inner_filter) { \ + if (cond && (is_vp7 || inner_filter)) { \ s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0] + 4, linesize, \ bedge_lim_y, inner_limit, \ hev_thresh); \ @@ -2247,7 +2247,7 @@ void filter_mb(VP8Context *s, uint8_t *dst[3], VP8FilterStrength *f, mbedge_lim, inner_limit, hev_thresh); } - if (inner_filter) { + if (is_vp7 || inner_filter) { s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0] + 4 * linesize, linesize, bedge_lim_y, inner_limit, hev_thresh); @@ -2268,7 +2268,7 @@ void filter_mb(VP8Context *s, uint8_t *dst[3], VP8FilterStrength *f, static av_always_inline void filter_mb_simple(VP8Context *s, uint8_t *dst, VP8FilterStrength *f, - int mb_x, int mb_y) + int mb_x, int mb_y, int is_vp7) { int mbedge_lim, bedge_lim; int filter_level = f->filter_level; @@ -2284,7 +2284,7 @@ void filter_mb_simple(VP8Context *s, uint8_t *dst, VP8FilterStrength *f, if (mb_x) s->vp8dsp.vp8_h_loop_filter_simple(dst, linesize, mbedge_lim); - if (inner_filter) { + if (is_vp7 || inner_filter) { s->vp8dsp.vp8_h_loop_filter_simple(dst + 4, linesize, bedge_lim); s->vp8dsp.vp8_h_loop_filter_simple(dst + 8, linesize, bedge_lim); s->vp8dsp.vp8_h_loop_filter_simple(dst + 12, linesize, bedge_lim); @@ -2292,7 +2292,7 @@ void filter_mb_simple(VP8Context *s, uint8_t *dst, VP8FilterStrength *f, if (mb_y) s->vp8dsp.vp8_v_loop_filter_simple(dst, linesize, mbedge_lim); - if (inner_filter) { + if (is_vp7 || inner_filter) { s->vp8dsp.vp8_v_loop_filter_simple(dst + 4 * linesize, linesize, bedge_lim); s->vp8dsp.vp8_v_loop_filter_simple(dst + 8 * linesize, linesize, bedge_lim); s->vp8dsp.vp8_v_loop_filter_simple(dst + 12 * linesize, linesize, bedge_lim); @@ -2577,7 +2577,7 @@ static av_always_inline void filter_mb_row(AVCodecContext *avctx, void *tdata, } if (s->filter.simple) - filter_mb_simple(s, dst[0], f, mb_x, mb_y); + filter_mb_simple(s, dst[0], f, mb_x, mb_y, is_vp7); else filter_mb(s, dst, f, mb_x, mb_y, is_vp7); dst[0] += 16;