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 CBA324C62A for ; Tue, 9 Sep 2025 12:42:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1757421714; 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=IDOJceLSrlVMlac28gYXNRupZnHcWC4Mzt35VE4nMTw=; b=ZtphYpw0az+WWZXbgQ04u0NIb3zvCV3nI6Q5BMjAje6raGWFtbVw7gE/88JCGJSp/GuKf BAgwRTjIkXGiMYS7R1EMy2mV06kzwYCY9VemBE2XJU5EBsuLnKMTg9Ka/2NiKVWhdZ+F5xX 5NYJfHSZpgIwqAbpa09k5te+PgSig7qypyW6a6DHhBUGgtNXthAB5JrLr/Kd9pZFv5J2AgS 2d7lDjpE9MSVE4l6al2O5ALDjlsrvSyU92EtgvXNo0Tf0m6ieeVABULZAPQZq0CbCeW2IQ4 TNP0XXLKYT2DazgncdnCgWNPgBPpjE2yrrqb30zrFYfU5RoBmGj3uWRoo4vw== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 1427768E7DE; Tue, 9 Sep 2025 15:41:54 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1757421713; b=OnfnUdlGFl34hCfrmlLw8nfKeBZ4gUsrCLYaNfbAdrNxGkXJqHvisiUwGPPla3ccmYVIb wmQxirYy4J+mn3oqdZE6p4uuOp1LxQXwHHo2PBQUVC+HZU5JwvgOJh8N0Dl+y2KtyyUrx3g BCys7M7NogLa9pqCkrVmKWF9Z4g5eP4An80tcyihc2PyqcH2wRKitftVIhfnfgS+8egRT7b pI9fMdWVjsEbl1qgx4WNKlqd1q5u0xVmOEqybIW3Wn4tuIHo5nncxDx6p9fHH9aL3jbWPY3 KLx+Jvvi07Sb7l6UAAIMbmT5mnDqJrhGCYWk1lQyS1sX2D992IWubaHeOBJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1757421713; 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=3SEkRb3Y0p2CJELmRVbxAGzayuPwFh4pRbkVhHRDuhI=; b=SJnNW3un0PUCfoxhrbwNeRL6OkjU8uN1hr6Qwafh5WqZ4Xzxon2BLGcNUfSXqQND/+AoV ywWmV3KM1HUIuc2TEv3/sb+BEAwPdI9ycERnxW/sPbT+xhpGi6A+oQisttGEr21jMQaZqCp NmVgmjbFRkergXF45zoCAYZLsBlSFO1/g/wzKIkjSs4FLIkYbk7jl3IOpw/CsvNU/8wXMCk LxvLMXmLXM9NTM5pnJtWt2ZYQIaSQROYWhCGJYR0iQkuZWT2ZrW7N+XSuNMz3YZTDCYPaOt iBK/f68Z6qCXVUAla6h1RwSn3foaL57nrhsfEPuJhS0aeltb/2fHAu5QKKUA== 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 9.mo576.mail-out.ovh.net (9.mo576.mail-out.ovh.net [46.105.56.78]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id E1BF468E816 for ; Tue, 9 Sep 2025 15:41:45 +0300 (EEST) Received: from director7.ghost.mail-out.ovh.net (unknown [10.110.37.40]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4cLk3F1W59z62XP for ; Tue, 9 Sep 2025 12:41:45 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-t7cxb (unknown [10.110.168.247]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 98DEEC0158 for ; Tue, 9 Sep 2025 12:41:44 +0000 (UTC) Received: from mediaarea.net ([37.59.142.107]) by ghost-submission-5b5ff79f4f-t7cxb with ESMTPSA id DH7PGoggwGgv1gAA8bK6gA (envelope-from ) for ; Tue, 09 Sep 2025 12:41:44 +0000 X-OVh-ClientIp: 84.143.147.172 Message-ID: <64007e4f-bdb2-47f9-b50d-418584ac16a7@mediaarea.net> Date: Tue, 9 Sep 2025 14:41:39 +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: 2344123608471472377 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggddvtdegfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurheptgfkffggfgfuvfhfhfgjsehmtderredtvdejnecuhfhrohhmpeflvghrohhmvgcuofgrrhhtihhnvgiiuceojhgvrhhomhgvsehmvgguihgrrghrvggrrdhnvghtqeenucggtffrrghtthgvrhhnpeegveffhffgfeehkeffteffueevieehhfehjeeftdeglefgleetieejheffffduueenucfkphepuddvjedrtddrtddruddpkeegrddugeefrddugeejrddujedvpdefjedrheelrddugedvrddutdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehjvghrohhmvgesmhgvughirggrrhgvrgdrnhgvthdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhgpdfovfetjfhoshhtpehmohehjeeimgdpmhhouggvpehsmhhtphhouhht Message-ID-Hash: YR7LXQIX7L7LWCFDRXFF7PR4233V2XUD X-Message-ID-Hash: YR7LXQIX7L7LWCFDRXFF7PR4233V2XUD 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="0006-matroskadec-read-timecode-in-BlockAddition.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 6/7] matroskadec: read timecode in BlockAddition 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="0006-matroskadec-read-timecode-in-BlockAddition.patch" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: >>From 887508f9f4e4ab21431a41cc78bea48039811cba Mon Sep 17 00:00:00 2001 From: Jerome Martinez Date: Thu, 4 Sep 2025 20:17:55 +0200 Subject: [PATCH 6/7] matroskadec: read timecode in BlockAddition --- libavformat/matroska.h | 1 + libavformat/matroskadec.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 719f2ef796..d78b33d4b2 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -361,6 +361,7 @@ typedef enum { MATROSKA_BLOCK_ADD_ID_TYPE_DEFAULT = 0, MATROSKA_BLOCK_ADD_ID_TYPE_OPAQUE = 1, MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35 = 4, + MATROSKA_BLOCK_ADD_ID_TYPE_SMPTE_12M = 121, MATROSKA_BLOCK_ADD_ID_TYPE_DVCC = 0x64766343, // MKBETAG('d','v','c','C') MATROSKA_BLOCK_ADD_ID_TYPE_DVVC = 0x64767643, // MKBETAG('d','v','v','C') } MatroskaBlockAddIDType; diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 1e0c75c51b..d8800b48a6 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -295,6 +295,7 @@ typedef struct MatroskaTrack { uint32_t palette[AVPALETTE_COUNT]; int has_palette; + int add_block_timecode_count; } MatroskaTrack; typedef struct MatroskaAttachment { @@ -2530,6 +2531,9 @@ static int mkv_parse_block_addition_mappings(AVFormatContext *s, AVStream *st, M return AVERROR_INVALIDDATA; } break; + case MATROSKA_BLOCK_ADD_ID_TYPE_SMPTE_12M: + track->add_block_timecode_count++; + break; case MATROSKA_BLOCK_ADD_ID_TYPE_DVCC: case MATROSKA_BLOCK_ADD_ID_TYPE_DVVC: if ((ret = mkv_parse_dvcc_dvvc(s, st, track, &mapping->extradata)) < 0) @@ -3954,6 +3958,36 @@ static int matroska_parse_block_additional(MatroskaDemuxContext *matroska, return 0; } + case MATROSKA_BLOCK_ADD_ID_TYPE_SMPTE_12M: { + if (size < 8) { + av_log(matroska->ctx, AV_LOG_WARNING, "SMPTE timecode from BlockAdditional is malformed.\n"); + break; + } + + size_t sd_size = 0; + uint8_t *sd = av_packet_get_side_data(pkt, AV_PKT_DATA_S12M_TIMECODE, &sd_size); + uint64_t count = sd ? *((uint64_t*)sd) : 0; + if (!count) { + sd_size = sizeof(uint64_t) * (1 + track->add_block_timecode_count); + sd = av_packet_new_side_data(pkt, AV_PKT_DATA_S12M_TIMECODE, sd_size); + count = 0; + } + + if (count >= track->add_block_timecode_count) { + av_log(matroska->ctx, AV_LOG_DEBUG, "There are more timecodes in the block than the count indicated in the track header, extra timecodes are ignored.\n"); + } + else if (sd) { + uint64_t tc = *((uint64_t*)data); + av_log(matroska->ctx, AV_LOG_DEBUG, "Reading SMPTE timecode from BlockAdditional: 0x%016lX (RFC 5484)\n", tc); + + uint64_t *sd_64 = (uint64_t*)sd; + count++; + *sd_64 = count; + AV_WB64(sd_64 + count, tc); + } + + return 0; + } default: break; } -- 2.46.0.windows.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org