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 DB59A47ACC for ; Sun, 1 Oct 2023 13:13:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 90DB368CD83; Sun, 1 Oct 2023 16:13:43 +0300 (EEST) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2084.outbound.protection.outlook.com [40.92.58.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0163368CD9A for ; Sun, 1 Oct 2023 16:13:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HdZPuXwxCFQ+cLu4UA3ZEp/xvZdshFTzOGF7zlQj3vyOOsgloyVAh4o6/w/Ll00CTzH/2aP1Zbj9DUUGSEkgR7yqnjYxWi45dFYmS++1n3Rz+hMMvyqmySk9h9TeZ3OuUrq2vurSO1iWqh7aY22zPWuhzeYKwT+EbnDR981QKsQDMQdiroKa2ZQFO/ftHuNg3bEnXVwnR2ScJmZ0lA9m26aK/MjwHOMdNt0blYhXTOuaZRagwTfUB/5M6+Cl+57nJ9S525rV3zUvMpQDFtZOwcu1Zrlpe5E1BIxNBPn20GeRDPOybI6ACGEMyOtuKQiFzwc/hW7QHYH3bbeLV21irA== 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=xij88Z/B6DlAnQKmTRswC6mGtYHn7bjNMObHCViGcis=; b=kkll/hLkf8QLPg/IuuW323r6qLKolcrFXCbNWL41yEi5TmDZO0GIra9Dr1QjwmztGXAuSEPGiObWNV6xNBsx7CCY371oVqHQi1Thrr2OPO+nAX/kQIYym0Jk2RW18YIAj67KJDQkwYxN7XBYQ+9JpmEydGV8Ga6o6nQiQZNM/OdtVkrculmieDYz78/w/8Viu1fkkCk7OWuHnSU9d0OYPLpwgblGuxfzAm2EHjt1PhKhoGjsZdT51e64PUdBV+PU2ABYrQXo1coNOJGmtMT/Duqpn4y7WoLlB+yMZpGUZToexDYOt58kuwwxdqkIGLEWOo02Y3OI19WKTjq3RMlUjw== 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=xij88Z/B6DlAnQKmTRswC6mGtYHn7bjNMObHCViGcis=; b=P8oEKK+NY/G/jZY72kFVdkYQxpAXESasTx7kHkvs55ds7YeSQNWoyTRPPeHPeY8k8CaXdM6gLRa2xBB/u2DO0Mf2nxeNEAHQnjSevpdj9NkrD/wSAQZ3573Uu+gvCJ2642I63DtRu/BnGQw7cBJI3f7XDPu92Jmi9S/DQhpZeMoR9zzD6dd7EWyUJfPYTki0stGuksLpNpQbZHpQBlsJCApITdRceWgBKbn9L4MuvUEYSzozIril7kTqaOlSbLNuicKcgdSNJLz0FZAr+iK5+9EBscBKq8NP9Z5LxdmJcZUf8jnoF+7vkwUE2LPMG3BlbAub6SfNdG138H9qUW6CCA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0188.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.26; Sun, 1 Oct 2023 13:13:35 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Sun, 1 Oct 2023 13:13:34 +0000 Message-ID: Date: Sun, 1 Oct 2023 15:14:49 +0200 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20231001125552.23976-1-anton@khirnov.net> <20231001125552.23976-6-anton@khirnov.net> From: Andreas Rheinhardt In-Reply-To: <20231001125552.23976-6-anton@khirnov.net> X-TMN: [hzyfowQFA5CTparXeKQXrF2DLGi6jRDh] X-ClientProxiedBy: ZR0P278CA0144.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::23) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0188:EE_ X-MS-Office365-Filtering-Correlation-Id: 45fccd18-b9df-4ec7-46fd-08dbc280378d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qngcX1yVkPIR6bJeAcv4d8/+Bo1mnDzs502odaHtG+NEPU5kaDJ/wl7kgnGGfALJfXReFNg7QVuQb5fRRVnRMPWEPcR4EZuHf1mnxh//+H263866LBzSHREgCbNvRmnKYd/msVy0UVivxt1Ja2I6hoR/UnHDvOHfJTYGJjmTFmFNg6kGMZOZOnAi2HCBgvXVH0/DmH1VwX2xvXfX37pljzgzM5lIipEshQS8efE9ziH2ysFKSsdWOIxMn8FBAOycKsFMFq2K4ZjJCyUYwxxw5wozcGHSTs3XGHt+/8H8d1Nm9LSpi49dGwvGlQEv+62zqW+16pB8HGAO/pbepnAEtYscUAPg8aTr+si2j3XbTGPWPUn9ohYs2hyJO5ZzlWCywQM2HuKNRbZEmcI9Eek+Lmln79nVh0gcO83v9pHZrg6UwyBIQvdwYZ5tDR2O3JhCKyA9PaRYp+YNRXRk8zrY+l41vyydOU1NObC2Xq+DuGSbLBvC0AmVxmAQRJqKe/AwRCTSD7b7DRnQZIaes31EgI7AmLJxQA6fLfch8AVmeMLxDec2gtOkJjZV1WA1En8m X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UGhWUEg1L1BkSDBMZm9iaG11T3RjRzJwNWhsVEFIbWd0MGhPRGp1MnVnY3Rj?= =?utf-8?B?S2gzbE5ncjZnQnh0YUJaQTZoYXkxOHF5SDlIMVJ3aS9sc2tFNWNST3pUMzlv?= =?utf-8?B?MzZtdUYvSmhUbGk2WWJRSUxVK0x2UitVVllvbnVSMklPNkdzYUNmbVJnZUdV?= =?utf-8?B?TE5UQmFLQ2VqWVRPR2xldTNyelNsa0p1Q2tUUGlvR2V1VXVjb2FFTzhMcThr?= =?utf-8?B?amV3SllISUZ5NGdTc0NCV2tOcHlFS05hOURUVk9xMTJIRFMvMGluU2Y5c3JH?= =?utf-8?B?SW5tdjN0U1EvLzBnci96c3RzdmV4Zkl6WjhXT3N0MVZ4Wmk3M3RxN1RlS3Ni?= =?utf-8?B?Zm9NYWhsdWc0bnFjNCtHNnk2eTJRdmljQ1BEOFQyeFJRaFNyZGl0UDN1T2tN?= =?utf-8?B?TFZiaXl1WE5ydHdOa1EzME95OHhHQk5jSVVsK01MZEJPdzB5Y0hmTWUvVFJS?= =?utf-8?B?MGZnOWphT3JHMTk2c3lxbUtTQlE0QlRzY1VSSzVpTWVDSEplcE9ZSkFqcTg3?= =?utf-8?B?bHM5L2hBelFqNUlKdDBCY21xaUtzMDZHMWpLZ1M2cmlCdHd2THdSUWxQRk5k?= =?utf-8?B?U2RpOU5KZ1dLS1Z5cnZ3MGNobE9oYlJTa0h2L0J1Q2FCVTlkVis4S0lmeTl0?= =?utf-8?B?Tkt3Q3JoWi9xdVBHVE82NHg1WlZQYUhRL2xpOGVPMElXTHV0OW1lSWIwaVRQ?= =?utf-8?B?bFlxeEpwT2pBZE5MU21saktBeDZWSm9sbGVtenR0SmhIMFRualRDVDUzWk1l?= =?utf-8?B?Q1hsUWU2R0NwQmVxL0FDRnNkanJQZWRzYXo5ak05T2FpWXpOY2RrUUhLbW96?= =?utf-8?B?d1pMZE91UnVzNVcwb2czRHB2NGV2Nm5lMEVuWHZKUFFmb0FHWWFEcjhJUDdH?= =?utf-8?B?S3YxVXVFRW9xMlcrUlRoYzNFNUhFZk5yQnlUd0NOV0t5V0VGK0k0K1VsRVJU?= =?utf-8?B?MDdHOWZ1Q05sdVcwVzJSUWJ4djVxU1VjV3daYjEyOXdEQjlqQnNqVnl1MGdJ?= =?utf-8?B?ajlRYWNVM1BmdW1WNXhhdFY4dXZOYjdMVm95WmhPRVd2U2pVbThsR2xQQmxQ?= =?utf-8?B?Q2h1eVR0RVB4YjZTRkZ5R2lDUmtDMm4yS1p5UUVubHA3ZVpacGd0WUpMcXph?= =?utf-8?B?TzZwU3BrTDFKNEw5bHU2a2JKcDlvbGIyQnVtSHYwUjlyTzJtUXhFTXBLaUMr?= =?utf-8?B?aUE4QU9qUWJ2NEFQUHRvdVRuWmE5RXhiZE1UWnRBQTN2N3dGUHR2SktxMkNj?= =?utf-8?B?cFlyTWMrY1IxMk9jRyt1dmxlQlhDS0l3bS92Uk1QWkVhWWtQRGd4dk1mNWJo?= =?utf-8?B?ZVpWdGtwclQ0aFRRSG40SEQ0QS9IWUcyL2NYa0thVXJPd1NhaThSclpCMVpr?= =?utf-8?B?aTAzWmVKN0FSeEFxajZka0lCdXRiR0RRVWhkOFFsNWdyUUpvSEFuQTBwYkpj?= =?utf-8?B?RVVZbyt3WHdOTTNnMEYrUjNReDhUVENQUk1JNEVxVXRLQnJkejRGck5lU1R3?= =?utf-8?B?K3pXeW1qTWZxSnRwRUVBWDBSRE5GaG5JSWd5cDVQZTFDbnNCdDZPeFBJUm00?= =?utf-8?B?YktjUzNFU0xLVEthQ2xUd1d4MHowL2dCLzJ0TlZnTDc5U1pTU0JCVGZOUmpV?= =?utf-8?B?dWV1R00zUnpVMlRFWThhbFVWMERZNWtoam9FMTVXbXpwRll5RHRCSTFLV1J0?= =?utf-8?Q?A5SjH0sQSbJx/waO7j2p?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45fccd18-b9df-4ec7-46fd-08dbc280378d X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2023 13:13:34.8816 (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: AS8P250MB0188 Subject: Re: [FFmpeg-devel] [PATCH 6/9] lavc/mpeg4videodec: do not invent a framerate from guessed numbers 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: Anton Khirnov: > Improves timestamps for fate-m4v* What makes the new cfr timestamps better? > --- > libavcodec/mpeg4videodec.c | 3 -- > tests/ref/fate/m4v | 84 +++++++++++++++++++------------------- > tests/ref/fate/m4v-cfr | 1 + > 3 files changed, 43 insertions(+), 45 deletions(-) > > diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c > index a8dd57bf6b..b24fe3db20 100644 > --- a/libavcodec/mpeg4videodec.c > +++ b/libavcodec/mpeg4videodec.c > @@ -3141,9 +3141,6 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb, > > av_log(s->avctx, AV_LOG_WARNING, > "time_increment_bits set to %d bits, based on bitstream analysis\n", ctx->time_increment_bits); > - if (s->avctx->framerate.num && 4*s->avctx->framerate.num < 1<time_increment_bits) { > - s->avctx->framerate.num = 1<time_increment_bits; > - } > } > > if (IS_3IV1) > diff --git a/tests/ref/fate/m4v b/tests/ref/fate/m4v > index cebe443adc..4eee84d01b 100644 > --- a/tests/ref/fate/m4v > +++ b/tests/ref/fate/m4v > @@ -1,47 +1,47 @@ > -#tb 0: 1/60 > +#tb 0: 1/5 > #media_type 0: video > #codec_id 0: rawvideo > #dimensions 0: 320x240 > #sar 0: 1/1 > 0, 0, 0, 1, 115200, 0x7262156b > -0, 11, 11, 1, 115200, 0xa6aebc2f > -0, 22, 22, 1, 115200, 0x9c7beba1 > -0, 33, 33, 1, 115200, 0x556037a2 > -0, 44, 44, 1, 115200, 0x532e3a23 > -0, 60, 60, 1, 115200, 0x110511f4 > -0, 71, 71, 1, 115200, 0xb7f929a4 > -0, 82, 82, 1, 115200, 0xdab9f3c2 > -0, 93, 93, 1, 115200, 0x441413dd > -0, 104, 104, 1, 115200, 0x01163f33 > -0, 120, 120, 1, 115200, 0x47720c78 > -0, 131, 131, 1, 115200, 0x07c21356 > -0, 142, 142, 1, 115200, 0x085d4291 > -0, 153, 153, 1, 115200, 0xf6db074c > -0, 164, 164, 1, 115200, 0x95093e75 > -0, 180, 180, 1, 115200, 0x5f8118ef > -0, 191, 191, 1, 115200, 0x2b4de34a > -0, 202, 202, 1, 115200, 0x0a731857 > -0, 213, 213, 1, 115200, 0xd75ef3be > -0, 224, 224, 1, 115200, 0x321cf5a9 > -0, 240, 240, 1, 115200, 0x3eb222fd > -0, 251, 251, 1, 115200, 0xc7d92f3e > -0, 262, 262, 1, 115200, 0x6fda0366 > -0, 273, 273, 1, 115200, 0x6bb61b03 > -0, 284, 284, 1, 115200, 0x5f367ef8 > -0, 300, 300, 1, 115200, 0x237d0c77 > -0, 311, 311, 1, 115200, 0xafa813ef > -0, 322, 322, 1, 115200, 0x39263ef4 > -0, 333, 333, 1, 115200, 0x47c70441 > -0, 344, 344, 1, 115200, 0xd43fffb0 > -0, 360, 360, 1, 115200, 0x75696afb > -0, 371, 371, 1, 115200, 0xb0f117a3 > -0, 382, 382, 1, 115200, 0x002f42f0 > -0, 393, 393, 1, 115200, 0xa192487e > -0, 404, 404, 1, 115200, 0x19a7072e > -0, 420, 420, 1, 115200, 0xc500669c > -0, 431, 431, 1, 115200, 0xe4636ba9 > -0, 442, 442, 1, 115200, 0xdf3d5d86 > -0, 453, 453, 1, 115200, 0xf30825d5 > -0, 464, 464, 1, 115200, 0xe3c944a1 > -0, 480, 480, 1, 115200, 0x8fec4420 > -0, 491, 491, 1, 115200, 0x9381fdab > +0, 1, 1, 1, 115200, 0xa6aebc2f > +0, 2, 2, 1, 115200, 0x9c7beba1 > +0, 3, 3, 1, 115200, 0x556037a2 > +0, 4, 4, 1, 115200, 0x532e3a23 > +0, 5, 5, 1, 115200, 0x110511f4 > +0, 6, 6, 1, 115200, 0xb7f929a4 > +0, 7, 7, 1, 115200, 0xdab9f3c2 > +0, 8, 8, 1, 115200, 0x441413dd > +0, 9, 9, 1, 115200, 0x01163f33 > +0, 10, 10, 1, 115200, 0x47720c78 > +0, 11, 11, 1, 115200, 0x07c21356 > +0, 12, 12, 1, 115200, 0x085d4291 > +0, 13, 13, 1, 115200, 0xf6db074c > +0, 14, 14, 1, 115200, 0x95093e75 > +0, 15, 15, 1, 115200, 0x5f8118ef > +0, 16, 16, 1, 115200, 0x2b4de34a > +0, 17, 17, 1, 115200, 0x0a731857 > +0, 18, 18, 1, 115200, 0xd75ef3be > +0, 19, 19, 1, 115200, 0x321cf5a9 > +0, 20, 20, 1, 115200, 0x3eb222fd > +0, 21, 21, 1, 115200, 0xc7d92f3e > +0, 22, 22, 1, 115200, 0x6fda0366 > +0, 23, 23, 1, 115200, 0x6bb61b03 > +0, 24, 24, 1, 115200, 0x5f367ef8 > +0, 25, 25, 1, 115200, 0x237d0c77 > +0, 26, 26, 1, 115200, 0xafa813ef > +0, 27, 27, 1, 115200, 0x39263ef4 > +0, 28, 28, 1, 115200, 0x47c70441 > +0, 29, 29, 1, 115200, 0xd43fffb0 > +0, 30, 30, 1, 115200, 0x75696afb > +0, 31, 31, 1, 115200, 0xb0f117a3 > +0, 32, 32, 1, 115200, 0x002f42f0 > +0, 33, 33, 1, 115200, 0xa192487e > +0, 34, 34, 1, 115200, 0x19a7072e > +0, 35, 35, 1, 115200, 0xc500669c > +0, 36, 36, 1, 115200, 0xe4636ba9 > +0, 37, 37, 1, 115200, 0xdf3d5d86 > +0, 38, 38, 1, 115200, 0xf30825d5 > +0, 39, 39, 1, 115200, 0xe3c944a1 > +0, 40, 40, 1, 115200, 0x8fec4420 > +0, 41, 41, 1, 115200, 0x9381fdab > diff --git a/tests/ref/fate/m4v-cfr b/tests/ref/fate/m4v-cfr > index e2d02032fe..4eee84d01b 100644 > --- a/tests/ref/fate/m4v-cfr > +++ b/tests/ref/fate/m4v-cfr > @@ -44,3 +44,4 @@ > 0, 38, 38, 1, 115200, 0xf30825d5 > 0, 39, 39, 1, 115200, 0xe3c944a1 > 0, 40, 40, 1, 115200, 0x8fec4420 > +0, 41, 41, 1, 115200, 0x9381fdab _______________________________________________ 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".