From patchwork Sat Sep 10 01:07:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37816 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1245511pzh; Fri, 9 Sep 2022 18:08:25 -0700 (PDT) X-Google-Smtp-Source: AA6agR7BTi/eGytphGlR/f0LjfLYC1sjLU1sDTwO982X+Se68BcMmxsDhHkmgMnc07L11uV6QfSd X-Received: by 2002:a17:907:7fac:b0:741:4247:d856 with SMTP id qk44-20020a1709077fac00b007414247d856mr11297090ejc.565.1662772105214; Fri, 09 Sep 2022 18:08:25 -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 ds10-20020a170907724a00b00732fa7c5058si1847581ejc.300.2022.09.09.18.08.24; Fri, 09 Sep 2022 18:08:25 -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="Maj/Kzy3"; 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 C984068BB24; Sat, 10 Sep 2022 04:08:01 +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 2059768BAA4 for ; Sat, 10 Sep 2022 04:07:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RjcqcVEJnGD4Vf7SHCpJwoITOqLlwFC30BdGI1rmLqyPY1iuDVKSJwLelJKnoeMoiHY6Ml5XZYeCs3XdBpibUm7RpCE7shBeslCiwmjjJFKbE0BUINvJPTSvETjIiA1sqKNYEBOycCMB/Z06RS+6ilbGaJQlBogQwIitDd47AwYbGI/N6Z05MwsqtGJWXWuf2VsJZtA9XSxO6tacXdgmbebQrJHyls9fAe5Ek5UhXvNLyoaoT6bPEURT2gXoIMBFBnj0iW+yCRHFSinDisJ0DY0auaBvjCFgGDoUS9Up5Vj18PoUetcCWDklCmLPcPgJVkqJQ6+06N9DE+zzHbZ3gA== 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=dlhNeFiaSFhbQRyySt8qRC9pwofPVlC8I+joz+3+FHE=; b=eXTAzl08Grp35mpQbgj7HI6RylYgEVAnlAyj2YqXjSIxkrkCwqKfAF/HjUNlelu8V562dWnNorwt+/T2TWzPcWmoUUUukEs4PP4c5EdXt/+8NLDFwdKiA298Ic1TNBPfCPJW8hrm0LXaumPV6YshHevhLCi8xIWLBLxxb+8OUWf64klZpyq6aaQQdmMDwQHRKhAfInCzHoRxmYrW7rGMZc2bu3Wm1HeyF+o52uUIOH8573K3PjSYwrj091AsSXxyGuzr5djDijhG+UL9zllPtRTquf0wCT4+zLu30CCdMRdKQdf9q88BtytQaccKNLaAcmQuXz9V80hg7Bu50EBPkg== 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=dlhNeFiaSFhbQRyySt8qRC9pwofPVlC8I+joz+3+FHE=; b=Maj/Kzy3QGTyc1yfCd5PTfxVYC1KCHV7IpXjHmSkysLGvRMJNzug9W4wYZ/rW0FDMuRznoV765xkFoLEyzpaudHbag8m+Oe+i7whDgbsjw+XTVSjK5Esv/LD/harO5y1cLBYO4V089VGwBmNM9bNl2mffalxMXuLJ9Wppb11oCJIKaJHktCYeq0oUnYknIk6qwpmAPhfHr72bazAajaOGiuflFxDc1XslKbHftur50ShM5uGpr2n2buGaINIAc/8puvM3m4hMUMrspVj9WiBSXnBenV3u3rcKJJMU41Xlhl+oD7R+pQoRbLPpoyNBYpnwQwruns+eZqopGzCbf+pxQ== 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:55 +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:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Sep 2022 03:07:17 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Dp9z65oD+DnjL3dy5OWFcCfJJGxdmzVXQI99vafRZYI=] 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-5-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: 01aa7a76-a7c1-47ed-4502-08da92c8e469 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmqc989vEjNQgjm661f4SJJ4poxq2B1EyBcOsVAtB8gLUfHaKM96Kp9nvHHb5GZVMgKyamIZfS3+g2MJ4BlcVBNzVz0eGP5lvz3IGSDtUMsYxAGL1t/hiWphtFg6FrPph4gr7og+9P7Sijsb49NCMZAfav5xPLbl+Nka0zGV7AXobhfENKGKTlK+TxYsLm5y9LGdh1wl8H/zMTLSolREXAl7ge+wczreiMEBPy+NNMaYsZUTJGEfZKQBPLE4QEIEwOmS/8/81D6Bg6eQG9e/ssXLD/C/t2H/pXPc+3uPsRy49MQJE8eqNIGZOe0hbXUZm2h6Hi15XJohOXVofCQTAJs6Iv8XH8vx38xSuHvRDC9YQjYpqfBkomNM/sc3wDCcAPvLskSd2lHLlhI9bIbnZrS7R4fJwf0UIaQUeAU/w+tzAc+PYFc401UKvGEiK0OfV38zk1UZTUAJ6IA6+hM/lVYQUCjwnADdfSv69RdsPGAFuklR5xB1h3fY77n6mUHP2Fcv70/ds4ukGxBB3ib1FLFMMPfzfwPAMCGR6l9ckEPTeaGfLWdPztZUVWrq3HyaCxlrMOhW7jAnaSWuHxjp2jUiOMutIbURwiEIlcXWPIi5NE896CoHEBiJwQ/tbtPjNKIOuwyGNBdSMDGobaIc3tFRIWHlYZ2v7H0zQdHVvz4hCWKoYA3ynSyx6+dkd5mjcuqZ1oqQsi/xhOQj1f41o7puSvIEyLHctoI1NbRYHLZbYufIWF1LBa8WQWFVIOqtDxo= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FaltVIzrrQs8WLEdrBM00h/wjWet2iq6Ay4Qr7+bQf+zwAL7QWC18av4U5lddx/qhweMXgxHWoXE1w3pWvwT5e2woypuEZHY6FBT2owpILuZxmlWumbinZdQYDZ84wb/qPAexwLNlpHiUQIyVggntWpC1Cjj9R1l11gEzaW9BgpzTQm+TwUppzN5Cv+tNCHk4RfMgslwypf9iR8jUT4jMWzZiDdgu/wbHwUgvRv4eHL1RWFfp3PXMmzJBcoInZS3vpURNVsv+eElyZf7yUeamXljid3xz1bNs/1RTAS6WvUThT6e2trb90tPkrqfv/F+JUqp/822GjDM5q9lcO3VCHppKyBuV/B2x+j12Pky672ATlnrdrM3ncdrMBZJ38usC32r107+dplHgn4Gel0fGj0yLnU1RFjLWmg81FjzCvMNn/eQ1wZAvAdjmvwoInfYXJb99OKv752UJEfU30Lgzp/cwcvpOFK1+FzpaRmxy2S7C7Mi60lqsEwbZHC5oCpMtKbyM+k/npjVR34R9nTKHJuHX+ZPOIJVLs2v5MUSMk19VPK9+oCEfZNTKAkwijH7G7zBmQ1NmWnoGGTVdDeqyU8/c8DFiUF4eKR5Q3XnjRE16QWur7kb6Js9azKUsqccpbaRKWzh0ZESKQSAVvvAnQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 44dhPlbIc0KA/qmUlrLf9ugi6kuXAYN3+htoXkK4jm38zkS6q85M8VMHJ1xuc6x1lphpjcSWTtYa+9QxbMNoRLY6GtmVRUEvr6e8NqfpiZiVBITfy058f2xsy5agz/VTGt9ORN36Qmcw1ki77SOR1VrkrGyaBMHS3/2TlJmQ3G1MK5CzfvF/TekEYva7vP9aRB+/4CKsWEPWpZuRQUc2YGhGlWwEzCTVyJ1pZqEJGc6icPE93Ydtp+Qj9JDOHFMNXhACgQerHPvCkkdyrP4RIqSzFJYULN5lDUfeiweLzr2+nBJ/iGM2FHxGUTQJC3E1SJCEXM97oa2RCogocG6eA8wvSJ/udBRDtm1bU/qp6pGv3ECKACetPl66wqZHCLZBIu3CRIhtA6fy5bNQ1nr8Aj4PS8SoiMI/Rn8N+pRXD52kQSPf1qhoa0AEjo1VMuG2/+QENFNYWhvQgQcfjnTscWccSIR5Smkvflg5qBPuv7Y/AcviwQMmGwECF7zdnluVjova3oh37v0tT0MS1E/XVpd7xyjZA9duei2zJJj5803Meg8gg3bDt2p3XHPomFBXSuXKl7USCRYXIxjIA+MJ7EOsDD+TJJPP/SiIfqAPiJMjJ2kG4bHMu0Vbm2yqWViQTytZ07B120y6SG4yJdXgssOBR5J5Srw8ONrA37lKsI5xIpHkxK1NNwzo8LxMZICVHxXRXAogZjYDCNe+bJzC37xUizSF2LRXfsBnaZuj1uegbI5VebXjoCc4AddqR0GBV+ZxpqJa+D+/QnQQOz2vgirc/iYxnxipKfxkh7y9baBRzVjVaQhFMwwjfB1/G6i0ZKjd6vXW6hDbMOETkthBdUzt0jjgSE1ZswCPraBpttTe03zjZKYLAA5NqrmM0fs3zXGZ3jBvX7fyBeboWRTUNltEmqP84YdMy4a0CjxnlAOKGoNXhs5hVMyqgOCtWtaLE7XGVXNJM8JprOkBlSE00BvzhcEwBFYDsnlQyymXaTjddyu0ysdIzjrgNoVHnEfd974R9YQMKxQoZgNa4utPV2NHRmFQk87wDCimGIWkDJ8lGaNWEDvlsN/5S1Z2y3uDHlI5s0ENTXX1R86AQe6RBUC0OSjVklsJECttBcloEr/3r1Onp1+F7CDf3HxlhtVfjo8RasrgSYWoOo7ArXFVAiTMKkX8AhU9KLnhASt0CFIl9h41ambLDc1R3kg+eh2m8dCNCcyNQXO/JXLThgRTpAGgp3ym+U3RvcxxyhZzMx7XXGPoeb2jWPAmfM46ZrfJMOJvJ4qmiAvCKsHqbeiP/XVy/x+zFfbV8DIhnfOJ93C65RD5yFGSkmTLWCLbbmNR X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01aa7a76-a7c1-47ed-4502-08da92c8e469 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:55.1751 (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 06/18] avcodec/vp8: Inline mbskip_enabled 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: 6KQuyO94p6Un Always zero for VP7. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 35d75170f1..c259f3588c 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -1296,7 +1296,7 @@ void decode_mb_mode(VP8Context *s, VP8mvbounds *mv_bounds, *segment = ref ? *ref : *segment; mb->segment = *segment; - mb->skip = s->mbskip_enabled ? vpx_rac_get_prob(c, s->prob->mbskip) : 0; + mb->skip = !is_vp7 && s->mbskip_enabled ? vpx_rac_get_prob(c, s->prob->mbskip) : 0; if (s->keyframe) { mb->mode = vp89_rac_get_tree(c, vp8_pred16x16_tree_intra,