From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 7876448FA4 for ; Tue, 30 Jan 2024 22:07:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 665F068CE08; Wed, 31 Jan 2024 00:07:49 +0200 (EET) 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: =?us-ascii?Q?8c6v+mOWGU9mL7KPzL+8qa5M0HZiYHrpL/aubZ5acDu0vmB7GnZOZGR/OIvT?= =?us-ascii?Q?fdHKjefLwFdzxAF7XN6+V5+VxaTHj6BXlK09SfCPPdXpyLt6DrXw58Wi0HDb?= =?us-ascii?Q?pRhdugsAQ2UCbRC8sF0AqXp0QGRdXVuj/+OwD5FJLLwhCpguRCOKCoOsBUNN?= =?us-ascii?Q?3a5LQL+lunTR5IMsWwKTUgCnevydltqlRTVBWTMCVao2qCg3T2QixiTk2+OZ?= =?us-ascii?Q?n6r619iLJSbVEkKfWCOXBqMMnxfnKj+TgicLp+YMyjTm9oqEOVZx0vJKNZPb?= =?us-ascii?Q?XxFYa8kbTKz49A8jynL00QtI8uwfZY2OHkALmhzMx9ZtHa3+7sCGFyzRBOLH?= =?us-ascii?Q?ncDq/xtLtZ6AqNBuaQbdGha/lm4i27pziNjYHQF1HnkoyrT58dREKdPz3uOz?= =?us-ascii?Q?+R4n3xL2Y1w03dprbQK9DW6aKaTffamAKff0Uf/b6goh7EaAerKy0zaE7eoB?= =?us-ascii?Q?54spvDi7rM6fyxqu/JdOewUE1pkkpYqFdiVx4ErWOLjNX52XBQFtXQIXIInx?= =?us-ascii?Q?edbPIw4z4LLoUHQXqIrpRXTgA1BDqC44Al6UFnurwiFcIu3jf6XKs9PdO2RH?= =?us-ascii?Q?BcchVZvEMM7gHphxtKCU0B0EumL0v2frkAEr8PQI2McurgYAO33JMkJn4MHc?= =?us-ascii?Q?q2bxNLC3REVYnhSXJ74MMfx/gfRo/umGw9wrPL+VxWId2cCYf317Izu7X9RW?= =?us-ascii?Q?z4tt7aE5A9h/hbtaIu9IYQVIV+tYUAtO6HPdGjxeaYH72m1Wefm1qFB9Wqze?= =?us-ascii?Q?lz4syKEsIBb08jCB9k7AkYw1LpfRhmYirWbc7Gl8o/dI9x/AHpFmdlKKT+0+?= =?us-ascii?Q?DF6y8CUuI2TJp2l0mSqQf2PtyhIxmtEnX00Hue2lQHZgXWf+hVpJgvClxH8V?= =?us-ascii?Q?iU48BOd9HoKTGJWUhNXkT9vuFZl2eYRn1kpfYVZRCSs7TxIT2YYopyDeGFUz?= =?us-ascii?Q?TSKuvplc3Yi4u0a6xvijLaDkN4TH4HqbU6ilgjqnyFfOsZbY7ZtDG/EEThVX?= =?us-ascii?Q?H/ugopOsiSbSdz9KcXfFIUVVd7n2EP7C6cFnzEfTZB1JlTsuLsv+BGBlpYBp?= =?us-ascii?Q?gtGGfJkENbkpyVYNjhfuBJZiPaYYYLPkf2r4RzCQ7VxGd4p5E9ES1CHFMzvs?= =?us-ascii?Q?smr+bKSgCIaN1adB5T2ZZt46LdD5sC47maUKAFyyzKjiuMvPO/MeZ0OxX7mH?= =?us-ascii?Q?aYm+LfrqC49gUQ7oraXi3ax8I7rTscB9RyGWXx7zYrgCeV373+452EPFNlwM?= =?us-ascii?Q?nCFTPg041+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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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); -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".