From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9AB12426D3 for ; Thu, 6 Jan 2022 09:35:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E09D68AAA1; Thu, 6 Jan 2022 11:35:30 +0200 (EET) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067051.outbound.protection.outlook.com [40.92.67.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2627A680CB2 for ; Thu, 6 Jan 2022 11:35:24 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XzG0Su/56xozzlQzOAlGTMexPvHvZtBpj4kz7noNPTovB/mjFB785goYA45UIYMI4qWwotAMUwS6rflx7ggT1PJwUzp1gn+1OUz0kOWgvJIBxXUHWQIcuend+oLlKg8/0nPKhXx5K2x79Dfmn4lzaeEfKjDkEN7/5MneymeHqHLJo9ORZpyqccU53ky92vfTOitAGo19Z4B10OOiIFRZ8Q2oD4mXJkLY3GP+EGASKBJdK355SnqbtOBCaS86/Ho6wR2IXWRuQ16eZOWfLehTUhkNgtuXfqgEl2QNwdhHuGi0D5zq72mZVPJWPLLbI4NGGR+81dlpAxwKbGHLZPS0zg== 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=fdC9611ASaPiXUBXrkzNZmt2/p9AC/5a7WKT2VpzBh4=; b=XW/7smVtIXakK2WgjFnHDfh+Q4Ss8awxkTfdHxqfAw1NIyyr2vEng44HpZJASbDxqqN6K255NkhbTY2otD+m60Prxa+Aj+X2L13Xagn1xMcm0y0gkN2hueqpkJP9pcL457wbpDPyGjNrDUDtJC2d/Xw3y5W0voNytnWYwZBim13nPTltwEid9Zd6fckxBU/cR0HMpZC+Q5uNJGemqLLUgjZt4LcWOvYkZwo2g0Edt/H3EJEoX2ZQwZkYEeC9DzfW4VMe9DvwBYJ9PR+29M7Qy1QsQuz1Zdi0AXYK8BxPedO3DCKajDYmDWZAj8sWO8377BCzhnSlp8FQCXK3oZTjlQ== 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=fdC9611ASaPiXUBXrkzNZmt2/p9AC/5a7WKT2VpzBh4=; b=Y9dp7TMd3fPoXhdlgMAxPQQzsyPeAzPMuAJQ7kTomHhYURDDVzkqEDr2MXRLXNC/gQ+ZCsDBRjLOxvAW4IsYT+BfHPvJYR02lNU3GFBjxabRjAKVEVDIxvWi55Yo5whf+jvCXaEnnPcemHqiydjAwMNpNP3GvXxn18JvoC4nOPHueRNi5qD36f/ikEuPcAGe9edPvNZ2Z9iHbMyJoFgiQxJUdhchn9bNddUq5mkV3z8D1Fvz18ftW47uiRN9vMyAY7gjnsOMQdtDujsF3FL4rjwmoSzFY10YA/rKBSnDbS77SNpM0ybthuItlD5zdGOKrRSGqc71r3dhyGR0QMsw/Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5252.eurprd03.prod.outlook.com (2603:10a6:20b:c4::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Thu, 6 Jan 2022 09:35:23 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 09:35:23 +0000 Message-ID: Date: Thu, 6 Jan 2022 10:35:21 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220106093202.GZ2829255@pb2> From: Andreas Rheinhardt In-Reply-To: <20220106093202.GZ2829255@pb2> X-TMN: [s63KqrkG5D0iKM9Zek5aUEVfxplvDKR3] X-ClientProxiedBy: AM0PR02CA0003.eurprd02.prod.outlook.com (2603:10a6:208:3e::16) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <97c4d770-563e-a59d-de2e-52ab3a62e271@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bb1577cb-dfd6-427f-d23c-08d9d0f7dcbf X-MS-TrafficTypeDiagnostic: AM6PR03MB5252:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CYQ9UAr0Rt9mvUF7/jfWKqzx6Apk2anK4KsStrI9SBugM47bJg7bH6bL3A1DdLMTc5oKpu5zG3I4hIqgMxBExyksUZEMCP6WREv1oNP5JANmZriQokB+TL51aqZx+poe66rDNKFomx46R+bqKgFC6ao2bjuJeO1RgarytXFES5TAiN/vInUKkLX+BQLDC08K2c3H0kXeLpLeIOyu1IyoiCbXdgHk0sHqHuohgIBEWcN8GhHq62DrcUjDtyTrQMMC5JIyZiLZbUkrQSGd9CRiw+St4KzWxcnUq1YPp7hD7lamrP5AqfnktNkN+NMqE/rqiOkFkYl3jjBjYS8ah6xctZbSN+AKS6E3vRRZ9TtlAxb+YdL/KOorx5GPt9z75TbjZVITgn3jbfKBOp8DGRigaLvs+ocjd9AkgOGRsZ8EMpvzRNma0NndwJdU/pDy/LdeIp3V84MO4Pvl3nSERiHBovWlaSAEvbXg81itC7OXccNLKSzboiR0T2etcNg51rO+GdhxrzEDXxSg9/9jQk6jpaFbceaUvm6NsyIhdcH9FNo791XpL8JMtdy32ySKAjCxedtCWrCzh5HXEmtkiXK2Sg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NkhKOFpLVzJjdWdFZWYvVlJNRnlHRCtCZ2t3QU9BcjVhQ2F6VmpPOUZsYW9r?= =?utf-8?B?SWdWZktFOGNxRitjZzI5ODMzSmkwV1R2TmNtQVR4UHRONHNkTG10TUU4S3BI?= =?utf-8?B?bE9pQkEwdnA5R0dNa21HVG13ZVdZVForSmRHSFRKYk5CQ2RKdzFackZYY0E3?= =?utf-8?B?R0grOEU3L2xkeDIwQWxHczRveGhJMS9aTWxMVzl5TmV3NGhnWk5EZDRWZ1h0?= =?utf-8?B?UmNHZWhQS1VUUkRVTzVnVVc4bWJyQWpjc3ZvbDZOMUYyTUVGZUQzS0NpVFp6?= =?utf-8?B?YXZpSTBycDlrUmtMMjNwRzltb1dQYlJnS2tScXZ0NGVRVlI2cWpEWFdEN2c3?= =?utf-8?B?QW1HMEtQUUwxbnJGbXlMOWEwNElWdDZFajJ6M3poNjdDUllzZFU1eUhnTFZK?= =?utf-8?B?NnRPOXVyTEIwdmZ0anBCSGNJTFFjeUtBS0RRMVNncytmRFFyVzc0bExTSytk?= =?utf-8?B?V0FhMzFzQ1VVUzJjN3BoN3M2S040b0Frc3hyMFlqcUdta2pRTDN4U0hxa2Zn?= =?utf-8?B?bDVNWENtZDdhZ1RkelRWeTFjWlExb1krS1Fnb0gwOFEwNVFpcmdmajhDQ3ZF?= =?utf-8?B?b0hpK0hvSUk5RTErb1orYmJFam5TSjI5ckpVd2pCa1BSaEY2ZHZwTzlvbzFV?= =?utf-8?B?ZFpDWE1sazZoRlQ0SjdPc0w5UkRxSGE0VjlzcFUxL05TWmdac3V1cWtCY09O?= =?utf-8?B?aDNaZjR0Z1RLTFBoLzBLdnBuK2VrNFRJcTVDMUhjN25GRWdocjArK1NJbklB?= =?utf-8?B?T3g5NGE1cHB6cVdRT3c5QWNyeUE4eGdYaWJLT3dSUzJGSldLaEVVOHpOOUx3?= =?utf-8?B?eGY0MSt4Q08rTGtsV0V2Vnc0bTJWbms3cWdmaGJJeDE3YitXYjFrTFpLNXpu?= =?utf-8?B?YzVWN2RpMlBDUTBQbmlQUHdYWDZNci9XV2hVaWtZeHphWG9XeXhpVURQVkl0?= =?utf-8?B?N2ZvV1RNL3NYb3k3eWJQWStYcGF4am9UNHlhSUVxYkdCdTMxK0k3NVNHUnBs?= =?utf-8?B?YXhaYmlOZXpJK3pGbGNXZy9PRnR2SmhNSDVJUHRRVG04ZWRIVHdmTndjazV3?= =?utf-8?B?WStickJIRmI3dFlpSFBjWWtWeEVsOERmRFh5clJuZDRkTkdxdXhwaWQ4T3Yx?= =?utf-8?B?U1A5N3pqd3ZvZUcxR3pMZU5aaEVWZnhVSEhKdDdydmhkYjJ0QjRXMFNyZ0g0?= =?utf-8?B?RCtrZ0RGN01xZGJwbUp1a01rQjZONlJ0czR4OHNxbGJsU2JEekVqMFFyd3NL?= =?utf-8?B?S0hmSnAraWJLVkF0YlNjbDdFS090OUZ2QWtvZUxqWU1rMCt2QT09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bb1577cb-dfd6-427f-d23c-08d9d0f7dcbf X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 09:35:23.0558 (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: AM6PR03MB5252 Subject: Re: [FFmpeg-devel] [PATCH 2/3] avcodec/mlpdec: Use get_bits() instead of get_bits_long() when possible 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Michael Niedermayer: > On Wed, Jan 05, 2022 at 10:38:34PM +0100, Andreas Rheinhardt wrote: >> huff_lsbs is guaranteed to be in the range of 0..24 and >> so is lsb_bits here, so one can use get_bits(). >> >> Signed-off-by: Andreas Rheinhardt >> --- >> libavcodec/mlpdec.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c >> index 29fac54542..61b9a641dd 100644 >> --- a/libavcodec/mlpdec.c >> +++ b/libavcodec/mlpdec.c >> @@ -268,7 +268,7 @@ static inline int read_huff_channels(MLPDecodeContext *m, GetBitContext *gbp, >> return AVERROR_INVALIDDATA; >> >> if (lsb_bits > 0) >> - result = (result << lsb_bits) + get_bits_long(gbp, lsb_bits); >> + result = (result << lsb_bits) + get_bits(gbp, lsb_bits); >> >> result += cp->sign_huff_offset; >> result *= 1 << quant_step_size; > > This seems not to fully work > > Assertion n>0 && n<=25 failed at libavcodec/get_bits.h:403 > > lsb_bits and cp->huff_lsbs are 31 in this failure, it seems > the checks that prevent this are conditional but i didnt debug/check this > any further > Seems like I misread the check at line 841: It does not apply to the first codebook: if (cp->codebook > 0 && cp->huff_lsbs > 24) { Thanks for testing, patch dropped. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".