ffmpeg | branch: master | Marth64 <mart...@proxyid.net> | Tue Jul 2 00:41:39 2024 -0500| [eb07a593d346b835df60fe923331c62e3aa10c22] | committer: Stefano Sabatini
avformat/dvdvideodec: Don't add chapter markers for empty/dummy PTTs Some discs (usually same ones with padding cells), also have empty padding PTTs / chapters to accompany them. This results, for example, in an extra chapter marker that starts and ends at 0 (no duration). Don't add these empty chapter markers. Signed-off-by: Marth64 <mart...@proxyid.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb07a593d346b835df60fe923331c62e3aa10c22 --- libavformat/dvdvideodec.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/libavformat/dvdvideodec.c b/libavformat/dvdvideodec.c index 28c6b1c27f..59b8762503 100644 --- a/libavformat/dvdvideodec.c +++ b/libavformat/dvdvideodec.c @@ -875,6 +875,9 @@ static int dvdvideo_chapters_setup_simple(AVFormatContext *s) for (int i = chapter_start - 1; i < chapter_end; i++) { uint64_t time_effective = c->play_state.pgc_pg_times_est[i] - c->play_state.nav_pts; + if (time_effective - time_prev == 0) + continue; + if (chapter_start != chapter_end && !avpriv_new_chapter(s, i, DVDVIDEO_TIME_BASE_Q, time_prev, time_effective, NULL)) { @@ -935,13 +938,16 @@ static int dvdvideo_chapters_setup_preindex(AVFormatContext *s) continue; } - if (!avpriv_new_chapter(s, nb_chapters, DVDVIDEO_TIME_BASE_Q, cur_chapter_offset, - cur_chapter_offset + cur_chapter_duration, NULL)) { - ret = AVERROR(ENOMEM); - goto end_close; + if (cur_chapter_duration > 0) { + if (!avpriv_new_chapter(s, nb_chapters, DVDVIDEO_TIME_BASE_Q, cur_chapter_offset, + cur_chapter_offset + cur_chapter_duration, NULL)) { + ret = AVERROR(ENOMEM); + goto end_close; + } + + nb_chapters++; } - nb_chapters++; cur_chapter_offset += cur_chapter_duration; cur_chapter_duration = state.vobu_duration; last_ptt = state.ptt; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
