Message ID | 20230117093123.67731-1-martin@martin.st |
---|---|
State | Accepted |
Commit | 431f6260ac6408fdccfe06dd5276084b17c3557f |
Headers | show |
Series | [FFmpeg-devel] mov: Reduce the verbosity of the warning about fragmented MP4 vs advanced edit lists | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
On 1/17/2023 9:31 AM, Martin Storsjö wrote: > Only warn if the advanced_editlist option is enabled (it is enabled > by default though) so we don't print one warning for each track, and > demote the warning to AV_LOG_LEVEL_VERBOSE; this message does get > generated whenever parsing a fragmented MP4 file, regardless of > whether the file actually uses multiple edits or not. > > Later when parsing the mov structures, the demuxer does warn if > the file did contain multiple edits which would require the > advanced_editlist option enabled for decoding correctly. > > Adjust the warning message for the case when the file seemed like it > actually would have needed handling of advanced edit lists, to > reflect the fact that it doesn't help to try set the option as > it has been automatically disabled. > --- > libavformat/isom.h | 1 + > libavformat/mov.c | 20 ++++++++++++++------ > 2 files changed, 15 insertions(+), 6 deletions(-) LGTM. - Derek
On Mon, 23 Jan 2023, Derek Buitenhuis wrote: > On 1/17/2023 9:31 AM, Martin Storsjö wrote: >> Only warn if the advanced_editlist option is enabled (it is enabled >> by default though) so we don't print one warning for each track, and >> demote the warning to AV_LOG_LEVEL_VERBOSE; this message does get >> generated whenever parsing a fragmented MP4 file, regardless of >> whether the file actually uses multiple edits or not. >> >> Later when parsing the mov structures, the demuxer does warn if >> the file did contain multiple edits which would require the >> advanced_editlist option enabled for decoding correctly. >> >> Adjust the warning message for the case when the file seemed like it >> actually would have needed handling of advanced edit lists, to >> reflect the fact that it doesn't help to try set the option as >> it has been automatically disabled. >> --- >> libavformat/isom.h | 1 + >> libavformat/mov.c | 20 ++++++++++++++------ >> 2 files changed, 15 insertions(+), 6 deletions(-) > > LGTM. Pushed now, thanks! // Martin
diff --git a/libavformat/isom.h b/libavformat/isom.h index 64fb7065d5..5107b4eb74 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -286,6 +286,7 @@ typedef struct MOVContext { int use_absolute_path; int ignore_editlist; int advanced_editlist; + int advanced_editlist_autodisabled; int ignore_chapters; int seek_individually; int64_t next_root_atom; ///< offset of the next root atom diff --git a/libavformat/mov.c b/libavformat/mov.c index e0b7df2815..6ab43b00c6 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4063,10 +4063,15 @@ static void mov_build_index(MOVContext *mov, AVStream *st) } } - if (multiple_edits && !mov->advanced_editlist) - av_log(mov->fc, AV_LOG_WARNING, "multiple edit list entries, " - "Use -advanced_editlist to correctly decode otherwise " - "a/v desync might occur\n"); + if (multiple_edits && !mov->advanced_editlist) { + if (mov->advanced_editlist_autodisabled) + av_log(mov->fc, AV_LOG_WARNING, "multiple edit list entries, " + "not supported in fragmented MP4 files\n"); + else + av_log(mov->fc, AV_LOG_WARNING, "multiple edit list entries, " + "Use -advanced_editlist to correctly decode otherwise " + "a/v desync might occur\n"); + } /* adjust first dts according to edit list */ if ((empty_duration || start_time) && mov->time_scale > 0) { @@ -4507,10 +4512,13 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom) * 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 " + if (!sc->stts_count || c->use_mfra_for != FF_MOV_FLAG_MFRA_AUTO && + c->advanced_editlist) { + + av_log(c->fc, AV_LOG_VERBOSE, "advanced_editlist does not work with fragmented " "MP4. disabling.\n"); c->advanced_editlist = 0; + c->advanced_editlist_autodisabled = 1; } mov_build_index(c, st);