From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 888944C621 for ; Tue, 9 Sep 2025 12:39:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1757421551; h=message-id : date : mime-version : to : references : in-reply-to : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=r5+wa1kjN0kOBA7829NesA6VRLoUPdJNNoo6Nf3+hCM=; b=ySYua1J3ZtvKmniaVHtbEzqYQbtELOkADlAYhtQvP4ydctqWwvtFtugP85snzJbMopcq7 VJWUqzVRymnSWMOTxGsN9OQEEgF/WSw0jcMu3cxH6vQss8soh6u5fq9/AfbStQ0py5szlsJ OoX8YfnMuElC73a+ws268ZsFhkQOhY6lpQWGenSHNyLujV7Va71/rq5QCHELAplC93Lyx1d lHRPM15xihPlxjtWAzc2PkSXWLvzYz362/hKHYWlTV/9nhLfcgaDtANMsCjhvHo+aN/k58B /R6oiO7cAhdRTYfA8iu0QQISaVxZv25wFrp6PydpOJtHq3nVgLZoMAaVA46w== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id F3C4A68E77D; Tue, 9 Sep 2025 15:39:10 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1757421549; b=SkPN+baoq7abjSBITU9de1zYmLMO188Bda2faq0Fr6b7HUFFGreCl5prEXZ2yQOab13Ml 9Z7jz2PygJ/mPU3qZ+jRZGcnRoVPOQf0b/q+n0A8raEkzwPbvYFLMRaj1DV7khl6cKWt1T8 hoMUknN9lF27rJvgFAJji86FcrEgt2HhJGEHEllYTjrZLnMJk5yTAkAaAw7xLz4vzxOzk52 V1psdp/C3sxiLs8el0A6ZxgaAaN7PgpYck4ZpRQPHpJsou9uOdifDOo+BHIzVWI+yJJPZwP XwTYL27PhoRERztN+VhIXotAjKPeIqNEXnl+QJaNZ5pV5LHbArL2bn0MF8+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1757421549; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=JdkHkGapKkI8gPBEJQHtFKfZPUtjpoIHO8psv/58WhI=; b=AOwMDZSVxea8erHBT03WzEAHggfmQUKluqFlbpRfOq+PpRF4nQKIl0Jx5IrvHAdVhkEst E1uxZL7nGvGdQeA2duqdBePbdeN3ptUa/MHe4OvcNT14B6JdXqyI9U2BuzSIIEbvY+PNkDF 0pzCAIBPyoRwSZpetXdezuVaT4Fq18tA3ZoQ1rcVAK8ev4A25BSBDmhuVS7r3mF8o6mFO2/ iY3sg6Xz/IHCA1tOOjeZHtkr8Ohzi3EU4z3fy0RHkeVq1a/rcVGGHvhFEK0BmYvu5R1NR3R zVr2L+ubwOyVRiUr5AF+JWK09coHL+33a/PsZRQ5TKnZ8hetmT8s4+he+lGQ== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=fail; arc=none; dmarc=fail header.from=mediaarea.net policy.dmarc=none Authentication-Results: ffmpeg.org; dkim=fail; arc=none (Message is not ARC signed); dmarc=fail (Used From Domain Record) header.from=mediaarea.net policy.dmarc=none Received: from 1.mo583.mail-out.ovh.net (1.mo583.mail-out.ovh.net [188.165.57.91]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 6FF8368D3AA for ; Tue, 9 Sep 2025 15:38:57 +0300 (EEST) Received: from director6.ghost.mail-out.ovh.net (unknown [10.110.43.238]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4cLk006RkKz6WZ0 for ; Tue, 9 Sep 2025 12:38:56 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-npp82 (unknown [10.111.182.240]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 4B43D80338 for ; Tue, 9 Sep 2025 12:38:56 +0000 (UTC) Received: from mediaarea.net ([37.59.142.113]) by ghost-submission-5b5ff79f4f-npp82 with ESMTPSA id 4h+aO98fwGjy1QAAJzvq6A (envelope-from ) for ; Tue, 09 Sep 2025 12:38:56 +0000 X-OVh-ClientIp: 84.143.147.172 Message-ID: <5fc6ed86-32a5-44fc-bf15-01da82538de6@mediaarea.net> Date: Tue, 9 Sep 2025 14:38:53 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: fr In-Reply-To: X-Ovh-Tracer-Id: 2296835812609263865 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggddvtdegfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurheptgfkffggfgfuvfhfhfgjsehmtderredtvdejnecuhfhrohhmpeflvghrohhmvgcuofgrrhhtihhnvgiiuceojhgvrhhomhgvsehmvgguihgrrghrvggrrdhnvghtqeenucggtffrrghtthgvrhhnpeegveffhffgfeehkeffteffueevieehhfehjeeftdeglefgleetieejheffffduueenucfkphepuddvjedrtddrtddruddpkeegrddugeefrddugeejrddujedvpdefjedrheelrddugedvrdduudefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehjvghrohhmvgesmhgvughirggrrhgvrgdrnhgvthdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhgpdfovfetjfhoshhtpehmohehkeefmgdpmhhouggvpehsmhhtphhouhht Message-ID-Hash: GDTRNQLK763F3D2UXJUZ62FQMQZFVBQK X-Message-ID-Hash: GDTRNQLK763F3D2UXJUZ62FQMQZFVBQK X-MailFrom: SRS0=HT8a=3U=mediaarea.net=jerome@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header Content-Disposition: attachment; filename="0001-matroskaenc-remove-unused-MaxBlockAdditionID.patch" X-Content-Filtered-By: Mailman/MimeDel 3.3.10 X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH 1/7] matroskaenc: remove unused MaxBlockAdditionID List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Jerome Martinez via ffmpeg-devel Cc: Jerome Martinez Content-Type: text/plain; charset="us-ascii"; name="0001-matroskaenc-remove-unused-MaxBlockAdditionID.patch" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: >>From 305cce5e1db5e6ae48497398bec024da206b9035 Mon Sep 17 00:00:00 2001 From: Jerome Martinez Date: Wed, 3 Sep 2025 19:54:10 +0200 Subject: [PATCH 1/7] matroskaenc: remove unused MaxBlockAdditionID For non video tracks: it is never used, let's save 4 bytes For video tracks: simplify the temporary storage with only a void element and MaxBlockAdditionID will be written when finishing the track if needed (not the default value) --- libavformat/matroskaenc.c | 8 +++---- tests/ref/lavf/mka | 4 ++-- tests/ref/lavf/mkv | 4 ++-- tests/ref/lavf/mkv_attachment | 4 ++-- tests/ref/seek/lavf-mkv | 44 +++++++++++++++++------------------ 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 8142d9125e..5339b6fd33 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1706,16 +1706,16 @@ static void mkv_write_blockadditionmapping(AVFormatContext *s, const MatroskaMux const AVDOVIDecoderConfigurationRecord *dovi; const AVPacketSideData *sd; - if (IS_SEEKABLE(s->pb, mkv)) { + if (IS_SEEKABLE(s->pb, mkv) && par->codec_type == AVMEDIA_TYPE_VIDEO) { 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(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 */ + put_ebml_void(pb, 4 /* MaxBlockAdditionID */ + + 3 /* BlockAdditionMapping */ + 4 /* BlockAddIDValue */ + 4 /* BlockAddIDType */); } @@ -3294,7 +3294,7 @@ after_cues: for (unsigned i = 0; i < s->nb_streams; i++) { const mkv_track *track = &mkv->tracks[i]; - if (!track->max_blockaddid) + if (!track->max_blockaddid || !track->blockadditionmapping_offset) continue; // We reserved a single byte to write this value. diff --git a/tests/ref/lavf/mka b/tests/ref/lavf/mka index 6f9a56b24a..6fe5ca8d9e 100644 --- a/tests/ref/lavf/mka +++ b/tests/ref/lavf/mka @@ -1,3 +1,3 @@ -b9c2d23dffba449cf1111f062b93c93f *tests/data/lavf/lavf.mka -43588 tests/data/lavf/lavf.mka +00381b9855734adb05bc96cfd2f3b6b2 *tests/data/lavf/lavf.mka +43584 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 5a3c3b931e..b32b521cfa 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,3 +1,3 @@ -dd709c2b5e173eaca39cdd4a10aac3ec *tests/data/lavf/lavf.mkv -320447 tests/data/lavf/lavf.mkv +9397da7654fc3a00a439545584608637 *tests/data/lavf/lavf.mkv +320443 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 1a086a4f24..aa3faf9d12 100644 --- a/tests/ref/lavf/mkv_attachment +++ b/tests/ref/lavf/mkv_attachment @@ -1,3 +1,3 @@ -7cd7b06892b74d66da217c8dda90bfac *tests/data/lavf/lavf.mkv_attachment -472597 tests/data/lavf/lavf.mkv_attachment +1c40de58fae4e878e0a499bfe61d78e0 *tests/data/lavf/lavf.mkv_attachment +472593 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 e327959058..2eb8506356 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: 689 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 685 size: 208 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 901 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292321 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292317 size: 27834 ret: 0 st: 0 flags:0 ts: 0.788000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292321 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292317 size: 27834 ret: 0 st: 0 flags:1 ts:-0.317000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 901 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: 320165 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320161 size: 209 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146873 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146869 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 901 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: 292321 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292317 size: 27834 ret: 0 st: 1 flags:0 ts:-0.058000 -ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 689 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 685 size: 208 ret: 0 st: 1 flags:1 ts: 2.836000 -ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320165 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320161 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: 146873 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146869 size: 27925 ret: 0 st: 0 flags:0 ts:-0.482000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 901 size: 27837 ret: 0 st: 0 flags:1 ts: 2.413000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292321 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292317 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: 689 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 685 size: 208 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 901 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292321 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292317 size: 27834 ret: 0 st: 0 flags:0 ts: 0.883000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292321 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292317 size: 27834 ret: 0 st: 0 flags:1 ts:-0.222000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 901 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: 320165 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320161 size: 209 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146873 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146869 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 901 size: 27837 -- 2.46.0.windows.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org