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 ESMTPS id 63D944BE24 for ; Tue, 29 Apr 2025 21:35:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7789B68B017; Wed, 30 Apr 2025 00:35:19 +0300 (EEST) Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D6A92680069 for ; Wed, 30 Apr 2025 00:35:12 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 20CCA433E8 for ; Tue, 29 Apr 2025 21:35:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1745962512; 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=fCKDRywJxNRPwt/0tledVKGfkyQOy2SWy7b5ZO8KAP4=; b=lQ8VR1jX9zy9j6Eym4VsT4DhjxaMDtOTJ2bfRDrBU13WfVuY2iHfVPkkN05n1unfujMKjr M/kiDzpQS1gVg9e76QwC1xXevipkNwkCHavdZ5uYKXJ9tsL1ySJZniWLRmx5/vYxWPJ/TR duabzOJDOYPQAi0c+c12HBK4iEOnb1RV5MrReQWNhj9R4Kq0LwduRsT7nYrw3M7iRq5wvR ViUg08kjnA5vYOKvFBA4LZS4tfa0A6HsznlUxgGxQYZINxpWKEnQfsVk/WWs057+2x4e5S CuI5dtNlC3Zldbb+bB+O09MqafIZSqfikiX3QAp2/4WN4fZ6Vg7ZJ6p2FxDJRw== Date: Tue, 29 Apr 2025 23:35:11 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20250429213511.GR4991@pb2> References: <20250428233136.37007-1-romain.beauxis@gmail.com> <20250428233136.37007-3-romain.beauxis@gmail.com> MIME-Version: 1.0 In-Reply-To: <20250428233136.37007-3-romain.beauxis@gmail.com> X-GND-State: clean X-GND-Score: -70 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvieegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdeftddmnecujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpeeigeektdejudffjefhteegjedtgeettefggedthfejgfevhfetgeekjedtvdfhveenucfkphepgedurdeiiedrieejrdduudefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieejrdduudefpdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH v2 2/2] ogg/{vorbis, flac, opus}: Remove header packets from subsequent ogg streams from the demuxer output. 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: multipart/mixed; boundary="===============5079766191814424921==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============5079766191814424921== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="KglrOSqRiOmTMQnW" Content-Disposition: inline --KglrOSqRiOmTMQnW Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi On Mon, Apr 28, 2025 at 06:31:36PM -0500, Romain Beauxis wrote: > --- > libavformat/oggdec.c | 26 ++++++++++---------- > libavformat/oggdec.h | 6 +++++ > libavformat/oggparseflac.c | 28 ++++++++++++++++++++-- > libavformat/oggparseopus.c | 12 ++++++++++ > libavformat/oggparsevorbis.c | 12 ++++++++-- > tests/ref/fate/ogg-flac-chained-meta.txt | 2 -- > tests/ref/fate/ogg-opus-chained-meta.txt | 1 - > tests/ref/fate/ogg-vorbis-chained-meta.txt | 3 --- > 8 files changed, 68 insertions(+), 22 deletions(-) >=20 > diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c > index 5339fdd32c..5557eb4a14 100644 > --- a/libavformat/oggdec.c > +++ b/libavformat/oggdec.c > @@ -239,10 +239,6 @@ static int ogg_replace_stream(AVFormatContext *s, ui= nt32_t serial, char *magic, > os->start_trimming =3D 0; > os->end_trimming =3D 0; > =20 > - /* Chained files have extradata as a new packet */ > - if (codec =3D=3D &ff_opus_codec) > - os->header =3D -1; > - > return i; > } > =20 > @@ -605,20 +601,26 @@ static int ogg_packet(AVFormatContext *s, int *sid,= int *dstart, int *dsize, > } else { > os->pflags =3D 0; > os->pduration =3D 0; > + > + ret =3D 0; > if (os->codec && os->codec->packet) { > if ((ret =3D os->codec->packet(s, idx)) < 0) { > av_log(s, AV_LOG_ERROR, "Packet processing failed: %s\n"= , av_err2str(ret)); > return ret; > } > } > - if (sid) > - *sid =3D idx; > - if (dstart) > - *dstart =3D os->pstart; > - if (dsize) > - *dsize =3D os->psize; > - if (fpos) > - *fpos =3D os->sync_pos; > + > + if (!ret) { > + if (sid) > + *sid =3D idx; > + if (dstart) > + *dstart =3D os->pstart; > + if (dsize) > + *dsize =3D os->psize; > + if (fpos) > + *fpos =3D os->sync_pos; > + } > + > os->pstart +=3D os->psize; > os->psize =3D 0; > if(os->pstart =3D=3D os->bufpos) > diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h > index 43df23f4cb..09f698f99a 100644 > --- a/libavformat/oggdec.h > +++ b/libavformat/oggdec.h > @@ -38,6 +38,12 @@ struct ogg_codec { > * -1 if an error occurred or for unsupported stream > */ > int (*header)(AVFormatContext *, int); > + /** > + * Attempt to process a packet as a data packet > + * @return 1 if the packet was a header from a chained bitstream. > + * 0 if the packet was a regular data packet. > + * -1 if an error occurred or for unsupported stream > + */ > int (*packet)(AVFormatContext *, int); > /** > * Translate a granule into a timestamp. ok, but seems unrelated > diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c > index f25ed9cc15..d66b85b09e 100644 > --- a/libavformat/oggparseflac.c > +++ b/libavformat/oggparseflac.c > @@ -27,6 +27,8 @@ > #include "oggdec.h" > =20 > #define OGG_FLAC_METADATA_TYPE_STREAMINFO 0x7F > +#define OGG_FLAC_MAGIC "\177FLAC" > +#define OGG_FLAC_MAGIC_SIZE sizeof(OGG_FLAC_MAGIC)-1 factoring this out could be a seperate patch > =20 > static int > flac_header (AVFormatContext * s, int idx) > @@ -78,6 +80,27 @@ flac_header (AVFormatContext * s, int idx) > return 1; > } > =20 > +static int > +flac_packet (AVFormatContext * s, int idx) > +{ > + struct ogg *ogg =3D s->priv_data; > + struct ogg_stream *os =3D ogg->streams + idx; > + > + if (os->psize > OGG_FLAC_MAGIC_SIZE && > + !memcmp( > + os->buf + os->pstart, > + OGG_FLAC_MAGIC, > + OGG_FLAC_MAGIC_SIZE)) > + return 1; > + > + if (os->psize > 0 && > + ((os->buf[os->pstart] & 0x7F) =3D=3D FLAC_METADATA_TYPE_VORBIS_C= OMMENT)) { > + return 1; > + } > + > + return 0; > +} > + > static int > old_flac_header (AVFormatContext * s, int idx) > { > @@ -127,10 +150,11 @@ fail: > } > =20 > const struct ogg_codec ff_flac_codec =3D { > - .magic =3D "\177FLAC", > - .magicsize =3D 5, > + .magic =3D OGG_FLAC_MAGIC, > + .magicsize =3D OGG_FLAC_MAGIC_SIZE, > .header =3D flac_header, > .nb_header =3D 2, > + .packet =3D flac_packet, > }; > =20 > const struct ogg_codec ff_old_flac_codec =3D { > diff --git a/libavformat/oggparseopus.c b/libavformat/oggparseopus.c > index 218e9df581..07ddba8c82 100644 > --- a/libavformat/oggparseopus.c > +++ b/libavformat/oggparseopus.c > @@ -81,6 +81,7 @@ static int opus_header(AVFormatContext *avf, int idx) > if (priv->need_comments) { > if (os->psize < 8 || memcmp(packet, "OpusTags", 8)) > return AVERROR_INVALIDDATA; > + > ff_vorbis_stream_comment(avf, st, packet + 8, os->psize - 8); > priv->need_comments--; > return 1; stray change > @@ -125,6 +126,17 @@ static int opus_packet(AVFormatContext *avf, int idx) > return AVERROR_INVALIDDATA; > } > =20 > + if (os->psize > 8 && !memcmp(packet, "OpusHead", 8)) { > + if ((ret =3D ff_alloc_extradata(st->codecpar, os->psize)) < 0) > + return ret; > + > + memcpy(st->codecpar->extradata, packet, os->psize); > + return 1; > + } > + > + if (os->psize > 8 && !memcmp(packet, "OpusTags", 8)) > + return 1; > + > if ((!os->lastpts || os->lastpts =3D=3D AV_NOPTS_VALUE) && !(os->fla= gs & OGG_FLAG_EOS)) { > int seg, d; > int duration; > diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c > index 9f50ab9ffc..248ac4a416 100644 > --- a/libavformat/oggparsevorbis.c > +++ b/libavformat/oggparsevorbis.c > @@ -418,6 +418,7 @@ static int vorbis_packet(AVFormatContext *s, int idx) > struct ogg_stream *os =3D ogg->streams + idx; > struct oggvorbis_private *priv =3D os->private; > int duration, flags =3D 0; > + int skip_packet =3D 0; > =20 > if (!priv->vp) > return AVERROR_INVALIDDATA; > @@ -477,10 +478,17 @@ static int vorbis_packet(AVFormatContext *s, int id= x) > /* parse packet duration */ > if (os->psize > 0) { > duration =3D av_vorbis_parse_frame_flags(priv->vp, os->buf + os-= >pstart, 1, &flags); > + > if (duration < 0) { stray change [...] thx --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I am the wisest man alive, for I know one thing, and that is that I know nothing. -- Socrates --KglrOSqRiOmTMQnW Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCaBFGDwAKCRBhHseHBAsP q3aLAJ9SZBUpPOjqUxNxZ9riMmfnv6F5jgCfTQ9SdqNwRl7Vg4CQbc/Se1GaKog= =fIay -----END PGP SIGNATURE----- --KglrOSqRiOmTMQnW-- --===============5079766191814424921== 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 https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --===============5079766191814424921==--