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 CA86546AB2 for ; Sun, 18 May 2025 21:23:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id A996A68DBA9; Mon, 19 May 2025 00:23:31 +0300 (EEST) Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 2D93C68D15E for ; Mon, 19 May 2025 00:23:25 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 7AD3A43349 for ; Sun, 18 May 2025 21:23:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1747603404; 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=oZQ6K33yGUhtLgFPyzJA3YNr+pLiOFwIXH1pC5mylC4=; b=an2CNfIDQFXcc/X92Mlf9umBPRhBQ4hRsKZ0AdVbUQUKUvwv671WZ4jHmWmjUotiixOC+P 6ffcyBt7sZVFauC5U12NZoNhN0C2vLByrlp3ahuh+c8II1MRcXQ9dFucbpf7gOsu3Wou/M imxafj+BAMLmZU3D1NnrY8owSRrHcNJfbmIB6qTtJ6KbqSK+0nJkV9wIMoGXivkbrl+MaT h9IWgL5y0FuAPhSMKwORc7M/IQ5GS92W59pQc2MOoILhg7224808reo6/1SQlzmUaIw+6d VGxEiVjAQGIInTuiFwfjGTx9R9Q52FPPgXJDWm1z9OtuRzmpWfImqcm/sCSQOQ== Date: Sun, 18 May 2025 23:23:23 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20250518212323.GH29660@pb2> References: <20250518122639.2958966-1-michael@niedermayer.cc> MIME-Version: 1.0 In-Reply-To: X-GND-State: clean X-GND-Score: -70 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdefudelheekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdeftddmnecujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpeeigeektdejudffjefhteegjedtgeettefggedthfejgfevhfetgeekjedtvdfhveenucfkphepgedurdeiiedrieejrdduudefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieejrdduudefpdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH] avformat/framecrcenc: List types and checksums for 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="===============3395953125402766101==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============3395953125402766101== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="8A33kwWUmC+fncpD" Content-Disposition: inline --8A33kwWUmC+fncpD Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, May 18, 2025 at 11:43:14AM -0300, James Almer wrote: > On 5/18/2025 9:25 AM, Michael Niedermayer wrote: > > This allows detecting changes and regressions 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 | 116 +- > > tests/ref/fate/autorotate | 2 +- > > tests/ref/fate/cover-art-mp3-id3v2-remux | 2 +- > > tests/ref/fate/ffmpeg-bsf-input | 10 +- > > tests/ref/fate/ffmpeg-spec-disposition | 2 +- > > 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/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 +- > > 20 files changed, 1346 insertions(+), 1236 deletions(-) > >=20 > > diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c > > index 2ba20f3aab4..96c2a82eb2a 100644 > > --- a/libavformat/framecrcenc.c > > +++ b/libavformat/framecrcenc.c > > @@ -21,8 +21,11 @@ > > #include > > +#include "config.h" > > #include "libavutil/adler32.h" > > #include "libavutil/avstring.h" > > +#include "libavutil/intreadwrite.h" > > +#include "libavutil/hdr_dynamic_metadata.h" > > #include "libavcodec/codec_id.h" > > #include "libavcodec/codec_par.h" > > @@ -48,6 +51,20 @@ static int framecrc_write_header(struct AVFormatCont= ext *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)); > > + } else if (size =3D=3D 2) { > > + uint16_t val =3D AV_RN16(buf + offset); > > + AV_WN16(buf + offset, av_bswap16(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 +75,104 @@ static int framecrc_write_packet(struct AVFormatCo= ntext *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; > > av_strlcatf(buf, sizeof(buf), ", S=3D%d", pkt->side_data_elem= s); > > - 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) { >=20 > Wont this potentially introduce extra work for when we add new types? no, it will be less work because maintaining this in a seperate branch is the identical work but in addition its also the extra work due to the seperate branch. and it adds complexity if one wants to bisect. Every hour i have to spend maintaining this or anything else in a seperate branch is an hour less i spend on the ffmpeg core repository. Maybe I should write this in a more formal way to show it Developer_t =3D Michael_t + James_t + ... Case 1: Michael_t contains SD_t =3D time needed to maintain sidedata testing Michael_t contains SB_t =3D time needed to maintain a seperate branch w= ith side data testing and checksums Case 2: Developer_t contains SD_t =3D time needed to maintain sidedata testing In both cases Developer_t contains SD_t so it cancels out but in case 1, Developer_t also contains SB_t that is the time needed to maintain sidedata checksums in a seperate branch. So with a seperate branch the developers will have less time remainining thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB During times of universal deceit, telling the truth becomes a revolutionary act. -- George Orwell --8A33kwWUmC+fncpD Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCaCpPxwAKCRBhHseHBAsP q11eAJ9nN2hifBgpZW/fZfv6RjVmHp64rACfT6KA+oypwuY1lPwuqZ8Dl5H7lyE= =AySx -----END PGP SIGNATURE----- --8A33kwWUmC+fncpD-- --===============3395953125402766101== 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". --===============3395953125402766101==--