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 360DA46CAF for ; Tue, 8 Aug 2023 16:40:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1DCA568C7FF; Tue, 8 Aug 2023 19:39:55 +0300 (EEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2098.outbound.protection.outlook.com [40.92.64.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28C5A68C780 for ; Tue, 8 Aug 2023 19:39:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L04+qycBOVpXHsFUpcvoHpN3an+P7Bx6l2YQBG5dVgumeADEMjXJv7EVif2uPBR7Ln62kxtnfU7MXaINmvhzd/OfdiIdUHwrL4iGWSO7WmwGHNgU3IdFOqBWqogderuO7oDg/U2H4y4g2S8s3H/LIT/pr7US7FK5keDJNqhqA8/QQWa6PZ1CiBvE0zIDAd2ja0bAAY5wPhBAhTrtODkvhfPrxs1vY+2ShAIKbH/mO441UJbHAO+oDlRJHc1H9gxOGh4lypprwu2p8I6VMzItjeAzfmowuG/jp+PCZ3C3Y2M4QNY8YqkbWIYf1PK2wFABbBoBpJM1SMSOKUUaeK4/dA== 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=wJw4vrC5nrHHzg21zX4JRd6Rn9EjB+yRIrQjI4w2dAQ=; b=bUV5cweD754XbVTcSwstiNkKIyyi7XiAqu9VLogWIqVS3pgerxEgfsIzP0LdAE/1fE5aoEOocfO9ZmkfP5mlw512aCHlUSEIV+VnmK5Sk3EQTlrigd0yzpA9Olmw4D5YGSVLOcWXU04Z+pi7S/DpXe6wQPq5m22ayE4jCKLIQ8gxjpf9gOC6IuQQUvSNhfcKFpAMtipbL9DuwQ8Aw1wrdOEbJnOA0As1UY7cL29S/z4W049sNMtwgpTtJXUoVFbEIeqYW1GLp8OkpIXAuysiPflUbW7jHhIhilxlLUSVFMJCSARar8JwLFv8b7ZwCRuXxQSZSzC1TgK0AIl9Uo1lzw== 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=wJw4vrC5nrHHzg21zX4JRd6Rn9EjB+yRIrQjI4w2dAQ=; b=ea31RFw4V9RA2Ki3XXW1MNnCDe1BZf3PiGyoVxeox+57MnfYBNhzsvJ9NrId+ol6EW0V+ZjDfvCK4lhcaJDuJuTCiNplkFHHVcP5jx8cWNs2F+71FKEXIh2Wlhp+qr9pjFSSt3+C3WsSFYS6g+fY74TO+kHmY6NrkmkeL0evu2EIsB42MycbRe/Ga9/2bXHpDTjv06iSwu/8GqSib0WCPuIMsi0xsfYyLDsd1MQTB6MGWZy/oyNMSC8yPHyM14ZjQsTmLI6psqpet5aD0L/40FLqsdkdaUbXFB+177Qv3tc3C2neoFBlL70ylJCpM6/Iiyv9M8Cp//nkllxUX0W4Bw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0355.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Tue, 8 Aug 2023 16:39:50 +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.6652.021; Tue, 8 Aug 2023 16:39:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:40:34 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [nkHVDAPt6s/4A5rB0ubGDjlOdv8YS3Qj0LgIg1TDvQg=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230808164036.810177-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0355:EE_ X-MS-Office365-Filtering-Correlation-Id: 986a2f3a-0082-4aef-7896-08db982e15a5 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoMTHls4qxpPCYYkh36TB/2b0CZgHCiwf8eie2Kgx4FldJfQdmHJDfN4SwgPnWc11XA5gXC9okjoq8N5azeFZ5DU/DMIyx73KU+uWe8Pf1Btbo1nGXK1Nl5sqw289M1AnRS5Gdo3c1jtFBV2u3RyFjVCj0/uGRPZxzR4DgU1tm1XGzlk5KvHfpKgyDZlHquij1rLmYgRv1BGwebqoBn/vAVfLeljlaelHaT+qsK9uL80xK9DOpb40SwW+5j9ks+z4y+oKvBcvIcrVETTFJ25Jn8zI0MrXy6Pk1RAImYyHDj4ThfbYeUxKTS4zTCGNIZjaRHn2XvolsnLkF61mUCDd3EIqwfKuqYlPfLg8FEfl9zN+iCuJZ1sK4Yp8/2ejFaKCCcDd8JhrtiORIIxTIc4PKthXRk2JJ7GhMvfBa8Pb2FOjoh9D9IwPRLXIGJ66UOXS1YBcAcjyu/ipLkxulUFzl70rki9g8QxAwnnfWkxyDGBTG8cynewqKpzd8pWCk191DYTLF1MH4r6P2b8+v58oQcvj2qreEWtapE9Xn/5+MldbczazhCmRh9EHBTq0ioFQmKhy43fcCVzjZwZ//9GG2xd693WxnDeh1opXqJAtOcU0Bo/x2FCSb3WQgQ4VJOIoYd1p9M46cCkuzuiW8ItI3g6yatwlYd0MT3GnLCDI6VhXkl3U61jRVljDhHEA85lKv4bk5h8d5RycQDBRzpGQFOhrecCrNkhKScghAIRkUzLdP+XkILdh7WPDGx6rcp5WU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PGAx144oLub/6dZ5R+Gwoy1W7mWfNWJYnx0+02o1bUG5vqh5JTOcjZUntIl9p8BGIja0kCQgrXS/bDvHcBt+tcKLDO0H7K4Ti6nP8oNI05Zf2vkQ7o11igZwRCi3+mwht+mSSaCvlE9Egh2VnWB9ZrEesamDA3xk9Zy1dXnIKO2YofwpSGoQzQ5QWyTnvUXbSjg8cjghB3bQb4fn9ksfAA0wioiRkeBDmcK05SHvaiZScfqYnq1ejYMhCCVJA7sVIJSlsuxT7sI8GevQ+SRBjswmjiRHjGkuNs+KTyHOCNFGcm8NI9dwyci4xR7nMb/9iJAy7AdC57z23juedcCKN/9xX5NCZOuIQsRSSPPpK6MgMIrXTRsuasoYe6e1QYa02yj4e2xgq7ajUtdT/6/reUuOBTGKMljypFPgxoKQlaRCs4TmBpoDHRf6ZamYGeScw7gPIYZipb5qpIa/G1pn2oriFaGHlih6GA1espQLb9kp17829nftlNXweG18zck4/DMphpPULwymTLRKHRa5X5bPEfLyZx9ORzOYrm3QpzDd+eOl93bIMT3MLSVWxlu/SkHF0EnpO3atxZvlG400WP8orpwMsLBBgpGgNIHwtZdlo9Ae7gk9NF7wAcwt9+ti X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FFcKwLICSXxg016Aco2+Qay/Vw3ONGbf46eUgvSlWTwcJW5aIL/urM62yHpK?= =?us-ascii?Q?DmgF8jY9n7W77OdB/ypij4Af3wCNSTpTdmKVTi1s/AI4dV/Erqp24jIUuy5I?= =?us-ascii?Q?rX1bFtLCzykQ6RjcwtEuLSQUA6jLH72F3sC0Q1BjNCHRus9S2qQtD+2QJg2m?= =?us-ascii?Q?VEIlop3tDi+WoWf5TDiDPQxeMuoHQRFWLiyg/pK9YG0flWwKX5VU1u4Vb+ma?= =?us-ascii?Q?Ber0nhF4Wg9teulkcAR27QmeqClL36KwdRcUHYsCktg9GAIWp1Dq8t/uxlfm?= =?us-ascii?Q?MsRoRdnapXX5ww+o4v7W1K6oEeXjtE1KMdnBcrmMFVhlPupoi23fL6UdK6DR?= =?us-ascii?Q?lTXl+Yc73ROed4bhVkh7yleycD6jK3crA6W6SVtuvei2JhBZVf2nMluuiTa1?= =?us-ascii?Q?Mt+AIWmlEwBInzb98CyGP9GmIPoJsayaWPnphnPQhnUBcdWc92jlD3lI1/ex?= =?us-ascii?Q?z6fcVXE1tBFvO29a3ulvuEYjnBSjQ+B8Ac42Cbd6nU8pQ2cv1RcS5ozRCvxm?= =?us-ascii?Q?1a2FwfXpE4jcp7kW4mP+S+LrEIfTGUuvrb/LawGc7lyzYi011m/e+eQ5c7NJ?= =?us-ascii?Q?Gc7PXg8gSbxPxwCJRD6YIeBx8w9C5ikUTVvRCCyghWdI2M1A7nyDDSJe17+I?= =?us-ascii?Q?F6wcdoTzR6r3MR6Xyn+bcAC53s1J6bunm+PRpvphIgLeGv/WQb0VWYCCPiVX?= =?us-ascii?Q?w77heLsIzb1TWA9Na4sQEYuzobwFQ56gsoFEgqBOik4flLvd8JaCK657X8gJ?= =?us-ascii?Q?zXWbDHiTATdnt7tSWj/xa6aeL7B1vI7CuozrnB0eADQfy1glLIqXyYawZaQu?= =?us-ascii?Q?UlVdcUTeLHbYRKzAN3VU8VQR3xHsnlM8tQ8Kl8Bk8k97aGdwd1J6dNz2Wc4x?= =?us-ascii?Q?mgKhQ2UjLHCjaHansHAFn3XWvlQEHskt4CRiPfrydB2ExNrRuqLCDlD4/7qF?= =?us-ascii?Q?hsJNPQ9tex8mt+rbJBoTcl3pgoIS9hX4/uAhxktwJ1gtqZ4+Sx/o6VXu+/kE?= =?us-ascii?Q?drZNkZZUq78oqE18jj0mEvgRSn4RzWuYYBkmg3145tXki5hN9tNyP+QQ0yCZ?= =?us-ascii?Q?kKJuhMo6WpmX7hWQPtasQkOiclhr1JnIZgiLMiCpetSqY0iH+7i0SkzR4vW9?= =?us-ascii?Q?UBJY8HQsXSosd1XixG6hUi3p9bCzMN9ATVSge4KgNJXDHPfUMGO3D2AoTM2b?= =?us-ascii?Q?mxQBiEYg8NkOwRyllYFKU9szrkbBecqkwE35YiIicqlAwGWN2TXAeYxxxIFn?= =?us-ascii?Q?z+95xGSXUGYzFIz8VAvB?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 986a2f3a-0082-4aef-7896-08db982e15a5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 16:39:50.5362 (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: PR3P250MB0355 Subject: [FFmpeg-devel] [PATCH 13/15] avformat/matroskaenc: Don't reserve space for HDR10+ when unnecessary X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Do it only for video (the only thing for type for which HDR10+ makes sense). This effectively reverts changes to several FATE ref-files made in bda44f0f39e8ee646e54f15989d7845f4bf58d26. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 9 +++- tests/ref/fate/aac-autobsf-adtstoasc | 4 +- tests/ref/fate/matroska-alac-remux | 4 +- tests/ref/fate/matroska-avoid-negative-ts | 4 +- tests/ref/fate/matroska-dovi-write-config8 | 4 +- tests/ref/fate/matroska-dvbsub-remux | 4 +- tests/ref/fate/matroska-encoding-delay | 14 +++--- tests/ref/fate/matroska-flac-extradata-update | 4 +- tests/ref/fate/matroska-h264-remux | 4 +- .../fate/matroska-mastering-display-metadata | 4 +- tests/ref/fate/matroska-move-cues-to-front | 4 +- tests/ref/fate/matroska-mpegts-remux | 4 +- tests/ref/fate/matroska-ms-mode | 4 +- tests/ref/fate/matroska-ogg-opus-remux | 10 ++--- tests/ref/fate/matroska-opus-remux | 10 ++--- tests/ref/fate/matroska-pgs-remux | 4 +- tests/ref/fate/matroska-pgs-remux-durations | 4 +- tests/ref/fate/matroska-qt-mode | 4 +- tests/ref/fate/matroska-zero-length-block | 4 +- tests/ref/fate/shortest-sub | 4 +- tests/ref/lavf/mka | 4 +- tests/ref/lavf/mkv | 4 +- tests/ref/lavf/mkv_attachment | 4 +- tests/ref/seek/lavf-mkv | 44 +++++++++---------- 24 files changed, 84 insertions(+), 79 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index abac70dd80..5c251cec7b 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1668,7 +1668,8 @@ static int mkv_write_stereo_mode(AVFormatContext *s, EbmlWriter *writer, } static void mkv_write_blockadditionmapping(AVFormatContext *s, const MatroskaMuxContext *mkv, - AVIOContext *pb, mkv_track *track, const AVStream *st) + const AVCodecParameters *par, AVIOContext *pb, + mkv_track *track, const AVStream *st) { #if CONFIG_MATROSKA_MUXER const AVDOVIDecoderConfigurationRecord *dovi; @@ -1679,10 +1680,12 @@ static void mkv_write_blockadditionmapping(AVFormatContext *s, const MatroskaMux // we either write the default value here, or a void element. Either of them will // be overwritten when finishing the track. put_ebml_uint(pb, MATROSKA_ID_TRACKMAXBLKADDID, 0); + if (par->codec_type == AVMEDIA_TYPE_VIDEO) { // Similarly, reserve space for an eventual HDR10+ ITU T.35 metadata BlockAdditionMapping. put_ebml_void(pb, 3 /* BlockAdditionMapping */ + 4 /* BlockAddIDValue */ + 4 /* BlockAddIDType */); + } } dovi = (const AVDOVIDecoderConfigurationRecord *) @@ -2010,7 +2013,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, } if (!IS_WEBM(mkv)) - mkv_write_blockadditionmapping(s, mkv, pb, track, st); + mkv_write_blockadditionmapping(s, mkv, par, pb, track, st); if (!IS_WEBM(mkv) || par->codec_id != AV_CODEC_ID_WEBVTT) { uint8_t *codecpriv; @@ -2763,6 +2766,7 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, track->max_blockaddid = FFMAX(track->max_blockaddid, additional_id); } + if (par->codec_type == AVMEDIA_TYPE_VIDEO) { side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_DYNAMIC_HDR10_PLUS, &side_data_size); @@ -2785,6 +2789,7 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, track->max_blockaddid = FFMAX(track->max_blockaddid, MATROSKA_BLOCK_ADD_ID_ITU_T_T35); } + } ebml_writer_close_or_discard_master(&writer); diff --git a/tests/ref/fate/aac-autobsf-adtstoasc b/tests/ref/fate/aac-autobsf-adtstoasc index 12b80ef6bd..76125083b6 100644 --- a/tests/ref/fate/aac-autobsf-adtstoasc +++ b/tests/ref/fate/aac-autobsf-adtstoasc @@ -1,5 +1,5 @@ -68cb46874ca6029d3ae3a184b4a71b04 *tests/data/fate/aac-autobsf-adtstoasc.matroska -6657 tests/data/fate/aac-autobsf-adtstoasc.matroska +3d4465a7ea2cfba31af737e288c892fe *tests/data/fate/aac-autobsf-adtstoasc.matroska +6646 tests/data/fate/aac-autobsf-adtstoasc.matroska #extradata 0: 2, 0x0030001c #tb 0: 1/1000 #media_type 0: audio diff --git a/tests/ref/fate/matroska-alac-remux b/tests/ref/fate/matroska-alac-remux index 7f2698eee8..3eb3cdcb37 100644 --- a/tests/ref/fate/matroska-alac-remux +++ b/tests/ref/fate/matroska-alac-remux @@ -1,5 +1,5 @@ -d9b986b34e36e865912fd42d2c5b0cab *tests/data/fate/matroska-alac-remux.matroska -1293821 tests/data/fate/matroska-alac-remux.matroska +c683b17ab66c9f0fba57da7af86740c9 *tests/data/fate/matroska-alac-remux.matroska +1293810 tests/data/fate/matroska-alac-remux.matroska #extradata 0: 36, 0x562b05d8 #tb 0: 1/1000 #media_type 0: audio diff --git a/tests/ref/fate/matroska-avoid-negative-ts b/tests/ref/fate/matroska-avoid-negative-ts index dcde937d52..f52f3dec72 100644 --- a/tests/ref/fate/matroska-avoid-negative-ts +++ b/tests/ref/fate/matroska-avoid-negative-ts @@ -1,5 +1,5 @@ -6a1a524a5700de7b94bce5a283bbe8b9 *tests/data/fate/matroska-avoid-negative-ts.matroska -973085 tests/data/fate/matroska-avoid-negative-ts.matroska +69461a333cae20646d4e514b7b510bef *tests/data/fate/matroska-avoid-negative-ts.matroska +973074 tests/data/fate/matroska-avoid-negative-ts.matroska #extradata 0: 22, 0x2885037c #tb 0: 1/1000 #media_type 0: video diff --git a/tests/ref/fate/matroska-dovi-write-config8 b/tests/ref/fate/matroska-dovi-write-config8 index 58eb454865..de90101a55 100644 --- a/tests/ref/fate/matroska-dovi-write-config8 +++ b/tests/ref/fate/matroska-dovi-write-config8 @@ -1,5 +1,5 @@ -80d2b23a6f27ab28b02a907b37b9649c *tests/data/fate/matroska-dovi-write-config8.matroska -3600620 tests/data/fate/matroska-dovi-write-config8.matroska +56eea905c35996a729371372dd3113f9 *tests/data/fate/matroska-dovi-write-config8.matroska +3600609 tests/data/fate/matroska-dovi-write-config8.matroska #extradata 0: 551, 0xa18acf66 #extradata 1: 2, 0x00340022 #tb 0: 1/1000 diff --git a/tests/ref/fate/matroska-dvbsub-remux b/tests/ref/fate/matroska-dvbsub-remux index b5bb028343..03341d9668 100644 --- a/tests/ref/fate/matroska-dvbsub-remux +++ b/tests/ref/fate/matroska-dvbsub-remux @@ -1,5 +1,5 @@ -7154511243fd7edb695c159bb12a0948 *tests/data/fate/matroska-dvbsub-remux.matroska -39041 tests/data/fate/matroska-dvbsub-remux.matroska +5d1591e9abd7e1373d43bc776572aaf7 *tests/data/fate/matroska-dvbsub-remux.matroska +39018 tests/data/fate/matroska-dvbsub-remux.matroska #extradata 0: 5, 0x00bb0064 #extradata 1: 5, 0x00bb0064 #tb 0: 1/1000 diff --git a/tests/ref/fate/matroska-encoding-delay b/tests/ref/fate/matroska-encoding-delay index 437992468d..3059c32e03 100644 --- a/tests/ref/fate/matroska-encoding-delay +++ b/tests/ref/fate/matroska-encoding-delay @@ -1,5 +1,5 @@ -416f35d123daef715b7c4bbb75c9c778 *tests/data/fate/matroska-encoding-delay.matroska -961251 tests/data/fate/matroska-encoding-delay.matroska +c51ac49b96b213e6646196fc81f8eb84 *tests/data/fate/matroska-encoding-delay.matroska +961240 tests/data/fate/matroska-encoding-delay.matroska #extradata 0: 22, 0x32ea0490 #tb 0: 1/1000 #media_type 0: video @@ -32,7 +32,7 @@ dts_time=-0.010000 duration=24 duration_time=0.024000 size=1152 -pos=1268 +pos=1257 flags=K__ [/PACKET] [PACKET] @@ -45,7 +45,7 @@ dts_time=0.000000 duration=40 duration_time=0.040000 size=237628 -pos=2428 +pos=2417 flags=K__ [/PACKET] [PACKET] @@ -58,7 +58,7 @@ dts_time=0.014000 duration=24 duration_time=0.024000 size=1152 -pos=240063 +pos=240052 flags=K__ [/PACKET] [PACKET] @@ -71,7 +71,7 @@ dts_time=0.038000 duration=24 duration_time=0.024000 size=1152 -pos=241238 +pos=241227 flags=K__ [/PACKET] [PACKET] @@ -84,7 +84,7 @@ dts_time=0.040000 duration=40 duration_time=0.040000 size=238066 -pos=242398 +pos=242387 flags=K__ [/PACKET] [STREAM] diff --git a/tests/ref/fate/matroska-flac-extradata-update b/tests/ref/fate/matroska-flac-extradata-update index 37e0367297..d6713aaafa 100644 --- a/tests/ref/fate/matroska-flac-extradata-update +++ b/tests/ref/fate/matroska-flac-extradata-update @@ -1,5 +1,5 @@ -8a75767c14e63e7d15291c5c4918a661 *tests/data/fate/matroska-flac-extradata-update.matroska -1840 tests/data/fate/matroska-flac-extradata-update.matroska +fdbfdc51b519fd5e8f425aca1e7b8704 *tests/data/fate/matroska-flac-extradata-update.matroska +1807 tests/data/fate/matroska-flac-extradata-update.matroska #extradata 0: 34, 0x93650c81 #extradata 1: 34, 0x93650c81 #extradata 2: 34, 0x93650c81 diff --git a/tests/ref/fate/matroska-h264-remux b/tests/ref/fate/matroska-h264-remux index bfc80a273f..aefd6f65ef 100644 --- a/tests/ref/fate/matroska-h264-remux +++ b/tests/ref/fate/matroska-h264-remux @@ -1,5 +1,5 @@ -38ede644af311f443d7446600f25a8e3 *tests/data/fate/matroska-h264-remux.matroska -2036093 tests/data/fate/matroska-h264-remux.matroska +bc0ce442f20d1d62663b40391a3be812 *tests/data/fate/matroska-h264-remux.matroska +2036071 tests/data/fate/matroska-h264-remux.matroska #tb 0: 1/25 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/matroska-mastering-display-metadata b/tests/ref/fate/matroska-mastering-display-metadata index c63365c181..ad36f01e61 100644 --- a/tests/ref/fate/matroska-mastering-display-metadata +++ b/tests/ref/fate/matroska-mastering-display-metadata @@ -1,5 +1,5 @@ -a4924bfe22ed0c72b0eddc353bbee10c *tests/data/fate/matroska-mastering-display-metadata.matroska -1669615 tests/data/fate/matroska-mastering-display-metadata.matroska +b3204c8fa6a78037243cc4948a2775ee *tests/data/fate/matroska-mastering-display-metadata.matroska +1669593 tests/data/fate/matroska-mastering-display-metadata.matroska #extradata 0: 4, 0x040901a3 #extradata 3: 200, 0x506463a8 #tb 0: 1/1000 diff --git a/tests/ref/fate/matroska-move-cues-to-front b/tests/ref/fate/matroska-move-cues-to-front index ce3b9fce92..79ccc2fd93 100644 --- a/tests/ref/fate/matroska-move-cues-to-front +++ b/tests/ref/fate/matroska-move-cues-to-front @@ -1,5 +1,5 @@ -03ed7fcf99dd993ebb9bc9c6c93ba73e *tests/data/fate/matroska-move-cues-to-front.matroska -23210319 tests/data/fate/matroska-move-cues-to-front.matroska +74a5ed3f0b14112322c8bf3e94d6e98b *tests/data/fate/matroska-move-cues-to-front.matroska +23210297 tests/data/fate/matroska-move-cues-to-front.matroska #tb 0: 1/1000 #media_type 0: audio #codec_id 0: pcm_s24be diff --git a/tests/ref/fate/matroska-mpegts-remux b/tests/ref/fate/matroska-mpegts-remux index 1f211dfc29..af41b57af1 100644 --- a/tests/ref/fate/matroska-mpegts-remux +++ b/tests/ref/fate/matroska-mpegts-remux @@ -1,5 +1,5 @@ -53424355db1d78441b62ad114d6ea502 *tests/data/fate/matroska-mpegts-remux.matroska -6524 tests/data/fate/matroska-mpegts-remux.matroska +ca1b91e49b6e238b641007c186d8f424 *tests/data/fate/matroska-mpegts-remux.matroska +6502 tests/data/fate/matroska-mpegts-remux.matroska #tb 0: 1/1000 #media_type 0: audio #codec_id 0: ac3 diff --git a/tests/ref/fate/matroska-ms-mode b/tests/ref/fate/matroska-ms-mode index b12e9ac9f2..7ce0f1e4ff 100644 --- a/tests/ref/fate/matroska-ms-mode +++ b/tests/ref/fate/matroska-ms-mode @@ -1,5 +1,5 @@ -f3b1b804d40d70d012e85ba6d03ea8f1 *tests/data/fate/matroska-ms-mode.matroska -413116 tests/data/fate/matroska-ms-mode.matroska +703d268b966d5dfabe5e22c2de69dc66 *tests/data/fate/matroska-ms-mode.matroska +413105 tests/data/fate/matroska-ms-mode.matroska #extradata 0: 40, 0x54290c93 #extradata 1: 114, 0xb6c80771 #tb 0: 1/1000 diff --git a/tests/ref/fate/matroska-ogg-opus-remux b/tests/ref/fate/matroska-ogg-opus-remux index c70c58a697..cd3eade361 100644 --- a/tests/ref/fate/matroska-ogg-opus-remux +++ b/tests/ref/fate/matroska-ogg-opus-remux @@ -1,5 +1,5 @@ -d891990279e6ba202448f9fffde52d3f *tests/data/fate/matroska-ogg-opus-remux.matroska -10215 tests/data/fate/matroska-ogg-opus-remux.matroska +b602a1a4aaa4fbca4b8aaf39b66d7235 *tests/data/fate/matroska-ogg-opus-remux.matroska +10204 tests/data/fate/matroska-ogg-opus-remux.matroska #extradata 0: 19, 0x399c0471 #tb 0: 1/1000 #media_type 0: audio @@ -57,7 +57,7 @@ dts_time=-0.007000 duration=20 duration_time=0.020000 size=402 -pos=555 +pos=544 flags=K__ [/PACKET] [PACKET] @@ -70,7 +70,7 @@ dts_time=0.013000 duration=20 duration_time=0.020000 size=216 -pos=964 +pos=953 flags=K__ [/PACKET] [PACKET] @@ -83,7 +83,7 @@ dts_time=0.033000 duration=20 duration_time=0.020000 size=215 -pos=1187 +pos=1176 flags=K__ [/PACKET] [STREAM] diff --git a/tests/ref/fate/matroska-opus-remux b/tests/ref/fate/matroska-opus-remux index f5dcbe164e..975510e167 100644 --- a/tests/ref/fate/matroska-opus-remux +++ b/tests/ref/fate/matroska-opus-remux @@ -1,5 +1,5 @@ -dc14cd32921d86e03c155bb745edf44b *tests/data/fate/matroska-opus-remux.matroska -9370 tests/data/fate/matroska-opus-remux.matroska +fe0258eb0d4b525203ea240c87a154d3 *tests/data/fate/matroska-opus-remux.matroska +9359 tests/data/fate/matroska-opus-remux.matroska #extradata 0: 19, 0x3a04048f #tb 0: 1/1000 #media_type 0: audio @@ -68,7 +68,7 @@ dts_time=-0.007000 duration=20 duration_time=0.020000 size=320 -pos=511 +pos=500 flags=K__ [/PACKET] [PACKET] @@ -81,7 +81,7 @@ dts_time=0.014000 duration=20 duration_time=0.020000 size=159 -pos=838 +pos=827 flags=K__ [/PACKET] [PACKET] @@ -94,7 +94,7 @@ dts_time=0.034000 duration=20 duration_time=0.020000 size=148 -pos=1004 +pos=993 flags=K__ [/PACKET] [STREAM] diff --git a/tests/ref/fate/matroska-pgs-remux b/tests/ref/fate/matroska-pgs-remux index 482357b899..a086111495 100644 --- a/tests/ref/fate/matroska-pgs-remux +++ b/tests/ref/fate/matroska-pgs-remux @@ -1,5 +1,5 @@ -60161b7f8af39a8d280cc8b1f8693129 *tests/data/fate/matroska-pgs-remux.matroska -49759 tests/data/fate/matroska-pgs-remux.matroska +d39daa393d66ae0b0c153be045897585 *tests/data/fate/matroska-pgs-remux.matroska +49748 tests/data/fate/matroska-pgs-remux.matroska #tb 0: 1/1000 #media_type 0: subtitle #codec_id 0: hdmv_pgs_subtitle diff --git a/tests/ref/fate/matroska-pgs-remux-durations b/tests/ref/fate/matroska-pgs-remux-durations index 6280110948..37494cd98f 100644 --- a/tests/ref/fate/matroska-pgs-remux-durations +++ b/tests/ref/fate/matroska-pgs-remux-durations @@ -1,5 +1,5 @@ -2c78a4337f61f24175a8ffe06087e581 *tests/data/fate/matroska-pgs-remux-durations.matroska -49771 tests/data/fate/matroska-pgs-remux-durations.matroska +27af80eecea4f15f415f22841bc699d5 *tests/data/fate/matroska-pgs-remux-durations.matroska +49760 tests/data/fate/matroska-pgs-remux-durations.matroska #tb 0: 1/1000 #media_type 0: subtitle #codec_id 0: hdmv_pgs_subtitle diff --git a/tests/ref/fate/matroska-qt-mode b/tests/ref/fate/matroska-qt-mode index e14584893b..62a2d82f16 100644 --- a/tests/ref/fate/matroska-qt-mode +++ b/tests/ref/fate/matroska-qt-mode @@ -1,5 +1,5 @@ -a976ac0fd5c1ca916280f64525d12c10 *tests/data/fate/matroska-qt-mode.matroska -1884254 tests/data/fate/matroska-qt-mode.matroska +f2eac23e9f7f3a7dac9e2d94885ff4f1 *tests/data/fate/matroska-qt-mode.matroska +1884243 tests/data/fate/matroska-qt-mode.matroska #extradata 0: 90, 0x817d0185 #tb 0: 1/1000 #media_type 0: video diff --git a/tests/ref/fate/matroska-zero-length-block b/tests/ref/fate/matroska-zero-length-block index 0f90ccbdd7..3987cc14c4 100644 --- a/tests/ref/fate/matroska-zero-length-block +++ b/tests/ref/fate/matroska-zero-length-block @@ -1,5 +1,5 @@ -b9a8a67ffdba18eec1c04827d3d404ca *tests/data/fate/matroska-zero-length-block.matroska -645 tests/data/fate/matroska-zero-length-block.matroska +f577fad2fff41d6e055f605281582b8d *tests/data/fate/matroska-zero-length-block.matroska +634 tests/data/fate/matroska-zero-length-block.matroska #tb 0: 1/1000 #media_type 0: subtitle #codec_id 0: subrip diff --git a/tests/ref/fate/shortest-sub b/tests/ref/fate/shortest-sub index 4db0e13328..49e13d65d7 100644 --- a/tests/ref/fate/shortest-sub +++ b/tests/ref/fate/shortest-sub @@ -1,5 +1,5 @@ -791a2ce136bef538491bbe31ac0134b1 *tests/data/fate/shortest-sub.matroska -139262 tests/data/fate/shortest-sub.matroska +2b6e72494d74aaf07380bfe3d50b62d5 *tests/data/fate/shortest-sub.matroska +139251 tests/data/fate/shortest-sub.matroska #extradata 1: 167, 0xf7272d5f #tb 0: 1/1000 #media_type 0: video diff --git a/tests/ref/lavf/mka b/tests/ref/lavf/mka index 40b1f07f9b..93a0b8f71a 100644 --- a/tests/ref/lavf/mka +++ b/tests/ref/lavf/mka @@ -1,3 +1,3 @@ -dffd74918d13be7dd07e83832de3a15c *tests/data/lavf/lavf.mka -43584 tests/data/lavf/lavf.mka +77db16a9fe1c42a230c85124bfb40cad *tests/data/lavf/lavf.mka +43573 tests/data/lavf/lavf.mka tests/data/lavf/lavf.mka CRC=0x3a1da17e diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index 5d0bf06fa9..8ddc9cf57f 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,3 +1,3 @@ -1dce6c32d49a8f637262db2d8e7f2744 *tests/data/lavf/lavf.mkv -320439 tests/data/lavf/lavf.mkv +05889ab61cc6144018c80e50c781fe44 *tests/data/lavf/lavf.mkv +320428 tests/data/lavf/lavf.mkv tests/data/lavf/lavf.mkv CRC=0xec6c3c68 diff --git a/tests/ref/lavf/mkv_attachment b/tests/ref/lavf/mkv_attachment index b79bf9a619..6a08a580d2 100644 --- a/tests/ref/lavf/mkv_attachment +++ b/tests/ref/lavf/mkv_attachment @@ -1,3 +1,3 @@ -140ffb4f6a734972a9d38f4e6d57f304 *tests/data/lavf/lavf.mkv_attachment -472589 tests/data/lavf/lavf.mkv_attachment +901b4ba820fe1d6c627ce2a4b31b65af *tests/data/lavf/lavf.mkv_attachment +472578 tests/data/lavf/lavf.mkv_attachment tests/data/lavf/lavf.mkv_attachment CRC=0xec6c3c68 diff --git a/tests/ref/seek/lavf-mkv b/tests/ref/seek/lavf-mkv index 90d91e3968..6abdbd6ee7 100644 --- a/tests/ref/seek/lavf-mkv +++ b/tests/ref/seek/lavf-mkv @@ -1,48 +1,48 @@ -ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 687 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 676 size: 208 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 903 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292319 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292308 size: 27834 ret: 0 st: 0 flags:0 ts: 0.788000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292319 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292308 size: 27834 ret: 0 st: 0 flags:1 ts:-0.317000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 903 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 ret:-1 st: 1 flags:0 ts: 2.577000 ret: 0 st: 1 flags:1 ts: 1.471000 -ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320160 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320149 size: 209 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146871 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146860 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 903 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 ret:-1 st: 0 flags:0 ts: 2.153000 ret: 0 st: 0 flags:1 ts: 1.048000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292319 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292308 size: 27834 ret: 0 st: 1 flags:0 ts:-0.058000 -ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 687 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 676 size: 208 ret: 0 st: 1 flags:1 ts: 2.836000 -ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320160 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320149 size: 209 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146871 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146860 size: 27925 ret: 0 st: 0 flags:0 ts:-0.482000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 903 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 ret: 0 st: 0 flags:1 ts: 2.413000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292319 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292308 size: 27834 ret:-1 st: 1 flags:0 ts: 1.307000 ret: 0 st: 1 flags:1 ts: 0.201000 -ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 687 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 676 size: 208 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 903 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292319 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292308 size: 27834 ret: 0 st: 0 flags:0 ts: 0.883000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292319 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292308 size: 27834 ret: 0 st: 0 flags:1 ts:-0.222000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 903 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 ret:-1 st: 1 flags:0 ts: 2.672000 ret: 0 st: 1 flags:1 ts: 1.566000 -ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320160 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320149 size: 209 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146871 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146860 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 903 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".