[FFmpeg-cvslog] avformat/dvdvideodec: Do not EOF on WAIT events

[Marth64]

ffmpeg | branch: master | Marth64 <marth64 at proxyid.net> | Wed Jun 26 20:34:35 2024 -0500| [0c1c7688eacd1c8eba1e85757494c681442f2667] | committer: Stefano Sabatini

avformat/dvdvideodec: Do not EOF on WAIT events

A DVDNAV_WAIT event by itself should not warrant an
EOF when navigating the program stream. Some discs
have WAIT events in the middle of a title, causing
playback to end prematurely prior to this fix.

Signed-off-by: Marth64 <marth64 at proxyid.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c1c7688eacd1c8eba1e85757494c681442f2667
---

 libavformat/dvdvideodec.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/libavformat/dvdvideodec.c b/libavformat/dvdvideodec.c
index c94e7f7fe6..8326595e1b 100644
--- a/libavformat/dvdvideodec.c
+++ b/libavformat/dvdvideodec.c
@@ -814,8 +814,15 @@ static int dvdvideo_play_next_ps_block(AVFormatContext *s, DVDVideoPlaybackState
                 (*p_nav_event) = nav_event;
 
                 return nav_len;
-            case DVDNAV_STILL_FRAME:
             case DVDNAV_WAIT:
+                if (dvdnav_wait_skip(state->dvdnav) != DVDNAV_STATUS_OK) {
+                    av_log(s, AV_LOG_ERROR, "Unable to skip WAIT event\n");
+
+                    goto end_dvdnav_error;
+                }
+
+                continue;
+            case DVDNAV_STILL_FRAME:
             case DVDNAV_HOP_CHANNEL:
             case DVDNAV_HIGHLIGHT:
                 if (state->in_ps)
@@ -829,14 +836,6 @@ static int dvdvideo_play_next_ps_block(AVFormatContext *s, DVDVideoPlaybackState
                     }
                 }
 
-                if (nav_event == DVDNAV_WAIT) {
-                    if (dvdnav_wait_skip(state->dvdnav) != DVDNAV_STATUS_OK) {
-                        av_log(s, AV_LOG_ERROR, "Unable to skip WAIT event\n");
-
-                        goto end_dvdnav_error;
-                    }
-                }
-
                 continue;
             default:
                 continue;