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 ESMTP id 4B9A44AFC1 for ; Thu, 30 May 2024 17:44:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3543E68D3D7; Thu, 30 May 2024 20:44:38 +0300 (EEST) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D50E68D231 for ; Thu, 30 May 2024 20:44:31 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id C882C240005 for ; Thu, 30 May 2024 17:44:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1717091071; 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=J2UPNlZoVnpwvVbSYqhi8kWM2UsPrR44yoVaBRaC68U=; b=euig4KTXhKvsBsi+sE0ybswMlSAg11HIncbpms2g6ZZ6UlqQc3Cdnc2ZkQYkawWNgPGv5u QbAn9oM+xS6NmAfUAmtPrPu5XLTk92wSw5R9ZLccfYseudZvMSp27zSHtUni2eSziVOOgK Ms9U6a6RXnJ49c5pZkcCS+ihe6A/YQGFWTj4UZjDUTK5IEGHo83HlCgTESyzVGtfG08+yB PR6LQDxCFjubJ5iMMDc20ZMyAwdo7Sx1yFsELr79cxggNWk/g4qJ2sfXzfcQn8jNE9o2Np UkWeYQvet29pWHCD8vMVBwTS3IOeN94qB1HGuq5mNK7NXDWrcMPb9iXUzs3YVA== Date: Thu, 30 May 2024 19:44:29 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20240530174429.GZ2821752@pb2> References: MIME-Version: 1.0 In-Reply-To: X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH v3] avformat/nutdec: Don't create inconsistent side data 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="===============0554348977321192728==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============0554348977321192728== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="27E2kr7c9faIxYHh" Content-Disposition: inline --27E2kr7c9faIxYHh Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, May 30, 2024 at 02:14:20AM +0200, Andreas Rheinhardt wrote: > Forgotten in 65ddc74988245a01421a63c5cffa4d900c47117c. >=20 > Signed-off-by: Andreas Rheinhardt > --- > libavformat/nutdec.c | 14 ++++---------- > 1 file changed, 4 insertions(+), 10 deletions(-) >=20 > diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c > index 0bb7f154db..34b7e3cb9a 100644 > --- a/libavformat/nutdec.c > +++ b/libavformat/nutdec.c > @@ -881,8 +881,6 @@ static int read_sm_data(AVFormatContext *s, AVIOConte= xt *bc, AVPacket *pkt, int > int count =3D ffio_read_varlen(bc); > int skip_start =3D 0; > int skip_end =3D 0; > - int channels =3D 0; > - int64_t channel_layout =3D 0; > int sample_rate =3D 0; > int width =3D 0; > int height =3D 0; > @@ -930,7 +928,7 @@ static int read_sm_data(AVFormatContext *s, AVIOConte= xt *bc, AVPacket *pkt, int > AV_WB64(dst, v64); > dst +=3D 8; > } else if (!strcmp(name, "ChannelLayout") && value_len =3D= =3D 8) { > - channel_layout =3D avio_rl64(bc); > + // Ignored > continue; > } else { > av_log(s, AV_LOG_WARNING, "Unknown data %s / %s\n", name= , type_str); > @@ -952,7 +950,7 @@ static int read_sm_data(AVFormatContext *s, AVIOConte= xt *bc, AVPacket *pkt, int > } else if (!strcmp(name, "SkipEnd")) { > skip_end =3D value; > } else if (!strcmp(name, "Channels")) { > - channels =3D value; > + // Ignored > } else if (!strcmp(name, "SampleRate")) { > sample_rate =3D value; > } else if (!strcmp(name, "Width")) { > @@ -965,18 +963,14 @@ static int read_sm_data(AVFormatContext *s, AVIOCon= text *bc, AVPacket *pkt, int > } > } > =20 > - if (channels || channel_layout || sample_rate || width || height) { > - uint8_t *dst =3D av_packet_new_side_data(pkt, AV_PKT_DATA_PARAM_= CHANGE, 28); > + if (sample_rate || width || height) { > + uint8_t *dst =3D av_packet_new_side_data(pkt, AV_PKT_DATA_PARAM_= CHANGE, 16); > if (!dst) > return AVERROR(ENOMEM); > bytestream_put_le32(&dst, > AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE*(!!sam= ple_rate) + > AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS*(!!(wid= th|height)) > ); > - if (channels) > - bytestream_put_le32(&dst, channels); > - if (channel_layout) > - bytestream_put_le64(&dst, channel_layout); > if (sample_rate) > bytestream_put_le32(&dst, sample_rate); > if (width || height){ This would break mid stream changes to the channel layout & channels when it is carried at format level only The commit message also does not adequately explain why such mid stream cha= nges are ignored thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Into a blind darkness they enter who follow after the Ignorance, they as if into a greater darkness enter who devote themselves to the Knowledge alone. -- Isha Upanishad --27E2kr7c9faIxYHh Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZli69wAKCRBhHseHBAsP q+jnAJ9KYsEyQIVIFr7Bq5kCpxIFkBMZ3wCfRyC8s59I5nXkgEKcXnNJJsEG06o= =QQzu -----END PGP SIGNATURE----- --27E2kr7c9faIxYHh-- --===============0554348977321192728== 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". --===============0554348977321192728==--