From patchwork Tue Jan 30 21:21:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45918 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:8786:b0:199:de12:6fa6 with SMTP id ph6csp2456209pzb; Tue, 30 Jan 2024 14:07:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IFxbfLJVcLJ2rSzzh3GKr6ivySdVWW5sTvNH6Opwr4ilII6q1XiBorzdI9WNcLZVsnLMdh/ X-Received: by 2002:a05:6402:2711:b0:55e:b365:5bc with SMTP id y17-20020a056402271100b0055eb36505bcmr8193624edd.1.1706652472258; Tue, 30 Jan 2024 14:07:52 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g24-20020a50d5d8000000b0055f0ebf44c3si2114676edj.641.2024.01.30.14.07.51; Tue, 30 Jan 2024 14:07:52 -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=@outlook.com header.s=selector1 header.b="J/Ihq4vr"; 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 A192668CEE7; Wed, 31 Jan 2024 00:07:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2071.outbound.protection.outlook.com [40.92.75.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 843F268CDD8 for ; Wed, 31 Jan 2024 00:07:42 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fU5LSLyEdN+SjmQ+1rGPGHzSH2iRvVEiNYgQmmPlQmQ8/i0K9uY93MUl0h5sq+YQlgUlwz2tkGkHfI0WOG07dYwMDM5H3+oh+yGNlkavenF/oaUmVeMncohB9z3u958pW5SDyenqXF4NslCe2S8UzxXz5D70GwguYWMyKfQ/T58GV4poDzbjYYJBG5u/+1xz85T4nfRZzMkkHpOysU5oNEZu8aeNRnHWGJnJXEWhk6ex7sr5lGmkRBWQ024MfWpTnwawwMZ3Ps1JnYGWnQCV4El0R83dH+i9m+ZsiuF7Zglb9YeSZiLL8J0SmaKskRbWUwTygwLvOKBlk6RyxmvCog== 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=gMVRK6rmYlDk+yRNRJCtWeAFYcrZopwA7YHd+qREvp8=; b=RP8goCQWVypS6RroxnkzTOTUAlCoWFbj4gBZTodpGIZGWdKHccAj4LxO7mfenfHCbMC4eUK/HNr82Z8+uNxtHfYAh4AaEglTtgymLtN63b8KfLoZ4kY3QMAVzhBSvkq65x+jexzKv3i98EmRNJtuMmeR8X1r+/IcHFktfpRPdXoE52+N5XpR7Rpogal+0jPHlGNnDgU0Kp8slMZ0TppLoGjlbf2wVXwrYzDumFJuDKb+WYTtmTuUXKkVHpAcqH54HYshMeK/SlrB8FZLYys1GaHSOa590VZI0SkD7m/dz8V0ZVnmHXTx2AsNfFB3saWB2zQ2Wia4cImvfVwubWnoLw== 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=gMVRK6rmYlDk+yRNRJCtWeAFYcrZopwA7YHd+qREvp8=; b=J/Ihq4vrkRPgv6sb2CJtCgLgVE62X1nfX14auBsr+seJU5yDlW4tMveucaKduVBRWcCv6cUvtNHI3n1D6qfS9PZ1p26Dgz+g5FHNejN69SYGoof34QIl6t2jsHBAgIn8rnmATx4hwXUpTIGsz5y8lw18RunsNIUIefIM0BVjTkiOLnckUp4AN/JVM5hZxHwre4FPbbFhWJeGbkoFESAUumHh5TtnT/zuV8MPmNDs6Fg2ie4eaUFEi0/0UeksiIbsgZ9qnR2ByMg8NBeCegFcL3haCBMcQsav0uC0mUtN0rvddquLjtWHHjxty2s4EAslHsXk1B5jY8spPLZ9SoLxEw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0411.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:343::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.32; Tue, 30 Jan 2024 21:19:33 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7202.031; Tue, 30 Jan 2024 21:19:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Jan 2024 22:21:18 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [ZZ3Gv62dzixeMGj0XfOSAdErKZliH5BOWPv5vXipq9k=] X-ClientProxiedBy: FR5P281CA0019.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f1::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240130212120.402009-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU0P250MB0411:EE_ X-MS-Office365-Filtering-Correlation-Id: 96d9c505-28b0-4c25-9302-08dc21d92744 X-MS-Exchange-SLBlob-MailProps: obhAqMD0nT/xKpI3RRTBP8S4BnKGNDesPPsKWyBgYDDrPwtUChtbY8ib/o+dtSK6ZoqzkLA83aRbs9t/zZpyrELMnGHeH3J8yuoHO2eWQPtbHctJQln+D0szlbUVsa1ZUHZtxh2x9sFxR0Be7wC2t3Kb3hZfZ9tqDjZbR73TspILd0fy+Cm7smwwdHMQg0DWbIrWHHtSfnfA3vyuZeUJderSgn6mlrJ9UEjQn18V+v+nUIWAwv/wFrtWq7RtixbTDSgBpPiEARQ3eHSrcQEDTvFS1T88GCivTRonNCtoYFu3IHw6JkWDeqK0L/963kRYD3Y/v3iQ3w6Y+QTKCcDpLQzfbnu21H7yRsYRAoOoOGfCryTMRs2Fw57bYB9aoAJYIyql7lydZ2d69Kc7f9txzJ7oHG7jz1iWv9UiGhdiBXbL+RRJOziNYGCNl15gM09R4COcLAjlVEEzWv2fS1KkG3IqdlENhkTTLkTLl0LZWYCD1IlSANDF80gYUqP9fdsWQwP1yV4cmt13zi5NOupKEYBtrcceToFq7DjEMTtO43Hwm8g3iawKIfKPWNXhvD9FnjC2H2aiEtQ0sIs5uCtw65jM/KCVe1yyt9An51c2bFP8n9BEQ0F3qtzrOIuF1u5tgPZB9nYfdnqmsXwAdC5DR514ewgMmZ1oc48yuVep5XyIXIsJHk3xj8sOKj/h3lcAgrPvR6ZvIvw5C5a+r6XavmvN9aKJ2aeZrDzK7XRh8jtAA2S3Mn5Raa6wOZlp2k6vJieyHA9xtcuTTMcf4l+a8liWjLt/+ctzJOLTAWsUTXkd/bZ31HshULNHnVGRJm1R X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: udRpJ7yJJ5VXkTURADgWAlCuB+16TwnyjSb4zBEDDrWrydv9TQLE/XdAAP5cQ2EnUrVdpuuNm9cMSBnuW7dCD0SVvXC3NAh9Ptf56heD+oJoSYrZh4cAc3SzSFvkV4WPRF8cF2mGztc+wLC+sYqbDjgZPLp9Hh5EQePvcPUEmUuVb8vjN+U4u1G8vD+EtkQ8jPwxwsLzZlwxp4DCij7tlJ5FqzkMw2eRj0JQbRfp0lVhfh8phFsc2x03zi0W2ZGBB2Hp+Vr2+XjzJEWjz+s5KvK9jMZLlI7Uyiiv/eCt/flkB+q00aNLVgZE4KOSqn+xOJY6lv0eJjUlyjvUQvWRybtyEf84Smh2WWJmJCKveXMBKxBe4hXE/5SHsBAlcD10CLmE4y2B7T0moumSS4KWLsPllVXm2Wdh59L0NaD3hcT2G/viSvNpitZnzf1X2+Ygq8Q23EDoar08nHmRAhQb4MiL/gah2L4dsXfEhv/UU1vE6BTDM9LCeNExmqJK5U+/Gxf27g2yd5FTJAEGyQobaB/xo05jo5YHJXx9yGtK6Epi7mzjFdwTyRDHPBwCWdHEQCoMFYYsiOvM4HFqebOrSD3r2PrhvnYCDy1vgJ3B4sNTTXgXEszUHYEIPYFoRIQ1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8c6v+mOWGU9mL7KPzL+8qa5M0HZiYHrpL/aubZ5acDu0vmB7GnZOZGR/OIvTfdHKjefLwFdzxAF7XN6+V5+VxaTHj6BXlK09SfCPPdXpyLt6DrXw58Wi0HDbpRhdugsAQ2UCbRC8sF0AqXp0QGRdXVuj/+OwD5FJLLwhCpguRCOKCoOsBUNN3a5LQL+lunTR5IMsWwKTUgCnevydltqlRTVBWTMCVao2qCg3T2QixiTk2+OZn6r619iLJSbVEkKfWCOXBqMMnxfnKj+TgicLp+YMyjTm9oqEOVZx0vJKNZPbXxFYa8kbTKz49A8jynL00QtI8uwfZY2OHkALmhzMx9ZtHa3+7sCGFyzRBOLHncDq/xtLtZ6AqNBuaQbdGha/lm4i27pziNjYHQF1HnkoyrT58dREKdPz3uOz+R4n3xL2Y1w03dprbQK9DW6aKaTffamAKff0Uf/b6goh7EaAerKy0zaE7eoB54spvDi7rM6fyxqu/JdOewUE1pkkpYqFdiVx4ErWOLjNX52XBQFtXQIXIInxedbPIw4z4LLoUHQXqIrpRXTgA1BDqC44Al6UFnurwiFcIu3jf6XKs9PdO2RHBcchVZvEMM7gHphxtKCU0B0EumL0v2frkAEr8PQI2McurgYAO33JMkJn4MHcq2bxNLC3REVYnhSXJ74MMfx/gfRo/umGw9wrPL+VxWId2cCYf317Izu7X9RWz4tt7aE5A9h/hbtaIu9IYQVIV+tYUAtO6HPdGjxeaYH72m1Wefm1qFB9Wqzelz4syKEsIBb08jCB9k7AkYw1LpfRhmYirWbc7Gl8o/dI9x/AHpFmdlKKT+0+DF6y8CUuI2TJp2l0mSqQf2PtyhIxmtEnX00Hue2lQHZgXWf+hVpJgvClxH8ViU48BOd9HoKTGJWUhNXkT9vuFZl2eYRn1kpfYVZRCSs7TxIT2YYopyDeGFUzTSKuvplc3Yi4u0a6xvijLaDkN4TH4HqbU6ilgjqnyFfOsZbY7ZtDG/EEThVXH/ugopOsiSbSdz9KcXfFIUVVd7n2EP7C6cFnzEfTZB1JlTsuLsv+BGBlpYBpgtGGfJkENbkpyVYNjhfuBJZiPaYYYLPkf2r4RzCQ7VxGd4p5E9ES1CHFMzvssmr+bKSgCIaN1adB5T2ZZt46LdD5sC47maUKAFyyzKjiuMvPO/MeZ0OxX7mHaYm+LfrqC49gUQ7oraXi3ax8I7rTscB9RyGWXx7zYrgCeV373+452EPFNlwMnCFTPg041+OZidNWljos X-MS-Exchange-CrossTenant-Network-Message-Id: 96d9c505-28b0-4c25-9302-08dc21d92744 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2024 21:19:33.1970 (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: DU0P250MB0411 X-OriginatorOrg: outlook.com Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/vp8: Enforce key-frame only for WebP 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: cISiayAcs1w2 VP8-in-WebP only uses key frame encoding (see [1]), yet this is currently not enforced. This commit does so in order to make output reproducible with frame-threading as the VP8 decoder's update_thread_context is not called at all when using decoding VP8-in-WebP (as this is unnecessary for key frame-only streams). [1]: https://developers.google.com/speed/webp/docs/riff_container Signed-off-by: Andreas Rheinhardt --- libavcodec/vp8.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 83c60adeb0..7972775a1c 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2665,7 +2665,11 @@ int vp78_decode_frame(AVCodecContext *avctx, AVFrame *rframe, int *got_frame, if (ret < 0) goto err; - if (s->actually_webp) { + if (!is_vp7 && s->actually_webp) { + // VP8 in WebP is supposed to be intra-only. Enforce this here + // to ensure that output is reproducible with frame-threading. + if (!s->keyframe) + return AVERROR_INVALIDDATA; // avctx->pix_fmt already set in caller. } else if (!is_vp7 && s->pix_fmt == AV_PIX_FMT_NONE) { s->pix_fmt = get_pixel_format(s); From patchwork Tue Jan 30 21:26:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45916 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:8786:b0:199:de12:6fa6 with SMTP id ph6csp2437073pzb; Tue, 30 Jan 2024 13:25:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IGzIo7lrgv9xYb6Xn5qKZ32NCxxN1zz/KL9aa1zo6PVa2m95lwLTsmBXlVH9KCOMBpfPAFs X-Received: by 2002:a2e:b5ba:0:b0:2d0:6473:6286 with SMTP id f26-20020a2eb5ba000000b002d064736286mr290924ljn.41.1706649900170; Tue, 30 Jan 2024 13:25:00 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n16-20020a05640205d000b00557748eacecsi4958886edx.545.2024.01.30.13.24.59; Tue, 30 Jan 2024 13:25:00 -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=@outlook.com header.s=selector1 header.b=Pvulu4Te; 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 60C5468CF68; Tue, 30 Jan 2024 23:24:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2037.outbound.protection.outlook.com [40.92.89.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F25E68CF68 for ; Tue, 30 Jan 2024 23:24:49 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PE0TYADXveL3SYvMIO56Xpn/5CmvLN0QcHzxiTwynO+vTLR9b+m53QJMhlfrW8hYFi5psTJszj+0+yxf68sJ3xPdV0EDt+g0RtBDWnihHu4TkP1UlqACjutTSfpfBKnBSt58AxOGgM2Mh4UotNQ8/JWhMAv/p21z8CJ9PoPBrdGS9u4VDkI/L3R6ewQicUeYwDbkf9cUYSQ7VcVMcyrsZdk2sgtfwDE1DCjVEAExJRPcc/NwG7tnXWD1xMeDCPDjMB7lUFs2kZhZhqqJn5QC8Xq2betN1AT2Q5kovbNEAoZjhhBJekBMvbL6Upnp3D1eT5IT1tqnKrFXt7MTKY2jpA== 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=uLsuMRY9AJUuvizN0QYScJKCoBnxLYx6z5Jx9Rl4wmA=; b=iaUfiAGj5jucs95VUpAurBJA3OJgTTRQO/uSfhogVh/EsNfhB3XdEGS1H5oUUYJ4p5GnLn0OAthpst5g9cbhlZ8pvhX6cxiSpyq58fg3CNWqVQkUMX0ZyK4w2MZLP/gj4hqyQ6/Xvq35xTNyBkruArGhzzXgvvsfLIeWKbkT5sCQJD+MyEuCcy679jIsDdHVNUnhLQ/2UGvSPEJ+cWzPI5vRBZARUS9azTMHUpode5X523UDQBikdVnPagtedTtzqhHRVLoOlf0pRTLxuHUpD6/lYVNyAUZU9E/zMI3IqyZGVnIxt+oOk/Bpn65UF/p35F1C6T5m04+F//dmpswiKg== 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=uLsuMRY9AJUuvizN0QYScJKCoBnxLYx6z5Jx9Rl4wmA=; b=Pvulu4TeQoDvQSNrK6ZsLCIYnjYBbUjOoF00C25bmFOLflpMV4zgwVzblutgxD7cF7UObVrBdozT/dWDSncnyU+larJ5KxpALu0ba339FK24V7jBEEJrci4WqaqS+u3/T020K14bsPSosrRll91ciRcBiE++8gq2tbqkRTc3+NgYranBdppEC0gNZvqFaEVrLViSQyuxmetAANO/M0Pm7QJgTcFqTiE1/ieq79u0PCicEm+1eIiwA0bVHnCxbKRblzhz8dvYsN7GtgVu0XSUxhygZDlmBt5nQSzmBecIpl0mTDBP17KFfWXWlm2pe7BEheN8mvHnqwgwX4XCyCx9uA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0133.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:374::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.34; Tue, 30 Jan 2024 21:24:47 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7202.031; Tue, 30 Jan 2024 21:24:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Jan 2024 22:26:34 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [JPt1kgJhR+YZjPRoedliOkqUWzQB3PdYbaC+geYjn+k=] X-ClientProxiedBy: FR0P281CA0186.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::16) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240130212635.402271-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0133:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c2e11c6-c243-4ecf-2169-08dc21d9e2d5 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicDrf0PUiQi1bM46WoYt4Z4RE5+OWUrzJiNy4E0lE5qYjtRfuJj845X8lmhMHhLjfRbzJSp5/1HiUesY0vEHmTQ+cDRz73Mh2xX8PQ1ALuczy4ZNDU8nDVBp3arz8AoHUgQYSrnr0g99EJ9EFEpS4EeVm9RumTg8HynufG6HbdajCz0UFWp+UsMkWPLR+gLJcz9D7xo9PRZZNekzIleju2/PNXqZS4SPV6KbRD5BFitEScQ1aoYyaFTUp+4mBKbcOG02VQs5XBPUctoQVu+NFMB9ZYDlrmTkkpjey9dHVRNk9mL7SrA+LxMt7TYACGp+wZSYTROtCLOoEUtwo4bBjbB3pIpBUluSHX7rF8H8ONoyjw2KbuMw209VEIgVrdQBFGiBEBwsBTgbckjcmprYynUnKO8Sm6m0DbMayH4Kagxi8wvEG5qhMsZoBGcbdrGaQRD/WQF9leen1dkmQ0SfzB8bXGw7kp13SkZDTN8wbNfJ2oOTV2K0xBSM5pmQD5vXrYAJQFLvk0PAg1hxj0GoT0qsxmlQDBhWtge0rkf1YH7UHn/poyOJtR9kj25q+VOkIQjPtbFlQGcJEtVoqWAsOOi/swrri3OEKwuTHjwjzLJukzhP90/nHadV+xLfyiEFK0HcaGi5bQQJGivEjCTlK+6ZKrjsJw2ttKHGTXZ4i5GqzuVnwg0bg2P4f4yMsBYgIXsshXJAwelSU0DdhDH0vF2CSWTvxIrPmwMThZtrazjtVQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j8x0lsncb1AJCrqJ+aSooWsYWX3qLcZdwTmW5+v9BzpnqR+9gQY9vMiCcFEEqf7eLSSI+DfVUxeFXWr1rdf7MDW0hs6hfOllP/Mon+FJdNx0LxaNBLp2LdN6SGF5jO/WsGCr6Jf3xnluzFSmHuq6NOEpWL42aESqozSTnw6xpU8/2J8R7qF9JVCf+Bm/pBF0ke5FWoowxKC+ootxd2Pgujc+RFks7zuaYL+toJn467DzyTMuOjuuifRMClmKhOuGavBzkfMfyA46Db59e+06ai8cXqz2JeE33kd8QbWXFJ9PNb15uhVI1keizCxD6T/UnanGqLTYQu82HpXIOSLazxrAk1G34sQ2q3JdVn9YAP1M1w/a94NHhfYXVOHeNy4tH+uX/Sfn8QoR1tk2aD5xPw/ZqirwTEmMwdWwzPq4y4nQXUFWJYY9TY2Q0vYb9QnZH4mXckAJbAp3TxdyjuwradplVg6ba7BSxIMnmTt0K27m/qFZwjbx00pfRPn91CT+IWPP+Y6S1cWowwJ17TBl4l8+AKJxO+dauv8BSBvnOjYwsHN3f7cCHm2ZNRVBU+ZyEVN8U0lpGlmJqUr/DBJRHQvJx6d+NJXlF6GH0TBxxegcBryglvAIfwCZQoVCROnT X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Rm28COP0uSIUo2z4YVCvRi0aLma4b+8jQel94a4FWfnSBSNPppeOMAOsK1kao+qUn3G6GYSCeJOP6tKljPgX6HiQxApB7x5CSJR0ybKzwwRsbUEVjfRYrgJGA7G5gpzvwkoMfZ/T0ZzWHd6HVuGyY7omXeYTFdba7abZCiVxJXbu8kXVCBjY1ifJ6kwS8NfrgY7jw7luqS8bjXJrhtLssZMMTlmq1JwIMIcgNBkZW22LvfsryfzxcB9LWDomk75kJa1IVpVW+gyoRmUgWVw9cPQ0PnPHWxMI3ZHuruMfS5TdXAyq1LWDapzuuXLPUpedhGIKuLD9n7e40aLg38VLOwfhwpVm3ul73hDke/wKG6AsV37Gd9KV/zWeqgc2MpibabbuQb+yErN4ER2CBOppS5TYx+yzivH9ED2YkxzS/qL8zUWL/PsV0iJdXzh92Yb7EaGSy86vtWD87uAhYOKkW+QPtAueKsPOSpDSpjayepDXRSQQjS++OlLcXhlg6EpsBMkMgz+EO664mer46PsfqulJZkiOMF3yTzea0/EgEVJ6NTswXCl70V2mX/IN5kMdXPhcGuXe+UPA5ycETMoh4IqusEDEStFFARQEO3aWVoDcmYzrJsOi4Bp5IIODGP7vlM63QAzVLV6QLNN7R9foBhyKJMvId/PtpBHMXjfh9EPRqhVLtThrY8sPG/h+OoQIbmC/FodeHTKvi3Sg6EIXGxRMTsq1l6ZVUiOLvH2NPiGpD8eKZK040XjSB3m4nPAIwmujjq807nK9tafSv228SqRKOf1TTM1phw1TlM7fYQ5k97Ps+UmJvQOONQD6X+VghJL0SDo/U80qpfOfPzXVbeIgLfABd4Jswr89CwqNFV4htIZj9qaXlExtJeGrk1uF6WwPA+Hodnq5V5UldTjft4osbIF2TFrhIXmvk/D3TUp5Z3GMKQ3ARw2viHjUi/5kqZwFyoOY8Pqw4nnFFBxmO7kq82FOQtuInSSEMBa+Y5f1r1K55tRbi1Fjr0lECtLFWirsKaTPdq5IvF/Au+gN4a/jIzkrEry/RHa/PFIpq1G7gN/44IjFK25thacYvoHiSnGcjGSyN4rwz8FjTEmj2PDjbwIbic1h6YZVJ2PWaupr8dqGAfSX68FRU+WZsCsKrOjjMDyBqPpoiUsxsLYk4qtlvs5hf35c8/Y/Tt+ghqGzq4LJX+Al9i51B8VC8iDrlwgyUv5AyICeI5ZSyoPFv70wSG4Sm9GIBlqjHS672yR/8Xj7W2bFcn1nWWwtjpot X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c2e11c6-c243-4ecf-2169-08dc21d9e2d5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2024 21:24:47.8526 (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: AS8P250MB0133 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/vp8: Remove write-only vp7 struct field 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: yxhJYtViPHnP This decoder always inlines whether it is VP7 or VP8. Signed-off-by: Andreas Rheinhardt --- It even inlines pretty cold code... libavcodec/vp8.c | 1 - libavcodec/vp8.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 7972775a1c..6b49ec9fe7 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2887,7 +2887,6 @@ int vp78_decode_init(AVCodecContext *avctx, int is_vp7) int ret; s->avctx = avctx; - s->vp7 = avctx->codec->id == AV_CODEC_ID_VP7; s->pix_fmt = AV_PIX_FMT_NONE; avctx->pix_fmt = AV_PIX_FMT_YUV420P; diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h index eb9fa2f166..798f67b3de 100644 --- a/libavcodec/vp8.h +++ b/libavcodec/vp8.h @@ -331,8 +331,6 @@ typedef struct VP8Context { int (*decode_mb_row_no_filter)(AVCodecContext *avctx, void *tdata, int jobnr, int threadnr); void (*filter_mb_row)(AVCodecContext *avctx, void *tdata, int jobnr, int threadnr); - int vp7; - /** * Interframe DC prediction (VP7) * [0] VP8_FRAME_PREVIOUS From patchwork Tue Jan 30 21:26:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45917 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:8786:b0:199:de12:6fa6 with SMTP id ph6csp2437228pzb; Tue, 30 Jan 2024 13:25:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IEUbwhcVCJ1tTd5CT88MA/VKSZnCf/GvQI14EmeT/zuGkf9VSzg8xyDQWHH0H8YeNcuxvEx X-Received: by 2002:a2e:2401:0:b0:2cd:217:45fc with SMTP id k1-20020a2e2401000000b002cd021745fcmr5828182ljk.13.1706649924834; Tue, 30 Jan 2024 13:25:24 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x24-20020aa7d6d8000000b0055f4fbc05f0si595582edr.190.2024.01.30.13.25.24; Tue, 30 Jan 2024 13:25:24 -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=@outlook.com header.s=selector1 header.b="HMruf/dL"; 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 769F168D0D4; Tue, 30 Jan 2024 23:25:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2095.outbound.protection.outlook.com [40.92.89.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 46F9468D03F for ; Tue, 30 Jan 2024 23:25:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ROdrgTEWQdOZUDiIEKJaGpQ3cosCPMdcLX5NClFwzEx2232IopihWnhziLv3qZqZNKO/Rtvc2ggfq3MrkElqPrylETMWf2Y7KB3/tauAoQcMleIHL0RhkL4DS2DNTzMPrryFFmBNSGxSO5r3sY7unflVc1McqwNGMkyYqO2ciYd3fSaTF06lQeY2pioOwnB0MCGJ8w3QNBFE9CzsJ+pSdEWSlFxjDkShsAQHi7euNA/OsDZlpDeqGoxo/AOA/PtUZnqSo8ZnThZ2PassqpITwhfrHD0Cx6U5oeaG1ZlYZcfQsuoBkxVQWGuNk0qlV3zLAsx7C1Fhg4win8SAEckX6Q== 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=NWL3HqoydPXzE7Fbm8WCJz1NAQJ1RmzTr64BOd00m9c=; b=Mc1mi/vS+teirKRZlexEe4GgVaT2S2wL0A49eJL4Cy9Q/nyUaZNHUe1f5rjwZmTyv0D2ogFix2ey+wWeICpF2zSydFByNEPNsBNGsScq2rPXHZOAVMf/wn91BtULO+uFcDkmehVRpB4SWH+UbjgS6Bw8KIiarXAHFbZwMcbDtxrCYEbK/EFh1l/xQN+PAQn48sKb1toDsNCPR8qrPlU6Tdi/gvXzt6ymwpz3eW+FEcjPbZRA7A3WrrIOYkGo1mmqkqhHsX4tp/PbKyXzj0L2hR9EK+epGMJwbKzbPj4V0ADHNuN3hOGMU237KLbDqiVXZOOzdBpoaSOqqAjWPL5Deg== 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=NWL3HqoydPXzE7Fbm8WCJz1NAQJ1RmzTr64BOd00m9c=; b=HMruf/dLXTmkQvkdtF3I23muMLCxbsY2C3WTTwU4m4yr0Js+GJR494B8FN4lr4jDoQXHK2e7sFaL8oo/CyJ9ksqXP14BFJM7+DjQJC0qJZOYznpZkz06U50HQb0KP18yRppaTLqfIdWYS8TgO2B6j/JsQ7XQ65XQ6XnLmQXbKriOyOCUmnHXB7W7bUk9ZfAlGuHhe1/HKGzbVMsUDJxHXE6baid5k7P1ocjtBBe40cudMHriPJ0PUZN6QNTKhxrkLAM7yDWJFYdzLg3WeUl8ol9/V9/xXRhu0iZCb3GeK/rDg5Jv3vVpI9MknGEQzxDA77p2PnHUiVjhjq6hTsfLNA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0133.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:374::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.34; Tue, 30 Jan 2024 21:25:18 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7202.031; Tue, 30 Jan 2024 21:25:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Jan 2024 22:26:35 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [qcNi2oDWI1PvivC/0kV9AwcBsphCKb/bGXem0pM8B3c=] X-ClientProxiedBy: FR0P281CA0186.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::16) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240130212635.402271-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0133:EE_ X-MS-Office365-Filtering-Correlation-Id: 9226022e-0027-4515-4356-08dc21d9f537 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicDrf0PUiQi1bM46WoYt4Z4RC2ZlNx7ZTTCNYoIky9QTmQrS4AP43gnFw9cZYGYYdXsb3YO0koDAkCUKfeIcXvgp8vqoxRjhW+TV5qcqSdNRubqEuHs6ziPbpnu8m8EKY4lPVnMH4Opk5tmi7Amt2DQsHoHV/GwTtD2FyIDJ2dhALrul8luoy29zhRE8n1YWfwEmA4WxITauCh2W11n5icAhI3sYSB3nogrlrT/6+pTpYe4rCY6eLMnpB7IiyRpID/8OZzeEo0+KebQzT1iramTV86Wk4btI2ytdNWx82NBa9zcuLFRhF8fYLXRF7NgklqovzOFVYyAaFqYunE9V7uKLDETpV0DBsB3mWMXtELU4GIeqdopT59zvhDLE52N5n3dF3bvjSlKh/KIiwTOCPnP56DWxWuHOdFQSXdKdvU/x+XflVmW6Mg66UPBayw7id41yPHyDmW+F9q0q8MQaQUbxb5tHBP0sBY3QziRrSLvC9EDe2U1ry5O+ywBB5WbYpNQEJJCpCf4tx9UtQIVMxgmZyf9yRrqkMJq4U05G9jhGKey4jHeoehqCwKOH9qiF+jy7p79yg79jYg5lLyHkluwqfmIN8mqTFtfbxZOmxQnAnT3sJ3SH5Au65uhBLYQNvm1/1KFfil8E104gNYGP8+a04e4jig1AYz+jmSHcQeoDBcGNqD9dBBkbHCuoMy4QM67gOeIYU35z8l6r8FDwUEkvMaP6EPEwhL979WbqAV/yyQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2gYggpYGxrdMsUGHocswlKQwON/Ri4wx6n9MyNJ6gRAyd0Lodz/11RHBh8vSfs7itmOT7g6IrvnS0GMzKGhgEfi40DHc6cR+xKblL5sEOFV8AQCPxWA4ksKUPSEPITku2oOg5pEjjXs7o4D6y/WGWmBcNtPwxZIN4yd4RryAWk2gK93PcB+V6jyuwZzoidblh42UgHipzUCkDim/xux0DaTi0sdJGw9SDAOMFfCGYZycw5xluVtGnW8n06+QT6csskiOJAe/tqWzXtnaLpfS9tAkCh9Fs6SMzDJsIzkOH6WPUSf0OnjG4j5y2EV2QrjRpTu8L90t1mvIIYxAZWQWiMqkCDP1EjrbScnoFNFSXCH9dQcughZv71Qe2SqTGgVtypHIGF0yXB1C1ddUvf+/QB0ZyxyXT7nvjy+F39ZP5t8zn30Q1f8ZmymyVlZbtTV05eTdVmByaJIMnnvgOGaAV6FrafNJT2HF8APg6mYKeWFVNALYY8PMf0I5XAvhGA/CXuu5Ym/QoxyCd31wbQ62KWO5ShMguspN2NAhSXftXP5XDq482Y9Z1b1ictmWEseuViaUYTRTf67KOQ3j/FB06oWgYFgej8BqboPMyEt+xxhxiEDIB6E9iczenBIzvkHF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9ySK3ZBKWN6PKyYWeaw0RTXVRIfFdHgJOMaZr/tWDE+qaPON19pQv+TUTvZaLmfv9RUqWNO/w159uXC+OP3U5KNA2VbSRsK2q83KfoyuVix7/iEJ7wuWsG0f/NtXWFt/iEyfFfdcgBQfDho0DKFnrkZTnZ2myZYIqMwcOCfWSURQqo0BF4SexgmWxWwdgygqkwIzD26NpESAHDanMr2JBxGaOKeELuejwNtqmqwJ09An1tqsShs5iZxJJAmUT9ArOwGNJWSqyrWBuAsYkgh/B0DjImPXuL6vr3y5foL2cTiENGp76oOWfFBcFiJfGhI+rPhbBMLLBXVHJvj62/Hl7m3e40EHMHd9xxe9wZN65bhWVqQX23L35OpZOcwTwheFMHqTyzyBOliKCTiUysbRx2A0yddt/Znko8mLKshg/yoWFr5YNr0dmjP6C7o1lVLaMV5AK/4ISps7vSVvWf7ZdFE+pVDJGBeyqwMpra/cVDPKVBei7xdVsp/JVO/PKm8Ipu4aN0mn04ZmYcdl3ERYQlCeTSY/bjIHvE6TZQGDsIkjgMPVPzMLiS/mVkSRFjIQXJW/ovxhYqRLRgESgYsDlGUFJflHZoFMxwHAGpbdGN8Hl1Peogx5yR5b41u8cTv2Aiaxq+3VP6jpXiOsCTrlT0DIVLIA1mXIqKAeLZXi2UO0i4U4JMcFUNS0EGbApSjzBhCo6h7StL64UL7qQPmWhongQbmXbh4cNNmq03YZPW6B42LTESVgsfdnOcx95jt3H9cy7Rb9bba2HoMhdYeZ/1slZg2rggbxExU4oUEse9hkXQ687FtWU5iUdHHyQXCNgwSTZf/F5fTwFKm95h2TrK+v0lnrlnWd+diy7EJysnc6HerHtbklzVZE3V0HHmhjXcodQ3BoJ2fgGut/gL2V+/Rd7QiRV5xjbmyKkLSR0WV/nu5NfqqXVXv/0tBZzlCafO/fgwvACsDfcX6MpDv9L7sJZtG64irBGIAQee/msCu/fqt1mXI/WrqjA/2TNslCJlW71RkskQOiqi1Nfh5Q18wis+rgAIUMGbQ+UmoQw49TMDOsmMda5tPbix5L1UdlvVXz4eNJ8VArWFCzLEEyRwFx1kMAfWyuc86bvB0VFy2zo3L/gsIF4YWGGN105PewqKcwZ8og1OoysgQJxjhNmZjYWCvGm6HbxSIjb+5gM5AEyuCqfI9OzhEszRjXb5T5LJ5oP6OU5zotsSI+mTQii6b+FhNxTpUXYNU8AAvb3tFbz7bT16L5+pWRGIZ/nBo+ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9226022e-0027-4515-4356-08dc21d9f537 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2024 21:25:18.7001 (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: AS8P250MB0133 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/vp8: Change criterion for calling ff_thread_finish_setup() 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: xYEdKJ1SOoYz The current criterion is to check for the existence of update_thread_context. Change this to check for whether we are actually decoding VP8 (and not VP7 or VP8-in-WebP). This is equivalent to the current criterion, but allows the WebP decoder to evolve and to get its own update_thread_context. 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 6b49ec9fe7..dd6c1b361b 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2754,7 +2754,7 @@ int vp78_decode_frame(AVCodecContext *avctx, AVFrame *rframe, int *got_frame, s->next_framep[VP8_FRAME_CURRENT] = curframe; - if (ffcodec(avctx->codec)->update_thread_context) + if (!is_vp7 && !s->actually_webp) ff_thread_finish_setup(avctx); if (avctx->hwaccel) {