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 2F5354D1D8 for ; Mon, 30 Jun 2025 03:34:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 0937368DEF1; Mon, 30 Jun 2025 06:34:04 +0300 (EEST) Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 5231D68C25D for ; Mon, 30 Jun 2025 06:33:57 +0300 (EEST) Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-32ce252c3acso7133331fa.1 for ; Sun, 29 Jun 2025 20:33:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751254436; x=1751859236; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7LACWXT+LVkKA816EjzxJUlsDzpr/ysAtr2VgT+W4pY=; b=NNXwv6w4vYyOCng77UvCvf46jqt1GzZytCSXA1eA48YMiinAec4pEo71luWkHmW3fO tU+5c4yFqyVK8VYIslhbB5K0HAhp1dXNgn/7++2aTpScjBa5plxk7hDiNc5fD0vJpko3 5KZQKkNlWz+oyMhuApSXN8iAw7T2g9Mr/ia2A3ALRqygFOnGv2ALJyoKDB3++nOfuA7v lFsggH5MRRss1FdhYPSrld6wfGjsFHftAoBmTKF6A/U0wlWfDnWyhW/Izz4mM95k4jrg l5dZnO24lS6P1Rrn1wElCrkVkG8F4N0T5WUtGmdNK0jb85GnzgI+tN8XWOpkAWslxc8c oMtA== X-Gm-Message-State: AOJu0YxQ1tsqjhWi8W9EREhb/E1OFADi9vzoPwrll7oB9OEvJCbxQ3D8 ELluaN5KycLTrMRE2jmJkm8Lc26UjgvoPxUpDbR7P4XldpUze1a88TIISLkTGH5MOrcKOzm40Ae Q2pCRgiCDOxuaR4hXI8qm+LCPohazHbdRmg== X-Gm-Gg: ASbGncsVLD0RnILJlDXYZw7+2TnPNkhHPu9Mx4GBA5hh5oo0pKrulUuUhrUdQQqxeEH suyfzi+irjrtOYF0LN8jC2zBTrH2NePl/e/3aCVhP2Vt8RoycIZTNKeTRCrh5ujuzmNH3Elxeym JhbA8hi8Mf0BU9IwrFpL4a0q4SHy99z4hFE8NO3icoxKg= X-Google-Smtp-Source: AGHT+IENlp4hBFOw1U00YHnkUcBx463J32ZTEmrOoWamWFSjiPx6wPFhSpYB8ONKoqcLA504xX6tMnZk5zVtAEssG+E= X-Received: by 2002:a2e:7d13:0:b0:32b:76fe:134e with SMTP id 38308e7fff4ca-32cdc4ca7femr30393341fa.23.1751254435573; Sun, 29 Jun 2025 20:33:55 -0700 (PDT) MIME-Version: 1.0 References: <2C68074A-F28F-42DB-8346-E65A80F7DB6F@gmail.com> <2BA2B6A2-A0EE-491A-8651-99C9EE1641F9@gmail.com> <20250630004122.GW29660@pb2> In-Reply-To: <20250630004122.GW29660@pb2> From: Ken McGaugh Date: Mon, 30 Jun 2025 15:33:43 +1200 X-Gm-Features: Ac12FXy7cP7MEW6fzVik2SWKWJfk5r1-txWyPzv6UJSuj5cZ7cbOZ5x7eLk54VM Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="0000000000008b4eb20638c1b273" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [PATCH] avformat/mov.c: Fix to allow custom udta tags through when export_all option specified. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --0000000000008b4eb20638c1b273 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sorry about that. I just attached the patch directly. Please let me know if this still doesn't work. On Mon, 30 Jun 2025 at 12:41, Michael Niedermayer wrote: > On Sun, Jun 29, 2025 at 09:42:27AM +1200, Ken McGaugh wrote: > > On Sun, 29 Jun 2025 at 08:33, Ken McGaugh wrote: > > > > > On Sun, 29 Jun 2025 at 7:44=E2=80=AFAM, Baptiste Coudurier < > > > baptiste.coudurier-at-gmail.com@ffmpeg.org> wrote: > > > > > >> Hey Ken > > >> > > >> > On Jun 28, 2025, at 1:04=E2=80=AFAM, Ken McGaugh wrote: > > >> > > > >> > On Sat, 28 Jun 2025 at 13:52, Baptiste Coudurier < > > >> > baptiste.coudurier-at-gmail.com@ffmpeg.org > >> baptiste.coudurier-at-gmail.com@ffmpeg.org>> wrote: > > >> > > > >> >> Hi > > >> >> > > >> >>> On Jun 27, 2025, at 5:46=E2=80=AFPM, Ken McGaugh > wrote: > > >> >>> > > >> >>> Hi, first time contributing to ffmpeg so I hope I got this right= . > We > > >> use > > >> >>> custom udta tags in our pipeline but they were not coming throug= h > > >> >>> correctly. Looks like they were incorrectly being routed through > the > > >> code > > >> >>> path for "raw" data. > > >> >>> --- > > >> >>> libavformat/mov.c | 2 +- > > >> >>> 1 file changed, 1 insertion(+), 1 deletion(-) > > >> >>> > > >> >>> diff --git a/libavformat/mov.c b/libavformat/mov.c > > >> >>> index bd6b23466b..1b17f52a16 100644 > > >> >>> --- a/libavformat/mov.c > > >> >>> +++ b/libavformat/mov.c > > >> >>> @@ -484,7 +484,7 @@ retry: > > >> >>> return ret; > > >> >>> } > > >> >>> } else return 0; > > >> >>> - } else if (atom.size > 4 && key && !c->itunes_metadata && > !raw) { > > >> >>> + } else if (atom.size > 4 && !c->itunes_metadata && !raw) { > > >> >>> str_size =3D avio_rb16(pb); // string length > > >> >>> if (str_size > atom.size) { > > >> >>> raw =3D 1; > > >> >>> -- > > >> >>> 2.39.5 (Apple Git-154) > > >> >> > > >> >> Thanks! > > >> >> Would it be possible for you to share a small sample? > > >> >> > > >> >> > > >> > Certainly. Here is a sample .mov with a handful of custom udta > atoms. > > >> For > > >> > example, the '[169]tco' one should have the value "FrameNumber", b= ut > > >> > without this patch it is exported as an empty string. > > >> > > > >> > > > >> > https://drive.google.com/file/d/1KJgRueP26cuo1os2OaNqBz2u8-aeUbBS/view?us= p=3Dsharing > > >> > > > >> > > >> Thanks! > > >> I feel we should do "if (atom.size > 4 && (key || c->export_all) && > > >> !c->itunes_metadata && !raw=E2=80=9D to be safer. > > >> What do you think ? > > > > > > > > > That would definitely be safer. Thanks for catching that. Do you need > me > > > to submit an updated patch? > > > > > > > Here it is in case you need it from me. Thanks again for your prompt > review. > > > > --- > > libavformat/mov.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/libavformat/mov.c b/libavformat/mov.c > > index bd6b23466b..31ebcebca1 100644 > > --- a/libavformat/mov.c > > +++ b/libavformat/mov.c > > @@ -484,7 +484,7 @@ retry: > > return ret; > > } > > } else return 0; > > - } else if (atom.size > 4 && key && !c->itunes_metadata && !raw) { > > + } else if (atom.size > 4 && (key || c->export_all) && > > !c->itunes_metadata && !raw) { > > str_size =3D avio_rb16(pb); // string length > > theres a linebreak corrupting the patch, check your editors word / line > wrap settings > or attach patches > > thx > > [...] > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > For a strong democracy, genuine criticism is necessary, allegations benef= it > noone, they just cause unnecessary conflicts. - Narendra Modi > _______________________________________________ > 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". > --0000000000008b4eb20638c1b273 Content-Type: application/octet-stream; name="0001-Updated-patch-allowing-custom-udta-atoms-to-pass-thr.patch" Content-Disposition: attachment; filename="0001-Updated-patch-allowing-custom-udta-atoms-to-pass-thr.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_mcijnjy70 RnJvbSAzY2NlNTNiN2ZkNGYwZGQ1OTg3MjUwOWYzZTNjMGFjMGRjNDZkOWFkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW4gTWNHYXVnaCA8a2VuQG1jZ2F1Z2guY28udWs+CkRhdGU6 IFN1biwgMjkgSnVuIDIwMjUgMDk6Mzc6MjAgKzEyMDAKU3ViamVjdDogW1BBVENIXSBVcGRhdGVk IHBhdGNoIGFsbG93aW5nIGN1c3RvbSB1ZHRhIGF0b21zIHRvIHBhc3MgdGhyb3VnaAogdGhlaXIg dmFsdWVzIGNvcnJlY3RseSB3aGVuIGV4cG9ydF9hbGwgb3B0aW9uIHNwZWNpZmllZC4KCi0tLQog bGliYXZmb3JtYXQvbW92LmMgfCAyICstCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyks IDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9saWJhdmZvcm1hdC9tb3YuYyBiL2xpYmF2Zm9y bWF0L21vdi5jCmluZGV4IGJkNmIyMzQ2NmIuLjMxZWJjZWJjYTEgMTAwNjQ0Ci0tLSBhL2xpYmF2 Zm9ybWF0L21vdi5jCisrKyBiL2xpYmF2Zm9ybWF0L21vdi5jCkBAIC00ODQsNyArNDg0LDcgQEAg cmV0cnk6CiAgICAgICAgICAgICAgICAgcmV0dXJuIHJldDsKICAgICAgICAgICAgIH0KICAgICAg ICAgfSBlbHNlIHJldHVybiAwOwotICAgIH0gZWxzZSBpZiAoYXRvbS5zaXplID4gNCAmJiBrZXkg JiYgIWMtPml0dW5lc19tZXRhZGF0YSAmJiAhcmF3KSB7CisgICAgfSBlbHNlIGlmIChhdG9tLnNp emUgPiA0ICYmIChrZXkgfHwgYy0+ZXhwb3J0X2FsbCkgJiYgIWMtPml0dW5lc19tZXRhZGF0YSAm JiAhcmF3KSB7CiAgICAgICAgIHN0cl9zaXplID0gYXZpb19yYjE2KHBiKTsgLy8gc3RyaW5nIGxl bmd0aAogICAgICAgICBpZiAoc3RyX3NpemUgPiBhdG9tLnNpemUpIHsKICAgICAgICAgICAgIHJh dyA9IDE7Ci0tIAoyLjM5LjUgKEFwcGxlIEdpdC0xNTQpCgo= --0000000000008b4eb20638c1b273 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". --0000000000008b4eb20638c1b273--