Add prelimimary (basic, possibly broken) dvdnav support

This readds a more or less completely new dvdnav implementation, though
it's based on the code from before commit 41fbcee. Note that this is
rather basic, and might be broken or not quite usable in many cases.

Most importantly, navigation highlights are not correctly implemented.
This would require changes in the FFmpeg dvdsub decoder (to apply a
different internal CLUT), so supporting it is not really possible right
now. And in fact, I don't think I ever want to support it, because it's
a very small gain for a lot of work. Instead, mpv will display fake
highlights, which are an approximate bounding box around the real
highlights.

Some things like mouse input or switching audio/subtitles stream using
the dvdnav VM are not supported.

Might be quite fragile on transitions: if dvdnav initiates a transition,
and doesn't give us enough mpeg data to initialize video playback, the
player will just quit.

This is added only because some users seem to want it. I don't intend to
make mpv a good DVD player, so the very basic minimum will have to do.
How about you just convert your DVD to proper video files?

1 files changed, 9 insertions, 1 deletions

diff --git a/mpvcore/player/mp_core.h b/mpvcore/player/mp_core.h
index 607000cd5c..9827387e2c 100644
--- a/mpvcore/player/mp_core.h
+++ b/mpvcore/player/mp_core.h
@@ -47,6 +47,7 @@ enum stop_play_reason {
     PT_CURRENT_ENTRY,   // prepare to play mpctx->playlist->current
     PT_STOP,            // stop playback, clear playlist
     PT_RESTART,         // restart previous file
+    PT_RELOAD_DEMUXER,  // restart playback, but keep stream open
     PT_QUIT,            // stop playback, quit player
 };
 
@@ -310,7 +311,6 @@ typedef struct MPContext {
     struct ass_library *ass_library;
 
     int last_dvb_step;
-    int dvbin_reopen;
 
     bool paused;
     // step this many frames, then pause
@@ -329,6 +329,7 @@ typedef struct MPContext {
     struct command_ctx *command_ctx;
     struct encode_lavc_context *encode_lavc_ctx;
     struct lua_ctx *lua_ctx;
+    struct mp_nav_state *nav_state;
 } MPContext;
 
 // audio.c
@@ -354,6 +355,13 @@ void mp_write_watch_later_conf(struct MPContext *mpctx);
 struct playlist_entry *mp_resume_playlist(struct playlist *playlist,
                                           struct MPOpts *opts);
 
+// dvdnav.c
+void mp_nav_init(struct MPContext *mpctx);
+void mp_nav_reset(struct MPContext *mpctx);
+void mp_nav_destroy(struct MPContext *mpctx);
+void mp_nav_user_input(struct MPContext *mpctx, char *command);
+void mp_handle_nav(struct MPContext *mpctx);
+
 // loadfile.c
 void uninit_player(struct MPContext *mpctx, unsigned int mask);
 struct track *mp_add_subtitles(struct MPContext *mpctx, char *filename);