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 2D01248337 for ; Sat, 27 Apr 2024 12:07:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC27068D2A7; Sat, 27 Apr 2024 15:07:13 +0300 (EEST) Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E3DB168CEBF for ; Sat, 27 Apr 2024 15:07:06 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 39C64C0002 for ; Sat, 27 Apr 2024 12:07:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1714219626; 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=6v3PC6pO79a48cW+Nb+eVlgLqIiaIE7YFOo6CMw5MJs=; b=hzp5KGdIVyDvW1Cwmrnf3N3Dr0kKO0J/+V/C0qDTHgKYC2pRzSb7WUKrIAJXEUqgmxJ46n lhHRp6mZZRWYkCxfiXgq48m+XX5HxrjeksZMsMX/BtX7WMu6z1a0vR9WsAS0gp+puTmjaN IbYBnzvXQ7IDrYy4AFQFFuORULIlKEKJAGM9NiyQJqJY+ZlzBehwddlRhnKH0YlKo6YxdI w1fhuL8X66izPN6tCPFtgiPUAkHFSTcO6L33I3Aa5SGOHRyW1IjLYSiAJn6QdZ8slWO71W 8UWy/ydzsnXEVpOIhMdU4rzaPDdn6CReFqACrFALfINdaPPBgTADjn8KETBvqA== Date: Sat, 27 Apr 2024 14:07:05 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20240427120705.GD6420@pb2> References: <20240427003623.118199-1-michael@niedermayer.cc> 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="===============1899924858127899470==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============1899924858127899470== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="bQv7/Ly3ZiHDw0aV" Content-Disposition: inline --bQv7/Ly3ZiHDw0aV Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 @@ > > =20 > > #include > > =20 > > +#include "config.h" > > #include "libavutil/adler32.h" > > #include "libavutil/avstring.h" > > +#include "libavutil/intreadwrite.h" > > =20 > > #include "libavcodec/codec_id.h" > > #include "libavcodec/codec_par.h" > > @@ -48,6 +50,17 @@ static int framecrc_write_header(struct AVFormatCont= ext *s) > > return ff_framehash_write_header(s); > > } > > =20 > > +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, AVPacket *= pkt) > > { > > uint32_t crc =3D av_adler32_update(0, pkt->data, pkt->size); > > @@ -58,11 +71,68 @@ static int framecrc_write_packet(struct AVFormatCon= text *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= ); > > =20 > > - 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(AVProducerReferenceTime= ))]; > > + 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, field),= sizeof(((struct){0}).field)) > > + if (sd->size =3D=3D sizeof(AVCPBProperties)) { > > + memcpy(bswap_buf, sd->data, sizeof(AVCPBProperties= )); > > + 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(AVProducerRefer= enceTime)); > > + 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->size); > > + 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", 0x%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. 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. 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 :) ill repost it with a reference to c6ae560a18d67b9ddaa25a0338b7fb55e3312e57 and without the int i change, i did miss that. thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB It is what and why we do it that matters, not just one of them. --bQv7/Ly3ZiHDw0aV Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZizqZQAKCRBhHseHBAsP q0jwAJ0cbEO7GBxGA6c3D5A9tEfBva4GmQCdHqmt3++xPjdA0FoNRAE4+GkE8FE= =v52P -----END PGP SIGNATURE----- --bQv7/Ly3ZiHDw0aV-- --===============1899924858127899470== 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". --===============1899924858127899470==--