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 D200848CF3 for ; Wed, 24 Jan 2024 14:33:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C5AE168D0D2; Wed, 24 Jan 2024 16:33:42 +0200 (EET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2108.outbound.protection.outlook.com [40.92.65.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7038068CD0C for ; Wed, 24 Jan 2024 16:33:35 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mzRFzvNHnv5LubVuYychEYUYg17BN2e22FsXSP836cH+dDrtpyBJyNnLbNfuH4wtyx8cYP+k0m971FkEEZeu7e9ckCsCipRHCJ00kxGiZGj5bn4dGftnbnM/PLOypkf/haAO6OHp07OTzdYAx/XaCmsVllwJEnVawlIzkF0g6O8DCQUc2xFeQYSuDSdO6Tb9koXf79+BEP7fs4s1P8RC2O4+TtLTA0dVvVBAYhW8JuAJ3uFrp6eJa0FfvEZ1XFIAT611bhZCAXs6xujRnljgB+2Kyvn8b+ZoDpMmDUE9V8Bd4Sw3LdBAi8LAmbsggGmnwdwE3Uhz3M1rkeIukaAezg== 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=3V8FcH3DRTRtvYl2lL2Ev/5MUJbbUqoxWGTfcwn2LA8=; b=DfRMczpPjCC2n/+wNCnLcn3PkH2AJKI2sYyXGeK1S1HMsw3Rj1o4bvm4N/9dtWjzo6YJZljRC+26ojZclxp0wq/VL6UyPQD+mC7QdKSmt7rXmPQ6UIQ5BugWG+wfCkZ/3oQ1aTRjD/qI6Bcljh5V6T93WBE4RyNXSmjJQdeerzJzc79g7G/uSk7Nlaq0wzHGWQ0egNL1RzeonqcHlEF8nS/zn+z2z8EzjhyiXcvjqCuMf1ykiqdAL7E9mkXvelhTnPhZePV/pXxBvDnfpwG5IthIhTp/JnetRGVQJCO808acK1nkDYwnIPvNCT46DMIQmQjV32CJuwz5LwS8cg7Gog== 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=3V8FcH3DRTRtvYl2lL2Ev/5MUJbbUqoxWGTfcwn2LA8=; b=Yp0vmgs5Rhc1N4/wRT9cbJ6DuN1M3qc+zu226xd/6NKnUuNE6j1j85BQgAqzfeVjFM2lhb/TbYpyTzqinp2gQvTyU8FyvEwIgltuINFOpToqBBwSv25OpFPtuz7qqL02K+NDSJ4QSoC7Bhxgts+PXZoAbh8UoiYAmLSRJVaw8Jy6M5xq7V2doeRFBUvLIFEap54SVk5m/h3I/OrTIvdKtvR6N6uo4AtTlYjVIP86AkEHg4sS88rv+XdP29uPXWLINbILXnmOAVGTS9M6Lf+08JH4VdJAk6qgX7WQ+ZCfNfegcrCmDsTsxOzcynmO/SYR0aPC0qLi90RsBitt9JjAnw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0014.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:2b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.22; Wed, 24 Jan 2024 14:33:33 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7202.031; Wed, 24 Jan 2024 14:33:33 +0000 Message-ID: Date: Wed, 24 Jan 2024 15:35:11 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240120014730.53635-1-jamrial@gmail.com> <20240120014730.53635-2-jamrial@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20240120014730.53635-2-jamrial@gmail.com> X-TMN: [bZXcrUx+j2RUX6V/TpbeqtW3rXvmohvdneUFS+C7hrI=] X-ClientProxiedBy: FR5P281CA0023.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f1::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <32f03c1e-7d87-40cd-8b85-5eccaa32c451@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0014:EE_ X-MS-Office365-Filtering-Correlation-Id: 038d1d47-e454-4276-e157-08dc1ce97118 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xYu0kJqNPsC4yOqoEgQDJcuJ33e1FRtLxu2M2m306DF2HVYYPOU0or326Kc+fmesJgxDwx4bxCfvOLyXBv29vusBmzwPCacwY1Z/2+25vhVzfM54tRhNOiKv26Nq8wRKfwElcAqmzeo1852OA3xZMQXlt7XgADJVB40KZnjvi2HOJBWqyZtBeFTRjvEa/WzN3h+LlLSlg/lEAg0QBHkbaFKNvDdMMiGGWIjTq49r4SOeKodDyLmU1WxvOdTHEXL/Lh6Tk01P/iujoJPS4QQRThxBO+hxKq/6KytODQHuVXl6etSu+kuc5s2WyAAQngzVc9qRblWqFalPNY4WgdfMT+wYOonnwKlfQxGSZ1GX0gakwLGmln/J0LzJ1ZOrZ7+LQex3holZHkHgnI/T3pMLrCqiD+xr6v69AdfLLnJQFm/w12X1XVapNp60IJZQ35eSxFoqJqW/Lsj4K7eq2VPtbN76q9xZ+6+EfWvTaVz5PIAPbNS9MRBRUwq/fjMOnvh9hZ62w4tDwTzgXKPrxqmsIuHAMk23wbsg49E4Ipd78nFmqNXmE5vxDO7VpZBBdZGt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SXg4Q1liZExCY3BzVVk2Z1dYTzFjc2xaWk9HSVo3aUREeElwenh0SWN3c3VK?= =?utf-8?B?bVhHdkZHT0FoRWZnellLYmxkYVpRdERldzJZQUJyWlpZN3hqcjdUVVRxQ0li?= =?utf-8?B?a0RiYnVZZldZelZqK2NublRSU3g4SnU2UmpBY3drOERTT0ZUY2VvcCt6SVBN?= =?utf-8?B?YWlENlR4WXN6SytMWkc0YnRScFRtelhJWk0remlVM3J3a1Q2Z0haRzFWNnpP?= =?utf-8?B?MkhXTzJLQTRnTGNiZ3pPL2Vya2pXakdneHFsVHNjcHRZdVVDV3VuYnp5ektn?= =?utf-8?B?Rm14NmRKQXppSmkvNy93Ykthc3V6Y1ZjelMzMFdGUE52aFUrOGsvajR4Tm5t?= =?utf-8?B?a2J4MHBYejVFZSs5ZHVTMldRZXhTYWZoaW9PNkpjYVhKdnJMWm1YM3gzWnNJ?= =?utf-8?B?dFN0dmhpaUtRTWxTVWF4dWJ1STZZZG1HaExOSVNLODBIK0NxT0xmWFBwSzMv?= =?utf-8?B?bDB4K1MwZStaTldSQ1YxRDQ1VEQ4eFBqVTBCVENKbWVhQmxqWHBydThCeVhS?= =?utf-8?B?RUxERlJhUk1SeFgzaFFka1A4T053MWFWUkdoSlI5U2RSMU1BZVVBaVNJNytX?= =?utf-8?B?SndJMWdsRldraWZGNWVDQksvMTZhMW9nNm1ZdmVMa3NZQ1JaNFVoaUM0ZHdT?= =?utf-8?B?b0NYcjVrcVdueUJGWDRrMml4dlVsZUZqZE5YYURsYTRubU5PU09kRDZSNkRl?= =?utf-8?B?dTJFN2pVUkVEVXozeEFMTWtDWFE2UUplSTBYaEhVQzlNczFBczIzWkJ5QmxH?= =?utf-8?B?SThUYTNXZ2ZiQnljMUtXbE1zNElIWWRudUlKc0tmVUFDU09xWS9UWE1LVHdO?= =?utf-8?B?VllGNmVtVVZscGZHVXRLOWZZcjkrL0FlL0d0OEZySnQvRUUvc2QyUW82VzNy?= =?utf-8?B?NGtLSVh1MFVRaFh5dXBaSjUvNVkrTGhTTVpOWFk5ODlYU0x3cjUxT29rT0lX?= =?utf-8?B?RU1vb2o1ekxydzlmdjFjekRlS0tMdGFwRGgxMVN1djZjelM5VFR3cWJBNzlG?= =?utf-8?B?NWI1TE1sSlJ2c2owc3Erd1dKano0NXBROUxXSmdVc2dYOGM4VlVZaytUa1NE?= =?utf-8?B?OHVKVkhEMDZuS1psR25DMkxmcDlrVW4xamxWYmtUMGZjNlZiWlVwekRRdUF0?= =?utf-8?B?dnZWVS9KUjRBcy9mRnFjdHJPa0J5L2lMZlBWbFVYaXlMazU0WUg1T3U4bEMr?= =?utf-8?B?U2VZVjJQc1FteU9SbVNHTm1kWUFncUo5V1phc2tUZ0l3MVNGZkozMFhKWStV?= =?utf-8?B?QWJaazFkNlJROW1iSExraml3WEdMb0JmM0F3U3FxM1N3M2dyUmlvN1NiMUJy?= =?utf-8?B?d1gxZTE0Y3k4Zmg5S2ZXdnBrWVh5UWJhZjM2dDBMS08rZWRJNGVaeEZhWDEy?= =?utf-8?B?Sllpc1FMeVc2VStVNVBib2VHbkFnNW8yWGE3ZHp3dUMyL0Fjb0VDaERVbFlt?= =?utf-8?B?SXdDalRyMUIwZFdCTWo1aUdVWXdCM1NrTkZTMFFyeWVCTldSWXRWYjNPWC9a?= =?utf-8?B?Snk0MVl1cWk0eldVZXpxMDJwSktrb3J0SHFrYUkzcmZWSDhqc0szNlF6TjNU?= =?utf-8?B?ZEJIQjg3a3FRTTd2dFlHbjVGVFUwU2hIVzI3MUNYL2FpVGg1SmM0K1IrK0JB?= =?utf-8?B?RDgyZkpkRTNzZ0cvdmNMN2dMZnRVOVNIM3haaU5xNm4vbGRFbUxxOC9hWm84?= =?utf-8?Q?6buj6aVhPQBhbytCTpdP?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 038d1d47-e454-4276-e157-08dc1ce97118 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2024 14:33:33.2034 (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: DU2P250MB0014 Subject: Re: [FFmpeg-devel] [PATCH 2/2] avcodec/speexdec: fix setting frame_size from extradata 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: James Almer: > Finishes fixing vp5/potter512-400-partial.avi > > The fate-matroska-ms-mode test ref is updated to reflect that the Speex decoder > can now read the stream. > > Signed-off-by: James Almer > --- > libavcodec/speexdec.c | 4 +--- > tests/ref/fate/matroska-ms-mode | 2 +- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c > index c73b2a7ec2..51c5834769 100644 > --- a/libavcodec/speexdec.c > +++ b/libavcodec/speexdec.c > @@ -1420,9 +1420,7 @@ static int parse_speex_extradata(AVCodecContext *avctx, > if (s->nb_channels <= 0 || s->nb_channels > 2) > return AVERROR_INVALIDDATA; > s->bitrate = bytestream_get_le32(&buf); > - s->frame_size = bytestream_get_le32(&buf); > - if (s->frame_size < NB_FRAME_SIZE << s->mode) > - return AVERROR_INVALIDDATA; > + s->frame_size = (1 + (s->mode > 0)) * bytestream_get_le32(&buf); > s->vbr = bytestream_get_le32(&buf); > s->frames_per_packet = bytestream_get_le32(&buf); > if (s->frames_per_packet <= 0 || > diff --git a/tests/ref/fate/matroska-ms-mode b/tests/ref/fate/matroska-ms-mode > index 5c91209910..0e31c990dc 100644 > --- a/tests/ref/fate/matroska-ms-mode > +++ b/tests/ref/fate/matroska-ms-mode > @@ -1,4 +1,4 @@ > -a2897e3951b0054d0fa31fe51860444f *tests/data/fate/matroska-ms-mode.matroska > +e7f44cd6a5c0f45fea11874afb8c1c0d *tests/data/fate/matroska-ms-mode.matroska > 413103 tests/data/fate/matroska-ms-mode.matroska > #extradata 0: 40, 0x54290c93 > #extradata 1: 114, 0xb6c80771 This changes the checksum of the generated Matroska file; presumably some header parameter is now set differently without affecting the size of the generated file (which one?). But this means that this test probably needs an explicit dependency on the speex decoder (which it currently doesn't have). - 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".