| Message ID | 20221228162844.197098-1-derek.buitenhuis@gmail.com |
|---|---|
| State | Accepted |
| Commit | dae3679a9bfa421829ef9049ae2167089a2fdef7 |
| Headers | show |
| Series | [FFmpeg-devel,RFC,CURSED] mov: Disable advanced_editlist for fragmented MP4 input | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On 12/28/2022 4:28 PM, Derek Buitenhuis wrote: > --- > libavformat/mov.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) Ping. - Derek
On 1/5/2023 7:44 PM, Derek Buitenhuis wrote: > On 12/28/2022 4:28 PM, Derek Buitenhuis wrote: >> --- >> libavformat/mov.c | 14 ++++++++++++++ >> 1 file changed, 14 insertions(+) > > Ping. Will push some time soon if there are no objections. - Derek
> 在 2023年1月8日，00:11，Derek Buitenhuis <derek.buitenhuis@gmail.com> 写道： > > On 1/5/2023 7:44 PM, Derek Buitenhuis wrote: >>> On 12/28/2022 4:28 PM, Derek Buitenhuis wrote: >>> --- >>> libavformat/mov.c | 14 ++++++++++++++ >>> 1 file changed, 14 insertions(+) >> >> Ping. > > Will push some time soon if there are no objections. LGTM. > > - Derek > _______________________________________________ > 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".
diff --git a/libavformat/mov.c b/libavformat/mov.c index 29bd3103e3..e0b7df2815 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4499,6 +4499,20 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom) avpriv_set_pts_info(st, 64, 1, sc->time_scale); + /* + * Advanced edit list support does not work with fragemented MP4s, which + * have stsc, stsz, stco, and stts with zero entries in the moov atom. + * In these files, trun atoms may be streamed in. + * + * It cannot be used with use_mfra_for = {pts,dts} either, as the index + * is not complete, but filled in as more trun atoms are read, as well. + */ + if (!sc->stts_count || c->use_mfra_for != FF_MOV_FLAG_MFRA_AUTO) { + av_log(c->fc, AV_LOG_WARNING, "advanced_editlist does not work with fragmented " + "MP4. disabling.\n"); + c->advanced_editlist = 0; + } + mov_build_index(c, st); if (sc->dref_id-1 < sc->drefs_count && sc->drefs[sc->dref_id-1].path) {
Advanced edit list support is entirely broken for fragmented MP4s, currently. mov_fix_index is never run in mov_build_index, since in fragmented MP4s the stco, stsz, stts, and stsc boxes have zero entries, with the index being filled in as each fragment's trun box is seen. The result of this is that the skip samples is never set properly, since half the code thinks it doesn't need to, as advanced_editlist is enabled, but as mov_fix_index is never called, it doesnt get set. This means that any edits for e.g. priming are not properly applied as skip samples side data. This also means remuxing to fragmented MP4 from progressive MP4 with lavf will quietly drop the edit list, currently. Example: $ ffmpeg -loglevel quiet -advanced_editlist 1 -i non_fragmented.mp4 -f md5 - MD5=d02d929f8eb4edef624758a298d5f7c6 $ ffmpeg -loglevel quiet -advanced_editlist 0 -i non_fragmented.mp4 -f md5 - MD5=d02d929f8eb4edef624758a298d5f7c6 $ ffmpeg -loglevel quiet -advanced_editlist 1 -i fragmented.mp4 -f md5 - MD5=e38b110f586fa886ff94e0ca98a95d59 <-- wrong, extra samples are output instead of being skipped $ ffmpeg -loglevel quiet -advanced_editlist 0 -i fragmented.mp4 -f md5 - MD5=d02d929f8eb4edef624758a298d5f7c6 We cannot call mov_fix_index after reading a trun box since mov_fix_index seems to assume it is only called once, on a fully complete index, an multiple calls to it don't seem like they'd work, so the "best" option seems to be disabling advanced edit list support entirely for the time being, as it is broken for these types of files. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> --- Obviously, I think this is a pretty gross 'fix', but short of a rewrite(-ish) of advanced edit list support, I don't know a better option. Ideas welcome. I've CCed the authors of advanced edit list support, although I am not sure if they're still around or involved in FFmpeg. Files from example above: * https://www.dropbox.com/s/zw626kck6d9eist/non_fragmented.mp4?dl=0 * https://www.dropbox.com/s/c46ajkqewqurdrz/fragmented.mp4?dl=0 --- libavformat/mov.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)