From: Michael Niedermayer <michael@niedermayer.cc> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Subject: Re: [FFmpeg-devel] [PATCH] avformat/mov: correct 0 valued entries in stts Date: Tue, 28 Dec 2021 00:48:03 +0100 Message-ID: <20211227234803.GX2829255@pb2> (raw) In-Reply-To: <1df7ec4a-45cd-a6b7-2096-afaa19d09d08@gyani.pro> [-- Attachment #1.1: Type: text/plain, Size: 4664 bytes --] On Tue, Dec 28, 2021 at 01:33:54AM +0530, Gyan Doshi wrote: > > > On 2021-12-28 12:38 am, Michael Niedermayer wrote: > > On Mon, Dec 27, 2021 at 11:27:10AM +0530, Gyan Doshi wrote: > > > As per ISO 14496-12, sample duration of 0 is invalid except for > > > the last entry. > > > > > > In addition, also catch 0 value for sample count. > > > --- > > > libavformat/mov.c | 12 ++++++++++++ > > > 1 file changed, 12 insertions(+) > > > > > > diff --git a/libavformat/mov.c b/libavformat/mov.c > > > index 2aed6e80ef..fb7406cdd6 100644 > > > --- a/libavformat/mov.c > > > +++ b/libavformat/mov.c > > > @@ -2968,6 +2968,18 @@ static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom) > > > av_log(c->fc, AV_LOG_TRACE, "sample_count=%d, sample_duration=%d\n", > > > sample_count, sample_duration); > > > + if (!sample_count) { > > > + av_log(c->fc, AV_LOG_WARNING, "invalid sample count of 0 in stts for st %d at entry %u; changing to 1.\n", > > > + c->fc->nb_streams-1, i); > > > + sc->stts_data[i].count = sample_count = 1; > > > + } > > > + > > > + if (!sample_duration && i != entries-1) { > > > + av_log(c->fc, AV_LOG_WARNING, "invalid sample delta of 0 in stts for st %d at entry %u; changing to 1.\n", > > > + c->fc->nb_streams-1, i); > > > + sc->stts_data[i].duration = sample_duration = 1; > > > + } > > > + > > > duration+=(int64_t)sample_duration*(uint64_t)sample_count; > > > total_sample_count+=sample_count; > > This does not produce the same output > > tickets/2096/m.f4v > > > > videos/stretch.mov (2344 matches for "invalid" after this patch) > > > > tickets/976/CodecCopyFailing.mp4 > > > > But there are many more, some maybe even generated by FFmpeg > > Where do I find these files? https://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket976/CodecCopyFailing.mp4 https://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket2096/m.f4v i failed to find the 3rd online > > > Taking a step back, the problem started with > > 203b0e3561dea1ec459be226d805abe73e7535e5 > > which broke a real world file which was outside the specification > > Just to clarify, it did not break that file. That file uses stts in an > unusual way. > Before 2015, lavf exported packets with the same desync as the other > demuxers do so till today. > Andreas' patch added a hack to make it play in sync. My patch 203b0e356 > broke that hack. > The patch for max_stts_delta is a way to restore it back. > > > you then suggested a fix which crashed with some fuzzed files which > > where outside the specification > > > > and now this fix on top which changes real world files which > > are outside the specification > > > > I think, maybe you should consider the "outside the specification" > > more. The code above directly and intentionally changes values. > > So as a reviewer i have to ask the obvious, is that change a > > bugfix or a bug ? > > Not surprising that the output of out-of-spec files is different - that's > expected, intended and trivial. > It would be a bug if in-spec files were treated differently. FATE passes. > > If there's a specific / "correct" playback for these files like sync issues, > I'll see if I can restore it. First we need to find cases that broke. I certainly will not find every If a patch is writen with the goal "dont break any file" it would be easy But you said that changes are "expected, intended" so then my question as reviewer would be what about these expected changes ? Did it change any real files output? did it fix a bug? What is the idea behind the change ? please correct me if iam wrong but Here it seems you dont care what happens with changed files unless someone else finds such a file and reports it. (if its not in spec) And the idea seems that 0 is inconvenient so you change it to 1 Its not that 0 could fundamentally not be intended to mean 0 We are before a release and id like to fix the regression ATM objectively the only option i have is reverting 203b0e3561dea1ec459be226d805abe73e7535e5 can you provide another option ? something that fixes the regression without breaking something else ? PS: if you need random testfiles for testing arbitrary changes samples.ffmpeg.org should have alot and is also accessible with rsync so you dont need to wait and hope someone will spot an issue. thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB You can kill me, but you cannot change the truth. [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 195 bytes --] [-- Attachment #2: Type: text/plain, Size: 251 bytes --] _______________________________________________ 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".
next prev parent reply other threads:[~2021-12-27 23:48 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-12-27 5:57 Gyan Doshi 2021-12-27 6:38 ` "zhilizhao(赵志立)" 2021-12-27 6:43 ` "zhilizhao(赵志立)" 2021-12-27 19:08 ` Michael Niedermayer 2021-12-27 20:03 ` Gyan Doshi 2021-12-27 23:48 ` Michael Niedermayer [this message] 2021-12-28 16:56 ` Gyan Doshi 2021-12-29 12:28 ` Michael Niedermayer 2021-12-29 16:09 ` Gyan Doshi 2021-12-29 18:08 ` Michael Niedermayer 2021-12-30 4:37 ` Gyan Doshi 2021-12-30 14:16 ` Michael Niedermayer 2021-12-30 17:09 ` Gyan Doshi 2021-12-30 17:55 ` Michael Niedermayer 2021-12-30 18:12 ` Gyan Doshi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211227234803.GX2829255@pb2 \ --to=michael@niedermayer.cc \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git