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 0A2864C618 for ; Tue, 9 Sep 2025 12:40:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1757421618; 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=/XIveJk+pwlvgB/zzHES45N+TV7Paj9uzcWSEf2HtmY=; b=ahE9e2vZ05QJ7Rckv/0cZb3D1x40kZaGu3vs/Aam/xWG0zlZlQTOQ9ugKzA/J84uAWJ3q Ab653kkW+JUul7us8UB28C3xfwlzUkeG/WPeE3KrWZejvPmI8Tj4R11dmGrVRdWXEa3wRPn cv1zImvXlulcGO9gB4RFvgaDKN2b1bC8wtht9LqCwo1NTzda7cPl9OXnKcoDwX9p5mmwEwI fjUQkAVZ/ostrwTN0DvYor1yJv98zpNHqBBLJOVnfwItYlfDxMsqTZDFHpLkonwqFJDhCm5 W6zdmqYYnBOD8Bqa0F4Do1AIKH6vJJGoEP0NaEmVNgpp6RwAf4DKVh3YDOfA== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id F3E0D68E864; Tue, 9 Sep 2025 15:40:17 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1757421615; b=hR1GVWFUENNnQWN02MMW+sp7Qe50Xp9jeKF1AicNGlkvPJGLG0gJQ4yD9QBLfDPkSAKpC qWSEfgiioZ2/zqR2chIrxSCP6DVPhcBe0CyeuNdnIS8HSz/Cy+KMsWOw0+nf+7FZIQdP28o oq2Z8/FKMMp0vu8VN/Hv+FW8lRl35biH7BIOwxyw6hJal3K+THJRqUtFPYaOQESPx8M2RTS cpVd7pvcy5GB8b7/yWmB6FR0tayrsvOgv6WfYgEYOWdbF0MMtwLm6kAEkUvWC501qMWO6fA QMukzcqcfvMLxxuhS09i6fP6H5DWACfg98m+tqyV7vRT411lrqNwEzXE74Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1757421615; 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=Wm2A4EQhGV6F/A5fOVjwuRO2G69ElAmZK8VJUckPVCA=; b=N1b6ht8f1Ko3mXRtrGUt/h4FAu+XcDjSxL0emq57/fNXx7rHqOFVZr0OomfBirhP0jpYm 7GbwNZ07zfR6r90SU4I0xiRAYb+C5icaBkn/0wnSjBYqKk1C++rzQes+ojDzpw2hy/CGNV1 bTt/NyD/xx7vya89l3I69JM+0Eobi5wpmTypEqjeN5x2V6joc2F3nd3xvGhOJT7fQgukkTB HO4SrxP8vEyKQpWvThhMVMhgnv/3Wcsznt4NJ5T7X5ccXeLjqBvxAw1iy/IJP4OPW4l/bNU 1nY0L6o8yNGdMTJffa4qDzDVIQk9JHfJG7XhU5tl+X+/TgVHg7aSfrzZ8dXw== 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 5.mo575.mail-out.ovh.net (5.mo575.mail-out.ovh.net [46.105.62.179]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id F081F68E6D2 for ; Tue, 9 Sep 2025 15:39:44 +0300 (EEST) Received: from director8.ghost.mail-out.ovh.net (unknown [10.109.254.83]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4cLk0v6mqzz611n for ; Tue, 9 Sep 2025 12:39:43 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-cr24w (unknown [10.110.168.159]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 7F4C3C02CD for ; Tue, 9 Sep 2025 12:39:43 +0000 (UTC) Received: from mediaarea.net ([37.59.142.103]) by ghost-submission-5b5ff79f4f-cr24w with ESMTPSA id orw8FQ8gwGjnoAAAk0WzRQ (envelope-from ) for ; Tue, 09 Sep 2025 12:39:43 +0000 X-OVh-ClientIp: 84.143.147.172 Message-ID: <04b8495f-ffc9-45e7-8708-180eb1efc993@mediaarea.net> Date: Tue, 9 Sep 2025 14:39:41 +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: 2310065137055336697 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggddvtdegfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurheptgfkffggfgfuvfhfhfgjsehmtderredtvdejnecuhfhrohhmpeflvghrohhmvgcuofgrrhhtihhnvgiiuceojhgvrhhomhgvsehmvgguihgrrghrvggrrdhnvghtqeenucggtffrrghtthgvrhhnpeegveffhffgfeehkeffteffueevieehhfehjeeftdeglefgleetieejheffffduueenucfkphepuddvjedrtddrtddruddpkeegrddugeefrddugeejrddujedvpdefjedrheelrddugedvrddutdefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehjvghrohhmvgesmhgvughirggrrhgvrgdrnhgvthdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhgpdfovfetjfhoshhtpehmohehjeehmgdpmhhouggvpehsmhhtphhouhht Message-ID-Hash: PZZJYGVLX2HN7ESH5NY3AHTZGZDFKQJF X-Message-ID-Hash: PZZJYGVLX2HN7ESH5NY3AHTZGZDFKQJF 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*0="0003-matroskaenc-increase-default-for-reserved-bytes-in-v.pa"; filename*1="tch" 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 3/7] matroskaenc: increase default for reserved bytes in video 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="0003-matroskaenc-increase-default-for-reserved-bytes-in-v.patch" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: >>From becb8841223fb3efbd270df9ca8a26801da3444e Mon Sep 17 00:00:00 2001 From: Jerome Martinez Date: Thu, 4 Sep 2025 20:23:17 +0200 Subject: [PATCH 3/7] matroskaenc: increase default for reserved bytes in video track header This permits to handle by default more e.g. timecodes without having to set the corresponding option --- libavformat/matroskaenc.c | 2 +- tests/ref/lavf/mkv | 4 ++-- tests/ref/lavf/mkv_attachment | 4 ++-- tests/ref/seek/lavf-mkv | 44 +++++++++++++++++------------------ 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index c7b804a3e5..d304b63663 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -3580,7 +3580,7 @@ static const AVCodecTag additional_subtitle_tags[] = { #define FLAGS AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { { "reserve_index_space", "reserve a given amount of space (in bytes) at the beginning of the file for the index (cues)", OFFSET(reserve_cues_space), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, - { "reserve_video_track_space", "reserve a given amount of space (in bytes) at the beginning of the file for the block additions (HDR, timecodes...)", OFFSET(reserve_video_track_space), AV_OPT_TYPE_INT, { .i64 = 15 }, 0, INT_MAX, FLAGS }, /* the number of block additions is not known in advance, so the default value strikes a balance between the size of the reserved header size and the maximum number of block additions that can be registered at the end of writing */ + { "reserve_video_track_space", "reserve a given amount of space (in bytes) at the beginning of the file for the block additions (HDR, timecodes...)", OFFSET(reserve_video_track_space), AV_OPT_TYPE_INT, { .i64 = 4 + 11 * 8 }, 0, INT_MAX, FLAGS }, /* the number of block additions is not known in advance, so the default value strikes a balance between the size of the reserved header size and the maximum number of block additions that can be registered at the end of writing */ { "cues_to_front", "move Cues (the index) to the front by shifting data if necessary", OFFSET(move_cues_to_front), AV_OPT_TYPE_BOOL, { .i64 = 0}, 0, 1, FLAGS }, { "cluster_size_limit", "store at most the provided amount of bytes in a cluster", OFFSET(cluster_size_limit), AV_OPT_TYPE_INT , { .i64 = -1 }, -1, INT_MAX, FLAGS }, { "cluster_time_limit", "store at most the provided number of milliseconds in a cluster", OFFSET(cluster_time_limit), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, FLAGS }, diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index b32b521cfa..8fea09caf6 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,3 +1,3 @@ -9397da7654fc3a00a439545584608637 *tests/data/lavf/lavf.mkv -320443 tests/data/lavf/lavf.mkv +c95871d60c576ae73f360145cb61db90 *tests/data/lavf/lavf.mkv +320520 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 aa3faf9d12..221f4ddd49 100644 --- a/tests/ref/lavf/mkv_attachment +++ b/tests/ref/lavf/mkv_attachment @@ -1,3 +1,3 @@ -1c40de58fae4e878e0a499bfe61d78e0 *tests/data/lavf/lavf.mkv_attachment -472593 tests/data/lavf/lavf.mkv_attachment +fdfcb796a2e1a020bcc36ea926a243ce *tests/data/lavf/lavf.mkv_attachment +472670 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 2eb8506356..f2253e1c59 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: 685 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 762 size: 208 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 901 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 978 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292317 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292394 size: 27834 ret: 0 st: 0 flags:0 ts: 0.788000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292317 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292394 size: 27834 ret: 0 st: 0 flags:1 ts:-0.317000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 901 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 978 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: 320161 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320238 size: 209 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146869 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146946 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 901 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 978 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: 292317 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292394 size: 27834 ret: 0 st: 1 flags:0 ts:-0.058000 -ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 685 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 762 size: 208 ret: 0 st: 1 flags:1 ts: 2.836000 -ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320161 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320238 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: 146869 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146946 size: 27925 ret: 0 st: 0 flags:0 ts:-0.482000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 901 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 978 size: 27837 ret: 0 st: 0 flags:1 ts: 2.413000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292317 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292394 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: 685 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 762 size: 208 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 901 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 978 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292317 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292394 size: 27834 ret: 0 st: 0 flags:0 ts: 0.883000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292317 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292394 size: 27834 ret: 0 st: 0 flags:1 ts:-0.222000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 901 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 978 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: 320161 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320238 size: 209 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146869 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146946 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 901 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 978 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