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 90A6A44F1F for ; Sat, 13 Sep 2025 11:02:42 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'RWeUuSl91YIq1KmwnjJhpMrlNdGZkOgnY+0cXBBeg4w=', expected b'QPwt2wlggRrG8w9rk8UmDgQSXz1/V444ZQ3WeTk/88k=')) header.d=niedermayer.cc header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1757761359; h=date : to : message-id : references : mime-version : 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 : from; bh=NLLYKAaACoHVU9rp+wsA4mp1/64x0owAAA4yDOhmO3c=; b=rRlbH6jguCcNH4Xe+sl69bUsQktw3KgDgCVPhHme/2aFmlvxnFAMK37pJyyrUij9Li6gx XPlwE7wugVQQ6iGMvWND1fRMKYd2YHG4h9Kx/xcWhdrOwfkiJGUkzcmXFv7lNwNHD7XjwZH JS67JQzmS7LfceRV6Yf2VQzUSiQt3r/6Zl9TqlIm9TOg1fr0fATsVqurtDsO3OCbjAQTEXN 9L/nbjFwYjGbuQ0+Dzv5FQwziheBo6MS5mvmAHrSMGan51AEz3f0mdLGET2XxbElPjOu1SL MjYBDL143hraJIjd+BGqEfgR4OIMhF7vTmoYEW2W+oe1zJucsViZ0oMMapaw== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id EE62468E7EE; Sat, 13 Sep 2025 14:02:38 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1757761357; b=DBPWG0CgZGzsTCvCkmfQGhHVFdeesvCuTKU/k6dwaS0FQbOMvyBUKoij4gDoNU91ZJZfg 3SUKJHPb8SZpQTKh1sUeXNwbON2Hg9xkE83fYJQ9pSzlQ88kesGyudiPZWq0isWzDxBOb++ z5rXebW7ERtYLFRXUfqM1YxyoqRU9oyaAm6BCYWU/evPB9lSJSHqAep+n2BHgMD2DAwYhgE 98U5D5DA4lYqcTvNe0BKRzllyFRa2o1aa91i3vd2blyzPFubIBNxyCUI4ykmr3CpmBQXBMk 51nBRY3zuw/pDrJpX1Jp9GWvbsPq3jt7hyqRCaArIIWKyZ84U0OotW01eMrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1757761357; 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=RWeUuSl91YIq1KmwnjJhpMrlNdGZkOgnY+0cXBBeg4w=; b=AiqwF3PCtnvuCpRkxTDAc4MxHbJEB27a+Zsh8zdhrjrAu5DmcGa+6l+oHVYqLpp6x6G0G P346Frjqszz9GxgvkH9foHL+3rlsT01+7TBlIPHikvHK3bXcfHGdgJd7i/MsFQWvB9RMuOC cLCE5BcIJiyy+HwuxXD3j7pBzUSbO3tp98FXxXtPYCkDdY9Qk24nbXuZx84u27ROXrhpsWg MyhkC49Mhy+W8CaB126makGBS3HDkAhSh4WfL1Yyt94w2AzytIMC9lgQWB3cDgevYjsk0Ld nrmFVZg/wt9RLcMe/QJGxATRzeY6WhPjP5x52bM2ZCaeibD12R/XAdMl+E2g== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=niedermayer.cc; arc=none; dmarc=none Authentication-Results: ffmpeg.org; dkim=pass header.d=niedermayer.cc; arc=none (Message is not ARC signed); dmarc=none Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 55F4168E78F for ; Sat, 13 Sep 2025 14:02:22 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id B0F1041C7C for ; Sat, 13 Sep 2025 11:02:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1757761341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QPwt2wlggRrG8w9rk8UmDgQSXz1/V444ZQ3WeTk/88k=; b=d/BP5ir4cVPPFomnCpO1iHKyPehKNx+8Qj1I81yiVD9t+CvDDTttPJhTv1ReAWjbPLx3Ds RbmqELjO1Be2d4nVlJCC8OZvxWzfrb8PrPamck/wdF/v862DMLvkoZEc9eKtlhnlWjTqP6 Ozhew11/TX1lorzKio7ixv6QuVnuXvyWQ3ZcluSdaNlaGSyumc2n8uHuvuGkUzrHVEfOHN TfjviNWs0XGnSXiWc4kbabVVEIncUVLsmH9n94NF4BwP4BtDs04gLHa9F6etTkOFk1+eRz 2g0EUq3Ew7DcMn0QTYsOt29PW8Q1W4kmvnROcjPGp5shcgXQ56FhLKZOE9HAiQ== Date: Sat, 13 Sep 2025 13:02:20 +0200 To: FFmpeg development discussions and patches Message-ID: <20250913110220.GE29660@pb2> References: <64007e4f-bdb2-47f9-b50d-418584ac16a7@mediaarea.net> MIME-Version: 1.0 In-Reply-To: <64007e4f-bdb2-47f9-b50d-418584ac16a7@mediaarea.net> X-GND-State: clean X-GND-Score: -85 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggdefudejiecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfitefpfffkpdcuggftfghnshhusghstghrihgsvgenuceurghilhhouhhtmecufedtudenucesvcftvggtihhpihgvnhhtshculddquddttddmnegfrhhlucfvnfffucdludehmdenucfjughrpeffhffvuffkfhggtggujgesghdtreertddtvdenucfhrhhomhepofhitghhrggvlhcupfhivgguvghrmhgrhigvrhcuoehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgeqnecuggftrfgrthhtvghrnhepieegkedtjeduffejhfetgeejtdegteetgfegtdfhjefgvefhteegkeejtddvhfevnecukfhppeeguddrieeirdeihedrudejieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeeguddrieeirdeihedrudejiedphhgvlhhopehlohgtrghlhhhoshhtpdhmrghilhhfrhhomhepmhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtpdhnsggprhgtphhtthhopedupdhrtghpthhtohepfhhfmhhpvghgqdguvghvvghlsehffhhmphgvghdrohhrgh X-GND-Sasl: michael@niedermayer.cc Message-ID-Hash: K4QQXDQIBDBYPZXWMWVC5GU36PWFSL7U X-Message-ID-Hash: K4QQXDQIBDBYPZXWMWVC5GU36PWFSL7U X-MailFrom: SRS0=BF69=3Y=niedermayer.cc=michael@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 X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] Re: [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: Michael Niedermayer via ffmpeg-devel Cc: Michael Niedermayer Content-Type: multipart/mixed; boundary="===============4840515845194514423==" Archived-At: List-Archive: List-Post: --===============4840515845194514423== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="k1pM8Va43wmcQoxi" Content-Disposition: inline --k1pM8Va43wmcQoxi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Jerome On Tue, Sep 09, 2025 at 02:41:39PM +0200, Jerome Martinez via ffmpeg-devel = wrote: > matroska.h | 1 + > matroskadec.c | 34 ++++++++++++++++++++++++++++++++++ > 2 files changed, 35 insertions(+) > 83b42253e7a0ca4f220f658b0671e4056e719592 0006-matroskadec-read-timecode-= in-BlockAddition.patch > >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 >=20 > --- > libavformat/matroska.h | 1 + > libavformat/matroskadec.c | 34 ++++++++++++++++++++++++++++++++++ > 2 files changed, 35 insertions(+) >=20 > 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 =3D 0, > MATROSKA_BLOCK_ADD_ID_TYPE_OPAQUE =3D 1, > MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35 =3D 4, > + MATROSKA_BLOCK_ADD_ID_TYPE_SMPTE_12M =3D 121, > MATROSKA_BLOCK_ADD_ID_TYPE_DVCC =3D 0x64766343, // M= KBETAG('d','v','c','C') > MATROSKA_BLOCK_ADD_ID_TYPE_DVVC =3D 0x64767643, // M= KBETAG('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 { > =20 > uint32_t palette[AVPALETTE_COUNT]; > int has_palette; > + int add_block_timecode_count; > } MatroskaTrack; > =20 > typedef struct MatroskaAttachment { > @@ -2530,6 +2531,9 @@ static int mkv_parse_block_addition_mappings(AVForm= atContext *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 =3D mkv_parse_dvcc_dvvc(s, st, track, &mapping->ext= radata)) < 0) > @@ -3954,6 +3958,36 @@ static int matroska_parse_block_additional(Matrosk= aDemuxContext *matroska, > =20 > return 0; > } > + case MATROSKA_BLOCK_ADD_ID_TYPE_SMPTE_12M: { > + if (size < 8) { > + av_log(matroska->ctx, AV_LOG_WARNING, "SMPTE timecode from B= lockAdditional is malformed.\n"); > + break; > + } > + > + size_t sd_size =3D 0; > + uint8_t *sd =3D av_packet_get_side_data(pkt, AV_PKT_DATA_S12M_TI= MECODE, &sd_size); > + uint64_t count =3D sd ? *((uint64_t*)sd) : 0; > + if (!count) { > + sd_size =3D sizeof(uint64_t) * (1 + track->add_block_timecod= e_count); > + sd =3D av_packet_new_side_data(pkt, AV_PKT_DATA_S12M_TIMECOD= E, sd_size); > + count =3D 0; count is already 0 here > + } > + > + if (count >=3D track->add_block_timecode_count) { > + av_log(matroska->ctx, AV_LOG_DEBUG, "There are more timecode= s in the block than the count indicated in the track header, extra timecode= s are ignored.\n"); > + } > + else if (sd) { > + uint64_t tc =3D *((uint64_t*)data); is this aligned correctly for uint64_t ? > + av_log(matroska->ctx, AV_LOG_DEBUG, "Reading SMPTE timecode = =66rom BlockAdditional: 0x%016lX (RFC 5484)\n", tc); > + > + uint64_t *sd_64 =3D (uint64_t*)sd; > + count++; > + *sd_64 =3D count; > + AV_WB64(sd_64 + count, tc); > + } > + =20 Trailing whitespace > + return 0; > + } the {} is unneeded thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Concerning the gods, I have no means of knowing whether they exist or not or of what sort they may be, because of the obscurity of the subject, and the brevity of human life -- Protagoras --k1pM8Va43wmcQoxi Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCaMVPMwAKCRBhHseHBAsP q2n/AJ94aXwO52KC4IBl7iYJPhMZyJWRlgCeNXTISSZDGS5s/YmFw0IfK7VqKrg= =peAm -----END PGP SIGNATURE----- --k1pM8Va43wmcQoxi-- --===============4840515845194514423== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org --===============4840515845194514423==--