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 7498E45C55 for ; Thu, 30 Mar 2023 00:43:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 240B568C359; Thu, 30 Mar 2023 03:43:42 +0300 (EEST) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2091.outbound.protection.outlook.com [40.92.49.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 239C868C206 for ; Thu, 30 Mar 2023 03:43:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q9IywrFtpZZDpaVjuYNp5HjulPhPBIjIpN8aW2F2XvwtNjEH//vU+VtFIApxfc64Ol1lzn7d7baqtr+W6/E4oaAAVuwzNjMI6tQkDxY8Q0gluBKgfjL5Y2TdjOAweuOwnaKXW2a3otSgCkFcBXci+apjkJxYzjalRgk+aCVMNqXQPvcc9rghNG7s8D9IxuSJRVIXinHUui03tLY1Wg1HivxN/C1Bop0qs3IyyWkofjq1lj/0guBCaDieUdpOzETFDRPVJr5Wjqlk3hp5MsQRZBC+NlGGPtFaGmM3EeKHoZm0xi7EA3HRZCXQjThQsY3CoVHK83Qx9K/VHCFgolou/A== 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=0ZNBL+emdw6YQiBhG4iX8HTm3JISTd6QSLIB8VDFkWg=; b=Za5apsoESP+hdx3831EuPqblKcvY5xGawtuGj2U4EcLOfwEM2A1NFu+pFovux8ngbXcTzYrv27oyExRFK5yM/FD+IpBjMJdeFW6gthpvKqy5fqnw6t1z3CG69w8+L92jLq9xNkbtUvfSBzE4KI8E0+WK6uiWU10WzYKJm4Yb/Fin0XU+G73H5sqPKX/RfSqOhtwycMzfLRo1UZ/PVoI5jn7M4pRFpnXXBt1WvAQptsVIvF5XHTrZOnD6RUO2rAM2vhheucICoFbkGFgwco7lSt+4lNRhVf6EL71VArxvUF2OuvzlPchlOMmiaAGJes856OUPBRJBhst6yV2BvnK06w== 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=0ZNBL+emdw6YQiBhG4iX8HTm3JISTd6QSLIB8VDFkWg=; b=a4bL05otP790gsyEFbWeugaVXVMf5p5xsEEAWDAeJ4opleXlTKFBI2xT0kXlXSWxF7EMrPiW2OTxlY+QZbDs72ah+oirHsv3BF0IJH7MCBrmGOKK8EAkH37Px6rKPvHkhazqGzrVpEwUZ034oQ/MlV718up8Q1a3my2b/DviJCHcJooqWDbztlWRiVNUYIPqIHQeqNih/1AkLfJG2YVI9kDpiTXtNt8i8IVRN0W467n77YkqX3Jh2qjz1gaxS6UjKVy6Hyl7Rds13uG6Yom41klke3k4qvhZgG21OUuW2OSbQPBi8wkFq82JmVCuUG7h2zdVQdgJJW7W4qcOXkL6FQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0015.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:23a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.20; Thu, 30 Mar 2023 00:43:32 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::bd9b:b9f7:e94a:109e]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::bd9b:b9f7:e94a:109e%7]) with mapi id 15.20.6254.016; Thu, 30 Mar 2023 00:43:32 +0000 Message-ID: Date: Thu, 30 Mar 2023 02:44:10 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230324155213.3493-1-jamrial@gmail.com> <20230324155213.3493-5-jamrial@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20230324155213.3493-5-jamrial@gmail.com> X-TMN: [vuQqvteZwdmesjftFwnrgPqd7FNlCegoe2Ewvtus3WQ=] X-ClientProxiedBy: AM0PR02CA0133.eurprd02.prod.outlook.com (2603:10a6:20b:28c::30) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <0d30f6cf-c08a-c2d5-6e00-d9f9fc138bd9@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0015:EE_ X-MS-Office365-Filtering-Correlation-Id: 71b9a55d-6cd8-44db-951d-08db30b7c9b0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9gcqOJA0alq1r2HIY7freLtCz9DFZyb0ISxoHCjSJJHx4YrZ6+Z94T+aQnpBkfaTwcCVspM4PxqzgF129n8LIoqJ0FxlSJLH0JFlN9OTylFCIAAs2XuJ89Yv7JgAHTfLGSsAh/LoaGVrZxR848L0P/Ky+e8qB9p3KAelVRlBTQG2Dr7Kx9cqoXhRvAfnWiyIe9BxTT3kFrgWd7AM8C9m+6+/F6GaCAshvHBR50EwZeYMMPDbPxELn+N/VbJITzCilbnUZoaZ+LKe3UDVpr8619uWf7ed0WXnpayL+kq1u7eCtu3F/EHMpnDkEhqMC2Tb3jjs+PXCohCXlGJlZ1AOoQucFO9/PGiUxxUyiumrcUI9DXK5Om+fN6yAuMozuqRKJUgeod7ZQzNkKya7XiJLu0MQgPrdvdSRotfnBVbLuHh8qFg+6wznVJ2ja2Tvfr+ux/suTQpqFpmesn3GB8SR2G2SL1MtFs8G7Xg3Gs1F8Lx2+vC9IwfgRcz3O534m3LHzoYbe21p2P6+pBzPlhlsbvwq1vgg2FONvl8WmdYhYw96RdbW6BB2Vuf9W3jr+E05HUpM6E4a5YMFiQtQ9hOKc0c/4OMnYT1obOmzHicFV0+63Qlq++0b+1PCpZ09ADSy X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OVlidHNyRWpRbGQ4clJMMm5ZVTU1Y0lNbHU5WU4wVE5TUGdXNFFkazZwL1BG?= =?utf-8?B?T0NjcXpIbXFhWm9aNDh1QnFZd0VFcTNHUmhkaGZwQVFVMlZXQkZaSElERTFF?= =?utf-8?B?SWYyWjZ4ZU5sU21XVzFaNXdVZkVqRWd4WU5UaVgwNEhGN2g2cndkNEMvVkp1?= =?utf-8?B?VGdNOGsweUJNSThlYzBoaUF2ajFrd3ZsK0hoSkFQUDkvUHpFMFVkeU1pZTZz?= =?utf-8?B?eGtkNnFFcXRqdWdJN0FqY0lQOWtheUlyYWtOZjh1Mm9ZRUlNTjlPSHZGMkRy?= =?utf-8?B?Sk9KUlJoTFppNEVjZkFqdXhldU5lVERQa3NiQmtSMmxqSzYzSmlJeWRrbjdK?= =?utf-8?B?ZG1raVJuZ3N3ZTNUNEVvTFZmU3FOeDZiNFNValgwaGsyZzVrdGtBMmplQytp?= =?utf-8?B?WjlOa1NtcTVCNTRpRTc3WmFxNGRZbEJ5WWM0VEJRNXdUd2tiR0ltaWJNS2Jx?= =?utf-8?B?ckNWS2hGWHBZSzJVQjJQWHNPZWdhYWc2dHozbm9FTFhFTUVwblVYZ1VHNnRJ?= =?utf-8?B?MnFLOENHVkN1OGFDa0oxVkdDMmc0dGJ2T1huWG1FejBES3E2QmRXZ3E4ZkxE?= =?utf-8?B?NlJENHlJVHAyWkRqa1d6UU9yUlJsNWJRRHB3Sm12MDBlT3pSdEVJeUxhN282?= =?utf-8?B?cXV5M00ya0JpS2tjZDdJeS93U2tMUjZPbCtLd0RXVlFudU9uQkQyRHJ1KzBu?= =?utf-8?B?SVNWSnZCVnZpQ1FrNU84R0gzaHNobGdjWmRnRy9nQVlaamxvZHM1ajMvZHVJ?= =?utf-8?B?dmlvR2xLYW0ybGppMzY0cUxQVWRvNy9SWThlZlRyM1BiWjVCSG1INUhwK3Zz?= =?utf-8?B?VngzMjU2Z1lWWWVLd2gxMU5uZ0JMZnJqV3N4UUVDUWVWMjJoNk95N3VEU2dU?= =?utf-8?B?UVZhQlhHRlhEUmdUc3UzKzFIdGpLbm1URU1BbjRBTkFQblYva1NJbmJ1dUpJ?= =?utf-8?B?UWtMQVFMMEZQeFd0aUVmb2JpRk9wMDR0K2F5Smcyc3dubGkxRzNyYUN4R3dU?= =?utf-8?B?ZnQ4V1hCTW1tWVE4YTRtd3JMaGQ0eVBsd2IyNFd6ckJMeVhXV25maWhuV0hO?= =?utf-8?B?UnJ5clovcW5oTURLM1FDMkNPYWY5OG80dkVheHFaTnR1SjhyR3h3Ulg3RnVt?= =?utf-8?B?UW95Yy9DTUpDck5SQ1R0V0RzVFlFT3NSYkQ2K3AvSHp4elh6YXhhOFRjUkgx?= =?utf-8?B?MmhtTlRqbmlEZ3RZNUxNSitxMi8yVXErcURnT1F6enVBclg4VEdrMHRSQncw?= =?utf-8?B?TXpibjFTU1l3L3p5bE94dXZsOWZDZ0p1RTM4aGd3STRzK3g1d0MzNGozZlE1?= =?utf-8?B?NzY2UWIyZENRejU5OS9jUWF6TTFOU010NmhhWEdQRklFYVk0SG1Wb3BRYWsz?= =?utf-8?B?N3pFM3p2dS9Wd1RlNWNQSVNxVGRJU1hjbGoxR3liMytVZklEaHNxWGVCM00y?= =?utf-8?B?UFYvU2hsY292V3ZKc1RvYUY0aWoyRTY5UTVKWTZvTmx6YXNHZko0RlMySFJu?= =?utf-8?B?REFXQUVTNWN1dFFPcDRESm11MzdqUkdpdnJxUXErOXcrRTI1TVR3N3FvVi9z?= =?utf-8?B?OFA5N2g1RWN3ZUcvRTJlc0lrblhUZGlPQkpTd1RBZ3VGTUM2dk4waDU0Q25P?= =?utf-8?B?S0hJZHhNSE5Jak02VURpckpPMFA4dVYwODE5YVZqTDVjdkZpV2hJdGoxNmJi?= =?utf-8?Q?mNi8lpce+f0di5hbdpsF?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 71b9a55d-6cd8-44db-951d-08db30b7c9b0 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2023 00:43:32.5992 (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: DU2P250MB0015 Subject: Re: [FFmpeg-devel] [PATCH v3 5/7] avformat/matroskaenc: write a MaxBlockAdditionID element 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: > A non zero value is mandatory for Matroska if the track has blocks with BlockAdditions. > > Signed-off-by: James Almer > --- > libavformat/matroskaenc.c | 39 +++++++++++++++++-- > tests/ref/fate/aac-autobsf-adtstoasc | 4 +- > tests/ref/fate/matroska-avoid-negative-ts | 4 +- > tests/ref/fate/matroska-dovi-write-config7 | 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-spherical-mono-remux | 4 +- > tests/ref/fate/matroska-vp8-alpha-remux | 4 +- > tests/ref/fate/matroska-zero-length-block | 4 +- > tests/ref/fate/rgb24-mkv | 4 +- > tests/ref/fate/shortest-sub | 4 +- > tests/ref/lavf-fate/av1.mkv | 4 +- > tests/ref/lavf/mka | 4 +- > tests/ref/lavf/mkv | 4 +- > tests/ref/lavf/mkv_attachment | 4 +- > 27 files changed, 98 insertions(+), 67 deletions(-) > > diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c > index c083f55319..dfc3fbbe95 100644 > --- a/libavformat/matroskaenc.c > +++ b/libavformat/matroskaenc.c > @@ -188,6 +188,8 @@ typedef struct mkv_track { > int64_t last_timestamp; > int64_t duration; > int64_t duration_offset; > + uint64_t max_blockaddid; > + int64_t blockadditionmapping_offset; > int codecpriv_offset; > unsigned codecpriv_size; ///< size reserved for CodecPrivate excluding header+length field > int64_t ts_offset; > @@ -1597,12 +1599,21 @@ static int mkv_write_stereo_mode(AVFormatContext *s, EbmlWriter *writer, > return 0; > } > > -static void mkv_write_dovi(AVFormatContext *s, AVIOContext *pb, AVStream *st) > +static void mkv_write_blockadditionmapping(AVFormatContext *s, MatroskaMuxContext *mkv, > + AVIOContext *pb, mkv_track *track, AVStream *st) > { > #if CONFIG_MATROSKA_MUXER > AVDOVIDecoderConfigurationRecord *dovi = (AVDOVIDecoderConfigurationRecord *) > av_stream_get_side_data(st, AV_PKT_DATA_DOVI_CONF, NULL); > > + if (IS_SEEKABLE(s->pb, mkv)) { > + track->blockadditionmapping_offset = avio_tell(pb); > + // We can't know at this point if there will be a block with BlockAdditions, so > + // we either write the default value here, or a void element. Either of them will > + // be overwritten when finishing the track. > + put_ebml_uint(mkv->track.bc, MATROSKA_ID_TRACKMAXBLKADDID, 0); > + } > + > if (dovi && dovi->dv_profile <= 10) { > ebml_master mapping; > uint8_t buf[ISOM_DVCC_DVVC_SIZE]; > @@ -1846,9 +1857,6 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, > if (ret < 0) > return ret; > > - if (!IS_WEBM(mkv)) > - mkv_write_dovi(s, pb, st); > - > break; > > case AVMEDIA_TYPE_AUDIO: > @@ -1924,6 +1932,9 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, > return AVERROR(EINVAL); > } > > + if (!IS_WEBM(mkv)) > + mkv_write_blockadditionmapping(s, mkv, pb, track, st); > + > if (!IS_WEBM(mkv) || par->codec_id != AV_CODEC_ID_WEBVTT) { > uint8_t *codecpriv; > int codecpriv_size, max_payload_size; > @@ -2667,6 +2678,7 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, > side_data + 8, side_data_size - 8); > ebml_writer_close_master(&writer); > ebml_writer_close_master(&writer); > + track->max_blockaddid = additional_id; > } > > if (!force_blockgroup && writer.nb_elements == 2) { > @@ -3070,6 +3082,25 @@ after_cues: > > if (mkv->track.bc) { > // write Tracks master > + int64_t end = avio_tell(mkv->track.bc); > + > + for (int i = 0; i < s->nb_streams; i++) { AVFormatContext.nb_streams is unsigned, so i should be, too. > + const mkv_track *track = &mkv->tracks[i]; > + > + if (IS_WEBM(mkv)) > + break; This check does not belong into the loop. > + if (!track->max_blockaddid) > + continue; > + > + // We reserved a single byte to write this value. > + av_assert0(track->max_blockaddid <= 0xFF); > + > + avio_seek(mkv->track.bc, track->blockadditionmapping_offset, SEEK_SET); > + > + put_ebml_uint(mkv->track.bc, MATROSKA_ID_TRACKMAXBLKADDID, track->max_blockaddid); > + } > + > + avio_seek(mkv->track.bc, end, SEEK_SET); This seek (and the avio_tell() before the loop) seem unnecessary; see 0fc150f048398c9dbb8578f25e916fd356c18a54. > avio_seek(pb, mkv->track.pos, SEEK_SET); > ret = end_ebml_master_crc32(pb, &mkv->track.bc, mkv, > MATROSKA_ID_TRACKS, 0, 0, 0); > diff --git a/tests/ref/fate/aac-autobsf-adtstoasc b/tests/ref/fate/aac-autobsf-adtstoasc > index 57bfcae18b..76125083b6 100644 > --- a/tests/ref/fate/aac-autobsf-adtstoasc > +++ b/tests/ref/fate/aac-autobsf-adtstoasc > @@ -1,5 +1,5 @@ > -4342e4f3f93b16514bda511b3b7fd93a *tests/data/fate/aac-autobsf-adtstoasc.matroska > -6642 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-avoid-negative-ts b/tests/ref/fate/matroska-avoid-negative-ts > index 129ea1be66..73616cbc5a 100644 > --- a/tests/ref/fate/matroska-avoid-negative-ts > +++ b/tests/ref/fate/matroska-avoid-negative-ts > @@ -1,5 +1,5 @@ > -fbe66be73d379073e0705891f290a6b2 *tests/data/fate/matroska-avoid-negative-ts.matroska > -973055 tests/data/fate/matroska-avoid-negative-ts.matroska > +ff83530bf89f9ab1df0d181bb848c475 *tests/data/fate/matroska-avoid-negative-ts.matroska > +973063 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-config7 b/tests/ref/fate/matroska-dovi-write-config7 > index 9207b14b5c..8b40848f4a 100644 > --- a/tests/ref/fate/matroska-dovi-write-config7 > +++ b/tests/ref/fate/matroska-dovi-write-config7 > @@ -1,5 +1,5 @@ > -d23b8b0d0613a82ba36fdc27acf3ef5d *tests/data/fate/matroska-dovi-write-config7.matroska > -72672 tests/data/fate/matroska-dovi-write-config7.matroska > +b4db571fe6304f159a0383a38c9c0cee *tests/data/fate/matroska-dovi-write-config7.matroska > +72680 tests/data/fate/matroska-dovi-write-config7.matroska > #extradata 0: 116, 0x2b8d1669 > #extradata 1: 116, 0x2b8d1669 > #tb 0: 1/1000 > diff --git a/tests/ref/fate/matroska-dovi-write-config8 b/tests/ref/fate/matroska-dovi-write-config8 > index 5feb7b8065..c36d3a8a07 100644 > --- a/tests/ref/fate/matroska-dovi-write-config8 > +++ b/tests/ref/fate/matroska-dovi-write-config8 > @@ -1,5 +1,5 @@ > -0047ca43aa8ab2948752e367f184dc1f *tests/data/fate/matroska-dovi-write-config8.matroska > -3600576 tests/data/fate/matroska-dovi-write-config8.matroska > +8c77c1d18ee58a8923c411d3ba006a46 *tests/data/fate/matroska-dovi-write-config8.matroska > +3600584 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 b7346b8f55..03341d9668 100644 > --- a/tests/ref/fate/matroska-dvbsub-remux > +++ b/tests/ref/fate/matroska-dvbsub-remux > @@ -1,5 +1,5 @@ > -77d210dc36d7a01988d159b3c902524c *tests/data/fate/matroska-dvbsub-remux.matroska > -39010 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 e6cf4790f5..401de4facf 100644 > --- a/tests/ref/fate/matroska-encoding-delay > +++ b/tests/ref/fate/matroska-encoding-delay > @@ -1,5 +1,5 @@ > -b933b7b94de55ae029369312d48d8649 *tests/data/fate/matroska-encoding-delay.matroska > -961221 tests/data/fate/matroska-encoding-delay.matroska > +1f6f9c0fbaba0f128acbea296cec1887 *tests/data/fate/matroska-encoding-delay.matroska > +961229 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=1238 > +pos=1246 > flags=K__ > [/PACKET] > [PACKET] > @@ -45,7 +45,7 @@ dts_time=0.000000 > duration=40 > duration_time=0.040000 > size=237628 > -pos=2398 > +pos=2406 > flags=K__ > [/PACKET] > [PACKET] > @@ -58,7 +58,7 @@ dts_time=0.014000 > duration=24 > duration_time=0.024000 > size=1152 > -pos=240033 > +pos=240041 > flags=K__ > [/PACKET] > [PACKET] > @@ -71,7 +71,7 @@ dts_time=0.038000 > duration=24 > duration_time=0.024000 > size=1152 > -pos=241208 > +pos=241216 > flags=K__ > [/PACKET] > [PACKET] > @@ -84,7 +84,7 @@ dts_time=0.040000 > duration=40 > duration_time=0.040000 > size=238066 > -pos=242368 > +pos=242376 > flags=K__ > [/PACKET] > [STREAM] > diff --git a/tests/ref/fate/matroska-flac-extradata-update b/tests/ref/fate/matroska-flac-extradata-update > index d5814925f5..d6713aaafa 100644 > --- a/tests/ref/fate/matroska-flac-extradata-update > +++ b/tests/ref/fate/matroska-flac-extradata-update > @@ -1,5 +1,5 @@ > -28bc0ded5dc520d955caf29db80d35da *tests/data/fate/matroska-flac-extradata-update.matroska > -1795 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 6edd88fba8..9a9a98217c 100644 > --- a/tests/ref/fate/matroska-h264-remux > +++ b/tests/ref/fate/matroska-h264-remux > @@ -1,5 +1,5 @@ > -3c00191234d5c4d77151d38a86403101 *tests/data/fate/matroska-h264-remux.matroska > -2036033 tests/data/fate/matroska-h264-remux.matroska > +fa3352ef6d3abd7d93f8627981a53f6f *tests/data/fate/matroska-h264-remux.matroska > +2036049 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 5b23e9506c..95df3594c7 100644 > --- a/tests/ref/fate/matroska-mastering-display-metadata > +++ b/tests/ref/fate/matroska-mastering-display-metadata > @@ -1,5 +1,5 @@ > -69a904789151abaee46033391a4fce46 *tests/data/fate/matroska-mastering-display-metadata.matroska > -1669555 tests/data/fate/matroska-mastering-display-metadata.matroska > +e9a5f7314d6ae2ef16713335df2b5903 *tests/data/fate/matroska-mastering-display-metadata.matroska > +1669571 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 78697b2eae..79ccc2fd93 100644 > --- a/tests/ref/fate/matroska-move-cues-to-front > +++ b/tests/ref/fate/matroska-move-cues-to-front > @@ -1,5 +1,5 @@ > -8ebfcf15768bbe66611e349383fbf26a *tests/data/fate/matroska-move-cues-to-front.matroska > -23210287 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 2faab0892f..af41b57af1 100644 > --- a/tests/ref/fate/matroska-mpegts-remux > +++ b/tests/ref/fate/matroska-mpegts-remux > @@ -1,5 +1,5 @@ > -acaf3ebe07afe9815e0a984921d3ab87 *tests/data/fate/matroska-mpegts-remux.matroska > -6494 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 f90a7e431f..0a42ab0748 100644 > --- a/tests/ref/fate/matroska-ms-mode > +++ b/tests/ref/fate/matroska-ms-mode > @@ -1,5 +1,5 @@ > -afb4fc9b2ca6cafc03d8029fdf4da876 *tests/data/fate/matroska-ms-mode.matroska > -413086 tests/data/fate/matroska-ms-mode.matroska > +7f0b825626a028765098222816ba56b8 *tests/data/fate/matroska-ms-mode.matroska > +413094 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 473b9ff00c..cd3eade361 100644 > --- a/tests/ref/fate/matroska-ogg-opus-remux > +++ b/tests/ref/fate/matroska-ogg-opus-remux > @@ -1,5 +1,5 @@ > -a3f98769fe55bc5234cf75fb1949749a *tests/data/fate/matroska-ogg-opus-remux.matroska > -10200 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=540 > +pos=544 > flags=K__ > [/PACKET] > [PACKET] > @@ -70,7 +70,7 @@ dts_time=0.013000 > duration=20 > duration_time=0.020000 > size=216 > -pos=949 > +pos=953 > flags=K__ > [/PACKET] > [PACKET] > @@ -83,7 +83,7 @@ dts_time=0.033000 > duration=20 > duration_time=0.020000 > size=215 > -pos=1172 > +pos=1176 > flags=K__ > [/PACKET] > [STREAM] > diff --git a/tests/ref/fate/matroska-opus-remux b/tests/ref/fate/matroska-opus-remux > index 8ebc80ee36..975510e167 100644 > --- a/tests/ref/fate/matroska-opus-remux > +++ b/tests/ref/fate/matroska-opus-remux > @@ -1,5 +1,5 @@ > -551e45142f0989b281e837a3a86f0218 *tests/data/fate/matroska-opus-remux.matroska > -9355 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=496 > +pos=500 > flags=K__ > [/PACKET] > [PACKET] > @@ -81,7 +81,7 @@ dts_time=0.014000 > duration=20 > duration_time=0.020000 > size=159 > -pos=823 > +pos=827 > flags=K__ > [/PACKET] > [PACKET] > @@ -94,7 +94,7 @@ dts_time=0.034000 > duration=20 > duration_time=0.020000 > size=148 > -pos=989 > +pos=993 > flags=K__ > [/PACKET] > [STREAM] > diff --git a/tests/ref/fate/matroska-pgs-remux b/tests/ref/fate/matroska-pgs-remux > index ed5beb7463..a086111495 100644 > --- a/tests/ref/fate/matroska-pgs-remux > +++ b/tests/ref/fate/matroska-pgs-remux > @@ -1,5 +1,5 @@ > -6703d4e9a905bc5a1fc529776e8ffb51 *tests/data/fate/matroska-pgs-remux.matroska > -49744 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 a255640fa6..37494cd98f 100644 > --- a/tests/ref/fate/matroska-pgs-remux-durations > +++ b/tests/ref/fate/matroska-pgs-remux-durations > @@ -1,5 +1,5 @@ > -a547f8b6463a60e5ef2e9a2b117c4dfa *tests/data/fate/matroska-pgs-remux-durations.matroska > -49756 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 17a8e6619e..d54f5d167c 100644 > --- a/tests/ref/fate/matroska-qt-mode > +++ b/tests/ref/fate/matroska-qt-mode > @@ -1,5 +1,5 @@ > -39a3d6faff69892c8a20301560b80b14 *tests/data/fate/matroska-qt-mode.matroska > -1884224 tests/data/fate/matroska-qt-mode.matroska > +c3483a76cd0bfbaf80a32dad041b6f52 *tests/data/fate/matroska-qt-mode.matroska > +1884232 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-spherical-mono-remux b/tests/ref/fate/matroska-spherical-mono-remux > index 6b975c1586..c65d206e91 100644 > --- a/tests/ref/fate/matroska-spherical-mono-remux > +++ b/tests/ref/fate/matroska-spherical-mono-remux > @@ -1,5 +1,5 @@ > -31cdace875cb696973d5a493ce776eea *tests/data/fate/matroska-spherical-mono-remux.matroska > -161554 tests/data/fate/matroska-spherical-mono-remux.matroska > +dfc2e196ca14cce155b1a081a0628fd3 *tests/data/fate/matroska-spherical-mono-remux.matroska > +161562 tests/data/fate/matroska-spherical-mono-remux.matroska > #extradata 0: 43, 0x2b0e0d7b > #extradata 1: 43, 0x2b0e0d7b > #tb 0: 1/1000 > diff --git a/tests/ref/fate/matroska-vp8-alpha-remux b/tests/ref/fate/matroska-vp8-alpha-remux > index 17c15ec9df..1fad574edd 100644 > --- a/tests/ref/fate/matroska-vp8-alpha-remux > +++ b/tests/ref/fate/matroska-vp8-alpha-remux > @@ -1,5 +1,5 @@ > -fd4f24bf776a2f84e01b0aa7fdfece38 *tests/data/fate/matroska-vp8-alpha-remux.matroska > -235011 tests/data/fate/matroska-vp8-alpha-remux.matroska > +3339f3fa157bdd63f22f5a579f308c89 *tests/data/fate/matroska-vp8-alpha-remux.matroska > +235015 tests/data/fate/matroska-vp8-alpha-remux.matroska > #tb 0: 1/1000 > #media_type 0: video > #codec_id 0: vp8 > diff --git a/tests/ref/fate/matroska-zero-length-block b/tests/ref/fate/matroska-zero-length-block > index bef887d58b..3987cc14c4 100644 > --- a/tests/ref/fate/matroska-zero-length-block > +++ b/tests/ref/fate/matroska-zero-length-block > @@ -1,5 +1,5 @@ > -d9c8efb9d64addce3cac97e6c417d985 *tests/data/fate/matroska-zero-length-block.matroska > -630 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/rgb24-mkv b/tests/ref/fate/rgb24-mkv > index f2cff5ff96..d037c01b32 100644 > --- a/tests/ref/fate/rgb24-mkv > +++ b/tests/ref/fate/rgb24-mkv > @@ -1,5 +1,5 @@ > -a46cb669137f18ac0a42012485e5e863 *tests/data/fate/rgb24-mkv.matroska > -58211 tests/data/fate/rgb24-mkv.matroska > +69dc9d35fdfadccb28c7baf401776ec3 *tests/data/fate/rgb24-mkv.matroska > +58215 tests/data/fate/rgb24-mkv.matroska > #tb 0: 1/10 > #media_type 0: video > #codec_id 0: rawvideo > diff --git a/tests/ref/fate/shortest-sub b/tests/ref/fate/shortest-sub > index 53f89925b9..b6571b4f32 100644 > --- a/tests/ref/fate/shortest-sub > +++ b/tests/ref/fate/shortest-sub > @@ -1,5 +1,5 @@ > -145b9b48d56f9c966bf41657f7569954 *tests/data/fate/shortest-sub.matroska > -139232 tests/data/fate/shortest-sub.matroska > +d334a0eee71351ddad0a63011107909f *tests/data/fate/shortest-sub.matroska > +139240 tests/data/fate/shortest-sub.matroska > #extradata 1: 167, 0xf7272d5f > #tb 0: 1/1000 > #media_type 0: video > diff --git a/tests/ref/lavf-fate/av1.mkv b/tests/ref/lavf-fate/av1.mkv > index 2008e1a932..382e3aeee3 100644 > --- a/tests/ref/lavf-fate/av1.mkv > +++ b/tests/ref/lavf-fate/av1.mkv > @@ -1,3 +1,3 @@ > -72a4713f9165c73574d40e8b81c5d70f *tests/data/lavf-fate/lavf.av1.mkv > -55642 tests/data/lavf-fate/lavf.av1.mkv > +7d2c39dd98d5776425a4015e1eead6c6 *tests/data/lavf-fate/lavf.av1.mkv > +55646 tests/data/lavf-fate/lavf.av1.mkv > tests/data/lavf-fate/lavf.av1.mkv CRC=0x7c27cc15 > diff --git a/tests/ref/lavf/mka b/tests/ref/lavf/mka > index 7af63e0779..93a0b8f71a 100644 > --- a/tests/ref/lavf/mka > +++ b/tests/ref/lavf/mka > @@ -1,3 +1,3 @@ > -e2d55cd3844fd7237a92181dbbcb08d9 *tests/data/lavf/lavf.mka > -43569 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 d54c44a647..fbd40fc1cb 100644 > --- a/tests/ref/lavf/mkv > +++ b/tests/ref/lavf/mkv > @@ -1,3 +1,3 @@ > -0934e35639b6735c1e26595e8f47ba70 *tests/data/lavf/lavf.mkv > -320409 tests/data/lavf/lavf.mkv > +32b87b6adbe76df1008bc074f82fabb0 *tests/data/lavf/lavf.mkv > +320417 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 ad96424098..2966a827cc 100644 > --- a/tests/ref/lavf/mkv_attachment > +++ b/tests/ref/lavf/mkv_attachment > @@ -1,3 +1,3 @@ > -d2708709bdd6817d9cb2b475fdfa903f *tests/data/lavf/lavf.mkv_attachment > -472559 tests/data/lavf/lavf.mkv_attachment > +41739c51209d94b4763f9dbe4d1e1dc9 *tests/data/lavf/lavf.mkv_attachment > +472567 tests/data/lavf/lavf.mkv_attachment > tests/data/lavf/lavf.mkv_attachment CRC=0xec6c3c68 _______________________________________________ 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".