From patchwork Fri May 24 21:58:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49209 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2015499vqf; Fri, 24 May 2024 14:58:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWdgYcZ4kiShcqEhnQT3Fij30QAHCledp3Y/4vn2RfXjN3j/mCvExMFBy36yEYaq1MKVVX5D/nxeSEWVxSDWW/en7tOJ33CExC41A== X-Google-Smtp-Source: AGHT+IEVSI0L85looygiUI0NfVTPzP0OhLXUA07uwW6DZn0WkfyGkfKV6ec5AlSNDSaZT8cUk4NY X-Received: by 2002:a17:906:19cc:b0:a62:615d:47b3 with SMTP id a640c23a62f3a-a62643e9c10mr224688566b.34.1716587934185; Fri, 24 May 2024 14:58:54 -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 a640c23a62f3a-a626c800dc1si121609066b.79.2024.05.24.14.58.53; Fri, 24 May 2024 14:58:54 -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=R4NVBzus; 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 6E5BC68D581; Sat, 25 May 2024 00:58:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2066.outbound.protection.outlook.com [40.92.59.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 403BD68D37F for ; Sat, 25 May 2024 00:58:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iWlYpNxrGrwmHb0x4zPgzKmCX2N9gPvjdx6oIK58S4p+7+arYPFpIpm5O4AuzeK5X+H3su662P2M+YqgdzVESFIUHJki9BCf3kqL8wdCgT3IfLovj44aIunCF1evXgIntUUP1rlOIzG+tY3s8bLSzQT13eeCZgYyfkTdLy+BhfoSc4HGGT28xNHGCkU4BNUrXS1xPL5sWzn/DkiLO34DlqMV7rqCWhiuvlK2pHLAxgqDuwVt1WGLjb6Mtc1C3H/meS24AwCqUwO9Q0/LqtgeITLHB/h19uYAU+onL9rqjlEwKpzS2mjp0AYz6lcqwLYFEKnR2CWLBGTVpNV4CLtAxQ== 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=RRgBELnuPXLhfDJAx+jFey24jlGPGviiD5N/2jHl4gs=; b=h+JvHVwAHYRX1xeTL9kgO+J3w/Sbt9GLEOKOGNcYshYK4/470hSY0sBldpnC2QDbqhwWcfuVqGCcMA9zcdA2JFAV1lNW+scR7Z0wV/BWNQYuzJMR/r2cqPR3bbxcAlqb8yA9mvcW9z3hwnt2lJaRDqbSXALDS2HV9tLGrLnnyn143e99Xe/2foxwVH7SOSas0fBvAmCYUBJ/YXgb0K1P78iLBYIEFS5RQh1TqT4LSofLDEdDHUKeJSocKwWPWB3a95errMEKzSf72RuqKuUuzl++ZAq1myUcesrdOJstPEK7W8sPVePQbOdrixOxV9Tetc/DxtthQanXcWh+KoZX+Q== 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=RRgBELnuPXLhfDJAx+jFey24jlGPGviiD5N/2jHl4gs=; b=R4NVBzusXmDkWtNXEk7OXJTiOyJjnZVVcCm9scyl/4cVcE4jtx26/YUt96oOuPOktNb1dR10SSjOLUtEHGd3Op8MQLriQG0CNgHsXl1cScxVjYHwS+Kjbt/j89KBzmu8tH9tA0p8LBkTTGgt4RjqRP17L1Z9PuaVjbVyNWPpHPWqZcc6oeJBvyy6MT7+Ei+uDhy/JiVFeGGKZCBdPlZFY+Yo3Gijw9x+tteke0q2E2P+XrKGNC9z2IC+Q+K9PkZiQb7yAadu8RcywnjBEsOE3Y8xIEqUEr9We6c9vGtsOg3PhsJuAhtCnbvYtHnLcBlvlu5bIdlEdx6g1PBBP3Cjwg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0140.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:323::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.27; Fri, 24 May 2024 21:58:42 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Fri, 24 May 2024 21:58:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 May 2024 23:58:21 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [Eq/jcg/djSVjHBNQFVALxByZxbrCnN2XLLWM+DyZkT8=] X-ClientProxiedBy: ZRAP278CA0012.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::22) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240524215832.1276263-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0140:EE_ X-MS-Office365-Filtering-Correlation-Id: 10122cb4-842d-4f84-67d7-08dc7c3cacd8 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: ecVAfLgm85V/9/GYXoebVGMioLpzF0iB78P5sAPi4O6IIu/XtP3Olc2D/dK+RqBo6gHxkMDYfzuVtbwSTUeYumigBco81VbzLGDgYsdXCyC48T9f6APtUwiTtFHnFcAAR1DNDRutGcGAcutzLApwqc1c0NKvgP/qQ3nvtyk0LjwC6VXyL8fsQWvEobRYbGUsHE4PuVTklvvurIC50buyXPIF7k4gp0nYullcvA0sdHs2Q9wWOWZCWz/7nWfVYY4OYy16SoCbyMPlvustT5+L/8CAJ/N55BImKr3xqzVjBVVANAXETCXm2mWLOwdSExKdoO+T15WYGyn/B+OyKYfYWOAm3GObShsFzg6TbOSX0nD2T9aV96Qofqahh6Lx95KMe3iTM8jkMYJsvAFNG1U3wJ284Kdih8OlpsKSL0O4MplvN3kto1ikwvAV7qDUQKS8kVCpYC6c6qDj5HynbM5uFdxZGDt8ua8221vuWpZDjTrg8Dl1pJ60IEc3vtLxsf76YoEwAwE6bGmE8VWZyTvNTc0JmkV/vsuVuKztelmicyHsqUJFhDN2+D4Vqu+kiKlG1lc8QwBt3B0v3qenmqi13TURKK62bYe/ADmbPstmtvjswXt0Ew4g3hH/Q2GW9jAH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zmQoHnMAbRmwuLx48neZuEtu2rvTd8smVggzEcYcOVV/ZHclMZjuZbITFiADdAhzjW0YBhkfnZwMcpYilarGtCCwOTJDbKAKDagWaZQs8GtUqqFKxU0IBDcnRRvmNL4PfX7RQLjrx9GH3zT0P5MX9NHJyu05G1BHdk4/VwhdsSABmpaYT0Ft3rni3ui6HEAeSF/0sFb+FhWotAjWZDFZ41AYfx7S4hOrw2nizMqkQIOvFAnohcoCMdeBn3/aLkVwe0VRlSn04SbB4aqFd59uqLD7IJ+ELwUjlJKx+5zWPtJCINe2cLygmiINM32M6qsmDILV9C7tlblUh+Vlyb3tvUnMhKpDo6L5zP9tHKXWbuuxQ57+7AtqTD18m+nl3tZoitdrT/jd72nSU9p5Kjb+pHEQuwbrXhaikHsIf867PNvkBxRmbMLyLA+W+YRvHD+99mpgzZcTEEJl5RJbqkhwktrkIK8Z4C22l3hYYiEt+m5R/V4WFn5fl7REIx5JJ9h/DTJUzS+j6YIdf6ta+0Pekhkz7aOhjKh6ysL3lWbC+fc6IkDpr4+WoDMzbwBuiiEKhLrrpPozwa/ncDwOIH8oE07QS121jnrAfDN7OP+gTjYaYGKcf2C1+MEvlBjpe6N0RJnkPgyxAG9Kkgt2G8kPWiihFmB5E4F0rwUAuRi7Hk77g/NnuW11haV90ASun7JUhEZR1NqqDfp6v4JOaHibzarfhNJcdY2c+cmM84RvG2F8/mb7QBtRIZMciGWaZeCeI0ppxfHfF41nMuYhhigZsypM0FpOkMXrB01fI170kg/4LC7xix1BTpsbQF4zrsyZ4bICqxGdxOOOy90Su0yxBjTNnq1ZXmb7sEAF8gfJVDCebx9rCT2GtEuseSxeBi6tp3RAEiUrac/yQI50t9rKya6A7xKDDml7NWDFpBZHF9OlddfUNMzqXW/xBukg1S1ut0sfGD4Jhz7qKcT6HuK9/GYKqoYXLR/TsENk/D01dR5TxJ7oppFAHedhJGHQzN6Ax1bG6OCrfROthdNxoCQ07WFGi9Da5nk9eMBYk7URrCJiS1WjhVRgFzMvorCZ8++z7xBNhx8v4k3/+ZoXlUC4wDeX0gPuNzlLGE26a5PYUcMjqGArdCsqmfLQ1NTjDD4DAGCgoaKtqTxCakktdrHJC9YOCigg4Bs4Ix+3CRDSrQ/CZR8yJ4eIVoyB7sobccmvnmA1Wl6BkJRJYPEf4iTivFa179sewX+teeYfA5V/zPp0+hiSpmgu0I1ILaoz1v/xk6LbrrnutPQ7jalWLcM80g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10122cb4-842d-4f84-67d7-08dc7c3cacd8 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 21:58:42.1781 (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: AM8P250MB0140 Subject: [FFmpeg-devel] [PATCH 01/12] avutil/avassert: Add av_unreachable and av_assume() macros 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: VLLY2/OanyNc Useful to let the compiler and static analyzers know that something is unreachable without adding an av_assert (which would be either dead for the compiler or add runtime overhead) for this. Signed-off-by: Andreas Rheinhardt --- I can add more macros if it is desired to differentiate between ASSERT_LEVEL == 1 and ASSERT_LEVEL > 1. doc/APIchanges | 3 +++ libavutil/avassert.h | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index 60f056b863..5a3ae37999 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2024-03-07 API changes, most recent first: +2024-05-24 - xxxxxxxxxx - lavu 59.xx.100 - avassert.h + Add av_unreachable and av_assume() macros. + 2024-05-23 - xxxxxxxxxx - lavu 59.20.100 - channel_layout.h Add av_channel_layout_ambisonic_order(). diff --git a/libavutil/avassert.h b/libavutil/avassert.h index 1895fb7551..41e29c7687 100644 --- a/libavutil/avassert.h +++ b/libavutil/avassert.h @@ -31,6 +31,7 @@ #ifdef HAVE_AV_CONFIG_H # include "config.h" #endif +#include "attributes.h" #include "log.h" #include "macros.h" @@ -68,6 +69,38 @@ #define av_assert2_fpu() ((void)0) #endif +/** + * Asserts that are used as compiler optimization hints depending + * upon ASSERT_LEVEL and NBDEBUG. + * + * Undefined behaviour occurs if execution reaches a point marked + * with av_unreachable or if a condition used with av_assume() + * is false. + * + * The condition used with av_assume() should not have side-effects + * and should be visible to the compiler. + */ +#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0 || !defined(HAVE_AV_CONFIG_H) && !defined(NDEBUG) +#define av_unreachable av_assert0(0) +#define av_assume(cond) av_assert0(cond) +#elif AV_GCC_VERSION_AT_LEAST(4, 5) || AV_HAS_BUILTIN(__builtin_unreachable) +#define av_unreachable __builtin_unreachable() +#if AV_HAS_BUILTIN(__builtin_assume) +#define av_assume(cond) __builtin_assume(cond) +#else +#define av_assume(cond) do { \ + if (!(cond)) \ + __builtin_unreachable(); \ +} while (0) +#endif +#elif defined(_MSC_VER) +#define av_unreachable __assume(0) +#define av_assume(cond) __assume(cond) +#else +#define av_unreachable +#define av_assume(cond) +#endif + /** * Assert that floating point operations can be executed. * From patchwork Fri May 24 22:04:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49210 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2018451vqf; Fri, 24 May 2024 15:05:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUod87uuwnf+sslvHqdpbWhBF81C887zlEvJY3eFDTMKw3oj/EpFkrd9EdVORCYEL/7VI91pJo+HKhursdJGb0uuyWnsVWO6uOxDg== X-Google-Smtp-Source: AGHT+IGBAkWlNRmj9L+rSwxAfUDERPdN99tg5tJlmiQVU3G1lZrypEE50SOsknP6xVmxqbJIr0LB X-Received: by 2002:a05:6512:29a:b0:51f:3f6c:7466 with SMTP id 2adb3069b0e04-529667cf9a0mr2321721e87.48.1716588315478; Fri, 24 May 2024 15:05:15 -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 a640c23a62f3a-a626cc36ad5si122121066b.425.2024.05.24.15.05.15; Fri, 24 May 2024 15:05:15 -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=cEgr83l3; 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 4998868D57B; Sat, 25 May 2024 01:05:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2043.outbound.protection.outlook.com [40.92.58.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 46A2168D4F6 for ; Sat, 25 May 2024 01:05:05 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WdxBxOUjra6nFayTjd6Bzdp3j2WFwjGgCBb9MmuGk1CbKHH9dHQ6z3rx56LGz4RA1w6e2Gvq5vAQz7GNgU+dXHen0mSYplIsDU1zxOTxnINCKt5QsaysPAnLrVXI5ldgfQBWkt1xWoSPoGRu2QtqGSEaB5CkSX53Dnq3JvoiXIDyJGRVxQDa5mYh5qYT57juyt4nqFG4F6LHUg/RdmcKquREsQYwUvB6/3NRQwOEKp5a/EIkK2jJ4GYdaCAuFiU0D+agFp3PbqU7UbUbJ4KkfAgV3MVZ8a9DVs5I9YDHfRJq1CZCh/nxK+JmqnGsd3iaRqdmGdyiBpP90AXQtxeAMg== 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=5MM+uIxS3CE/pxDRjCuy6bef/7VGt4EgOYJAS8D0E+o=; b=KKcFvoh7QychW1yVgpix0f3gQY/P7ICMRST6dbfdM0XLHC0g8mJnzwfmf1smS/hrj7E8JY5Ay4TUFdgbDMMmMGJBTAlr03lbm+W2+mCi1ipYDkxLhN8hihcnuZ479z6FtjsKC8OEVdqVxVTtzL8nQztzd6ALasUm9R5I+oywtV+biEkY/L0mLd5HTrpF2TTmotOe9CHi08be0Aay/k+TFaL/1QYPqVO/WN/0AiKHmIAiDxPPYbH4Lf2bMQzro67Vb9CUA+fzxv0vJgEdF2lQDyBucu4gaq1gjh/Q/Ek/04o/xRemIoecF+GqG4kPtnkPkP9DFcmyUA1w+q9zxDpQAg== 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=5MM+uIxS3CE/pxDRjCuy6bef/7VGt4EgOYJAS8D0E+o=; b=cEgr83l3Fa3fXcSQ0hCDPsNYwleF1q7j4qE5vsL4rcriIf6PR/Kv8EgbasTPbEGTzkGzpiHe+R8kkf1Yu5CSYKsrKBdPLNa0GPvvr8ewA8X/bwpOs/pKTMOkn/+XwUg+4tIEdDzY77L4oa0iEcFRlvoZK4EoqGUItqQH/Sni1c7I07v9C53yem5a8VffmxIiH67nUdJgWijrZTsiAGFCuBjNTUUWzxU8H8Zdn6M3OTuostMVu92ihSwuXfDtP6deZF4BCkNsZlBiF5y5o4gyNqP0jCAJt54X7sXiJhadyjbw0n1orqLIY9WSeC9FFiuOXcMQuHGmZY+SHHQN2FT/jA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0368.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 22:05:03 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Fri, 24 May 2024 22:05:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 00:04:45 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [eBelfRqUNQXCSJRhPZZfkbNyDG9TehIGGKZlYsjXl8k=] X-ClientProxiedBy: ZR0P278CA0194.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240524220455.1276419-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0368:EE_ X-MS-Office365-Filtering-Correlation-Id: 2bd07382-ea9d-4393-f413-08dc7c3d8fc7 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|56899024|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: t2SDI7nOvFzgT2RifugnG6YqbDp2oyRU36PDkJRu6CZ7XJOwXwAuLOD6cQMIDvFb8IJTfIS7XL4HLSmBEyDuqXks4hBj74hqC4juoDZ5dSgjYzAEvrRggkbo/6RA3UJ88LAzpQC6A3tOGbZ2agol7258NZqq06kFidV2WCM9v5+5MAE8X98b9/ZJJMINuZZp626ghqgoqyuWcKJTUWEfg1eM+7LwfTL9wyD1Szw7OA3wSZn8+wG0pJ052z5hgvRwMaBGXFvCLlP9FoLOU3hrOMkRZ5ju3l6dWcYRkxatH1Z3dr4ymklqwQ/Vw7jpalnFXpkPE/TiWzre7BVxdrckiX47rc750n8ImhLQWkjQXPXQHCgUIT/lufRn27SrHTqM39EBRJyOc9GedSo5Sb5kjwM63/GhrHkDyzq08vF0dtTBxP61uqODqcCpWQBKuiVf4K8puxjvkMvu2U/1pmvIBBXYT78twk/IAqmAovGBmFecn1DVW6ZcvH7bQ6VPB8nuatmlzL8pepOpCDIiYMnbz9gnOf4Zet0qmcNK7CJyWNrRlpMYGoJkfFc/ujuPAy55H9PpGfG4omnB6JzCsqOroYjwSC/cwx4FHb4w0RJgt4DZ+tT4SDiKD1I5v4Kklq4A X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uGuNl1bgCNfAtQgAwJWbvfmvxn9Z8buzgPdjw6N1eGjL1CYeZmjhrHENBguzWR7Hy4MrSvQ1tSaK60KSakaKIgD/NVcPZKY/QptLyJCzw8M1nMdOqlexHAEfrPG9vCCGoxJ7UKmnUBBnEtHAgjrmdpq+ztwzs8UVX6ujrlU1IbWe+dlNUFoHpbSYZRcOTAJyjKWEnQyIgeQZGz0AQBLVjtyIHYZixlQ5t4xgWsMz+JitgvnF0/hOjJxrql5I/WDQH7M+qYeIokvFs/n74+8m+vAPKukg1WJUDX09T2MVXBHpQf20Y1z/7YMBTquPpMS9epTeCcUYtLJVkecDDpnufGqYM0ojCnVRj9w7y4B/Iqmv7kHpyqW2yzWoOV+iTdT4X0+88i/PQKTry4jt8mqDFD727uajE4Y3Ue5VT81bZt34kNZz2b0tVeKrtjYpsVBCO1WgD2n1kQ59my/KJ6GvDkFWc8c2NlCaikydi1bjsHHqotJC2kfizbz6DG5I9Lj9L4DnuMSHPzQJGmdwFkDn3S+wa409o5csDZKapnxNlL/lOch7uNGw29apNFPK0Y0qxbBS77D9e+5OooXrE+WD2yd796+yRkesrvI5O/A1148+wVslJYiYtJRw5ufzao/oVk5dNgEyRZVpPSFEBDOUedFQahu8Yv5NEjmR/T6lBPwhZvIseqc2A8kgZnu4tpSBxveFhkv2TKB4oGqYgHpk2au3KwI4hnGli3PE2kbRJ12BLNMF+DXJXmMz9sx5x9N+qVCeKgZ6xKHxyUCvEFXDsxlWx4Yp+h2Svg8VveydnBb6/BzKREd8YxopYgpdx7bcs8ZUvuM/NXq3gHHgmumFJQnWuayuWSrOZFXiY+m4LPSKB9C8sweyucdAPlFmuXkpOyrl+SuOXdOKG+pvgKp7vQCYyIM5U67t0bAuyjs0TI5bESxm9wXDHB8mgC8sPXPlvBZFwafjfz52TYYphx7bBjrAjQ40cfc9V8uAAkyFppjQ+Oe8vUFtSny/hjckUJGLf2/E/rSDEheTG+92H2VW+R4HnqNM4+4qKsovFwpsFNlFQJGowbRAI4Ti69YpeWLVB7yCuEQdWfpy/XiAg21tcOlrCrHGiI9hr2f2e4FaZ28v3Z7G/p1T6TJU2fDJgGKfNlK8X6c7uWyfVY/7VHbCNbM4/21jL+15v6A9ANRqE9mNgHvvtms04sCDouT/mWkjmk6iFgzpjVpHONrA44SAHaNCIRqH6pOgUEAQrU3ZepNSHHAUHs1lqNVHZaeIXwm4u022jylk7A5CY1YkD4njlg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2bd07382-ea9d-4393-f413-08dc7c3d8fc7 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 22:05:02.8851 (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: DU2P250MB0368 Subject: [FFmpeg-devel] [PATCH 02/12] avcodec/amrwbdec: Mark default switch as unreachable 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: V+5Epm+VoY5q Alternative fix for Coverity issue #1473499 instead of a3bb269db92601e2dc0e99352468d02f7b26c7c2. Signed-off-by: Andreas Rheinhardt --- libavcodec/amrwbdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index 21a730b835..de1e661f2f 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -556,7 +556,9 @@ static void decode_fixed_vector(float *fixed_vector, const uint16_t *pulse_hi, ((int) pulse_hi[i] << 11), 4, 1); break; default: - av_assert2(0); + /* Everything >= MODE_SIM is impossible: MODE_SIM is patchwelcome, + * > MODE_SIM is invalid. */ + av_unreachable; } memset(fixed_vector, 0, sizeof(float) * AMRWB_SFR_SIZE); From patchwork Fri May 24 22:04:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49211 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2018522vqf; Fri, 24 May 2024 15:05:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVMQh5y+9WU4FsPGxwMJdp/5O5VF6YnROc7NBm2puHLpLFuUiGfhxLFa0OXF0E5MOv3mQ5vwipUIOZQBR1VYr0HT29sDmkJ3CZAKQ== X-Google-Smtp-Source: AGHT+IFIT2gysK3ToqBpVOrSHGV8mAfk1sewiTBu4pOVbC5gKfNCQQIfUo3ff9+Z04OUmJEnfz1U X-Received: by 2002:a50:bae3:0:b0:578:68f7:4371 with SMTP id 4fb4d7f45d1cf-57868f744f8mr233500a12.3.1716588324361; Fri, 24 May 2024 15:05:24 -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 4fb4d7f45d1cf-578523316f2si1219003a12.94.2024.05.24.15.05.23; Fri, 24 May 2024 15:05:24 -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=qoKyFftg; 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 6612268D595; Sat, 25 May 2024 01:05:20 +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-db8eur05olkn2056.outbound.protection.outlook.com [40.92.89.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC0B868D566 for ; Sat, 25 May 2024 01:05:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fsOYRRDR48CQ7FhGspLsPGsWXTs5Y2RYvLno+DQQiulFbUMp8QsVngK4mNhkyH7wtBvaLkhh/WRxa8pjGoLYEcRpDVB6XXfYhJqssdyqYQAh7+YKkjnivNYVERS178UmCcVy3zAwZBsALl0Z6PYnVFfoCXYg/zHa/jjtXyqc0FBcE7wwDSeGFzw4wkfgMhppUBmfhLmTM9Ef2HV+MpQfqaxsj2XYAzAtCFGQeBzcyrQaBvF58qnhvbrTBO2O3/M1yYEJiZYk4TxBR4Pcao8WkYI1TbEdTrt/kpjI3czDXjCFKrwDY4/QB2k5FR3SUQpo0qU1K7PpswkmZsfnZqTCmg== 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=aemugSAm3zB1ByKWddgvmanjzpRPj6xAhEfLrvQY2OA=; b=g3mNZ4zJti0OjxgebNZN3L41Viml7sw/sSL6fdAMRa+J29PoUT0Kd5u+f8VilehRhUBEIbeZQ+OMH/P4sz1Fvt9YRbpVykolzvU1lvsO5H6DyPgujVUkt6rvc9mZ91GCcN1kmtswUbysUyMJx7LgvX4oLDOXGhQtsD9UuIbAevrgTxVbqmaRIMjj8MKSYHsM9xpZxJUD2HiPLMZblPvlNjO7I84FRyOZLzWt+jSGA1ox+2fZ6PA3ISPlVUhM/3NbckERgpMwXciwXLt2UUHKQnBRzJaplTC4y7gHhviLJujSAsBGiuRHWGlMbOLmupimG4QKWjHDdKMYvOgHyQHTIQ== 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=aemugSAm3zB1ByKWddgvmanjzpRPj6xAhEfLrvQY2OA=; b=qoKyFftgp7b1ziVUMFKuaBzrO8534md1g+hI/pGzZ6TSFOzmEDa0lWhvp9jioF798lPcSUs1to26eTFMvDD5L4vw7sNI3b+5Rf79foiZ8/PuOFxJ9a2K6/tcC01/YfODJ3mOPGH7hqmAS/VUK0slLhXKsUs0xm2Qs+5rGfYeMC4mnszDiLzPBnlBW6l9MS6rZyGAwC3uwg6V/5kJYeEfiybN4e29D9qkNrR4PUl2tgxT9xqk9NiQQu97sDcuTVRud6Vl2nHuyISl2JjqT+Ad9epXU+X26AtpORVVVDu6aT+bpJepgArVGIVPxQoNMJ8GIwMMbeR2scSJ0fl/ofAglA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0368.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 22:05:11 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Fri, 24 May 2024 22:05:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 00:04:46 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [pZr2tdWDgvElyrGZLPZke5WamiJVI1yiqkuT+eyM4KQ=] X-ClientProxiedBy: ZR0P278CA0194.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240524220455.1276419-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0368:EE_ X-MS-Office365-Filtering-Correlation-Id: 1f1bef49-ae54-4a96-7ef5-08dc7c3d94ed X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|1602099003|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: WsoBK/c4Z67V8MjGdXlZ4c/IOTHpPf6bwO3lpvb8cYP3kVIwZjbCl0yT2A/5LURvXeJ99pNGhTtaT5++i74HSoBjbxk0yT4W/wadOPjfGAIwflMEInAN2IPG7/GmEidH9WFqHTMnZbWyDDWZSXhDNFw4urUSogQXM4hv/C7pUOamSZBecp5TDo2eiq67n5wr1inDZxRBQ1muukcyS5wPSSicGs4mkrSEcwDLborXTO46YMQ32kVhB2a8cnc56n776JZPtvVSuypArsLWKRy6vHvdnegpAzt22Ensj5eYqXjHyeeYZU9Fj0RL+TA98T6oDjocs6KETRRi0pAYi8yp5ISh7OfRiycXV7MeFqAbYAqrIQuXPTewt8BKxLwJ5SZhC78ZEyMi+7YLhaIYiyuMZIYK4FCZan2eOtJQW79lUra2aBRpb7097zd53Lk/eJIZRSLGEyWCNcIsuKysmHzJJB6GIKLmAbxYsaik5pkCaHPLxrGTJasQ6S6ds8x4LWb3vx3iicNKnOKaz1r0Fs9zawgfWjckk7UK+wgUK2fB9c/rhf/aY7Trtq5TQzboEXI36BfFrru1h5Sq4huBnRQvdc0no1E0by8C5mu2+LJ/wD1K3WNQfLCDDWxJo1X/ulgLJnZVVJHrGmuLd1NXL+UMKnDGi7pr7r5+Yi1YyheZlpW2HGysHPhD2sDQ6f12jXFq X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TebmcdhfASSMtb2Ithbn+Xl3efXxD0pcsbgQs4qHluq88oT6E8DnlYISDQlmPtGwwc6JOa1b35W++8tX8PR2CG5xyjWhsP68sQYjoAL+PsBqPIC5eVN6doj3v4BgOKz31U+ddn4saVt033dWLvw1N5VQ9ERWcO5uL1EUuhtxkqs+4q/Pw1grgNUYjoa9KSy+KkPvXjGuf93tXsD1IvDKWigvKpfDJyTWhy7xaX/yy8N5DIqCY+ckUgvCCGcLvnK40UXqFuPl6d2Io+ZvkdFiK2hHufXZi6R96DTGqO69T6V7SOApCay1LzZ5G7g+/0HhZq1sz857HTxcpgF/qEm5ouDu25o8xjG9tb6YYIEWLNh+t1OGwWA37nHnl9GYitGfjvB6msYjoaS2xlX5ERnE64SIxI1pf+8EngQ+vrHc7Y5Gam0b+ZzZI0SQwok0JbLCe+/lNgc5QwVAO7BEJTwJV/cznXGjrJRIUc+BV+ZycAIkcPegkfUBDhd8JnEnAIar4Gtjx+XhRm1HDSIzEFbtg7/IUzV07vKEQRUNUcHpIuE2qTWlseHJuc4XuN5OOmr0A9eCubdGUclOmquGxwq158C4GqavSfd3EGna4jsGakWoQ1sGK1QC6Vr2/Rb3BF4vv7/J3OziJ1Xan2sETLWia7uwiIKmt9Agb7oF5wJcCyx7aoBH6akeywpkCsQONy2fEjInDS/9eis++Wal4tTa8X6WBPcRYh6heRAcUzXzfC4wpcC0wdjNYKA+qNRFqsAFEzuAM32Tr1kU1QHkNYWzwsdK5emBAIrHv225dfp4azTBPIOEXiFZEnvdv5nRRRl0YL2Im8Ro/1Ajm1xBYwUfWF0tkdfogJjRBCwRhGCQze7OZFjlH//2VHYMIKN5CqLJEjeeeD3M3RlWL6/+lioySi4GKmRGpyNybtiT7eSuX6NGSphJKiiAqQdnto6VKL5JQV0PouNxCG+99FSAntIKNFNgaz51IruJdOVKkxG0o3z7x0XW6RFtCY6x5j6RVocdhNY2QnoRv6rBoPfgVphByzdBMufTvB+q4XT53VDlDdm22C9wCRUqbZyugfzWDRdfQl+yOnrjDbw7p4D+h0nH/KC8H1muSgeQ+bf5x8eSUVBWdDCpQw/cFfj27Ko/aEEa9lG3A/gzlKcTCm1Tm0+PNs6TgVMzUkCKDyZh0p6z40eDaF6COxmpw0UlV9IrikGji7QYe2APsMDqFBus3a5W32JnK+WAlLOGlxvgRFk3BC9QU4hNRdYLQcNajS7PWBYEAEyHzXnXEULz46HyG/rpbQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f1bef49-ae54-4a96-7ef5-08dc7c3d94ed X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 22:05:11.4804 (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: DU2P250MB0368 Subject: [FFmpeg-devel] [PATCH 03/12] avcodec/proresenc_anatoliy: Mark impossible case as unreachable 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: KdkLLvegXynn Should fix Coverity issue 1440385. Signed-off-by: Andreas Rheinhardt --- Alternative to https://ffmpeg.org/pipermail/ffmpeg-devel/2024-May/327293.html libavcodec/proresenc_anatoliy.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 2fb96e9cf5..7b7618af9b 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -845,18 +845,25 @@ static av_cold int prores_encode_init(AVCodecContext *avctx) } if (avctx->profile == AV_PROFILE_UNKNOWN) { - if (avctx->pix_fmt == AV_PIX_FMT_YUV422P10) { + switch (avctx->pix_fmt) { + case AV_PIX_FMT_YUV422P10: avctx->profile = AV_PROFILE_PRORES_STANDARD; av_log(avctx, AV_LOG_INFO, "encoding with ProRes standard (apcn) profile\n"); - } else if (avctx->pix_fmt == AV_PIX_FMT_YUV444P10) { + break; + case AV_PIX_FMT_YUV444P10: avctx->profile = AV_PROFILE_PRORES_4444; av_log(avctx, AV_LOG_INFO, "encoding with ProRes 4444 (ap4h) profile\n"); - } else if (avctx->pix_fmt == AV_PIX_FMT_YUVA444P10) { + break; + case AV_PIX_FMT_YUVA444P10: avctx->profile = AV_PROFILE_PRORES_4444; av_log(avctx, AV_LOG_INFO, "encoding with ProRes 4444+ (ap4h) profile\n"); + break; + default: + /* Already checked via AVCodec.pix_fmts. */ + av_unreachable; } } else if (avctx->profile < AV_PROFILE_PRORES_PROXY || avctx->profile > AV_PROFILE_PRORES_XQ) { From patchwork Fri May 24 22:04:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49212 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2018587vqf; Fri, 24 May 2024 15:05:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUSIE9JZbmqNrEdH+J+X9EoveDl1M9DEsoB28xRxFaIgcCdvDzpAbE4sTrJLI/bIbSj5Syn/5DZrmZkXfHTo+QAAifs8zWNkgRi8g== X-Google-Smtp-Source: AGHT+IF3xWJWxTaU9DfmptsOCWsY0gG8TvpiwHmHLT++c27/MuLOHLyz9TeCOypLO5tZU1bEgVZY X-Received: by 2002:a50:8d0f:0:b0:578:34d3:c89 with SMTP id 4fb4d7f45d1cf-578519b275emr3047868a12.28.1716588333433; Fri, 24 May 2024 15:05:33 -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 4fb4d7f45d1cf-5785e9f6f38si855150a12.570.2024.05.24.15.05.33; Fri, 24 May 2024 15:05:33 -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=XBWBXCaB; 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 8DA0F68D5AE; Sat, 25 May 2024 01:05:25 +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-db8eur05olkn2056.outbound.protection.outlook.com [40.92.89.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D21D768CBDF for ; Sat, 25 May 2024 01:05:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ctme3pvlX3YbyBBNNwc0qgIFh+af+kmN2Nm6yOPHM/WjeVNQMnJ/+3xpMvDF2Wd4G902vDOlUqlr+HiFwfcEhHjHnHFZJB/p5oPDn+Oo79zx8irhIrcJKbwIsddxUNFnYLXCr4PRL0QCDsSkaHwUQ2KbQKittH6GX1JLjNfdZti9gtpe3qkYgsya/bvqbHfjZ/egEN+dq+oeRpmI0nEDrMlTXp9lmUyypo0o2k6MiqKTWQa++/N1fZgy3qrQ6sP1bJbyfNHdg47XU5+9OOu4zvmm9dzYa4MN87z67G7nBBb6N3/o0u34kXPFQx4Z+saQIKHl1vgMJ/s/iC0R2/t3JQ== 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=AjeK9t3vhyR1SLvOvT0hfzwTvfByxYsaIl5vMCZ8+Hc=; b=UaZF2nPEVLZ/sjmlzN8c9m8hPiE/L35qjHi+WOBG2w3LCKBqCyeRUATqSXoeCqZxlLOO1CdyOS5004CEB1ZoLdPRANoA+RHRqF8ok0ZwtBkf4pwiIo4kpDkVbmMRm6CRzXROw4Crxvma5B0HOBgdpxmZKiY7siW9JbpNbuTBEQ23KIjSFN3w6lX4pld1JVMw1DsRM1hiRya5YBZEdRr0SC5lhFJRKcZjaMvEgrVfoc+ThsqILF3fEv0JyWj+pTd+zgar/sCb0IiMjGkWCOeJ6D96y/n6aq4Qp2ry7jHduNTHz7sSNc48vMWBuKYSt9C+YPTwYxwAGdqPJGT66U5AZg== 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=AjeK9t3vhyR1SLvOvT0hfzwTvfByxYsaIl5vMCZ8+Hc=; b=XBWBXCaBb13g249rgdHkP+cYVnJm0bOSfX+oaYHU0dfwrnD+ED78avBJQpbBXWbEoIp6Vd3cK/HYvucEz01bm7IYrRvWQfEdPKEyCLZFIjMCUppaKztsrYny9+Rni04UIB3yBE7ZZ5anj8+2dJ6B2Zwy95KIm8RDE2ZFcL1Owk0JAdENCGRVj5u35PVp2tANngChJY9mYMdDjDqVeoyxwYlzST+/H70yd0Ka+2BK7G93mJ7VCMTIzlzB9S6F9+LnVDd06WrbSUFGLMUYiam0SAr2KjdlB9i65hAF3DfRo1BEblSSrb5n63BFxrhpcWvkj1adzFwbvenkiMXS/X5UfA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0368.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 22:05:13 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Fri, 24 May 2024 22:05:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 00:04:47 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [geIj+VNTF0qKPDGPUZHg/EnIuzdQUekwcRwDJfRlz4w=] X-ClientProxiedBy: ZR0P278CA0194.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240524220455.1276419-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0368:EE_ X-MS-Office365-Filtering-Correlation-Id: e57c5696-ce9f-4f4d-4edf-08dc7c3d9644 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: HJKk7wD66s41k4SUZw3DDnw2WgqK8aVV5T6uw/8UgwvrWu43P61f93N4Eja8A1XtYGoFmehOVMQgmaoadvgKAt6SOy5EVMJV+GltcXBAPo+yeII0TqS8pqeyigzjKBF8wl7UCFJ+2faR6XIZwbifxVaBELUUkhy1IkuH03ezaMdJSJERt469jjAb2L9Ph0lTjfygc73CWA2h6GfJD//rMlr2j+Guh91AaDXP46hUjGaNP03xpQMLh65ookkvXp/H9EJiDI46s3+HiqtRGcxbv7djBK6gm8enPtCjyxRro91at3nFDHxoiKAEshMyCLnHQAgmk5t60ts42EVN5pi+yL8iiBLLtd6x+WRinbKDBLp48SOrL6jxH5VzXuCSNU140hJpY5/8ghPkp7RIB9LdysGOGbgraBmWx25S6e9NxGDMD+thcz39Rp/9Dep6xMeX1+dHEMOaHynfV4u4zrwSl+axdpZotLsGutHI4D6kboNDQtwLqOvUmqC6e+WIqF5cjeeMWL+oAiBMbCGmbgwNqOSvn+KRbB+H400A5IJkSpzddkUUzhFWFW3IDHRgXojmVj2eE4rHmTr1ov79TmarqA2zGU8Zl7httz7VNjcoTzdmP3pIAdN3y6pCqg+iuR5v X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /5i5sHqSWz8yhX6hGkJ4hGUjTqwiQc9WAGkL0qy+4kQLyMpDtoU0nkct+zA7ogQMDOWiwoZMMbHnWa8ThVelB9Ho8S/GR3eivFbmpVV6UuHmg0c/7NUEQ0rjkE1E4VSPN3yrP8tTEXzWMItcmECbVA6itP0pIZ4hJ3tF2gENiXOL1GZHe5z1BgiwgiQVLNfc5pNyUn+hHk/tRmyNj0exRWqqygTYUsVoMwbfsx4EehVKWDKFqxuyWVg+pv6v13xAxOdnut/CPetZTMxk98ECmzQ1N7jhgMr88+GkbLHQzrqbZb/V9Y6+gDYifrrIAqjbzKRdXj4JAlfxtA0ghr1z+T/KMZ6SrAI+PlDFEPzm2j/EE4Dg5/MNgvVh3FwnQOjABN544TQmn98AV97zWDGz7yoY7Vc4E7vvTmwcMYsJTOHKBSXbXcJ83pXn+I8WUddee3tqxiOSg3f41jgDXRV8npCcHKYiQAsdY7a/Q/f2nPD+9P0b3h+xAfJgHZTRloN9l4UUpFSn+bhD9mWaMd+Hb0aaSrAxWCG+MBqc+EsK5KG0xYkmmoboXUbtvwVMTi2BDyFuSXrxLtYAQRyaMjM9vAWWrYpT+GPiQRmozTnEQWDnM4rQn7CJ+DYWeWKsgzM7pydiq0M9gnGARj8XHZjG+k270vxS1eueZIkWZEwuaJU16SlS9PUQ1kBuwLIkXIXNe9INDjJJY+znWiLpM4ap0lhWwqLNVLv1cElUwAIcsuOj3eWKfEXWQMcAljbl1FWGn0wQy6YDVxBFcMLZMxYBLx3oL0ZDiJpduXMtQkiMGtChABr/8yWYeDI5CXNusAQOVp6CJejDPcyv4/b0MS2/z3P1SGXUOvl7o6zCWYaIXTQqSsrWTo2W/g8vk6vnFJeBXFzj3HYL2iZ0T5ODZb8tiHwC/Og3Poky2aV5foPM0XT3Ag7tyQUznYLpednXCp0AsdH96j8JuvHOqwNEGae9HqoGd16G8KmCeyNx9nEgyVsOZj8lmiyc0v6U1EqY/ZMlYJhO7A0i68K/QdHsbkajzRtTbembtarkPf73xIGejGAq9oZUGeqQRvf+WnZL5o20ea4kcNUyW9f+pM0QQpASYB9nRRQDkW+CbyHQC0Rui/A4k6oFUCHgkjs594qjKUO8g8ceICtapF1xRM7b+3qo5Uvz2xmLl48DpjwufHAXz345df3cId1XfQkUuseE3dAjCZ2wdINET9yB39UsQGdEk4noh6WoUXdE9X1GUZznBjnkl7G46AzkoYITlaZmNY4cFPpBfrFZRO3W1Bv/S8de6A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e57c5696-ce9f-4f4d-4edf-08dc7c3d9644 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 22:05:13.7052 (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: DU2P250MB0368 Subject: [FFmpeg-devel] [PATCH 04/12] all: Use put_bytes_output() instead of put_bits_ptr - pb->buf 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: 1nATK21qYx4X Avoids accessing internals of PutBitContext. Signed-off-by: Andreas Rheinhardt --- libavcodec/ljpegenc.c | 2 +- libavcodec/proresenc_anatoliy.c | 2 +- libavcodec/wmaenc.c | 2 +- libavformat/mpegenc.c | 4 ++-- libavformat/swfenc.c | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index 46546e2160..3443951af5 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -252,7 +252,7 @@ static int ljpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, ff_mjpeg_encode_picture_trailer(&pb, header_bits); flush_put_bits(&pb); - pkt->size = put_bits_ptr(&pb) - pb.buf; + pkt->size = put_bytes_output(&pb); *got_packet = 1; return 0; diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 7b7618af9b..6ddb799297 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -382,7 +382,7 @@ static int encode_slice_plane(int16_t *blocks, int mb_count, uint8_t *buf, unsig encode_acs(&pb, blocks, blocks_per_slice, qmat, scan); flush_put_bits(&pb); - return put_bits_ptr(&pb) - pb.buf; + return put_bytes_output(&pb); } static av_always_inline unsigned encode_slice_data(AVCodecContext *avctx, diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 6949f08fb6..eaf0498ea2 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -425,7 +425,7 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt, put_bits(&s->pb, 8, 'N'); flush_put_bits(&s->pb); - av_assert0(put_bits_ptr(&s->pb) - s->pb.buf == avctx->block_align); + av_assert0(put_bytes_output(&s->pb) == avctx->block_align); if (frame->pts != AV_NOPTS_VALUE) avpkt->pts = frame->pts - ff_samples_to_time_base(avctx, avctx->initial_padding); diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 6b6763c30f..068bc9d71e 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -124,7 +124,7 @@ static int put_pack_header(AVFormatContext *ctx, uint8_t *buf, put_bits(&pb, 3, 0); /* stuffing length */ } flush_put_bits(&pb); - return put_bits_ptr(&pb) - pb.buf; + return put_bytes_output(&pb); } static int put_system_header(AVFormatContext *ctx, uint8_t *buf, @@ -269,7 +269,7 @@ static int put_system_header(AVFormatContext *ctx, uint8_t *buf, } flush_put_bits(&pb); - size = put_bits_ptr(&pb) - pb.buf; + size = put_bytes_output(&pb); /* patch packet size */ AV_WB16(buf + 4, size - 6); diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c index d106e16d19..fc883b8023 100644 --- a/libavformat/swfenc.c +++ b/libavformat/swfenc.c @@ -124,7 +124,7 @@ static void put_swf_rect(AVIOContext *pb, put_bits(&p, nbits, ymax & mask); flush_put_bits(&p); - avio_write(pb, buf, put_bits_ptr(&p) - p.buf); + avio_write(pb, buf, put_bytes_output(&p)); } static void put_swf_line_edge(PutBitContext *pb, int dx, int dy) @@ -189,7 +189,7 @@ static void put_swf_matrix(AVIOContext *pb, put_bits(&p, nbits, ty); flush_put_bits(&p); - avio_write(pb, buf, put_bits_ptr(&p) - p.buf); + avio_write(pb, buf, put_bytes_output(&p)); } static int swf_write_header(AVFormatContext *s) @@ -323,7 +323,7 @@ static int swf_write_header(AVFormatContext *s) put_bits(&p, 5, 0); flush_put_bits(&p); - avio_write(pb, buf1, put_bits_ptr(&p) - p.buf); + avio_write(pb, buf1, put_bytes_output(&p)); put_swf_end_tag(s); } From patchwork Fri May 24 22:04:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49214 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2018744vqf; Fri, 24 May 2024 15:05:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVKXj6mzINUYSQgQs/j6w9cPhg9syH2PoIYuFYPJ2/bU+C+7tR1cPpnH63OGAr2bsFgcONno2C50GBB8Dk7tZ1WR/w+PK6RA1e64g== X-Google-Smtp-Source: AGHT+IGGWIl7gFu953pGlnS8RwiJVsQpb9vDIvtPG6DWD9UR9Frv/ilN9RqdhvFBocCEI/XufLH0 X-Received: by 2002:a05:6512:3c6:b0:523:8723:32de with SMTP id 2adb3069b0e04-52966f8f472mr2905066e87.53.1716588351877; Fri, 24 May 2024 15:05:51 -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 a640c23a62f3a-a626cdd15e9si117541866b.929.2024.05.24.15.05.51; Fri, 24 May 2024 15:05:51 -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=NXQX5bYq; 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 660A668D5D2; Sat, 25 May 2024 01:05:32 +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-db8eur05olkn2028.outbound.protection.outlook.com [40.92.89.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A013168D4F6 for ; Sat, 25 May 2024 01:05:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S1xyH5IWOacRVjF/k/xQjBsZRiXZX/SYGKk78JSDgT+qH2IbGVhnqU7u5x9KxZ3sZsIqfDfrrFZWcRNOJ0oDqpM2oUFGvdvcnIp112GDH0pNhYgCH0RUt9WkPmZ4q2W7A4tyPuyCs5q8RgAStQ3+obTSTT9krgHIVGybtkvJN8RZFHh7oJ5qbi0FwQr4q+4DQLQ7Zbxf7rNkOY5mYFdbhAnV6HS1JKabO5zJ4Y8wGYWDmtppUpuhn0ZAX4B3um85HHfV7fyRdCB0ksxQazjHKU5qr0RAHYcCMy9m7hewmrFTG8geKIwKxtnjOpSK/eoeZURy0Xg3wpB6qG3hTRehOg== 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=CnlXLYfH/ImZdv9ZR8Tn0Gx8u/9zDFYMRyjiE1cVuzY=; b=XVlXfDk+yme1umulWHJi3D6jO6LuthlkSgOJfiuEWYSSaKAB39tLEbjack2Vd0n9xevw9GYCTiHTcEnrsa97XvIw32tt3xRewbexxclOBRBf9X1L0VeRVgTK4OU3EEec7TomdSfHnXX85duBawUASWN/IUUs91sZjxrwIZtNc24r5foFkuNxSzDWbo71Tfiwq0Be++8fBIKTpm9ospB10L8KaVos+P0GNQhs+66AUL9BUAP5cXiu69djvglIA7KL+27OEjLOqgECDjddXZfU+eU6EhVg3WYRULnJUwsJgH64fJufJD9BuEzmNTCo82w8z3ZhtOyrPwdiwP9MfPu4SQ== 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=CnlXLYfH/ImZdv9ZR8Tn0Gx8u/9zDFYMRyjiE1cVuzY=; b=NXQX5bYq4b7V/P1MjHaMGTPih79fgJecWk6Iqu/ts6murw5IulAfPjnohBrHq/SXjUk59aDKYMpjCqu9FLvM1jy8usT3HeI7zXNvRb/b2h2bbkPbTAqOQklvnKrY69i5TPSNSYGBLRJFqrHtrXbA7kWHGCZh3at8mhHrSk+xsbux3GJec3rUlG7sijfmz7JmntOJ+FXc537KEPDLN/bV25wrWWZ/T2DxQhdPVeYEFSijkWQE4hdlcBvqCIf4urZQajommbSyDKDTunUdCgKrtQGD9jBPO7zhhfRvQ3Py5656e1XJTj/Rr10St1cuJQm5SqN8/li6K0PovmLyn7gYNg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0368.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 22:05:15 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Fri, 24 May 2024 22:05:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 00:04:48 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [xpgjatxWjP0TdHQ5CGZGhOuXXFVIrn/2QFHfXeK0+bc=] X-ClientProxiedBy: ZR0P278CA0194.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240524220455.1276419-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0368:EE_ X-MS-Office365-Filtering-Correlation-Id: 50430f12-138d-495e-3b07-08dc7c3d9707 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: RKyDVPms9Bkj91DYtNDSn2TXZV3xaQgYTK8ekODomvD8boQT3+3pvMiHFcJAy5T6wtTUqI0o7y6TZ/rfkkzHVKKaOxKCZi69ezksm3XY6eYkWogvyM/BD7mxnUZcMS2Dt2cSoD+vs8qrEoaXwDdDwszqrVYLCGrPWrm9GNeHjXH45QXiZyLm0PmY+ul3lUEKI7mzR3/t5hLclqVg2vp7bOMH0PPwZ3fYNn6b3zDfjLs9k6alr+JeRcPm0LQ5brPZUc9Gyo6lMcXdFsTUYlbxCv3Owuf8tvCZNQYNnxsNFRNKdkVpwunFRYjf0N8ZWpGpKEN3jhKgahqkzukt0XbdpPljJlZHw7uFhbIburvvZ69zrDBaFYg9JgNTtzQOCdMkSFiGpjCMwapECsGKGbjfQtvHgb8Hq3Tuqb64/75CFq5izNwUQ28TJR6jrleZS2X9XK5baCwnJGA3/tpc/rP1KvDHB21O7wsFh787597op0ihY36CMs0pVMitER14yUtAxcj3AP6UKn/3GuEhXHz7kGJ0yennjWKUXv1+uD7EoRUcPTm3n6wJ5qaVi2djSWETCe28kj+UQOeeFAvGQRyHN+I0hGz3lnQ5iQD6twTufG736D70hwxYgUtft4idT3Ya X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NlN35eVODJLBRX+wzeigVETJMkUAWvO9/m+yIvv4bKylaK0Rc17MS71DR9DUP45dGnJT0GItP6dKgClyxsofbzV9hWGhVwvSxnSyRRYu0MwE57eEfc8YH6px+m1rIdCBF5DjpP79ZcID3bzlNTV1F4EBV6nrq04icLwGY5p/U/dPkwLoztROnkYwOBd1c+fn6De2MmhCXKfJx9jxjGua8KzT6OVnuwnq6EwWl3DP2vDdoR9l1EN48BzKTYwipjTybrmmtcKoNNewisOiGWZArskzdfOtDGKVPYQReAR+MsrJ5NiPO+0NLYZsRMH1dfBgtxzTWNCX5gR24omCEsOhaY3C3lfMXVxYaeMXySgu6+nt7MFWQfnWkTwwdYraRs1uBYvNl694AQYvYwLjBCVamLusAYwlYdjL/dDthI72ZMFC6yTbzPRy/SyiAsleltxRqb4XQjRmD9y/0YI4mFQVaJPeT4a8LHF/OPQuH7co0PFSUKRzhTWDCVLCpZ6xxeGg0YDEAoA1KDtt3C4gjdQE9HeMSdHvM3wWg4N+RwHudx0Ejeyv+/eJ9EsJpBhlf8aezaCdd+DIJV2hjTVTpnAOS3OjxcOBghy3OQ9AFIrODgtN6ce9nOpjk+THcDRjCDzKzSdPg6+0WlEFNqkVApYSLooWaWpjMpm7PIbzGTr7EPB/m3IuS8B2MUjj9b1cdO7pzrMEh8yGuQ5veb70s4B1+EAt1Fy//hICWOS1ftn5yiJzaKAEyDw8/MDnsGtSzoGYNzCLvCijEgSFbFqzKWVNVPgGgE+/BHjl1eqM+lvNj8rNm/dYGjccaC2uF1QAssMYlOQ3ZH1rfo1qBnPjTbVwKdlg7Akz1lnYZ78vbbE6eAPdRhi1z16UjlXJLTLrmAfmoVEW4ofSb0p5sc+2s34Qlx+necnojXAmHCgao5LefqMqLJqucHTR1op8Ykm+tFLOWVOQlVTilI127orDs8m9MWN5L3q6O9BoJl3x08DuNss4Efv9Me4OQpgl0l7/mLYzBNCVNvh7DZb3yLV6Ab4ng8Ivy+Yxce7cFElY6inzjL0JBM8506FCq90wJJU6lbe7KhsMeTu4EZ4u/3/QC5kD2RUrw6qhHZfIiGbg5SmdDctwTGDF01XVWVaet3Asag80uaMeNYjrppzpSFd+e286kTd5Hk/xvuq6BzfosRosrksPm1X5s2Nk4Fuz/fb1nCJJj9OAQtPcRcL/a601hod8iyIjTAw+xI41Bi/rrxJpip0KBfWWyWCYh6ODCBZAbKy1E9rMzNAgHX6CQg27RYLpAw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50430f12-138d-495e-3b07-08dc7c3d9707 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 22:05:15.2551 (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: DU2P250MB0368 Subject: [FFmpeg-devel] [PATCH 05/12] avcodec/mpeg4videodec: Mark impossible switch case as unreachable 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: OHe84xjHkc0P Alternative to 8fc649b931a3cbc3a2dd9b50b75a9261a2fb4b49. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index df1e22207d..724ca202f5 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -24,6 +24,7 @@ #include "config_components.h" +#include "libavutil/avassert.h" #include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/thread.h" @@ -598,7 +599,10 @@ static int mpeg4_decode_sprite_trajectory(Mpeg4DecContext *ctx, GetBitContext *g ctx->sprite_shift[1] = alpha + beta + rho - min_ab + 2; break; default: - av_assert0(0); + /* num_sprite_warping_points outside of 0..3 results in an error + * in which num_sprite_warping_points is reset to zero. */ + av_unreachable; + break; } /* try to simplify the situation */ if (sprite_delta[0][0] == a << ctx->sprite_shift[0] && From patchwork Fri May 24 22:04:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49213 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2018671vqf; Fri, 24 May 2024 15:05:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWu64SjfsvjoM9TwRRCYt7nDV47/Ew1VakCOe7DjJki1Qmc6y+E9RDE2bDezkkGIJRLFoQLqWSUfB3MgxcY6SZ/fDxkQQp8Nf9cOA== X-Google-Smtp-Source: AGHT+IEQYPV7xiMXuh2w1ojFW1whJlWnZzZOLpi9kplfmfHLUIbAkpzEKeHmgSiB26qW/BoQHEHn X-Received: by 2002:a50:8754:0:b0:578:5ace:1c96 with SMTP id 4fb4d7f45d1cf-5785ace1f85mr1798850a12.36.1716588343234; Fri, 24 May 2024 15:05:43 -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 4fb4d7f45d1cf-578523395c7si1256442a12.1.2024.05.24.15.05.42; Fri, 24 May 2024 15:05:43 -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=l3TfxFg4; 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 020FD68D5B3; Sat, 25 May 2024 01:05:31 +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-db8eur05olkn2056.outbound.protection.outlook.com [40.92.89.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF98C68D5B0 for ; Sat, 25 May 2024 01:05:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LJPb9uwWrLEoh7vzExxVy2l3W7WSBXTzSlqHFVKKBz33Qm5as0NtkC7Pxo2sYiWzuJldtKZysk4Ag8icdf9MRyMLdPvCzB/MUbX13ThZCspXaqRYn0uJRNKCTGTbMdDDz2r0CCyLHRvq9XU5rX+ilCglWxtSfifrwbNlFNqfaQbx9Tyg4BATMIvAYrg9rz4NSbtNcALt8skwPliRWfAmZ04Io28uKw29/7xdjH0YdlSz/aAyNpj+1Qby+fXdTDqhrneRRMiMlQMqYi6LoDJnB3rps+qzyCGmFWzehWju/AtSOQwjJFUvjGeGITQL892VV7TSkaWV272+TWwcDYvG9w== 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=YPrVmvNscfa7lAe1uywTUr1SLvNZ3exaiJ5bR4X8yHA=; b=Xcunqmb5y92tlqYgfvOrsIG7kTydd8WRbUX3V3jUxCBrSQ101YkYdNtEB2XEaXQai/Z+qi5nK/aXTYnBoB23e3aVv7GNKqp2Gflw9V95Uq64837fyO3O5ygIdwrQRv8ROQD/RXz3HeaKt5gfX8r7V+1ajOn/uR/X5OO9uC4PYqfHooTEFl/78CdVmDrVQBbpBBoydwf5CSMc6YOmue4AOVGLJgL0niDdr/+MlZlY/v2uSYsw+3i9i/q5w0HUec3cb90Gaea6LrxkoN+JQIAGlG4qP0v44M9cwYKg0Ym7ZvZVMFAPf5JeA7bTwe1NMbS541wPT0wrJVviKRNeG1KqLQ== 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=YPrVmvNscfa7lAe1uywTUr1SLvNZ3exaiJ5bR4X8yHA=; b=l3TfxFg4uH/IwAqneuBAaN25ukDd/rcVyR4LAmbwCCrCFmR9bs/iVtJBqs/R3RVamcrFGng/RjMTngfOWWAoD1lwBzDRVq2y4qpJl/6rDjP7dZ+MswcOq14qk8o87Klgc4LQ3zxF4OV0BgOgvf0EF8V38vNgZPCe7Co0GNBw04syw31JaLJZI/DuV4FDxt+X1W2ZQ2ypVmucK45sgF6OpTjhHqttdxCGzuMgxDwWeWWYIIuH0r8JHoIV/erbmsHcPHj1fVX5NjTK8StNATM47xUpRTO8WkylsnbZfNa9dE0BE2vXrwax60hcndwQc9jQO0ATRsx4hfTW5cxTGnRL+A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0368.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 22:05:16 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Fri, 24 May 2024 22:05:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 00:04:49 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [gm6I6oykWqVn18kApK7uHkZx17g9aIBkpzg7KuU4oRE=] X-ClientProxiedBy: ZR0P278CA0194.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240524220455.1276419-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0368:EE_ X-MS-Office365-Filtering-Correlation-Id: f42451fa-47d5-4994-a392-08dc7c3d97e1 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: iOzN4gjUWFRzQLfEos4QcTJmQoZfN0OunCrQat4JkusKJJ738AwFEl4i+NP7KjgXt/6BRR/BGbzCHvutDJbUSN/aRDq8MJmZTaapQdzEJPJGxKWhb5PRLlCCAtnCPavH6UL7XyMhOrCBzCRfvgidTH/Bl311lX5pMEv0i/YyHThXpshrjPbNhq39wXvgpcKnQ85iVq50zRJnUO8l87VAoezyy15duLvQgeV02wM2NlHqd9CMJQ5jW6BLXbCfLW0KdaZQ6oD5hu36rYl532OrblQS012o5o182n8pJpI5bfjqkXwvJixKN0Xmj3yWX/Wt+9qbCk4Y5TzoM/oV73F+Iy8br1IfkkgCo/Of0aZX3/hgCqc3z6PlQgDg3ibIuBjoBMbwUJHOUcvUfu+FGToU2uZabIXDzhqPbf0ejBbkKHUBh3FjGwPb4t+lL/Yz3KpPM3si5BCfiwQcFPKDs2G73zI/XPpfA7k5xL9s9BNzXd5YuT0p+HblnXNoxyYOiahYtzlouFB73nnE7owdDeLpowNF5qzwvOYnxbmVesyvMFpSFGgOsXnf7sDfdXI6wK13lP+JGT5iWtqplyn3ubhIqoBgL3McKcuVAqEMOdWTtRgwmBq5DPG+HFqkC2IpLvMj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +r/w2BpujPjjx9piMfOZf85cnqUAcYd7spmWZfnYMXgqawl2i4IKMgj0Wk+XtC/UZl/AZXhj/SD458gyiJeWk1BgRho8hOCcofsgskfnsNgyyMl5TR22MyP8EwZtkRQjFZhoCAinX6r3NoabgnpnPKG6G1OAjLhQ4xAvOsqqNdmjnphZIfmB+2/4J3Z9HMSMtu8KkCFJPN7uk2HwbgXBaOtrQkjiAAMotSL1znoqkimQxszjFQYke5Qv30QG9C4jpxIjbORbDPqPGSqftGt2IN3B5QIl92i5lSYkC5Ub9HqUGb9sbIGM5LndRpVKCzUBnQzY83pm3+M4sKAzzRhl6HYAAI2elB3HnV75ClrAoNOjXCefmHbdegCP9+TaUg60mtAONBBCCcsHxw/iJ12lPlSAZMdsdjRpZgRs5Max7L2gocBrrjgkHNOobAENNbhGi8+uFAwhgXMef1bLOaUXVQqT3md4L0gECM4oCHMRY4KmySGzJLzqcHgynJAEZ+Y5aKWqsF9JcXCTGcB16FwcEaMkiGqpY3wB6EnAzCzPJqMnbk4q6zo0HA7bofjHy6KLPbkDBUZvPeOW60KuBwE3j4bOBa/nT403fV+uAUuJ2zp+4kF8YPKJ8H2WhaPn1qokt5P42IKSakryiqrMjbxS5obzpt5CILjEkpWzsMqK5hT7QPYkegYocH+glpDsxkO1tFV/AL1HxHaVkVWgHMAPMfzakbyGY4rUKk1jS7yyqw+DnlIzGEwkSr/c64/OYCBH2/CBdjqALYt8pUH3E4yK/x9/2OwvFYWqaOJ9zXHeFfGpeja1GNIOv4rFw3GiFe8VASl6ixxU71gxUqyOt6FPbGmPmkmrDkJ8jMFeidnyWVPr1EIjbAsnvSg2aiPZvZthgzHJy097cRP3m1vjMA//WSPySadbK/y3r9XEt6BhU99HfTZFiA/EEgpnC/dOfFLGXlXHv1PcjdqqGg7kRMiqa5NCZ+jhIVGgymjCcW3tHbxz3VJ/TQVn/WldrkxYu7mUJTo5R5uE+kxhKqBMjmBdtwKqh+w7Hq88w27pZK1EaU8vWf79ttPOzAIaLHxNjtj0zgX2dzWzFE8aJbgwbTBhoDTJp2RWk3pTzmU/WJS9ROG0r8fvd/0mPTXnIpToC4rcftzfIfrMVomzgL91vly+0Exc8o6QuMh5ozKTy7RrlLe0a/rhUwZg8yix8YIwIoIV4Bb0J4aiI6FQT4uu5KkixB40FCh4trns70PKig2fzBZahYjwhxAA6/pWvasFb0g2NSc95vDT6WAuvJvlH95dbw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f42451fa-47d5-4994-a392-08dc7c3d97e1 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 22:05:16.4645 (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: DU2P250MB0368 Subject: [FFmpeg-devel] [PATCH 06/12] avcodec/pcm-dvdenc: Mark unreachable default cases as unreachable 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: jlVTbimy3WhI Fixes a Clang warning when asserts are disabled: "variable 'quant' is used uninitialized whenever switch default is taken [-Wsometimes-uninitialized]" Signed-off-by: Andreas Rheinhardt --- libavcodec/pcm-dvdenc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/pcm-dvdenc.c b/libavcodec/pcm-dvdenc.c index 1e7ee644f6..c3e853ed6a 100644 --- a/libavcodec/pcm-dvdenc.c +++ b/libavcodec/pcm-dvdenc.c @@ -45,7 +45,9 @@ static av_cold int pcm_dvd_encode_init(AVCodecContext *avctx) freq = 1; break; default: - av_assert1(0); + /* Already checked via AVCodec.supported_samplerates. */ + av_unreachable; + break; } switch (avctx->sample_fmt) { @@ -58,7 +60,9 @@ static av_cold int pcm_dvd_encode_init(AVCodecContext *avctx) quant = 2; break; default: - av_assert1(0); + /* Already checked via AVCodec.sample_fmts. */ + av_unreachable; + break; } avctx->bits_per_coded_sample = 16 + quant * 4; From patchwork Fri May 24 22:04:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49215 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2018829vqf; Fri, 24 May 2024 15:06:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVIE7MRJKGlfNQezbvCx3rk3fH5nkcx8QDkhyTvGxPrjjv9ftt+S/YyTTlwEiaSlm/33fFM3UZTjjLzl1kVqoljCf7uCmmWtVtF1A== X-Google-Smtp-Source: AGHT+IHh4v0g5mwqfnFmKs8pUC+fxTEcDTwoJ13HoMCbTSMlPf3hMaGfyhkjMZDNhjzACGKkEeG7 X-Received: by 2002:a2e:9dd3:0:b0:2e6:b00f:da92 with SMTP id 38308e7fff4ca-2e95b1dc418mr20601781fa.24.1716588361574; Fri, 24 May 2024 15:06:01 -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 38308e7fff4ca-2e95bdb12ffsi7418791fa.221.2024.05.24.15.06.01; Fri, 24 May 2024 15:06:01 -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=RXAjgnVh; 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 ADAAA68D5D6; Sat, 25 May 2024 01:05:33 +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-db8eur05olkn2028.outbound.protection.outlook.com [40.92.89.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8326E68D5B0 for ; Sat, 25 May 2024 01:05:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ovzzfyd0TlwC37o3NDbcKQr9izO1Uj+8tdLlZ7PkKnHAKb+3KxWpDahJxvSPFrir9MdMJTyZKc1puR6QXShjuY1nUWOuaYqzEOVIByEDzjPvL0hgWnx142povU1H3SsaDO2amGY2xdLH1RgpXTHK7kX3Llwxr40fvxQ2sVa2TyTe/ONsknSetaRhLH4ZoWUqc97o6MoTFYqc8GSZ1KRQVpg5VKNTfiO0F7Sa6UqiAZ6uMJMQfpsTFWsTX5Y1L1ZFdORBkX1K+bDpvoMC9TpqL8JhcRgLg3GqYwkLP/BOoCrSpdciEWs3dHLLH96tq16tV9zdIvVR0jzeYOQvXzc9rA== 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=JDurPhuPS1GxKI0zlfxf42/uvEX0NN8QhudVwp6QyLo=; b=ntrdZMp4TCBAHmcVNEAYwtPlMbvrWSHC3I4aYnma81XBm7xU8vXrPoECp+xrSTZfzvKxXgm33Bym9o7XDKqX0uHrJIf+8NM3YP/DSQndbe4ur5ljMFVY4XqpP64qJxiiuWOTJ90j46cJK0ATs/9q8dtfSbuVD1/JM6Hduv8xAgKRxnrGDU55A7XoSrdAq1/E/A2z2VFf0OYT8BWDxkESws8QnS2zxgFSqXbXSIaZH/Ul6xgiivWVqamdMBXLVkseq+qNjiT4gQdhJ/KAMHqk1/8B8KnT1DMEGAqiQoQDVO5JyvO6f28iRZuYzxXAZEE/dhZ07Kai7nIQxhkTzMzxoA== 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=JDurPhuPS1GxKI0zlfxf42/uvEX0NN8QhudVwp6QyLo=; b=RXAjgnVh51t6mkNFubV22NfgXee/++BUFd59YmV37Ie9v9otPYaE3k99GBDXzuBrTMM2U0pJSId2vcfDaCcov4M6KvxbYneJVMyHzN9zZR3F4wx4Tznt8HhlCNxh06/jWruoGnnbNSNNnrc1BoIM6f0AH2OjQlKnfo92PdDRkQm9Y16XyID8nTDfNM0TEyLndx9vCtAFM1QYy6p4gPc87KqOp1DJn1Jtqu0E6GHXyXdGPTGh6Tq3w4QaPknwrGOtyRh88WnOBCKflSOrRK4hwaWUDekdCtTqlSUO9h6SoZc5XiRCP6wutD/9+KsjxuungXA+4XFROs6DqSxGntMaBw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0368.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 22:05:17 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Fri, 24 May 2024 22:05:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 00:04:50 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [xaagMYmgznzAeuCDA1Qedo6T3YUiSLgu+T/twSB852k=] X-ClientProxiedBy: ZR0P278CA0194.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240524220455.1276419-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0368:EE_ X-MS-Office365-Filtering-Correlation-Id: 571591cb-08dc-4f96-31a5-08dc7c3d98bc X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: F6hIfzAOQg9OsmwhbiSum660OrwAn6nLv0UrlUdH7qFS+b+y5cwA6ZMzROQpQmg7uXQz7PbXhgeurQvUE6r4e3kunavVWAEEsOA1gf6tBFZ/ysUMyCIvkwNIQr+1GHbbUpq/Tp2K0KWRCs4zdienNKA2OEL5K/37VYuJFPgeEWyDctUaOPoIagOAj6dmcRTiqOPV4c4M/zCiiLh7H0k5sfRgBHhMCH6Sz53F+uwRyp36Vh2gs1EGj1poiHv3wqkhE2qMQTE43Nx/MUmjJQlipNj43fHEm9l6MwHgjfH2b4VE4UO3hEHTb1BXFdFzpnPB2bJHdJMFGD5lhy9DbVEaAncLs6ndWJsE7Nvc1LQYv3Qv5RkwVwG9XcaQeqPZSFODxAVOBQ5N/2ZKo94jPUekDwXmustFPlUDlU7gcIeg5n5+T4T3xdu+Fq5gGwm0A6o4K5P71as6ueD4pKSt3oPFDf7NS3cUcS9G51M0vyDtLf191e1r5Iejs7hHQ3f9DBoeO9gYkyXZsxs+LXGD4w5cK3YFUSoffeH4eCbFWN9LHyaPUFRXN5gNZURFUk02tz1aZeoqaKSSmM+aZz2xqkGyOsocyXlfumqGeNDyYdImGxkaPFuB3zYtHOHpgnvUT/Yf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ooQeLYCvv2gs8C+mWhzbwofN/j0sN8tVqbkWQ4RlmMgt1So5/A8I5aPo4QTM8jxFBSWddy1rLJTZPJHOl+j4qhutuEuZv4HTt/BNwaQs4ZJ7g6w8Nqw6tZ14+8NtDCR+dvoGA1xLonXkXf7yfM5ErgeGWUcfA1tmh9oaTLM7ZsdZvKeNDEm+Itg24roB1/2qc7u1wux91pNw8eKdHsJ40TQBnrHUpnPYo94Buib44ztUCTdivIVtLNt+aGCue5rprxsITKT2QxyE1V/6uqMgZO7U5xPh/YUVPrKy/Gzvc2A3b4CmjNOOtQlOBvDMRQzdbXYwilX/COXggkYCwwYfem0XZ1T+hU3ekjW6ZCaWa9NU9N4hEk/QBSlvrshceRsdkX0zdK2LiRdgRM0IMezWioECaA1HMACos1cLxkeA5QoRykGcT2wDfQOn8US+S81HftN1zRHcxxSHMR2la4DxVOo0kDtneDD5CF5wX4oTyBIXYa7VZXP3mb6wci/Dmz5e8YyapF00TfgP6n+W6qHi1hgsX51pf43sG/dbqMbzdOnrnnHngoy18uMKZy502E3/LDq1rwRNt9UfajErFeGQoVhVL7T85ssr1kwRAsTO40sNLClYFRXqFXPzFgiytR4cub6WODCcbqjtZzOiauhGIGCo1CBlH/11d156ZSzy+7SMjoR0p0D6LEkCMh1tMnAcnc2pql2K2yxOqzP1d1ZPCVPbBakbeg1MC6mMzGer8HaJLV/HddDNXlEbBEwz04yUcrH0+d29U5yQ+gkDQNmgksQNq95uePsz605qaiYXYQw3yWO3e8pOTx0blmI6DNDn1fiGbtTDw9e92A+ipRIpP+85ZCa8C2fIKYFgj7ConI/q+xomMJJKduETzkLJ7OPNKY2G1CYGnNf360wVVIJMJrvT7+mQ/XH/RGSpasdQL31rxzFQpZrBNQR4o1hzRzO8p1wh2tM10v4W//NGSVt6t+j64Jf2HXIE06BqA2GY4a5xpGMDi2Ka70KHDvI9CtHlrMwPRcemEPoNl3djhseGiYmevK25uecfGlZtdp8EW1mhirwWxFyxL0Y3SVDHKwsTFyvu3m8dtZnBjK26bRDZg7w50PXBzEdNkUbNQ2soCBhPZhSUDc/v0dHW2L5kut1g0mt2JtyOHv1KPQQoLrZxPygMiQNZP86+JsbfrPrqNg5c5mq8yxoArD+YzSEFgtUjPF7G8FstAKN1yIlk0uLPAPXd4ptFrx8+Q5egbBNzllligefeJfypEqT8O1mw2IPabmtFZWwJI/7Mn4iPfEC/qg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 571591cb-08dc-4f96-31a5-08dc7c3d98bc X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 22:05:17.8934 (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: DU2P250MB0368 Subject: [FFmpeg-devel] [PATCH 07/12] avcodec/vlc: Make code more readable with av_unreachable 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: 9/qZv0cMqB+D Signed-off-by: Andreas Rheinhardt --- libavcodec/vlc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/vlc.c b/libavcodec/vlc.c index ee09d96fd6..f869c19650 100644 --- a/libavcodec/vlc.c +++ b/libavcodec/vlc.c @@ -49,10 +49,11 @@ v = *(const uint16_t *)ptr; \ break; \ case 4: \ - default: \ - av_assert1(size == 4); \ v = *(const uint32_t *)ptr; \ break; \ + default: \ + av_unreachable; \ + break; \ } \ } From patchwork Fri May 24 22:04:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49216 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2018892vqf; Fri, 24 May 2024 15:06:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW2N7F9kXu/kfgVd81KI9WZQdUMjG+59F95kSFZErqAMqm2VtuSzBwRAKuCeA3BPZSlmGaynZrct5z/aKzV8dTIVQJGlUi8CeLdsA== X-Google-Smtp-Source: AGHT+IGXEVBEghaRaCjQzqiQQ65T2uWXCCa9zusyWSXfIZ3Jj3DtVlmnVMokPiXC8NnA3d6WIfe1 X-Received: by 2002:a05:6402:901:b0:578:6832:8c38 with SMTP id 4fb4d7f45d1cf-57868328cf1mr198804a12.24.1716588369269; Fri, 24 May 2024 15:06:09 -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 4fb4d7f45d1cf-5785233103asi1309048a12.112.2024.05.24.15.06.08; Fri, 24 May 2024 15:06:09 -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=a3tUXTIN; 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 D898968D5D3; Sat, 25 May 2024 01:05:34 +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-db8eur05olkn2056.outbound.protection.outlook.com [40.92.89.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9011A68D5B4 for ; Sat, 25 May 2024 01:05:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ec139ozZ0O8oTrsIx1aeUQN/zqcRTUPAsqg4KPLm/Y8jQc2kJkJCLOIWcNomGvfqdedMQVrAx3y8303awhldWFp5CM5awmROThIReyEOk7qEpsx7xB1RKIs/sjpf1P4PwHknvOp3QGJKTHFVSkjklbI66cKMqtOLrg5gdsTT0GDYsMdYqyFNAcNk8RaVMlrNGf1yXSSVf6AvIue8yaYFTpUMIbPvWmYHjJy8fvlsVAK1Gi9zNHJXHB7MX6bkc0UOytwSdJRZPSBYaiMNWHlHfYaHTtLZ3q+CJ5Irecc3TeiuWxEu7tH7839/Ek/tNRzUFyfYyiyIwLvat7gB/GOWZg== 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=WxSyZ+0urGf4MeF/mA+32RlofsPvQgKQHKQB6z+fenA=; b=QcTJzG/XLCIjY0eWLxrxDjq9BpcUnnq7w8HeVDZCrUaE4sxbz6iFl4tH61xj227TCa1Q8Nq486XPB3rHHuQV7RvSRxu2x1JboOhReUjCJNDD/XsJV1ZchIkZPD6YExa2WqEXaR+ZgsG8SZTYgeowsI/OGQwc9piNA9ELBp8Jig0YPfO6RFP1mRjRow5/dUz+uL7osEaN/ZwSMNdX/oFF1i08Y05O8WsuxxkdyLeZuHF8xyRYtDlkhJ9i/EkSENPmXidCM9IKSCPrZ8InEFY7CO3jT6tEEfi7++K4xVjG6gQey3GltR3D6dSU4qPvpUfQB0RWtlHIWz++tMaw1DjdHQ== 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=WxSyZ+0urGf4MeF/mA+32RlofsPvQgKQHKQB6z+fenA=; b=a3tUXTINTbKpVbs0JiK8yNkhHHlbZuvbY/c+3vRx1khCz3XfBPv1vTN/v+zBrpYbAciV9PKPQgJN0HYNN4b88awKNkcr2///Ci5hCM9CrqE+mCqEY/ql3LxBYVancLW9kmYooXr8Qotro8hgB/DBY7bCRILnJzhsn0Tme/wSdrBkLXXrgoPmmUZKTehoc0x/tZiV5PQ1APlruCiPBl5PQNLS6R7ZdnFE/SpT2e1eXWC0/AYydldd+nEC4odjl3dJK+BmbCDWx1q1LG33p4MfSqXvVxP5OdstL7ay8UFRJb7KUWYVJm8p/UMYv5PgPw8KfvsKn49K0Hsg8ij3wSVsIg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0368.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 22:05:19 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Fri, 24 May 2024 22:05:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 00:04:51 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [/tSniGvRty9x8pNlNnmyHNLp0B0O8B77IDu1vg/eSp0=] X-ClientProxiedBy: ZR0P278CA0194.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240524220455.1276419-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0368:EE_ X-MS-Office365-Filtering-Correlation-Id: 865b7ace-cfe4-4f43-4c59-08dc7c3d996c X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: Xs2+7r4s8uF4SabzFvBbVDF4GB+I8665vjI0JZgf5TDqSKgV86LXo3l1aq+OyVg1XRE5YvU5OKP103253uFMOYOYdwQvtm2SFdwPOwWbNesjs5zUqFiK7LiWpOeFnSn93HT8eCF4MuW7MbQ4lTUdyxEjG7OlbVnhfB2SF8KdD7wcY9fXZhbo1sErKT6JSF5Zm5qvQBYUQE9rMNf15noFUxxjup33VGNMTqFOu3LHjikT3q4XtUy38t+rX2zZhg/4GcpbNpbl4Wn7udK+8L+zGRtQluiW2UGo/wF1tSKyPyO5QgMTERYoxEw7OuUL4ZBkvg/61Hk7Whmf8Iz6SkwA6alJyPPvOq3QksCY6NvQa4u8WzGQb3Ttb2imsXpXBmEeTA3pKEC7CBShKyjG1U69JRtXLFByvWaDf2ZgjQ8a14wrhldAA8+2u6JOK2o1CZ8nbDMlt7JOwOZKrVVr/28czNA8HPf7nHVuj/M3IVEHKLzctyhbq8X3R86DVd6RXPS2RN0U2jAs0Gpkv5JxhzHQ5bjHgv5BqvyhJU3rf1yjMyC4TIbkJ2TqUTL/j62yzO4h+0chzgoZzBRu7XPu0H3cc1AFBR1NZykePvCNhou1zhBB2b0FN5+G78MPqj3xdgHR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 52evDFgTIXqxzq2lDhzTeEjx78GIJHRK2IPJIi2/4YJg+xhdnKBD39xeL8istVYWsR1AXSooTDeayIjudV3NvHV6Mq4WL8LYO0X37Z40kGQIkFEwbxaHXUYKuLZ5Po7tRK5SQWrSw3OdvfEcfD9iRHII/tc/ibz+TlL40Wfkc0peAL9//Wg21EFSCYSk3HoHZLgZKoDthx+aQ5+n8rAUxfQXviRNAA1Ey79zervNKF3gAzJtdkoiYntkZ+YyXMswQS8uOIVS2mDFo1+5cPaHIxB7iua3dHsW7XtH1jo5Iyi+7zKc11ab6MVkxiXIQaecU9qFtpxo2uM3ttupvUFP1cR9DsJCQkiesEpmSruWGMXeWUb8u7iGet6cxlp1nt5Kq4V0UgEiR7Vi3v/6DFPxOoiAiYJyeVk3NhL5XUQGdPI3/VhFyllYOcVJJpNldkpwnHiyipJ9zx6k6XrBO1/kczFx7o1wQ1bBaaqn8P1J112V5JIHwKIOirauugzmx2q2BAzL7gE1bXENXU+I1sduEP5N5TQ6JL0yj+CKfHE/iLm/fmgbNstkgeGQhUCVt4GAyJYBg76RhEyoDIERognA00po75xSOhNej0eBJRkb+GTMNoiWs9DfccUCkloxABukibFn/4EWS5MDcfk92xj52duNS9DiOMe0jmmBp+r+YcHXERvVptiqNi+flHUYYj4qV6a9OTwsW2wk/NZqFSlCD5lEuPt3PSS4T0oKTxqhKFFGU5y3Bg1If6Dhf8n1jBg8ThlkW5KeKPdg6oakqlHNVj0vozq2uBeVj9iu6lN9hedgdVGn2OoPsM4BX6hF7hk3+Zu44jvns68R73dw5JkE9QAIAzNb+06F3TYG8p9Wtehe4tHHprAw9ZxIpqFAjjUMVUDz5rd+7ycJYl4Gz7QPajPA5SkJ0MuqFkSb2iCefyISn2m9t4mZbHbii2Sk5XdBbMKRfmlck8AI9F8NXZ0reRUXVIpXP9JhJX7bXiYMprlFE6pOeVAyuzfNlLHZsmy0tvWrlmTho5tz1TA751wYnqxIbH3gM9QRdoM9oB52SLAEHvKiB8z3omYhS8rwpQ6wL1tbEeI5gjRbpoiHNEj2qx5Na5adtn6U45sD52WM4iDYpzvyH+serD+vcKS5VHCRF7+uw94RrvP0gzSeWN4OVRePH2g0EFJETB6nuKv3c8IeTbfTVFMgcgxxRloR1MQuUM+UnICJYzek0ZojSFHPog8zT/D2GywFWvAkiMOi216jr78K6GxU4R1JlW2ztOm73UuIrXPNUcmsBrvq0vnXNQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 865b7ace-cfe4-4f43-4c59-08dc7c3d996c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 22:05:19.0607 (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: DU2P250MB0368 Subject: [FFmpeg-devel] [PATCH 08/12] avcodec/utvideoenc: Remove always-false pixel format check 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: dTbjbpgabq2r Mark it as unreachable instead. Signed-off-by: Andreas Rheinhardt --- libavcodec/utvideoenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index 59e198458b..f347a33e6e 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -143,9 +143,9 @@ static av_cold int utvideo_encode_init(AVCodecContext *avctx) original_format = UTVIDEO_444; break; default: - av_log(avctx, AV_LOG_ERROR, "Unknown pixel format: %d\n", - avctx->pix_fmt); - return AVERROR_INVALIDDATA; + /* Already checked via AVCodec.pix_fmts. */ + av_unreachable; + break; } ff_bswapdsp_init(&c->bdsp); From patchwork Fri May 24 22:04:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49217 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2018950vqf; Fri, 24 May 2024 15:06:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWbqafwbPUoIxwtMO2FvlF1gHAEo7nlGV18EzGrQ4uo1DsXkz32PbGu00eaR4zHp5GP+Q2dIRRqTGfso0bQSFaFqNtIx/mgkV3IHg== X-Google-Smtp-Source: AGHT+IEWLKSjBMYKigmBpdNKefRqPWdbaRM6XsMCL6UlM5JazJDPEr1kmmYhfWNkq0iFBSF8Yt3Z X-Received: by 2002:a17:906:fac4:b0:a5a:7cd3:b2e7 with SMTP id a640c23a62f3a-a626407c6a1mr192871566b.11.1716588377587; Fri, 24 May 2024 15:06:17 -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 a640c23a62f3a-a626cc6a328si135816566b.672.2024.05.24.15.06.17; Fri, 24 May 2024 15:06:17 -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=g4+hZNEW; 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 E9DBA68D5DD; Sat, 25 May 2024 01:05:35 +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-db8eur05olkn2028.outbound.protection.outlook.com [40.92.89.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A194B68D5B8 for ; Sat, 25 May 2024 01:05:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V2tci/K73SNRXf9sS1tiDRs2ZhfUq634++/rMSkC9xUAinCvG55YBH7RM8jEOiwY5WTPEQmPVimTtSsQ3xwA5zPhJsJ4PSfjNDXMUpnRgPSFrNCtMKhYAdfgreSUDCp0nncknSdmEgDYoYoF6XwFl/l2RSnbMkVu2esnPyKaqwa6EotPYzf7gcNh4KYZJiZcEBBrzENIP8IuW6nSvyjUrWxvXhv2CYjE7NPpgZVqHIxf7cQBz3HpWAkUVCHQg7iVE/tRlBWw+eRafvSlySijRLBGm2Xvvb2WqW0stIVQ2eNDarfFIXUFtqIFsMrlPeM9El1YmUim3hVzyGccJBG7mQ== 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=KOyWOIWelAa7hoE59XCuCtxm/4g+3epWQDGhsrZxKlg=; b=B3SEbFRRMnvW7oWQaUTd2Bs4bjeJ8Gw0btedbULRY2rSgY3Wfc2OXYJ1Xhm7MPTi2trQifnwgAQ5xWdlKBHdP1kUByCSnwdZyM4vcd9pBjFQ6Tn+/hPhjYNZUbgH3xhGjwfreRPhAnqa9/CuRMIH0uATu0NVmGf9tZXyWpRTTUczZPXuFRi4nhQ2yCquLq8UB6CCjmM0YZ4faW5bakSu5/rye2SQpvtIE8R+WotOPoAP0AIvUfvbtLjBBTDSw0iiLNxFkvVoRorBgFFZy/Yvb5ndGCaF3pS8a9avhCWh7MPq2CvbrBg7wSYEho/fIjW9bfoXYS+oNU9O0+6A58gb+g== 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=KOyWOIWelAa7hoE59XCuCtxm/4g+3epWQDGhsrZxKlg=; b=g4+hZNEWEo1oD1O2h4p7YcGum/VnTbbSBIP9MzA/bDH+N8cQ1pxu8cYbqtEFxJHukguCy2I7KmqQWw9w2lZcGuKvWqXpI7d03L3UMhHwoQQMZfU/e7CviHeIGCJ6n2E8pp3DqeItFb54LB2myXnXE1pRGbyVxPtR8NpmiyWvFoVPh7bqbM+bJfouo/N8wQ/+A3qAcd0906qbhSF3Bj/oG1Mu2LREW6B5iTsdH0kHdIXklpTZQjxENpZEVBoq+IMEWcyoQ+XwqOlV3Y1MPjAmB5U5FGICABBKWOJZaI+fXwZBE4Hwn00oIiJPtlKHbykh57+QYGscxUFC+CK+/sMlYw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0368.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 22:05:20 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Fri, 24 May 2024 22:05:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 00:04:52 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [50l2sxHYn5NDgwZ/QLpC6zJAGpVo9uS6Dwq7RGfjMrg=] X-ClientProxiedBy: ZR0P278CA0194.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240524220455.1276419-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0368:EE_ X-MS-Office365-Filtering-Correlation-Id: 2eb8c581-f0dc-496b-3e7a-08dc7c3d9a5f X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: Mig+urc4/gNW8PESggQt9IKmh5dV+cZsb7htn3r2C4NjDGjxhZhLndnU6Wdunpvnpi+7WdamzV/zTFcgEobcOMvP/Fng+Q0zlqFi48OY+ud1jeHBS57ISVQEHyJIOmXrArbm05L8JRlHOnxY8TcMEHv2elxE9qoLsGJLH3hRiuXebCWcSbpfr9Z8x55MmEbC/NdU3Ah0anx7Qe1UDGIsCFNJIJJGnteTXAPiaRcPQ4Kg1KQyeXfNv2dlAdryahk5V2CcM7cL9B8ytAvFSTKipi4IOWFMPcnXSfdYzwlEwjqXOaadaoCD+GgIoEwXDJW5kya/t4zUCCIuxOY0kS1EnoD3uphqdaGy092SZSSdxjN3jJInIkZuQwfcUJBX2HAsTSl05c47MMd2rCxOBYiY4c24qu2N3MeROSJ9LVgE1d3HijG9XevXpL5212Am0cAvnkfYmE/pMQI5HpF9kOK2f3GHksNILyFwsq/w8r7HABu5eBD9HPP8kF1hvz+chZLrc/jqAi8Ws7TfFamidTLg8MxHgK9H03m4SqGh5YmLPbtM9aFI1+xHB4Xaf/1kvg0e4qsgxuv10TUJcvyBhvMF2bfZvgz9mSSkmbBXHLQi/173rOQFBH+Tct6D4FglEHXk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pLiGuMtWhB1aj7raoWtOmKMgdgM1BATR2WOwsQSXeG8sMdvvR96krnMgwPzF5+XsdOFfLNf6mM8ST4D1jeuAXByylw52bin/AggY+wlYkSvM24WPsT5mXaUSkV+xuKd6Usglj25praXFfFJtR5Rfx8HUMIWu4jpyRkfSkHEiTcV7oLZu2BTnwhJW0+FArCLxXukUXsR6Msdf+4FaS7NmvoTi4QRYMr/5OPQYjwh158wd908B5AL4UtB477TxKT/9OAcw7RJFVaFJ13/zmPmEyBD8LGe6TYDALiK8ri9Pl8btl0GZg7svJw59exXVYoLmahxqFyE172/XEb+uUuTOyQGYnW4o7dn+bQW8oPjq9XoK4Rg5gx8nmOaaJT6GkzhmVRlZblhSU3Oq+TJv5qkp6+QVoHZ8Ak6O9JbyxMDkR1PO/NrW/cJOGyLejWxrJ4uUD8Cc1gRWFRHwzkVQise0AC6oxoM5OCnW7nScFzqQSfExcx1Z2ZzJliVnTjY14YmT/9PsOtNvkTOQ4bkikV/L6XsLYUiWyfLdK6hEDBvx/PwPbe97VSlK0auBlcSBdgU8wLeVRMZcyVlE6KGesAnmbJ3CKBIapabx/zFZaII6l5M4ehTGImCeA96WRZP1ewzHNwMJbYu1J14Hbiq5a2Jzqyea1G/LQet2ACj3NOVclzddSXJadmGjjIFexh3VCLBkHkJcGJLhU8QrNqz0YZSVPAfWsO5gD2m8z3pC/aVIW12VwwEhnEuv7Ig/BoR/vvbv66fvXnuDm+lFQ1EtVnah2fI2UtaYC7tEuUyvG4oyAoCgmgLg7Qj9aBXFLzd5elvLNkmWPa4ODzYliQZMGc+l8LPBp1t1CPN/XIoFywil5gY03Pnv8iyCOy4YHIfhi0JohSxO2Rm4aZUyt2c5mdbAl0h+W+EUNFBl+Wgh9yiwLz9K43mXcYgtzCwnJ9bLdB7THvkIa3HauU4qgqrdHzdgn1o0O9b5/6bmo2NJByNlN/rW2Q34GuHOwzVvjDLF7kv8PrtHMF8LiL12ax5BK5xgFefQyXo2IGLHs1ypg/uFSKuvZKQLKau4zoGkHFiA4bHiNTD3iJV/fyGpA6LPjR4D61JOIlutWngzRq0fXnoPTPTp0+Vyt7VHUQN2EhpOJdmhX1zQUNO3yCSOIe/JV0EDYBJJUXJSQ/tztUgvXLV9r/rTGhxdUTENzyfuK2g746BLmiP01Opdha3DClNpdPmP65G9EDt6XdbiVOHxd6ISpJBHc7zWsRXwvHvWgCs6cHh1unVCIVJpiParnJFjZIhXqA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2eb8c581-f0dc-496b-3e7a-08dc7c3d9a5f X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 22:05:20.6579 (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: DU2P250MB0368 Subject: [FFmpeg-devel] [PATCH 09/12] avcodec/dolby_e_parse: Use av_unreachable instead of av_assert0(0) 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: b+oTJNzDZjlA Signed-off-by: Andreas Rheinhardt --- libavcodec/dolby_e_parse.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/dolby_e_parse.c b/libavcodec/dolby_e_parse.c index ffedcd99a4..62d38ab3a3 100644 --- a/libavcodec/dolby_e_parse.c +++ b/libavcodec/dolby_e_parse.c @@ -88,7 +88,8 @@ int ff_dolby_e_convert_input(DBEContext *s, int nb_words, int key) AV_WB24(dst, AV_RB24(src) ^ key); break; default: - av_assert0(0); + av_unreachable; + break; } return init_get_bits(&s->gb, s->buffer, nb_words * s->word_bits); From patchwork Fri May 24 22:04:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49218 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2019032vqf; Fri, 24 May 2024 15:06:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVNf40570CQ/nN9mfTGoc8MKlpKnmNZBLFriIBwrlv8bliXk0q+Wn4N2z1l4KW4v4NYUUwUOjRrKu+OTl+7KU3n1LeQfipe9aV0fQ== X-Google-Smtp-Source: AGHT+IHYXhcBOZ740khti8nXlEo6nRk5AatReTKB4moL5fmyxCkTD5hkRb14r8bbbHFISVjlVsxa X-Received: by 2002:a50:8d16:0:b0:578:676a:1aea with SMTP id 4fb4d7f45d1cf-578676a1b42mr344044a12.3.1716588386196; Fri, 24 May 2024 15:06:26 -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 4fb4d7f45d1cf-5785c1e46dbsi1054105a12.475.2024.05.24.15.06.25; Fri, 24 May 2024 15:06:26 -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=g9oig6UY; 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 6E2F168D5E7; Sat, 25 May 2024 01:05:38 +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-db8eur05olkn2056.outbound.protection.outlook.com [40.92.89.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD47668D5B9 for ; Sat, 25 May 2024 01:05:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dO5i9IhgnC6slg3NlG6K6yz8iLcrNJRm0VA8iaONcDySJbgEYwVcmiEDfVjbKHqixKQoxoHi5ly+cDl6wRBFY9Fn+b2qq7BbBIMc6acc/tZ9xUz/wVemwghj6qQpc4eVSROvNY5E6ooUPNz9hbIsXjiTixxnGMwXUby9Tcd7VvWeOT0efnFpa7hTofn00zOBUsRYHdcJqz/qWkgioKQKzwmik1VCKYMrixt3hri/tlkCB4ynWqu45g5hJVKpiIvYu7rKlZryaevmLF3nEGG/5yr/br6Z7ccnkCtz8dnWaaeHzmQJEts8AaJWcUOPc1Abhv3IlP8gt01SJ0XkaCowZA== 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=YnKIN8Dlm1NAZqNiT4vSc2TRTs68qJ3twrNaBr4tqe0=; b=dENuR0htIEWoLD5ZGrGYBx0dBYDimoogi78bY+zfjif6zTiUWuuh/RioIV5iAr3BLuluxICEHNoTTJkmrH5cKlfZJ2FwK36qwCDc6CqRJOy83orGs0dVi5uM41ayJ4O/i1sSbMSnmSkzjZ5YwucHKNEHFRWP1smeSnMcPvRKd+xSjiQHkfuS+xDfNVXdXvnmzUuPAtSFYkd/2Iw1ux0YooPMxDZ4bN2LwvOgkDEjdmos3A1xb4+PmTn2DcBr5Ac/cI2nk2utHGSGzeD4pEd1OWufdgYJPikR76HeQPi9gpg13zPeHnsa1livB4SFio8Iqt2yeaUSCJ/BYtfB5mOpJg== 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=YnKIN8Dlm1NAZqNiT4vSc2TRTs68qJ3twrNaBr4tqe0=; b=g9oig6UYnfL6PxingL2qtv2PstSZOzIoDgwum+xKS3kGpmjQlI+rko5AHwqQm4lA6cFZF6qSbDC6OC/JE5fPJmVuMxo958ttr/OfESKbexP48QpWjq7/8j9JnWr21mTiSjsvMhCZzQaHuYp6IXTIb5bc1USL/TZaq+rHHyD5sUiiYwP+S1nLYGBqcmxv+KnsKC9tc3yfoxirmOTtYjjOpYJNMPD0o0Yh/ORqpeIxJvUmiyalFJi/vJ/9ogLs8GAwowHx1zob/WlNgRsPwMDKTgu84wWhB5y8S1zBR2evAbKmbj/LQ16KuSe8QQEI4OvYtb0CW5Vc4l/WrOB9Px1BGA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0368.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 22:05:21 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Fri, 24 May 2024 22:05:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 00:04:53 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [PSZoCYwa98AZWJqWyHwHskiI7wlVy5ndEVhdonlV+R4=] X-ClientProxiedBy: ZR0P278CA0194.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240524220455.1276419-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0368:EE_ X-MS-Office365-Filtering-Correlation-Id: cf52a0e3-7174-4f10-5f85-08dc7c3d9b15 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: PBy3bmHKKY0RqjxJMo7dQ0oyMVoQD8LymyrxzRA4nn8iHbiAkQYlOvO3iqyHGotvO16O/sBQzEM6giDjnDtD0jf2TlUiq7uO3tkifNcajJuwj5MWpaAQubEB19ea2qy+EUlx5KdFS2MNzAzTfOCf73p2sU2lKGkZocfICsEN9ZwAYe30old/xGQlqxnfPZaKZizOWShA6vIWZcoMgXIonkB2rdy74yWiEoPnDdnTCIYoij6yTOgJNuXt277Jd6ExVPH2Q8bVM4YTJflO7Y+JpBkHAMc0lswfVTXzT1MHoGfB57qPAXrKJfTYoiziCsvfNOqmutH0EKkJ/9Qn70vgp+kxONOUH+qypYkfN3nKHu7eeGHi/kkDpiTLsxLIdI/mTszRIiY0tuIuSYBbBKUTctrrvPMuz3uzlHRum55kBuCW/I0Nd77k7szECGmIjNO95azicZ8kUC+y49WM9mfdU9XQjMwqmfuYoMGdZ0AQsasn+CgbxyKf7WZtU1ejJHvyU/o1WWIuqCzWTSqLtHctLI+hsqthdTdEOP79rdB2LsIAWY5C9yuXSzD6caRkaG7sZ/c9YcUbYixU4Ibvvqiwg/gTMTaQhAQN44LrqL0CUqu59618wLVLIGET6abeJ/sf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BNsrHPEJzknxJJNrZu4Tk0kxA7syi9byHC8a5qnjrtleRc+KKgVORj473GLVZyMyNCpNHEwmGm3NJnIluuecJxp5JAgcletwPDrKzDnXzfTNVey8/KcC4XCEiM23BTa4JRrhNhoLwzDuW9J5LvKdX2pG1A1YnHhI+5BUJJjX2Vn4xC8JwTRG33Bkwb0pBKbADZ0KuCaHHPCSXgET6JwS9n6H01F5cLna7sP071rYKV4LK6/kOn74rXitfP6doZl2ssZxFrXrFGPVpWwntNAbrixJ1CQNu9Mdp1ziLOwJWqq9MFom6B+QEZmyWfw/PjN9XD4CSGe3p8G5eBZQMUALKODcH49Jy8YMfsLQS/MCS1wxN5MDx32QvTqEB5elMYHTwcVGuqxfmIeFHu6emYVjXH4xWl79ZRHur2+WDMmHxCLt4A9BJJR6ZiBbMLLN1eaSDOrdh1Ky9ty8NKKkBQwLzJVVnAiR81keBGTukubgUuoWRMyKLpKZWl5iVlD+wYEL+vwuGBmJgiipGxSm4biHvGQhXMI/CnbrQ1WBvhKPs2dyVW+rd7kx1lQv31+7Xz/yMIejFZ+3GUalKom+xfnokRFWqRRLBx3/fRf6tK6FbRB9ZbgOihvgzOMNma3wRxnDCjK9LSikBfqYr3obHKTYBK2CpAxqkBihs3l67uRYxL/Dts2aYQo13O+4JKemp4VD+6nC267K6SRXdeDtCyIE28T8Z9wbvYy7GJ6x9V+jvfHOyV8SPfN5DNAmpBEQkXLvLPNuN+c5T71oF1MqWXFby62fWVTCnvscFPjfj24QaLHOJN3ggmsky+HC8gPFhNTPOqAaZLOk1OlZjutIr8dydqUmCuVpBbOknWWXjD/+brs2FV00u8mbEe4eV99ocJb8Rh70hJcuGgMaz2rewm5RTl5BLKrAy01Zx1RWsiIfP/1ft4BFYJ14ldLMjC/ml45Mns9fwMGiDjuJLKqZ7eee+36DQVctdMqv+kZBW+E8PvuTU+wtMSqy3QS6/r1QnPNVuV8aFmVth6vevVnMPMdaWaWBsdDE0PvfqWf++YxoR7qHZ/QXpQf5kcpNQ5Gku8NCEXCKdUQ0NjCHypcfW8eQy7UmAjOo9WnFWMfz7BaKCSxK2+s8dWKP7UIlS1NHeN+z9wB2dHc9cs3qQMIgjYt2JflEaNkoj1icdMbA14Oj4i9UvRqO6IZ3kES4qZhj3Y49Jd7w4uGC6g9Vz+2O6ZFsjMMVec2SvGSWqqGw0PvrNZrSnrbHOpP5fla9vx7nsaRZxRJgv1NcqTpNvHDGBgwuWw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf52a0e3-7174-4f10-5f85-08dc7c3d9b15 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 22:05:21.8574 (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: DU2P250MB0368 Subject: [FFmpeg-devel] [PATCH 10/12] avcodec/put_bits: Allow to mark places where PutBitContext is flushed 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: w+q/DK4lu1zP This will allow the compiler to optimize the "is the cache full?" branches away from some put_bits(). Signed-off-by: Andreas Rheinhardt --- libavcodec/put_bits.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h index 4561dc131a..79bad1c214 100644 --- a/libavcodec/put_bits.h +++ b/libavcodec/put_bits.h @@ -74,6 +74,16 @@ static inline void init_put_bits(PutBitContext *s, uint8_t *buffer, s->bit_buf = 0; } +/** + * Inform the compiler that a PutBitContext is flushed (i.e. if it has just + * been initialized or flushed). Undefined behaviour occurs if this is used + * with a PutBitContext for which this is not true. + */ +static inline void put_bits_assume_flushed(const PutBitContext *s) +{ + av_assume(s->bit_left == BUF_BITS); +} + /** * @return the total number of bits written to the bitstream. */ From patchwork Fri May 24 22:04:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49220 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2019194vqf; Fri, 24 May 2024 15:06:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVZqSCKO6eYaC6NDEr5UxryItdVSw7T4iewfCsBRF2UWkNcOihy+uMWrVUgQBbC+whi/ZTMlifTgR6uH2XH08pn4x33X/a88xSZ4Q== X-Google-Smtp-Source: AGHT+IF2S7CKPMT3FYx/hBKqZTRBfWaZVf86fuG6IiaNV4DrZ4fClXyqJ2bkH5igtyRnM0wD33Mo X-Received: by 2002:a17:906:19cc:b0:a5e:cdd:7783 with SMTP id a640c23a62f3a-a62643e3520mr224801766b.39.1716588406459; Fri, 24 May 2024 15:06:46 -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 a640c23a62f3a-a626cc68f10si114743666b.682.2024.05.24.15.06.42; Fri, 24 May 2024 15:06:46 -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=d2ynpfak; 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 0F95468D5AC; Sat, 25 May 2024 01:05:41 +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-db8eur05olkn2028.outbound.protection.outlook.com [40.92.89.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8C8C68D5A1 for ; Sat, 25 May 2024 01:05:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nMJoJ0KF0P1UAx50NhR/++t9SnEP8mUJzeO1nRzY8u0THFC8YYyHZWK3QABId51+RCWcoY55/RGNqm7kgO8A42ZG4Yxk4DsdIb2p6rkWmseM+Di9CqhDkhBQhVCYNBubvy9rBf+/31lsAhcC4QeaGNwG/ybTd2Yjmqz+mZJubfy0GowH1LxX61ZIXEjrMineyAAejT0tVdARQzyMPIj7g+n/g+Hh/WbqHV3uyoe2PDTY62qrF5G7OYBsxKSMDPeWzC2+Lz6wwK9VQXf6MdIQtrH6R5g2p2iMazkBVDtlhDoNxvBHFX4FKbkOHZTrKIyUrmgf9Cnmiwt6ggVxPkG4Xw== 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=ZHEOJZm6acD1uDry3mJbK6lehwf033eCrtbYNe3gS4Q=; b=HLUh9+yU3Ciwnbbfs+9lkycF5yNb21eYru6I2TsS2DjJ/hWh5oRhnvFROm9IRSLeeZX2Rl6zk/RLbAHdHZwB2UXrUglsBV0ALwVpARDPFKIduZzsF2ZfoPgIMl8MEMe+vuEK+o3Ei43513rbJKRPm82XhgAs2Or4xtblQMu/TYSO/F/QxnnRJ8gWzNuHPohTcDnq4i5GJvz2q6vrr7Ja2QgyFkPiQSZAt6HHslK3i1eYxlt9C5wtcG3SMHb2habNz1K04Sm6Ht5vQFAmYr5gtiNZ/Y/g4AlcyXJ5UK+BPtDipXoCf0k84/YHMVEPv/cOHlX3TFd65hqZwj6EmNBLhg== 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=ZHEOJZm6acD1uDry3mJbK6lehwf033eCrtbYNe3gS4Q=; b=d2ynpfakVJAyRMKXhDXcMZxxBhCE1WK9vnawXCmcViG8OeOHze21TkoqHDA5kWkhLyRGGk9hk6vDmshD1/ctgB48lzzIzfZyzrdSgHlKblcsDYTNXOyNKepULv33l19nw58sLKTASMQiLyKgwk3oQ7CUfW/r7J+TuKptv12PerkR3bpV5bQY+dvpPmk3/rahZq2Io5fV98c2XVaqIQhpb/Dg7DG/XcG8CK8Xsa1rhaO3xUeEKnhP0oFEn47RugVfErAezPQijv4c2A8kN94iDB2Is7ksikMQb9mHgDZmaMGwRxvI0CKQR6lUo0fnXuGpsQP+QwROl/aTWdQcc/73NA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0368.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 22:05:23 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Fri, 24 May 2024 22:05:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 00:04:54 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [GGfNjzqrQMxMNOcCxkaXXI78rM2xdPGJvbPQ1ENw0m4=] X-ClientProxiedBy: ZR0P278CA0194.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240524220455.1276419-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0368:EE_ X-MS-Office365-Filtering-Correlation-Id: ab39432c-8fc2-4f0c-9196-08dc7c3d9c07 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: hikj++Webj8b7Q1LM4hb6LfkrDWE0fzoMZCOqEBAtCjNAokTY+Z8fKHBCg0FKSRNVtbuYZGuWivpA9H2YWJSijQtYEQ2RRvPadaxQeTm9IZ8lK4/4t2uu96+16N9+ndHfSBknPS0iLyxU8HCtic6E+lgRV4ffZj3F3/c/D4wR2J/RXdlYSuQaRE2ioEqzmcYbGOgsKxR/zxREqPxKM2LjklcLgBtX0hrW1cBvKTJWUrxND8THomyIa9KXsfZvHzxxI8KC7vdrTlNWacj3zsWU79TJ/waxULnpbZLPZjlcBAAdDbne+0aEeNcHTmgrfnFn+wDen5Hn/LfbYaAzStRypX6G4vxVRqiBZnr1ne75ZLGkNIL0p00iD5YMBkqEmHK7LVCD6Syp94w3DI0BFDhKp4KJLNxcerMGSGX+r287m+52NTy1QkFiMMOcm3z4po+3D1ejuUQcfRfBI7jqphPdBfG+4kZPjE3zU1j2btHpcfUtP7qUYYXxAwHni89xNoAou42gERmA9ntZR4VYxYJJAAJE8vNpsWDHmtDjLHZnmyZxuzt58OYLfPW9r7J1D3yzYjbIGGR9NlRoJIpijHU4zp2uXHLizUfD39m73w9oBP1vlUkoMZ6IA+l2UFRWlQf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: p8cfVjiGnwn3KDnUB695lTqKsDv+aIZmWi62vZOxtvM3zz6NRfHtctNqAXMehhWL0OxOqFujlkw8WvKnVVqY07HidGjTRSWdSbw53hn52vcytAx3vmwxedc54sE0jJsjehNwOHdGYC1yPmoFEh9SAS0U7TWTT/5QxuDz/z+mRlvmsmdRZO6Esj2a0jVeTIV5Y29chdTp7vLR3cAqgWcNUB2LfaOPsm0cOaYNedRExferrbroEDZeYizTYOKC0L4dUi2XVAg5z5pkzo6IZ88xTyNb7cMgh/pFcdTrhHxjNSu7w/YzQPEJmrmNrKnbWGMo2vhmxBHvv5UlEUaGTYGy/5oiKjFGy5mdpT2wWjTKD7WFInntaPdFZvOV4BfVeMCt4PSzNcMb8uoYAoJaC4fDL6MTejb+1Rx6MrlR7Wvu9yu03RR0l4K4UThXiv+x+0/W7h8/w7/3Q3eWKbk+phPyHsEzBotijrTR3X0rBUwdxs7QK0cOcHftxem6VaR6HnW8/ObcQUSdNBRGeYL+EeZwAZG9L5+4V5a3g0H6t4AFo0gA5W4AU3zSpt+jc4O1AT+nfobPyGAltW3Y/7vBGbvpijyWjBoKuxmIdyzx5N0nN2/Ckq/ahr7VMRjAZ13rTTDGVSAYialaqW/9p5yIhm+0805FcMcn9Jpt5ObLYWlC7BVk/3UoftkOliWgaHuP1RuLzz1uH12Mo8eJ4UVbzwEK/cNySMinC1/fKjJDDeMA4XHWKbYe52wxYkArRqzoAFauwZ73QXisDe3BcPm5uGP5RJUFxWm2D5qMybbGwet4uj0dg5NNvgWHsmOqmLZtr6sMyTlaSnIE3dLHDA7MLYUXNeKURCqApnIatBT2m76o4+spbfB9dEKXXDRhs3DIH/WdfScz/GDKYWsvxZ+epP5CbHUUUXkFjLl6Xlp8WTc1sm1zjxfIUYASZzcqy/llkt3YCaJVcEwXChlnYwQlX6RHi/89JcD78t0wG4ILsPbkYNh7bonZzPjDyeKSiOFVDarEIrerXfrcpveP2DwYPYht/Eu80mrozKbd7GNEM9B8RFOw7ZoZ9jbpsH43JiRefHy/3XEvIFHmhP0sJwXeirSZZ9JTb6umEV6Z6I5C0CoUqHcChRaGCGOwP30JdJx2/hHiXKjFHVvqjCjvUQlwcH8Vl6GLTW/NnAJLFXE+neBUqOFQqGunf7blXQMbn0JXpXqU9fvcgvo+wgu59/7+n24+T4MT3qHQUyaAXKszjkNGWqyRTHusWV+rKns+urKt+VJ874EbousBogQxgXSoNuldRQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab39432c-8fc2-4f0c-9196-08dc7c3d9c07 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 22:05:23.4245 (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: DU2P250MB0368 Subject: [FFmpeg-devel] [PATCH 11/12] avcodec/e?ac3enc: Inform compiler about PutBitContext being blank 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: nWXOJVM1XnmR This turned out to be very beneficial: For GCC 13, the codesize of ac3_output_frame_header went down from 4522B to 1247B and from 10762B to 9298B for eac3_output_frame_header. For Clang 17, the numbers went down from 3923B to 2477B and from 8338B to 6548B (always with -O3). Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3enc.c | 2 ++ libavcodec/eac3enc.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 3649289865..a1783577c5 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -1638,6 +1638,8 @@ static void ac3_output_frame_header(AC3EncodeContext *s, PutBitContext *pb) { AC3EncOptions *opt = &s->options; + put_bits_assume_flushed(pb); + put_bits(pb, 16, 0x0b77); /* frame header */ put_bits(pb, 16, 0); /* crc1: will be filled later */ put_bits(pb, 2, s->bit_alloc.sr_code); diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c index 8ef3e7e773..1c522dae2e 100644 --- a/libavcodec/eac3enc.c +++ b/libavcodec/eac3enc.c @@ -135,6 +135,8 @@ static void eac3_output_frame_header(AC3EncodeContext *s, PutBitContext *pb) int blk, ch; AC3EncOptions *opt = &s->options; + put_bits_assume_flushed(pb); + put_bits(pb, 16, 0x0b77); /* sync word */ /* BSI header */ From patchwork Fri May 24 22:04:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49219 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2019111vqf; Fri, 24 May 2024 15:06:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVocYZJPbRKas6N+JGFt3jPOazJx45G/cOVbfbLP4n18gMV6YaberM53ICzS59dCVeEwqudiZciXLMQTwhJOTZv4EmMoImTweZxyw== X-Google-Smtp-Source: AGHT+IFpQVuy4hfMOJU2itHFaBSqW6WT7xacVfevXdgdVvLa9qqpxRlsIORWIL9GhK+mJ1JeT106 X-Received: by 2002:a17:906:7b55:b0:a5c:f349:da82 with SMTP id a640c23a62f3a-a626536c954mr207914466b.68.1716588394428; Fri, 24 May 2024 15:06:34 -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 a640c23a62f3a-a626cc36bc0si120635266b.316.2024.05.24.15.06.34; Fri, 24 May 2024 15:06:34 -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=VepHZhQG; 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 CD89068D59F; Sat, 25 May 2024 01:05:39 +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-db8eur05olkn2056.outbound.protection.outlook.com [40.92.89.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9E1268D5B5 for ; Sat, 25 May 2024 01:05:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EeXmFJDKiVFkGuZrINLipE145QcUt2fdXLZ3hkMk/48H5iNIC/g+Eygzbf+mE9NCi6yDDrYNt1EEcuW4jDwHV/7aK5azCll5Nyho51oorgxZ1PwULQmHz8A/5Cn4APw+bgMRT6kV0uw3DtzeEE0sOkUJQZsvXL170vT7VmA/IKXjRvDedw4WC7asLYPjH3Mr7XhCeUNx+mzpCNToyzfLvym84NuSwPLPztDIK4KaGJIrFDLymuCdtGmzJobH22ZUrMX8Q+Srrb/sPC5BUFGPifbDBfxOx+0z4ulr88fRK1Ge2A2ch46UizTyydFVJDccfMmn/NRku6Xw5WB8kx6Y8Q== 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=qDLN6U525DBYst1hdvG7Nw9eOmEuvAH1O2LVIwPPslE=; b=EmjvQ03w8xgABDAbDK+GOVuiG2yvl8xyTHcNTwupK1D+HW/VgiFQSGH+3yOzOd1VWnuxl0zCdu6VQXGtnmmvSmWfG0NlZgX3cfHIN/08+mr8uhHM78ueHaXTwBVY8e/5JJ0fHUjNwteC3gzHWKJJ/zkTgsyNp/iXvJzpTnfDombHsAwMdTK46b43RuANP5RQpB0xup+LXtDywCsfXUHBzYxPqXIXAC631ZL0WfsgA8k6H5Nr/l9/EuVxRbkZKv2mYKM0+xEPy0Vp7DS+kiIMQ9p9HApEatGX+ji1ZtJerIxengorkZFngaHxb9h34m5UuCbnTMVfnb1nGCnfAAGSkg== 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=qDLN6U525DBYst1hdvG7Nw9eOmEuvAH1O2LVIwPPslE=; b=VepHZhQG8Id8PWn6cK9C+qRxZ6++BHQ7EyXbed/YblwqZvXMR85ka3KrISuwIzYbK5/qaFhVDkmgN6d22f2zxiVL3LeHIE2idydgy6vAh2eblNYAc8XMlmQCjC/OWXhnmh4cX+kG59YOiZJVM126Nl95il3rBScO2msPHR4Uva2kW5oWJvS+wLdMSwp0ePtYQTPpjCTvz5HwkmODi4x1fYTp4b9BFD8L7XmMrlTZmdYZTc1ZKpG04mZyxdoKZ+xBXsvU0KoWT4mhHLI+YXR3PmU5oc33fVTfcOK6auikKjo8ZcMpltDkOgPrWnaplffvbwAWKS5o4n1BpmrrqozQDA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0368.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 22:05:24 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Fri, 24 May 2024 22:05:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 00:04:55 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [Tga55sqPzcfBnu9hCAU+ZdgtqOMnx8RGQqQtWLi0OR0=] X-ClientProxiedBy: ZR0P278CA0194.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240524220455.1276419-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0368:EE_ X-MS-Office365-Filtering-Correlation-Id: c155c22c-98ac-4eb6-ccd4-08dc7c3d9ce3 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: 9KV9BxpNfmMtSvCIA0GftY7eh6fnrzl7Zkqb1GYZ7SAfVyUo9XJgZWnsaCUVCB/8keKth/bc8UCmGiXI1bMQQw7G9oqlgRcv8Kavc/lv4RUXnm7OtxxRSy7PRbTGN7E0hCYA4YPEpMPUjxnNjTk8iYMPZX5OPiF8Wy82ZfdW92RC4D6bFKZ7FVOl16x8efCLpFYDklfqXUEr5W+7+7SJhaZTOB2946vuJabFG3mD+fzXFd7E5NIndR/1E0+OnWF+TjcTWv+RtU4SLSuXreeIwO0wKHX7MMuuu4Duj97REtGzxKWsQBzhS8mrrQXZT5SKIGsQJSN6Ypp8D4mr+ai0Bs7rgG9QJPHTcTaW7fIiMV9lJCgP9fELjpwTAaLXkautPyLqaubVgTMxv78UNJVLA5KIvUg2+4N/lYdx5Y5oSVcwjwcP9Uh4ab5DK2q/QwewBq6ZtcyX4+h5+oaBLK2xc9aKNaAcVodxL8j2wmFixORyOPlgiLIqG6fDBLLaPgQEGAGr5kgduq8U8bTyg2S01DdZpISZRwsyvq6qYSSzn9wrBb0T6S35VMFBWz3YIchddbFTO6T24NgI35sjoXukRDxDrnLQEPDwbFv7oK9drCRica2WV+LC88JioI44YIR8 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: A+gSpXvxJDKgt1qDcfGjwvVA8V1mU04YDIAs2xTqQ8FFMyJkOLHbLbCgHGmwuyEMVhxNwInKA1uH1Dbib0+vanD/dM/bQq/4der8pteZarH0XKYer0upf3urYHItGsYNQ2HOZkCzkRkZbIsxFLfdOX5Xfy/sC6qoK3q0Cn+hMyY+c7+NsfRymqwmVo2jlqpm9r3V1m34iQww3cCSkmeuyFvxEv4OdAZ401vUnVG5RWOUT9GJ+eeDOvbM1kp30EwE0uGtS4ZrECjG02ZrOuElGw/u6FwYnjYjWvjs16bCiphvhOW7wrbUdI9hwXsCH6v6wy4M4bTmqCNpSCzA4dzyEUBRnA7Mzpcn1hBTTKqKI51ElxGec7GEr+ew7KUTHb1ofILKHwDpugMcqMmazY1hHj4i6/0i+d/w1zFu2dEhdyL76Kw0S1ZhMn3qID2OHSBZ8b7eg3GgfxhTeePSt0Iwvv8U2QDG1IcWX3kZ7JaxV/0bwdea4txK6Wr8mDMKnKqxW6FgrXX6ZlQ+prg+qzMGcfp9x+O17eN4qflDj8o4xUwr84WmINixVO7Zz4+F9YAx9U7XckZu56ZPAWiCs6twpRwhJgQ45DVAryQ7H+nrY7BVwwedLttp2mJ00gHFsaIjPK3GvxPEtLe3xXGGPBe+y8QMt4IYTS+Lt5e9XVc9kGLvwti3bOtX2Np3nHCbDVAp2OiWcCeGg1iDbKS05+jqnpd8ArdAwXM7Hq48O9zmYVZjKZPLQUIoZVbz3kN0LuLZyNspLRGlYsg+8P415kyyVR8R79tAIpdrYUOHwu6P7KogHpgi6vLddQmbP/Ud8Vf3w03SlIHKTT1ueXp9w2QWwFr7f6kaMLRnlk+4ahwUTJ0mzskj+oOX1q2Mzvhq6LdOiIlVUSzQtRI56qVcJ1BQU41KVjNjHn4mAq+KwFYLllSStsxWsHj2ZjaZPKFX5vx0yQ9NjkmPFLkcr1voLCMHL0lMZrHzKodROo2V5/u2kRkObNMO0yLONFOtWZHFdhJwWc8jXRHMqfNLqAmlXMSHbdoU85c09gfNj4TfV0xi/kGo2zGqw6vEV0hEn+PSfK2gjl827CsatIFQXbcukXbiOMInMIeoNvSnjBOcog8/aSysOi6Dv+cIUV5qrOn7m5gJbJ7Qk/5NFOD2t4ls4YwM9eXvpUl/rbJe2YGTma72iJ7VCrv1TBPdXJ87/54WvIDMZNxosAYXC1BasFW/vYTCjhHTuWT3ac7DaCi+uO+fj621XR4jQ4CqxWlSZ1JsTxIxXTkR+xBhP1QnJf9+6DNMDA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c155c22c-98ac-4eb6-ccd4-08dc7c3d9ce3 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 22:05:24.8633 (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: DU2P250MB0368 Subject: [FFmpeg-devel] [PATCH 12/12] avcodec/speedhqenc: Use av_unreachable for unreachable condition 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: HphHng53u7Wp Signed-off-by: Andreas Rheinhardt --- libavcodec/speedhqenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/speedhqenc.c b/libavcodec/speedhqenc.c index 5b4ff4c139..29d603c729 100644 --- a/libavcodec/speedhqenc.c +++ b/libavcodec/speedhqenc.c @@ -128,7 +128,8 @@ av_cold int ff_speedhq_encode_init(MpegEncContext *s) s->avctx->codec_tag = MKTAG('S','H','Q','4'); break; default: - av_assert0(0); + /* Already checked via AVCodec.pix_fmts. */ + av_unreachable; } return 0; From patchwork Sat May 25 00:48:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49221 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2069816vqf; Fri, 24 May 2024 17:48:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXKyIMGDBFe6/SqGKdT10HMZSJF1wuCd7ar9+d6sWzFw9v8EeNre+5i7ANdi+Ttx/ZXweuS5tgilkvELwAXxhblO82yYd4LuiGCKw== X-Google-Smtp-Source: AGHT+IHTGevSmMTJjNaIr6nal5YCpitBaeEnIjhg+WGnegOvXYTroW7x/qyNN9YbV6wWBURevOo2 X-Received: by 2002:a50:aa9b:0:b0:578:59f4:9a29 with SMTP id 4fb4d7f45d1cf-57859f49b4bmr1947008a12.23.1716598132114; Fri, 24 May 2024 17:48:52 -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 4fb4d7f45d1cf-5785245fe9fsi1353819a12.212.2024.05.24.17.48.51; Fri, 24 May 2024 17:48:52 -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=KNYdaLUL; 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 A952A68D521; Sat, 25 May 2024 03:48:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2100.outbound.protection.outlook.com [40.92.75.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9339E68D2AC for ; Sat, 25 May 2024 03:48:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D28qnpEPDpmEuuLmKVkrncyxnQL6nIPUupjIn7a1vEYggPbfOmCaWo0ncUuFQK48Yj2mNUL2buerdIeuLVh5Sc9dJ8kaLQc95LfqTmGgZ11XqoazXwDWwpl/6s9ULPK54Gqjc1SOYzJN7s9IQVIZWuh6Lg/aTk3tjHeOxlbikdq6x1sap51i6boiVRA18Eg+e76TcRooYAS3kKzPQVvMT18qUiJ2JEgMZwtarjjHC9E5eHc9B/7UN4RYdOwSXwVfxoJVU5KyhJ+3CoZJ5LHKUuvYvRMgnnKDwB71UPKoW0vAt9Pal5Du8PtGqBD+pJs+FBgx26J2VNnrWgxQZxgz4w== 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=ILWTJwur4lTUQsMR5sqsmUzUK2VaDLY0XClc5FmymWo=; b=jyoybyHWKM/yzGJoGSXE02NZlHioVS2oI9vnKmGPAOffUwEXLXNs9GY/irfGMa9v2IR6SPbMmPUwJtNRqJMSr9Pgyc+CVObgA0z6AQOmH3siQNAMpjovvJpHksAuIzcu+wlzS3yiOoyHpuauYJPJY0vUtuLAGbUn80U8zmYze+O5oo5LUhaCNiBYsq3F5LdLoi86+D/CE6LoX+ikC7DxsKvK/3lj6bplOEkBh8w5hRyjt1MT/QVb0YFvSzoM8Lxqzv5hjpBF88kDb7cZshE0217WyhxIc1vTs5HSyFwwYcVEGD7L2Okb1C0RU1I8oAvlj/4uZLlefpww2D4nz9atng== 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=ILWTJwur4lTUQsMR5sqsmUzUK2VaDLY0XClc5FmymWo=; b=KNYdaLULtjlwgi7TgL6RV8W0vLSjo99X3+YoTnUhlUeJxkwGzCRr0kpCqiOYLBEsaG/sh6NwkLGZyQFAW9DiAdixkGHdvGztA033D1iwlkd6ZuXNJhy6YRx7QK03/mzanCbwuxEjtpaczj9jVCz6QYWGeNAdFBb+KUUZPQowYS/OFiLNaf70eAQcDR4CBbj7VNwjPbBuOiVuOdAm2xSpueJvHMEvOa1z5azVKy1f/sPOf35vQE4eTUcWa/zRq6J2C3GwiAvcyCF2wHXvQpja2ioM/VQ9yyxSV5778EtynuRCesHhkm81hhfk4RT3wnZPUB9JlyVqQ0QpvuxOcqkyuw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0578.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:34e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.27; Sat, 25 May 2024 00:48:38 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Sat, 25 May 2024 00:48:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 02:48:27 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [F/zRMRMdcD6IABFthSvfpGOB6hi98xMlshnZU/fKuNY=] X-ClientProxiedBy: ZR0P278CA0168.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::23) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240525004830.1549912-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU0P250MB0578:EE_ X-MS-Office365-Filtering-Correlation-Id: e0bd8194-047f-4f80-14a7-08dc7c546a71 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: VImVaQcpGdTan2y97ksF1zYHvkSUZNl29gAdc7Oa0TraoUzGeJuOTQwq0SFysVDPWx+tXibkk8lgAadF3wwn5xRozFJcs9Vd8PhkeB8Wsx3H5xQbEtecEPF8KYh9kjh8JOqwFW9s8lqQ+r/Y9GCc1dvB7z/yXSu6Mqsi361cGikVRVLbPcLwbQDj49P3WmuVguMhf7SIwJpukpmMtRsuTTXhf1f0z/CytIWUsPMhwBVbAFR7Epbt1TkOON9uSf1HUnYLfH4MZR8dVkliGhdKILTmogw32C4fhv5d7wvtoOzFAfpMHiivbNFagzsv+plGZ7bIaAOL+miP6Do2zVV4jGwKoFgOq9HFDJEDirriVfblUzI++sfH8WcCafI5Cd05xgtC8FhP0zwn0v8rpl+YLBggilkhJx7ml0hRU3iQwi3i+hDzw/M18qfGBcHXFLftjgQmlIrT4X5rrTOP6TdN3phN15fu3BftJyG2R8cAm59a/NDoQWQT6DT04POUQ7D4rgJ0R6bpd3nXThCjOiuzeC7qVdVXBGW5x7v44HtCt+uYbi0puUls8JVdEhfYZjcqNqvTcSLx4X+mlTYlBxT+t7ighsKvYteQS6A685Fu4YLmqP7EqhFE/mrU9a4EwEY7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lyOssYD1Dhhc53M7+E8dOu7Ae8NAVpvn4SjsJGHCTFjpLKiL8Fz/cweYugoU9v6CHBUiDZ2KIlU+tVyMXThnaRZe1rbFoRKUSjjF7W23vOIEyNP0Q+h/xYjN4D6nqCFC1tvTElSlc1eQ8LrEMIgxeIwMZ6kUWe+DvojJSUewjCTb538E+LgWulHMq1QiUo37IqzhSbkrFJEdYbw/DWXiM9210ha5oqKO9rW3P04ktE/j7gASrdEcYoJvmjVMfLcvLPn4tkE3fBhEAwd2hFPfspEIeXgVa2Z5zCR8aNqa6CQLfsIta2DLvCzd+GeR/mlH4VUu8PfXEFWu/PvZ+UgRnK9IF+hVWPUFCsHc/fZf8AN6HGo1WWg3C4Bh5pJgcEbAfP1hjrBLzzBx1mX1UgnnWhs02wMjPae3UVkVNwQD9GI8HLHGce8VqfQV9sT1Scn0AaGeNLK3NvW02wqtjvUIJ/lGF1CHwoAxfFjYduyo1XSGBgE/IHKtvlkFq08I+MrYkohy1UaYzhqahHSSQBwqLELiImSUZSssgpdEtOYISfIPzWyucK3x1ewkkGdl34/z9BemsweJzPgXzbtdn5bJoG3d9pUjkEqACsk8B93XoPD9aNtqNLggd7lqNHWECGpPW53ptK1WdWHCui9UvagvMM0p1e4x9mCknXVOErfuSJkGSamWANfnFokaVn/Nv2YVgZz6/zRSOpQcOcYIIu5SUaztTLkSrcf6dgrsQ+ZU86PoxfQMMSeNCA25lYchlMCHpcKrtUdl6GbW94LOK/pbIBsKPec617l9hp+fOK1bRba82CxrOhE00zt2iTq3eYb2/lYfs9cUGhjc3mMFeHzI/h/hQa32CqaD0jPsKzFdmQUG+eI4rfC61D1f6/fX62GtjWoNaJHCKoGbeCkD27R2eFc5R1tlOQiWsk5aJ+oA6He8ezDsKCnwSbtz1LnpoX6rqY6l4SX/aMlGbnWcmx/CXdadvZ4fiWC40hE4mdtBEkIljmChSdZBhOPkuLDulWyllsZhKGAv//TFEd8CqGIeDWb7VjiErdrHe1gj5YLrkuZC9WpAzucaHJIEKAdX5ec2GQOwFBITW/JUIVXimANyaGdkyyt2/0U+FmlrVmZ5GpgcppwXbtf93AViHu7f/Ke8nyA8DTjQkQHd8Ggcxl4qaDmK8yLsNEQwrqIsDMSW/Vglt329wn5rBVeCoI9KDrUrxxk0/C5KQ7e/HgY6WTDfufNHu+TlVo13XqWweOvxowkGQ3jj4d2RQVel+ZofXA0VcauRfrCzpUsm1iryDfpcJQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0bd8194-047f-4f80-14a7-08dc7c546a71 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2024 00:48:38.6487 (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: DU0P250MB0578 Subject: [FFmpeg-devel] [PATCH 13/16] avcodec/wmaenc: Move transient PutBitContext from Context to stack 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: 1/zqkTbFdCPq Signed-off-by: Andreas Rheinhardt --- libavcodec/wma.h | 2 -- libavcodec/wmaenc.c | 58 ++++++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/libavcodec/wma.h b/libavcodec/wma.h index 3d0d872ea3..a909f5baa7 100644 --- a/libavcodec/wma.h +++ b/libavcodec/wma.h @@ -28,7 +28,6 @@ #include "avcodec.h" #include "get_bits.h" -#include "put_bits.h" /* size of blocks */ #define BLOCK_MIN_BITS 7 @@ -68,7 +67,6 @@ typedef struct CoefVLCTable { typedef struct WMACodecContext { AVCodecContext *avctx; GetBitContext gb; - PutBitContext pb; int version; ///< 1 = 0x160 (WMAV1), 2 = 0x161 (WMAV2) int use_bit_reservoir; int use_variable_block_len; diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index eaf0498ea2..7240c0895c 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -28,6 +28,7 @@ #include "avcodec.h" #include "codec_internal.h" #include "encode.h" +#include "put_bits.h" #include "wma.h" #include "libavutil/avassert.h" @@ -161,7 +162,7 @@ static void init_exp(WMACodecContext *s, int ch, const int *exp_param) s->max_exponent[ch] = max_scale; } -static void encode_exp_vlc(WMACodecContext *s, int ch, const int *exp_param) +static void encode_exp_vlc(WMACodecContext *s, PutBitContext *pb, int ch, const int *exp_param) { int last_exp; const uint16_t *ptr; @@ -173,7 +174,7 @@ static void encode_exp_vlc(WMACodecContext *s, int ch, const int *exp_param) if (s->version == 1) { last_exp = *exp_param++; av_assert0(last_exp - 10 >= 0 && last_exp - 10 < 32); - put_bits(&s->pb, 5, last_exp - 10); + put_bits(pb, 5, last_exp - 10); q += *ptr++; } else last_exp = 36; @@ -181,7 +182,7 @@ static void encode_exp_vlc(WMACodecContext *s, int ch, const int *exp_param) int exp = *exp_param++; int code = exp - last_exp + 60; av_assert1(code >= 0 && code < 120); - put_bits(&s->pb, ff_aac_scalefactor_bits[code], + put_bits(pb, ff_aac_scalefactor_bits[code], ff_aac_scalefactor_code[code]); /* XXX: use a table */ q += *ptr++; @@ -189,7 +190,8 @@ static void encode_exp_vlc(WMACodecContext *s, int ch, const int *exp_param) } } -static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], +static int encode_block(WMACodecContext *s, PutBitContext *pb, + float (*src_coefs)[BLOCK_MAX_SIZE], int total_gain) { int channels = s->avctx->ch_layout.nb_channels; @@ -230,7 +232,7 @@ static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], } if (channels == 2) - put_bits(&s->pb, 1, !!s->ms_stereo); + put_bits(pb, 1, !!s->ms_stereo); for (ch = 0; ch < channels; ch++) { // FIXME only set channel_coded when needed, instead of always @@ -269,7 +271,7 @@ static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], v = 0; for (ch = 0; ch < channels; ch++) { int a = s->channel_coded[ch]; - put_bits(&s->pb, 1, a); + put_bits(pb, 1, a); v |= a; } @@ -277,8 +279,8 @@ static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], return 1; for (v = total_gain - 1; v >= 127; v -= 127) - put_bits(&s->pb, 7, 127); - put_bits(&s->pb, 7, v); + put_bits(pb, 7, 127); + put_bits(pb, 7, v); coef_nb_bits = ff_wma_total_gain_to_bits(total_gain); @@ -288,7 +290,7 @@ static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], int i, n; n = s->exponent_high_sizes[bsize]; for (i = 0; i < n; i++) { - put_bits(&s->pb, 1, s->high_band_coded[ch][i] = 0); + put_bits(pb, 1, s->high_band_coded[ch][i] = 0); if (0) nb_coefs[ch] -= s->exponent_high_bands[bsize][i]; } @@ -298,13 +300,13 @@ static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], parse_exponents = 1; if (s->block_len_bits != s->frame_len_bits) - put_bits(&s->pb, 1, parse_exponents); + put_bits(pb, 1, parse_exponents); if (parse_exponents) { for (ch = 0; ch < channels; ch++) { if (s->channel_coded[ch]) { if (s->use_exp_vlc) { - encode_exp_vlc(s, ch, fixed_exp); + encode_exp_vlc(s, pb, ch, fixed_exp); } else { av_assert0(0); // FIXME not implemented // encode_exp_lsp(s, ch); @@ -333,28 +335,28 @@ static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], code = run + s->int_table[tindex][abs_level - 1]; av_assert2(code < s->coef_vlcs[tindex]->n); - put_bits(&s->pb, s->coef_vlcs[tindex]->huffbits[code], + put_bits(pb, s->coef_vlcs[tindex]->huffbits[code], s->coef_vlcs[tindex]->huffcodes[code]); if (code == 0) { if (1 << coef_nb_bits <= abs_level) return -1; - put_bits(&s->pb, coef_nb_bits, abs_level); - put_bits(&s->pb, s->frame_len_bits, run); + put_bits(pb, coef_nb_bits, abs_level); + put_bits(pb, s->frame_len_bits, run); } // FIXME the sign is flipped somewhere - put_bits(&s->pb, 1, level < 0); + put_bits(pb, 1, level < 0); run = 0; } else run++; } if (run) - put_bits(&s->pb, s->coef_vlcs[tindex]->huffbits[1], + put_bits(pb, s->coef_vlcs[tindex]->huffbits[1], s->coef_vlcs[tindex]->huffcodes[1]); } if (s->version == 1 && channels >= 2) - align_put_bits(&s->pb); + align_put_bits(pb); } return 0; } @@ -362,23 +364,24 @@ static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], static int encode_frame(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], uint8_t *buf, int buf_size, int total_gain) { - init_put_bits(&s->pb, buf, buf_size); + PutBitContext pb; + init_put_bits(&pb, buf, buf_size); if (s->use_bit_reservoir) av_assert0(0); // FIXME not implemented - else if (encode_block(s, src_coefs, total_gain) < 0) + else if (encode_block(s, &pb, src_coefs, total_gain) < 0) return INT_MAX; - align_put_bits(&s->pb); + flush_put_bits(&pb); - return put_bits_count(&s->pb) / 8 - s->avctx->block_align; + return put_bytes_output(&pb) - s->avctx->block_align; } static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, int *got_packet_ptr) { WMACodecContext *s = avctx->priv_data; - int i, total_gain, ret, error; + int i, total_gain, ret, error, remaining; s->block_len_bits = s->frame_len_bits; // required by non variable block len s->block_len = 1 << s->block_len_bits; @@ -418,14 +421,9 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt, avpkt->size = 0; return AVERROR(EINVAL); } - av_assert0((put_bits_count(&s->pb) & 7) == 0); - i = avctx->block_align - put_bytes_count(&s->pb, 0); - av_assert0(i>=0); - while(i--) - put_bits(&s->pb, 8, 'N'); - - flush_put_bits(&s->pb); - av_assert0(put_bytes_output(&s->pb) == avctx->block_align); + remaining = -error; + // Add padding + memset(avpkt->data + avctx->block_align - remaining, 'N', remaining); if (frame->pts != AV_NOPTS_VALUE) avpkt->pts = frame->pts - ff_samples_to_time_base(avctx, avctx->initial_padding); From patchwork Sat May 25 00:48:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49222 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2069871vqf; Fri, 24 May 2024 17:49:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWaEP29o/WIZd+RnDbdKwmaKZdBkZ09o+5QWCrZi72j7CjfJ7qHpFxp4W1KHsSwfNLjuGsfaU3CfAMPsTYwVWV4Dy6sHC9wYx9/KQ== X-Google-Smtp-Source: AGHT+IGTQ6MuPP8tV/W1UIBVHvhsacitD34GyW02K3Xyp3VK1m3koJ0xqi3i0CPSFd4pTtIjo+4N X-Received: by 2002:a50:cdc3:0:b0:572:5f24:153a with SMTP id 4fb4d7f45d1cf-578519c1ae8mr2414104a12.3.1716598143270; Fri, 24 May 2024 17:49:03 -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 4fb4d7f45d1cf-57856d60629si1168881a12.654.2024.05.24.17.49.02; Fri, 24 May 2024 17:49:03 -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=uEk1kLdI; 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 304D068D582; Sat, 25 May 2024 03:48:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2100.outbound.protection.outlook.com [40.92.75.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BDCA68D2AC for ; Sat, 25 May 2024 03:48:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OegQkrG6yFYo99PNjTHKTgPqZT+FY8JaUOz9JgKWXfEy+luFMGWsRWK5rJXUMQlLgRwCOAzOCiNloVjIQwWI5JkMtrFCQO9atlNstk5b468HiqoQ34lsFj7dNFeXtdsf9m9SP73iM8RorC8Ozk8Aku0zJNMhJBAQJ7fk/+A1KrCoR2ZQGrtnm6WfK/0C5AJ4kFzI5LeG7c3Pe3AQlm1frIWbcVuNV1doQatk3o1jq/X8J5IpSipnKRebaAO5JaZfTjYsWcXuq/IeC5JPY9svPnvQ3fcxRyj51CxEwAZrhklwXFz6Cwva3emdhZioEjQbRcxSiCFvzc4cXsACLqph7g== 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=+3rC+1OJqN9GBHcR9R992/e44+NvLM7ofI6sekVxYR8=; b=L7M3oh5wL0ALWpai5ED7v9fXAWSesCEQIByB2+6RX0ESVaaZ/CPLmxxG+jlRzqYN7FJkGc+ZdSz6flygFdZYXJ79+Zqp9fbuGbCIgxPcG9tK9xLkPFWPOZbKtWjsTuI2eNyl+OMdEJA9WWvBj65ji8NIRCE3OohHQ5gGeM+SgVLY0MBGIUYf647GDM9AS1uQpOic03k/Ucau6zDpVasSuNoQA8tcQxo2ms2ONe7Eq6zrrk3xcT4MPuoq6CJgDxcgxVqYUx0994D7hGbXyTyCCqiCO8tE3FbSv587YeirpuzjzblhSGSxj5m4uGmuyBBw2OhaUWd5SHBqv57YLnVVHA== 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=+3rC+1OJqN9GBHcR9R992/e44+NvLM7ofI6sekVxYR8=; b=uEk1kLdIbmkusMI7dlk0m0X+nzeNbIDiXbmjCMFwADUKw6lFDSTk1HaOKLuzgm4adHfv9B3d5AvhFE2QQ4kwzlyULnBqrl/avAhITgZjN2LfFVmvOXCjH5ESXJM9tr1Kbg7xlBqXU1eoZP+9cqJb5RxWlwLbQt8WkRH0zOVxz+wo5lmCGimGGGlN7wnMk4W6zMpud0RR+iG+Bjtk6NAIQL1CTeAqk5/oAvIgMu3LH5yJPjh3WlMVDICVWyyXYiJtdO0gOhWz6NZCn8ybGLCefkbg79+d3BwhBiNDOghAqcIfVH/FX+gIclmTIAFHTDnwvGMH+hRMN6bNE6pMvYKlzw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0578.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:34e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.27; Sat, 25 May 2024 00:48:42 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Sat, 25 May 2024 00:48:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 02:48:28 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [cFpo/xOE0PZWsQvhH7nuOlTaek0WgNsyfL0p0i+IdNs=] X-ClientProxiedBy: ZR0P278CA0168.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::23) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240525004830.1549912-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU0P250MB0578:EE_ X-MS-Office365-Filtering-Correlation-Id: 88e6ea5c-dc6d-44b9-ea06-08dc7c546c81 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: cn5vzUiuG5uSoGxUgLCnLpmQDtGiU6p2dqwdQpsX50MLGIR3SbGldIjkJ3h08g9LNI8zsIHUE5UzEfgYyreJZAC9wxyrkDYxj91fomdQeSJ3QuCv4af0RAihnk4IUa+FK4qBI7ONlj0CQCmdduKV47VjdVA9k9qu+uMXY146ofSg2BmE4tkHlnNeI5ZUjUw3rBe3ptssJW7NzyhINSUvNwm/jR2BlRWs4m8LC4l7pooiFT7s6kNIfwtC3XWJc9ftToWJIZoK4IEHGygM77H4l2knRLSLyxBlwbLH8kwTa6X91qWtmZ/Ozq/7Tdj1RsvEusQkqvIgBzwuY6EJOc0YArif//eyWLnRiihVAcqBMZZ5/mG21c6nVA73wrlNkXmeyTUGbLa60eVUZwandgGmWx00jibrEJrOALgYn58Que7ajTPKdqU/uWgrrVc84i/zsG8mT3NDPl5IxUkGtUt4dGnKDihs994ApHistsLGKeOq621EJWgQN23G9R/M4K/zifFsGEsUPf+cepRNhbRrViUF9Ql/NbBSmwg4BuXo59PpRC4IXiK3lv1WTsuJmy6NcPHd4MDZOijpPAkvzAjIUojqC1iAf3MNWDDIu3tHD1zbJdJckgIKCKwY2uBCIn6h X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JfnwYgFOGJjqf9nfrLU3bQ1lnm+wvii/zxGNEZV+kekiKQl5r8mC70g/WeTXP8+c824MT5guUZK1pxVKkU1jaofhNN3IPAyIIQkqS1ILvAcKjerubZ1oJa5TcRw/eS4oIHF1QVl/iiDf0ymhJSPOgyRFFJ880FOj6+iYEGX882/g8xSn6PX6jmE2hRPhFybyl2eDbN4FnMSo1dqRYIfMxSGDzHzjTSAoVcN7XVKHwGACQDyZ9nxpuI2H2pegNXLKPd//vUlFNWuwuotY+2kscwefYX/HEQRwNqiAuKs5/qe7XAp2lSrDWEHnJXEo5Ep2+/Cl7J5GbM85pGz4QDm85YZltxOaq7HSYmR26JelSnHqHXC4Jdjy89KBgf0Afmy2ZeaV98FFINutMR6DUMOCBMaT+aEFOKXk5R3Hw32xM7GxALiy4TMOHa4rJ/2sL9FuHcJpRjyKvp6VOj4Mkq8oZN1A1q/9qkCmnDviRI+OlijQ4pdP1iHTQV3+Brn6+nxUp2t12jF0dkYHUuMW424n6KI9erwABi2gbYCLyx+5DWmLUlmRDkj4/C1uD7wN0gtVxg8O27Vb1yo0LYaY6luguWSo/jskM2YraOQDL8Fi47FpqHQWuPjUuaE7BjIdf+ZXMWGnrebZdyoXsGFMeNOWG9tQgKalYsMNt1vpJ+OQttwFvRStlwLRJfzkTrWJk4AHPjGs3ysxTjKCM58Irrpy5PeX5kKTUVgKPjHARrMwi/IJ/hT8/xIxm5hF/i9ZMD6jVCs4Ok2ERPwgi2H6B55BabdSmCeAap2Z+bwSKwZDq5OzHFyGT1+7CCHxtv9U1ynBabDNK/anodUKRH2bGf6GLz4f/l5xz3LH/BCHyO6Nl9yYJOJtEIXTEIrLZ9QIcb8vqatkWzGWP6UJTW/6ywix1L6UHlDOAkp4LSUP4DOHfV9uLcCK7f84Oi/KlDSBw6Yg8u5HLPlfHpCwrrDOer/VeUVQyF8/gjMly9fO/6po3kWgXpLhEIIigdKtFC1L3H0LOyNV8392M2rMcHS9auEeBgrJ7TdjPnuZ8XKXXQRkdo3sdz/xaFCidFegB4o/6Tocyguq20FZSqDbi2U3d5V4xhElpFJNTaYPKhaDes5jEEGSMootbX4nK/NES2MQO8eKI/t4DYRB1fyeWoZ65HxgqmTPNBMHY17FPDgHXWm1gTdzXrh9DK816hQImi5h7G0P4fMPiDQbD44qSKnLIlCVcPBUoo/+qgqcv4fnupxYI76Vhq/zN5TGhvuHHMzJ60LzWfDdBuqLTdNDEjqefD6ynw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88e6ea5c-dc6d-44b9-ea06-08dc7c546c81 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2024 00:48:42.1294 (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: DU0P250MB0578 Subject: [FFmpeg-devel] [PATCH 14/16] avcodec/wma: Mark ff_wma_end() as av_cold 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: 5DpfnmwFmlrY Signed-off-by: Andreas Rheinhardt --- libavcodec/wma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/wma.c b/libavcodec/wma.c index da9c914b57..257184c0d8 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -364,7 +364,7 @@ int ff_wma_total_gain_to_bits(int total_gain) return 9; } -int ff_wma_end(AVCodecContext *avctx) +av_cold int ff_wma_end(AVCodecContext *avctx) { WMACodecContext *s = avctx->priv_data; int i; From patchwork Sat May 25 00:48:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49223 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2069908vqf; Fri, 24 May 2024 17:49:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUNY0Rvg49wFUeZgff/ThxjLQTk2hGJuevMU65w2b3p2iHHlH7raIiWMnD0qVhLiMjueIqfk9PhmGqydh4diGcAF+gwTwTQE0RWVw== X-Google-Smtp-Source: AGHT+IEKv74RG6NMn5bewgeJO4U6SFqIyzch7jNG32MyTgNz7VpHbpdUIM7nYt7pyVk5Bnss6cXd X-Received: by 2002:a50:8dc6:0:b0:575:96e:e517 with SMTP id 4fb4d7f45d1cf-578519506d8mr3242309a12.15.1716598152135; Fri, 24 May 2024 17:49:12 -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 4fb4d7f45d1cf-578524b4079si1316110a12.502.2024.05.24.17.49.11; Fri, 24 May 2024 17:49:12 -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=soNBQiEO; 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 B885C68D586; Sat, 25 May 2024 03:48:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2100.outbound.protection.outlook.com [40.92.75.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 31EA768D57A for ; Sat, 25 May 2024 03:48:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bi+LkXqllw1jDLh7Nty94nAUvbrBTHBUx8DV2pS4HDpzsDaEvBg0gVM4eXw38YnpkElD0UUxuMOAlyOiHv7vFqgAPGsXkgt7LF+YPs4HN7N25NUawessJ91O1m3SU2VoBgAnKX6f/vT1aD4PeopA2yr/dDFp97xm/m+NeYWMGOfOy26nMjhq/EDAm4DEtck9e5mxTw84ZdP2YGfqbKO23OLubj8WOdwgsZ3lhN7PjUA2SXRdxEARy/w3EuP5MWQrDZRN2i9g38t7MXAvdse9oWY6qzGnCzOOR0lGVsfhsJeUKUoyo96GwM2kFoLNA5YkACV/qM+ULR7OmAJZblp4Pw== 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=1on46y3ec9CanYPIS+VaP6WkPGi280XPR0JSO0p9aP0=; b=lrrryG9K5GHvyfiUNC//Sz4iYlRHWjeMoPmfXM9Dvr32p4vv61mFVcIuIQluBjovtIKHtXLDNt55K70CmBqtokscpz0t95nFx8U9p+xQkC9/2MYU1j+zKHAo/A/hnDVYmBIyEZNNfvevIT2AoelA9Wt9Admr5MMFbBq+QicqDkki79caiNjAaw0WAmol/mhUu2Q+D1hL/z4SuXi6qwoCR/hKVivKlq2XL06uBLIzDTdkgA5CFD6MoXzCH+owoSngx8a9yYQTZXWsKTjh07xQVvC8hDKUPW58gLi2Vx2WMRCT2EWohlfKUVlQjyOo0pD8emcevc4Hx3nltEgIfDIs/Q== 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=1on46y3ec9CanYPIS+VaP6WkPGi280XPR0JSO0p9aP0=; b=soNBQiEOZvmM0ybUHmJ9RJWlrS8zxXH9KpKlDt3TohkDvELkUuLYktKEZBzF8I4VMZB+ZcRuvKG6o+Robs2xuAURo4nyeCfse/YNvz9PW7r9xW1sX56PjUe+pZzAmp/A5kvBsiR4idSjwJkb5yUe1Srrr2fCzt2teyik0cmiw/rBLGKWVSpzDTU9zG75aIXkby6mdqeqlD3dvdAvckMCf4qqQGoX4EzzuzfJ1wE1bJ4GGgfcE6s4djqq9juUWvt5x3rr/is1axECX7dpOHdZl3I7M26FueqYVDDECu0FqAm+R1hNG8TNJ9xEABGk7q7biSvPyvNOMfvIQ8VMdm1hFQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0578.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:34e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.27; Sat, 25 May 2024 00:48:49 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Sat, 25 May 2024 00:48:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 02:48:29 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [R6zSC0WdG1znBkk1+19bNjn0AmY+cQGRmurbT17rZpg=] X-ClientProxiedBy: ZR0P278CA0168.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::23) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240525004830.1549912-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU0P250MB0578:EE_ X-MS-Office365-Filtering-Correlation-Id: bf5161e6-99e4-409b-e3e2-08dc7c54711f X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: h0c3OsYDZCTKs4W1loJEt5MjMhRiSfNp54ndWmj9z7PDP7KuF8frk3LUAmUVTBABvaEsEbzrZezsZ3yiKW0Xs7uvuPmzKsEcquY1Zzg2d/KsYvt6YDg89tp+ispZ+13R3yYw+48aKK4HNtsrnzHvrP5L39TXCUIv6BBuxzj6AgxiIYugOI5eYp0Cy2feybMELpMC4W7Q1OdEbmm044Cf06jb3AIDKjjLbCnxEFUg44zVo8gX5udPnvx6zaXNqoq4P9rim/5jh15AtPnRms5/4HJ924YP+WfxC1bjPI23VccooSym3J5jK4jfds2L/k/Rj0Q0UnDlPb8ps+w3I2JxCsjleeP9U4B2rzfhtyIyUVCNCGc1KfwOLfSz82AVoUzQZ3UEgRTAwmniZW1cDlG+ZvXRIC3kZ24WpsAzVimUB4+P63wiuu4wgn38Us90VBypj8NC8quLB1v1gkFLp6ytnAJdOmiDfG9qS3jWx6bO7KeEKu50Ic43u5lHdzugFOSkNY8hydPI4vNK+JtqcUmtW5/f9PkkGHspMLqSTVNBwfFzBW4e/XCag9GPCJfvjlFpSSqckyk+phlVZ00kPG8VKiWUeGVz0l1CYm9PjgqtF9N+BqIt9i22Oe3XTQKoeGWc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dOMurUyuGUgnhun4F6cHsNzT55T3r8QMoPJzwS+HSiYZpiLoqYBOR5bgwqnxk0JvsNhlDMV0f3zjnhgArgkSV5HAdQ9XMPCnbUAzyK82+lfQYvhmyABfvSahgyeypQVzcbzpWwnqselnH4/9pjAtB7GSndrrrRcv88R5AAN64zWTOB4HYwlo4EMz7faTOW0juFJvzsrbApAbUAaj1oUywNlX+6TeS2h9jOaGt4MnRRtSBuTLM9lptEuUaaFd6oxs3jmjvTtWutH6587RrvLouxGTakF3/jBhWqF9tFZLL3Jw2fUbaH0J5X1myCk+pkbYc8ji/ldyLL/GRQBDHAyDiwsWRMtvIX7Mr85cnazmcq90oidSs2qA8mNeutAIC7jwP5o3EAq3eQPxmEKmGzBQnxqkkzZVxpcb/XD29sm7BoAzpcI8ea8Bp93ZQ/qUc+nKSncLq0xlSnB45Agd+WRup+U5/n488zIz8Jr2qNimyO0SvPBWqVQhV0JxAgmU/dpxu7Ssy1rUbNV0wPHmgRH7nZ5lWbCKo8doeAADkiR71TWC1TXptzK5Uulj9/tk8jiX2CfOJQYFejmhn91sVh3HUIPD03RgoGXD8edfwnOGc7KITsEepPOzTOwSJlsITM0JAEDyy2Mu1GMUTvo2nzHz3LNyu4MFGV//RU9qUoFz/uyG/ZZM2/BXEQmZ419gDX5BHcf+8lchopWxbS3Wj3+EDzhrzYS+RWTMZu2motfIcvAluofY+ThRdeveGYJv7v2W9jBjygIb0bGvi9f3YCA34vopVz1ucJrdCNgL7m3CUieUBkjkjomBn6tODWokrGLr8X0aw6CbxAtjH3UFnhiZkYJtp50fdcXMGnlUOWVoHPp+p34HeXhh4l4XwswV/OtusdeJ0wqsNE1ginU/DMCmRdHo2Xz+0QNQ/y4n9OePbALhwz2902kz9QC0zH424Ve+sawKac01+YBCWAb+RIVjEj5Mcj8DyaVTc9nXXLI2JsjIE+L4zs6LVMEEXGT092IJcufni4cAFIZ0ICV6tmmSICLuzEmAeG50CT66Oqj2Ud6j2A2aCDqaw6kPADTAXYshrO6HtPyd3TAX48MBXTlOyow7EP3EULuoyCwgSq7c1jIK6PgJRGSvmEPpPUzaXMuKXF70ruSFtL44D2gA3P+CAZ9V4eGADr82eIVjMvZ7ovzfoFXVueK53tC3O8IIVtJEsdYVPL+gI+Qm8+ThEOAcCkLHplWOsPBZNVGhElu9jg96J1l5t+suTy19R02BWAhWOB+9N8Rhm1amNF+ZPczD1A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bf5161e6-99e4-409b-e3e2-08dc7c54711f X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2024 00:48:49.8844 (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: DU0P250MB0578 Subject: [FFmpeg-devel] [PATCH 15/16] avcodec/wmaenc: Use av_unreachable to mark unreachable codepath 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: DLTACQReiga0 Signed-off-by: Andreas Rheinhardt --- libavcodec/wmaenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 7240c0895c..b4650d42b3 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -80,7 +80,7 @@ static av_cold int encode_init(AVCodecContext *avctx) AV_WL32(extradata, flags1); AV_WL16(extradata + 4, flags2); } else { - av_assert0(0); + av_unreachable; } avctx->extradata = extradata; s->use_exp_vlc = flags2 & 0x0001; From patchwork Sat May 25 00:48:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49224 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2069949vqf; Fri, 24 May 2024 17:49:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUdBc3r7IPL3PbyLnPAJ+isbn2fbV4KhtSa04Bcs3418IVSt6jWm0gRZbiPlvovVTjczH4s8/S9Fygwom6Kcqr+Ruw6D1ymfD1r5g== X-Google-Smtp-Source: AGHT+IHtvmfRk+4DPjPOeYuMqyEkMsper4puN076h1aZZte1noMawS2TvXTLw3AEFCtzk27DXrSU X-Received: by 2002:a17:906:b0c5:b0:a59:a48e:34 with SMTP id a640c23a62f3a-a62646d1dd9mr335257866b.32.1716598160726; Fri, 24 May 2024 17:49:20 -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 a640c23a62f3a-a626c8006f9si131392366b.104.2024.05.24.17.49.20; Fri, 24 May 2024 17:49:20 -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=r9+rXJRP; 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 EE61068D5B3; Sat, 25 May 2024 03:49:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2100.outbound.protection.outlook.com [40.92.75.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 54D0B68D5AA for ; Sat, 25 May 2024 03:48:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ijoa88+y7j0A3nbXlSVDizdqGJF+mCDY8bqjT68kPNfIkYu8lYVbMcVTaPcair6lY7vMMuzKkJwxLBqlPXe7IZtN7GblBwR2xvlWdtS2xvBYWZJtDJ2dCtZg08TpwOIYgThz27kZh2N2mpnZgw3y5VfCZsqG8xtvjAO6PmUZD2370QQotqSSrMQRtpIwcg04PNSgdatBLFh5d/18AEQbdLIj9qoMz1gqTWdJZxLQV9AycnFOKi6AwD2BDhbLBEpxQjqEvOJ+wUTuP/Mb2BrNFUMAfskzuMDNNZQsQ837dPhIYtAfYijCg8+g+UWw5E6ti6lI14wLEZ1TZB1wN9xdwg== 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=joBV/Si8f1nBgkLJLuIyu4eATGHo2EU5rHGHuUnqi0w=; b=QatOtahiyZrcIlfC63MUng3NK43o0T4WJjfBcrJCm/6wdG7mgKFRk9vb9Y2SsLkWvUui0wurOhDuboIRbnbMI9q2/6ttMpi3pWpDxx9nUxIT7IDiLO4TodNJ32HbLwoBKHduuLNYEki/ynJlEFfU9nU7DBMtsvp1pvrP6HjBom/BNFrEdWOxuObQYlEC6lsKWM/HWzRE1H/M+PR3EHvAEnO7IIyskuAzITK1NH9QvawnM149cDWcGLVfBaop5VA7rj0uYcMgLgSuryoPiRrr5RxES6Pj60Som46tHfb5XdP/NSuPdAT6icoG05bF6UDLRfe1SORNzsGrBf43jraBDw== 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=joBV/Si8f1nBgkLJLuIyu4eATGHo2EU5rHGHuUnqi0w=; b=r9+rXJRPg7lI3vdlXQFyX0d5XwNVPu8fszbuRYNwhaMz4B8yxYpIzsqbSUqpdD8I4OcQOSD24pTI5nArWbqQSXnecL8lkjrHaFsZlRSWG1OpNdnumEh9rPaa0kLRlbVeGtTwEvltlQla68SeCm0uwCzUdQiKes5dHBC90UTDdSwO958JUY+y6DUI0hXtfybNiEPAYiHZAWkYTM2LdupOlcQAaG3RuoBf8jf73Jwq5IgiQGEDAa4X+x62APQ0x1t9b+rSnQdyCPOT23AkBUjMfnOzBK7PeYSvSlgoDlEpifSHerT7GodUe15mL5asEaDfI+iKNj6DkZ0e+CZvSdeq5A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0578.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:34e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.27; Sat, 25 May 2024 00:48:51 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.016; Sat, 25 May 2024 00:48:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 02:48:30 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [8v2SFhwSv4JuNe7gYUKdSXlvn8fGnNS2xtN83KMzUew=] X-ClientProxiedBy: ZR0P278CA0168.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::23) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240525004830.1549912-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU0P250MB0578:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ec8cfda-1dc4-486c-2ba9-08dc7c5471d9 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: bl7TQIBKMkX3kgWdCfXcMyWT1C4jYlffw68AKba05Cp2j/u5cam9cJuK9u0KUQ2yqc5LQMLC8VFBOl8f1pWby3iRt7i9Dvi+vF6mG0oLgtpUvcLnvByVYZSEY4Nl8pH/hQu2ZpOXqJVNS6nRqeKS3ybYT+1a2Jxi3VDgqQJofmaiJ3gJMVPk6gFJLEgf1EB9nbsmNQqglfRLtRVR0JQ62guFEOsRrg6F+ySUeNoiMFeLh4SadX5gxlzr9WI4m+ioX2LdQTnel0dtlIaw+Bbcgpmby3M+kbTZaug2DuCWhklxDYGPQGf/9FrVqH6xyJWIc9N2bzC4nNaI6Amm4HQFS8Rvq3w0z4zCif5/5Ldq77ct4wCPSyaqgyXO5+wFcalVE22B7+EqC8eVzAf7TNsOckIjdWLRDhIUn+lsH0uFzYCtn3ZcQYnUqr6BdB6T/UqPmnOKVQIyOAHIIo0ijqCkXAW36IlmZMf6lId5Q/ebLBlrHb/HzBEtYDtaIfrd2wAKUCqC9PbFhSf6Uprgugta+fnKWSsaZQCcV0MH3OtPMlrSkwauZjNUwGuWFMg9jgBFjMVJMiA9BmSOTzLZ99+fLntGF1i1tSut2rwjDId6AyNAXUqPWYglrVreBWSqZ+l/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eNlxQUM6HiT2XAt01k/FDhTlGfxsxF+OmFf64MAuFjCvwgumLzcNUzSTyDJ2nzu/DpbVzMFQccSDmaQ6MsRBlRsq+Qfdveqqy2qOevq+rPZyDOYfn+HBtIegcoS2aNYz9UM3QetiF2rMVZSJFBEt1OXdhzaTOd/Ar5Sq43ybf1+FS7CffbNYtUmtKphd15WGhrv+f1PTjdOA82D2tl/OQGxAlB5EA3J9yxAUn4WPt5529IP/3JMJ6IPXfN79r+BEuLXhHreYJ4r/G2riGMrBr6y/7l1WnoNrecDSSzPMtdtBjWPL10j2+NSR//R5yKE11H2bsBx9CNNRtMbc7rlDs2V5K55rYq2duteaUGYt3rs+fu/l4ub+DM23JKsQ21I5M3vAUD9TiwWk2lQDzdaQBxYGqMlrenAhEn2lVLPqmYev1LtfeorRBIM+W8WEOQ9mm4mQC/wO3dzPxH5etZ1D/OuoDa76JVAddKFpFrbWMeGsZ6y0Q9M2C3U4A+Jwh06qZIiSpJRsUpxI+CbSlNaGcJP+BZQpmXZKO3emZDkOXAJ2U5oBhoi/EOPO1IuY92Lvp7skDupNrZaBhi+In5sf/CTflUKqfRRCum7DASZsPX9Z2NhJEY+infMJyEcqtO6u4H5fZXSJW0YFYjnBwQ9lCoJNW65f+OcF6uFyqufn1PKlNYl6E2DzuNdTjtsukpL9ZOKM/SsYZLSpvtngPqZedCgUyqd4SttxAst9tuaJAe8QRdVPoVr0sZ7AEEItHm/NWCcXOQAq7cAqKk6sR5QfnQ9YtwLFcEXFNZ85UpunV/KEo8ezVu+0yG/RlpUH3SfMTzmDlj7I6K5lUda70MG7+63i7TBgDMEViO6DyK51uVAYP69atuCegdTdS7AGv6J3dhmkABTotCmo3iUILKVhvxsgbWT35piYxRt5pWih6ofWhK0EKbzI1tYXcwlqMD+4rhS5ngYkhWwiF6BxBSeXydTHCJMoVtAz3CSiu9MNJUq3ECcxALrEL0rmasX9pJArADnAFWUogOqhwdaZarQ/3hjSZ0O6OcpgnieVpljdstcVZHGsmBj9Zbv443zsX23lY8LvJ4bYBGMEK+TW2xrx05w4Hnnq5vfQ1HdEeM4V0I6ane5PTulHVr0Hwtbcow0PQ6bhRF9vaH8JRJZ7gt7hNmRKvIAArOs+1ZW8i5D2nEb8/9QCX7kNREzuE2zd4kc191FgOWj9jX8NVWa2EmJCv8vReKAcXnycoAtQNxf2Ullir1P08O9sQusQE79c/CU5m+e6EqmDjJuN12SLwESl7A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ec8cfda-1dc4-486c-2ba9-08dc7c5471d9 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2024 00:48:51.0858 (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: DU0P250MB0578 Subject: [FFmpeg-devel] [PATCH 16/16] avcodec/wmaenc: Don't unnecessarily reset AVPacket.size 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: KosvxFxO9FWw The packet is unreferenced generically lateron anyway. Signed-off-by: Andreas Rheinhardt --- libavcodec/wmaenc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index b4650d42b3..73ce0876c9 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -418,7 +418,6 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt, error = encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain++); if (error > 0) { av_log(avctx, AV_LOG_ERROR, "Invalid input data or requested bitrate too low, cannot encode\n"); - avpkt->size = 0; return AVERROR(EINVAL); } remaining = -error;