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 04DA74A4F6 for ; Tue, 30 Apr 2024 23:25:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 45B6768D63E; Wed, 1 May 2024 02:25:57 +0300 (EEST) Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A2DE68D4D8 for ; Wed, 1 May 2024 02:25:50 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 9B74F40004 for ; Tue, 30 Apr 2024 23:25:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1714519549; 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=+AlrMePa1EJtlmzQGa8jf0zCS9YuYRLE58pb3JkO+QI=; b=FQEoOqK+avcJfQFwK4XXRc4fi4uNVSB4u850h6niOjyOPzEdulkxf3hIHMLQOtA4eAd1eB cCinzfnDj7emDiXQW/Kz2BxGCwBSJM8X6KGrehIy2+EYS0I5jzVfmA/E54EkfbiR0y+H08 2lStxw8PFyycwIrywB91zXuqUOtqWGNYRg2ecoFz7W1hzdUChFMi47Pa+79AIeA39u6t+g PNINiVA0AW3ZFdhn8Uv+xJzrGxK2xvZ/9Oi+GyNdivTawCCaVugJDqzJdOz1Yu2k3U4hV0 0tFs6zfrbrzp5uvb8FVG1VHMaR5B/iD+owEjEZuerAskcMCvxG3/pxZmReOktw== Date: Wed, 1 May 2024 01:25:48 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20240430232548.GX6420@pb2> References: <20240427003623.118199-1-michael@niedermayer.cc> <20240427120705.GD6420@pb2> MIME-Version: 1.0 In-Reply-To: X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH] avformat/framecrcenc: compute the checksum for 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="===============0667526847352083950==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============0667526847352083950== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="KuTdKaFTihlTgDdX" Content-Disposition: inline --KuTdKaFTihlTgDdX Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Apr 28, 2024 at 12:43:50AM -0300, James Almer wrote: > On 4/27/2024 9:07 AM, Michael Niedermayer wrote: > > On Sat, Apr 27, 2024 at 12:44:18PM +0200, Andreas Rheinhardt wrote: > > > Michael Niedermayer: > > > > This allows detecting issues in side data related code, same as what > > > > framecrc does for before already for packet data itself. > > > >=20 > > > > Signed-off-by: Michael Niedermayer > > > > --- > > > > libavformat/framecrcenc.c | 76 +- > > > > tests/ref/fate/autorotate | 2 +- > > > > tests/ref/fate/cover-art-mp3-id3v2-remux | 2 +- > > > > tests/ref/fate/ffmpeg-bsf-input | 10 +- > > > > tests/ref/fate/force_key_frames-source | 784 ++++++------ > > > > tests/ref/fate/force_key_frames-source-drop | 34 +- > > > > tests/ref/fate/force_key_frames-source-dup | 1224 +++++++++-----= ----- > > > > tests/ref/fate/gapless-mp3 | 6 +- > > > > tests/ref/fate/h264_redundant_pps-side_data | 2 +- > > > > tests/ref/fate/iamf-5_1-copy | 208 ++-- > > > > tests/ref/fate/iamf-5_1-demux | 208 ++-- > > > > tests/ref/fate/id3v2-priv-remux | 2 +- > > > > tests/ref/fate/matroska-hdr10-plus-remux | 2 +- > > > > tests/ref/fate/matroska-ogg-opus-remux | 2 +- > > > > tests/ref/fate/matroska-opus-remux | 2 +- > > > > tests/ref/fate/matroska-vp8-alpha-remux | 14 +- > > > > tests/ref/fate/mov-cover-image | 2 +- > > > > tests/ref/fate/segment-mp4-to-ts | 250 ++-- > > > > tests/ref/fate/shortest | 100 +- > > > > tests/ref/fate/webm-hdr10-plus-remux | 2 +- > > > > tests/ref/fate/webm-webvtt-remux | 24 +- > > > > 21 files changed, 1513 insertions(+), 1443 deletions(-) > > > >=20 > > > > diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c > > > > index ce306a6c498..e71bfbd8777 100644 > > > > --- a/libavformat/framecrcenc.c > > > > +++ b/libavformat/framecrcenc.c > > > > @@ -21,8 +21,10 @@ > > > > #include > > > > +#include "config.h" > > > > #include "libavutil/adler32.h" > > > > #include "libavutil/avstring.h" > > > > +#include "libavutil/intreadwrite.h" > > > > #include "libavcodec/codec_id.h" > > > > #include "libavcodec/codec_par.h" > > > > @@ -48,6 +50,17 @@ static int framecrc_write_header(struct AVFormat= Context *s) > > > > return ff_framehash_write_header(s); > > > > } > > > > +static av_unused void inline bswap(char *buf, int offset, int size) > > > > +{ > > > > + if (size =3D=3D 8) { > > > > + uint64_t val =3D AV_RN64(buf + offset); > > > > + AV_WN64(buf + offset, av_bswap64(val)); > > > > + } else if (size =3D=3D 4) { > > > > + uint32_t val =3D AV_RN32(buf + offset); > > > > + AV_WN32(buf + offset, av_bswap32(val)); > > > > + } > > > > +} > > > > + > > > > static int framecrc_write_packet(struct AVFormatContext *s, AVPac= ket *pkt) > > > > { > > > > uint32_t crc =3D av_adler32_update(0, pkt->data, pkt->size); > > > > @@ -58,11 +71,68 @@ static int framecrc_write_packet(struct AVForma= tContext *s, AVPacket *pkt) > > > > if (pkt->flags !=3D AV_PKT_FLAG_KEY) > > > > av_strlcatf(buf, sizeof(buf), ", F=3D0x%0X", pkt->flags); > > > > if (pkt->side_data_elems) { > > > > + int i; > > >=20 > > > This change is wrong. > > >=20 > > > > av_strlcatf(buf, sizeof(buf), ", S=3D%d", pkt->side_data_= elems); > > > > - for (int i =3D 0; i < pkt->side_data_elems; i++) { > > > > - av_strlcatf(buf, sizeof(buf), ", %8"SIZE_SPECIFIER, > > > > - pkt->side_data[i].size); > > > > + for (i=3D0; iside_data_elems; i++) { > > > > + const AVPacketSideData *const sd =3D &pkt->side_data[i= ]; > > > > + const uint8_t *data =3D sd->data; > > > > + uint32_t side_data_crc =3D 0; > > > > + > > > > + switch (sd->type) { > > > > +#if HAVE_BIGENDIAN > > > > + uint8_t bswap_buf[FFMAX(sizeof(AVCPBProperties), > > > > + sizeof(AVProducerReference= Time))]; > > > > + case AV_PKT_DATA_PALETTE: > > > > + case AV_PKT_DATA_REPLAYGAIN: > > > > + case AV_PKT_DATA_DISPLAYMATRIX: > > > > + case AV_PKT_DATA_STEREO3D: > > > > + case AV_PKT_DATA_AUDIO_SERVICE_TYPE: > > > > + case AV_PKT_DATA_FALLBACK_TRACK: > > > > + case AV_PKT_DATA_MASTERING_DISPLAY_METADATA: > > > > + case AV_PKT_DATA_SPHERICAL: > > > > + case AV_PKT_DATA_CONTENT_LIGHT_LEVEL: > > > > + case AV_PKT_DATA_S12M_TIMECODE: > > > > + for (size_t j =3D 0; j < sd->size / 4; j++) { > > > > + uint8_t buf[4]; > > > > + AV_WL32(buf, AV_RB32(sd->data + 4 * j)); > > > > + side_data_crc =3D av_adler32_update(side_data_= crc, buf, 4); > > > > + } > > > > + break; > > > > + case AV_PKT_DATA_CPB_PROPERTIES: > > > > +#define BSWAP(struct, field) bswap(bswap_buf, offsetof(struct, fie= ld), sizeof(((struct){0}).field)) > > > > + if (sd->size =3D=3D sizeof(AVCPBProperties)) { > > > > + memcpy(bswap_buf, sd->data, sizeof(AVCPBProper= ties)); > > > > + data =3D bswap_buf; > > > > + BSWAP(AVCPBProperties, max_bitrate); > > > > + BSWAP(AVCPBProperties, min_bitrate); > > > > + BSWAP(AVCPBProperties, avg_bitrate); > > > > + BSWAP(AVCPBProperties, buffer_size); > > > > + BSWAP(AVCPBProperties, vbv_delay); > > > > + } > > > > + goto pod; > > > > + case AV_PKT_DATA_PRFT: > > > > + if (sd->size =3D=3D sizeof(AVProducerReferenceTime= )) { > > > > + memcpy(bswap_buf, sd->data, sizeof(AVProducerR= eferenceTime)); > > > > + data =3D bswap_buf; > > > > + BSWAP(AVProducerReferenceTime, wallclock); > > > > + BSWAP(AVProducerReferenceTime, flags); > > > > + } > > > > + goto pod; > > > > + pod: > > > > +#endif > > > > + > > > > + default: > > > > + side_data_crc =3D av_adler32_update(0, data, sd->s= ize); > > > > + break; > > > > + case AV_PKT_DATA_IAMF_MIX_GAIN_PARAM: > > > > + case AV_PKT_DATA_IAMF_DEMIXING_INFO_PARAM: > > > > + case AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM: > > > > + side_data_crc =3D 0; > > > > + } > > > > + > > > > + av_strlcatf(buf, sizeof(buf), ", %8"SIZE_SPECIFIER", 0= x%08"PRIx32, > > > > + pkt->side_data[i].size, side_data_crc); > > > > } > > > > } > > > > av_strlcatf(buf, sizeof(buf), "\n"); > > >=20 > > > You should mention that you are basically reverting > > > c6ae560a18d67b9ddaa25a0338b7fb55e3312e57. > >=20 > > right, i didnt keep track of this as i just needed this locally > > for testing to be possible and at the time didnt expect to > > submit this to ffmpeg. But now 3 years later, it seems to make > > sense to see if people want this maybe. > >=20 > > To test side data, it IS needed to well test side data. > > But if people still want to not test side data in FFmpeg git. > > I can continue to be the only one testing side data :) > >=20 > > ill repost it with a reference to c6ae560a18d67b9ddaa25a0338b7fb55e3312= e57 > > and without the int i change, i did miss that. >=20 > I'm not against adding checksum for side data if it can be ensured it will > be the same on both little and big endian, 32bit and 64bit, If side data uses types that have a size that is platform dependant (except pointers). Thats probably a mistake that should be corrected on the next ABI bump. > but I'm against > skipping specific types like you did above with the IAMF ones. Or rather, > against printing 0 for them, which is misleading. I'd rather not print > anything for them after the size. ok, new patch sent thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB "Nothing to hide" only works if the folks in power share the values of you and everyone you know entirely and always will -- Tom Scott --KuTdKaFTihlTgDdX Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZjF99wAKCRBhHseHBAsP q5neAJ4opVsdZaA5Fyj5+pdPsvKrqKiPoACfQwtdpyWJpeHK5ZpM33AAgcMC47E= =wfhx -----END PGP SIGNATURE----- --KuTdKaFTihlTgDdX-- --===============0667526847352083950== 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". --===============0667526847352083950==--