summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--demux/demux.c4
-rw-r--r--etc/input.conf13
-rw-r--r--mpvcore/input/input.c2
-rw-r--r--mpvcore/input/input.h2
-rw-r--r--mpvcore/options.c2
-rw-r--r--mpvcore/player/command.c10
-rw-r--r--mpvcore/player/configfiles.c2
-rw-r--r--mpvcore/player/dvdnav.c207
-rw-r--r--mpvcore/player/loadfile.c24
-rw-r--r--mpvcore/player/mp_core.h10
-rw-r--r--mpvcore/player/playloop.c5
-rw-r--r--mpvcore/player/sub.c2
-rwxr-xr-xold-configure21
-rw-r--r--old-makefile3
-rw-r--r--stream/cache.c1
-rw-r--r--stream/stream.c4
-rw-r--r--stream/stream.h3
-rw-r--r--stream/stream_dvdnav.c718
-rw-r--r--stream/stream_dvdnav.h81
-rw-r--r--sub/dec_sub.h1
-rw-r--r--sub/osd.c2
-rw-r--r--sub/osd.h8
-rw-r--r--sub/sd_lavc.c19
-rw-r--r--wscript4
-rw-r--r--wscript_build.py2
25 files changed, 1122 insertions, 28 deletions
diff --git a/demux/demux.c b/demux/demux.c
index bfa999ab15..f1a468272d 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -523,7 +523,6 @@ static struct demuxer *open_given_type(struct MPOpts *opts,
.metadata = talloc_zero(demuxer, struct mp_tags),
};
demuxer->params = params; // temporary during open()
- stream_seek(stream, stream->start_pos);
mp_msg(MSGT_DEMUXER, MSGL_V, "Trying demuxer: %s (force-level: %s)\n",
desc->name, d_level(check));
@@ -542,6 +541,8 @@ static struct demuxer *open_given_type(struct MPOpts *opts,
demuxer->ts_resets_possible = false;
// Doesn't work, because stream_pts is a "guess".
demuxer->accurate_seek = false;
+ // Can be seekable even if the stream isn't.
+ demuxer->seekable = true;
}
add_stream_chapters(demuxer);
demuxer_sort_chapters(demuxer);
@@ -556,6 +557,7 @@ static struct demuxer *open_given_type(struct MPOpts *opts,
}
free_demuxer(demuxer);
+ stream_seek(stream, stream->start_pos);
return NULL;
}
diff --git a/etc/input.conf b/etc/input.conf
index 6bbb6996b7..5c000bcd60 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -189,6 +189,19 @@
#JOY_BTN2 add volume 1
#JOY_BTN3 add volume -1
+# For dvdnav://
+
+# dvdnav controls during playback
+#ENTER {dvdnav} dvdnav menu # DVDNav MENU
+# BS {dvdnav} dvdnav prev # DVDNav PREVIOUS menu (in the order chapter->title->root)
+# dvdnav controls when showing menu (additionally to the controls above)
+#UP {dvdnav-menu} dvdnav up # DVDNav UP
+#DOWN {dvdnav-menu} dvdnav down # DVDNav DOWN
+#LEFT {dvdnav-menu} dvdnav left # DVDNav LEFT
+#RIGHT {dvdnav-menu} dvdnav right # DVDNav RIGHT
+#ENTER {dvdnav-menu} dvdnav select # DVDNav SELECT (ok)
+#MOUSE_MOVE {dvdnav-menu} ignore # block mouse events
+
#
# Not assigned by default
# (not an exhaustive list of unbound commands)
diff --git a/mpvcore/input/input.c b/mpvcore/input/input.c
index dbda34ed40..f6553e7ba4 100644
--- a/mpvcore/input/input.c
+++ b/mpvcore/input/input.c
@@ -241,6 +241,8 @@ static const struct mp_cmd_def mp_cmds[] = {
}},
{ MP_CMD_DISABLE_INPUT_SECTION, "disable_section", { ARG_STRING } },
+ { MP_CMD_DVDNAV, "dvdnav", { ARG_STRING } },
+
{ MP_CMD_AF, "af", { ARG_STRING, ARG_STRING } },
{ MP_CMD_VF, "vf", { ARG_STRING, ARG_STRING } },
diff --git a/mpvcore/input/input.h b/mpvcore/input/input.h
index 2465fe6010..13b86d227e 100644
--- a/mpvcore/input/input.h
+++ b/mpvcore/input/input.h
@@ -75,6 +75,8 @@ enum mp_command_type {
MP_CMD_ENABLE_INPUT_SECTION,
MP_CMD_DISABLE_INPUT_SECTION,
+ MP_CMD_DVDNAV,
+
/// DVB commands
MP_CMD_DVB_SET_CHANNEL,
diff --git a/mpvcore/options.c b/mpvcore/options.c
index 97a5a5e6dc..de7183014f 100644
--- a/mpvcore/options.c
+++ b/mpvcore/options.c
@@ -365,7 +365,7 @@ const m_option_t mp_opts[] = {
0, 40, ({"no", -1})),
{"cdrom-device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
-#if HAVE_DVDREAD
+#if HAVE_DVDREAD || HAVE_DVDNAV
{"dvd-device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"dvd-speed", &dvd_speed, CONF_TYPE_INT, 0, 0, 0, NULL},
{"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
diff --git a/mpvcore/player/command.c b/mpvcore/player/command.c
index 7f92c50bd9..05285e0111 100644
--- a/mpvcore/player/command.c
+++ b/mpvcore/player/command.c
@@ -2957,8 +2957,7 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd)
if (dvb_step_channel(mpctx->stream, dir)) {
- mpctx->stop_play = PT_NEXT_ENTRY;
- mpctx->dvbin_reopen = 1;
+ mpctx->stop_play = PT_RELOAD_DEMUXER;
}
}
#endif /* HAVE_DVBIN */
@@ -2989,8 +2988,7 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd)
if (dvb_set_channel(mpctx->stream, cmd->args[1].v.i,
cmd->args[0].v.i)) {
- mpctx->stop_play = PT_NEXT_ENTRY;
- mpctx->dvbin_reopen = 1;
+ mpctx->stop_play = PT_RELOAD_DEMUXER;
}
}
break;
@@ -3087,6 +3085,10 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd)
mp_input_disable_section(mpctx->input, cmd->args[0].v.s);
break;
+ case MP_CMD_DVDNAV:
+ mp_nav_user_input(mpctx, cmd->args[0].v.s);
+ break;
+
case MP_CMD_VO_CMDLINE:
if (mpctx->video_out) {
char *s = cmd->args[0].v.s;
diff --git a/mpvcore/player/configfiles.c b/mpvcore/player/configfiles.c
index 31e3d0e75d..21450b482d 100644
--- a/mpvcore/player/configfiles.c
+++ b/mpvcore/player/configfiles.c
@@ -201,7 +201,7 @@ char *mp_get_playback_resume_config_filename(const char *fname,
goto exit;
realpath = mp_path_join(tmp, bstr0(cwd), bstr0(fname));
}
-#if HAVE_DVDREAD
+#if HAVE_DVDREAD || HAVE_DVDNAV
if (bstr_startswith0(bfname, "dvd://"))
realpath = talloc_asprintf(tmp, "%s - %s", realpath, dvd_device);
#endif
diff --git a/mpvcore/player/dvdnav.c b/mpvcore/player/dvdnav.c
new file mode 100644
index 0000000000..879bacd1c1
--- /dev/null
+++ b/mpvcore/player/dvdnav.c
@@ -0,0 +1,207 @@
+/*
+ * This file is part of mpv.
+ *
+ * mpv is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * mpv is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with mpv. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <limits.h>
+#include <assert.h>
+
+#include "mp_core.h"
+
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/mp_common.h"
+#include "mpvcore/input/input.h"
+
+#include "stream/stream_dvdnav.h"
+
+#include "sub/dec_sub.h"
+#include "sub/osd.h"
+
+#include "video/mp_image.h"
+#include "video/decode/dec_video.h"
+
+struct mp_nav_state {
+ struct mp_log *log;
+
+ bool nav_still_frame;
+ bool nav_eof;
+ bool nav_menu;
+ int hi_visible;
+ int highlight[4]; // x0 y0 x1 y1
+ int subsize[2];
+ struct sub_bitmap *hi_elem;
+};
+
+// Allocate state and enable navigation features. Must happen before
+// initializing cache, because the cache would read data. Since stream_dvdnav is
+// in a mode which skips all transitions on reading data (before enabling
+// data), this would skip stuff.
+void mp_nav_init(struct MPContext *mpctx)
+{
+ assert(!mpctx->nav_state);
+
+ // dvdnav is interactive
+ if (mpctx->encode_lavc_ctx)
+ return;
+
+ struct mp_nav_cmd inp = {MP_NAV_CMD_ENABLE};
+ if (stream_control(mpctx->stream, STREAM_CTRL_NAV_CMD, &inp) < 1)
+ return;
+
+ mpctx->nav_state = talloc_zero(NULL, struct mp_nav_state);
+ mpctx->nav_state->log = mp_log_new(mpctx->nav_state, mpctx->log, "dvdnav");
+
+ MP_VERBOSE(mpctx->nav_state, "enabling\n");
+
+ mp_input_enable_section(mpctx->input, "dvdnav", 0);
+ mp_input_set_section_mouse_area(mpctx->input, "dvdnav-menu",
+ INT_MIN, INT_MIN, INT_MAX, INT_MAX);
+}
+
+void mp_nav_reset(struct MPContext *mpctx)
+{
+ struct mp_nav_state *nav = mpctx->nav_state;
+ if (!nav)
+ return;
+ struct mp_nav_cmd inp = {MP_NAV_CMD_RESUME};
+ stream_control(mpctx->stream, STREAM_CTRL_NAV_CMD, &inp);
+ nav->hi_visible = 0;
+ nav->nav_menu = false;
+ mp_input_disable_section(mpctx->input, "dvdnav-menu");
+ // Prevent demuxer init code to seek to the "start"
+ if (mpctx->stream)
+ mpctx->stream->start_pos = stream_tell(mpctx->stream);
+}
+
+void mp_nav_destroy(struct MPContext *mpctx)
+{
+ if (!mpctx->nav_state)
+ return;
+ mp_input_disable_section(mpctx->input, "dvdnav");
+ mp_input_disable_section(mpctx->input, "dvdnav-menu");
+ talloc_free(mpctx->nav_state);
+ mpctx->nav_state = NULL;
+}
+
+void mp_nav_user_input(struct MPContext *mpctx, char *command)
+{
+ struct mp_nav_state *nav = mpctx->nav_state;
+ if (!nav)
+ return;
+ struct mp_nav_cmd inp = {MP_NAV_CMD_MENU};
+ inp.u.menu.action = command;
+ stream_control(mpctx->stream, STREAM_CTRL_NAV_CMD, &inp);
+}
+
+void mp_handle_nav(struct MPContext *mpctx)
+{
+ struct mp_nav_state *nav = mpctx->nav_state;
+ if (!nav)
+ return;
+ while (1) {
+ struct mp_nav_event *ev = NULL;
+ stream_control(mpctx->stream, STREAM_CTRL_GET_NAV_EVENT, &ev);
+ if (!ev)
+ break;
+ switch (ev->event) {
+ case MP_NAV_EVENT_DRAIN: {
+ struct mp_nav_cmd inp = {MP_NAV_CMD_DRAIN_OK};
+ stream_control(mpctx->stream, STREAM_CTRL_NAV_CMD, &inp);
+ MP_VERBOSE(nav, "drain\n");
+ break;
+ }
+ case MP_NAV_EVENT_RESET_ALL: {
+ mpctx->stop_play = PT_RELOAD_DEMUXER;
+ MP_VERBOSE(nav, "reload\n");
+ break;
+ }
+ case MP_NAV_EVENT_EOF:
+ nav->nav_eof = true;
+ break;
+ case MP_NAV_EVENT_MENU_MODE:
+ nav->nav_menu = ev->u.menu_mode.enable;
+ if (nav->nav_menu) {
+ mp_input_enable_section(mpctx->input, "dvdnav-menu", 0);
+ } else {
+ mp_input_disable_section(mpctx->input, "dvdnav-menu");
+ }
+ break;
+ case MP_NAV_EVENT_HIGHLIGHT:
+ MP_VERBOSE(nav, "highlight: %d %d %d - %d %d\n",
+ ev->u.highlight.display,
+ ev->u.highlight.sx, ev->u.highlight.sy,
+ ev->u.highlight.ex, ev->u.highlight.ey);
+ nav->highlight[0] = MPCLAMP(ev->u.highlight.sx, 0, 720);
+ nav->highlight[1] = MPCLAMP(ev->u.highlight.sy, 0, 480);
+ nav->highlight[2] = MPCLAMP(ev->u.highlight.ex, 0, 720);
+ nav->highlight[3] = MPCLAMP(ev->u.highlight.ey, 0, 480);
+ nav->hi_visible = ev->u.highlight.display;
+ mpctx->osd->highlight_priv = mpctx;
+ osd_changed(mpctx->osd, OSDTYPE_NAV_HIGHLIGHT);
+ break;
+ default: ; // ignore
+ }
+ talloc_free(ev);
+ }
+ // E.g. keep displaying still frames
+ if (mpctx->stop_play == AT_END_OF_FILE && !nav->nav_eof)
+ mpctx->stop_play = KEEP_PLAYING;
+}
+
+// Render "fake" highlights, because using actual dvd sub highlight elements
+// is too hard, and would require extra libavcodec to begin with.
+// Note: a proper solution would introduce something like
+// SD_CTRL_APPLY_DVDNAV, which would crop the vobsub frame,
+// and apply the current CLUT.
+void mp_nav_get_highlight(struct osd_state *osd, struct mp_osd_res res,
+ struct sub_bitmaps *out_imgs)
+{
+ struct MPContext *mpctx = osd->highlight_priv;
+ struct mp_nav_state *nav = mpctx ? mpctx->nav_state : NULL;
+ if (!nav)
+ return;
+ struct sub_bitmap *sub = nav->hi_elem;
+ if (!sub)
+ sub = talloc_zero(nav, struct sub_bitmap);
+
+ nav->hi_elem = sub;
+ int sizes[2] = {0};
+ if (mpctx->d_sub)
+ sub_control(mpctx->d_sub, SD_CTRL_GET_RESOLUTION, sizes);
+ if (sizes[0] < 1 || sizes[1] < 1) {
+ struct mp_image_params vid = {0};
+ if (mpctx->d_video)
+ vid = mpctx->d_video->decoder_output;
+ sizes[0] = vid.w;
+ sizes[1] = vid.h;
+ }
+ if (sizes[0] < 1 || sizes[1] < 1)
+ return;
+ if (sizes[0] != nav->subsize[0] || sizes[1] != nav->subsize[1]) {
+ talloc_free(sub->bitmap);
+ sub->bitmap = talloc_array(sub, uint32_t, sizes[0] * sizes[1]);
+ memset(sub->bitmap, 0x80, talloc_get_size(sub->bitmap));
+ }
+
+ sub->x = nav->highlight[0];
+ sub->y = nav->highlight[1];
+ sub->w = MPMAX(nav->highlight[2] - sub->x, 0);
+ sub->h = MPMAX(nav->highlight[3] - sub->y, 0);
+ sub->stride = sub->w;
+ out_imgs->format = SUBBITMAP_RGBA;
+ out_imgs->parts = sub;
+ out_imgs->num_parts = sub->w > 0 && sub->h > 0 && nav->hi_visible;
+ osd_rescale_bitmaps(out_imgs, sizes[0], sizes[1], res, -1);
+}
diff --git a/mpvcore/player/loadfile.c b/mpvcore/player/loadfile.c
index 00b6a4b97c..72d17086f9 100644
--- a/mpvcore/player/loadfile.c
+++ b/mpvcore/player/loadfile.c
@@ -477,7 +477,6 @@ void add_demuxer_tracks(struct MPContext *mpctx, struct demuxer *demuxer)
static void add_dvd_tracks(struct MPContext *mpctx)
{
-#if HAVE_DVDREAD
struct demuxer *demuxer = mpctx->demuxer;
struct stream *stream = demuxer->stream;
struct stream_dvd_info_req info;
@@ -500,7 +499,6 @@ static void add_dvd_tracks(struct MPContext *mpctx)
}
}
demuxer_enable_autoselect(demuxer);
-#endif
}
// Result numerically higher => better match. 0 == no match.
@@ -1078,6 +1076,9 @@ static void play_current_file(struct MPContext *mpctx)
goto terminate_playback;
}
+ // Must be called before enabling cache.
+ mp_nav_init(mpctx);
+
// CACHE2: initial prefill: 20% later: 5% (should be set by -cacheopts)
int res = stream_enable_cache_percent(&mpctx->stream,
opts->stream_cache_size,
@@ -1090,9 +1091,9 @@ static void play_current_file(struct MPContext *mpctx)
stream_set_capture_file(mpctx->stream, opts->stream_capture);
-#if HAVE_DVBIN
goto_reopen_demuxer: ;
-#endif
+
+ mp_nav_reset(mpctx);
//============ Open DEMUXERS --- DETECT file type =======================
@@ -1201,10 +1202,8 @@ goto_reopen_demuxer: ;
else
dir = DVB_CHANNEL_LOWER;
- if (dvb_step_channel(mpctx->stream, dir)) {
- mpctx->stop_play = PT_NEXT_ENTRY;
- mpctx->dvbin_reopen = 1;
- }
+ if (dvb_step_channel(mpctx->stream, dir))
+ mpctx->stop_play = PT_RELOAD_DEMUXER;
}
#endif
goto terminate_playback;
@@ -1268,19 +1267,18 @@ goto_reopen_demuxer: ;
MP_VERBOSE(mpctx, "EOF code: %d \n", mpctx->stop_play);
-#if HAVE_DVBIN
- if (mpctx->dvbin_reopen) {
- mpctx->stop_play = 0;
+ if (mpctx->stop_play == PT_RELOAD_DEMUXER) {
+ mpctx->stop_play = KEEP_PLAYING;
uninit_player(mpctx, INITIALIZED_ALL -
(INITIALIZED_PLAYBACK | INITIALIZED_STREAM | INITIALIZED_GETCH2 |
(opts->fixed_vo ? INITIALIZED_VO : 0)));
- mpctx->dvbin_reopen = 0;
goto goto_reopen_demuxer;
}
-#endif
terminate_playback: // don't jump here after ao/vo/getch initialization!
+ mp_nav_destroy(mpctx);
+
if (mpctx->stop_play == KEEP_PLAYING)
mpctx->stop_play = AT_END_OF_FILE;
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);
diff --git a/mpvcore/player/playloop.c b/mpvcore/player/playloop.c
index 359e38058e..b2eae3807c 100644
--- a/mpvcore/player/playloop.c
+++ b/mpvcore/player/playloop.c
@@ -1234,9 +1234,10 @@ void run_playloop(struct MPContext *mpctx)
}, true);
} else
mpctx->stop_play = AT_END_OF_FILE;
- sleeptime = 0;
}
+ mp_handle_nav(mpctx);
+
if (!mpctx->stop_play && !mpctx->restart_playback) {
// If no more video is available, one frame means one playloop iteration.
@@ -1269,6 +1270,8 @@ void run_playloop(struct MPContext *mpctx)
if (!mpctx->stop_play) {
double audio_sleep = 9;
+ if (mpctx->restart_playback)
+ sleeptime = 0;
if (mpctx->d_audio && !mpctx->paused) {
if (mpctx->ao->untimed) {
if (!video_left)
diff --git a/mpvcore/player/sub.c b/mpvcore/player/sub.c
index 2c6ec1dfc5..d3ce466121 100644
--- a/mpvcore/player/sub.c
+++ b/mpvcore/player/sub.c
@@ -133,7 +133,6 @@ void update_subtitles(struct MPContext *mpctx)
static void set_dvdsub_fake_extradata(struct dec_sub *dec_sub, struct stream *st,
int width, int height)
{
-#if HAVE_DVDREAD
if (!st)
return;
@@ -169,7 +168,6 @@ static void set_dvdsub_fake_extradata(struct dec_sub *dec_sub, struct stream *st
sub_set_extradata(dec_sub, s, strlen(s));
talloc_free(s);
-#endif
}
void reinit_subs(struct MPContext *mpctx)
diff --git a/old-configure b/old-configure
index 45e7add61b..63eaf1fd03 100755
--- a/old-configure
+++ b/old-configure
@@ -319,6 +319,7 @@ Optional features:
--disable-vcd disable VCD support [autodetect]
--disable-bluray disable Blu-ray support [autodetect]
--disable-dvdread disable libdvdread [autodetect]
+ --disable-dvdnav disable libdvdnav [autodetect]
--disable-enca disable ENCA charset oracle library [autodetect]
--disable-pthreads disable Posix threads support [autodetect]
--disable-libass disable subtitle rendering with libass [autodetect]
@@ -451,6 +452,7 @@ _libbs2b=auto
_vcd=auto
_bluray=auto
_dvdread=auto
+_dvdnav=auto
_lcms2=auto
_xinerama=auto
_vm=auto
@@ -639,6 +641,8 @@ for ac_option do
--disable-bluray) _bluray=no ;;
--enable-dvdread) _dvdread=yes ;;
--disable-dvdread) _dvdread=no ;;
+ --enable-dvdnav) _dvdnav=yes ;;
+ --disable-dvdnav) _dvdnav=no ;;
--enable-lcms2) _lcms2=yes ;;
--disable-lcms2) _lcms2=no ;;
--enable-xinerama) _xinerama=yes ;;
@@ -2467,6 +2471,21 @@ fi
echores "$_dvdread"
+echocheck "dvdnav"
+if test "$_dvdnav" = auto ; then
+ _dvdnav=no
+ pkg_config_add 'dvdnav >= 4.2.0' && _dvdnav=yes
+fi
+if test "$_dvdnav" = yes ; then
+ def_dvdnav='#define HAVE_DVDNAV 1'
+ inputmodules="dvdnav $inputmodules"
+else
+ def_dvdnav='#define HAVE_DVDNAV 0'
+ noinputmodules="dvdnav $noinputmodules"
+fi
+echores "$_dvdnav"
+
+
echocheck "libcdio"
if test "$_libcdio" = auto ; then
_libcdio=no
@@ -3249,6 +3268,7 @@ DSOUND = $_dsound
WASAPI = $_wasapi
DVBIN = $_dvbin
DVDREAD = $_dvdread
+DVDNAV = $_dvdnav
GL = $_gl
GL_COCOA = $_gl_cocoa
GL_WIN32 = $_gl_win32
@@ -3396,6 +3416,7 @@ $def_arch_x86_64
$def_bluray
$def_cdda
$def_dvdread
+$def_dvdnav
$def_vcd
diff --git a/old-makefile b/old-makefile
index f6108bac67..31fa13dd43 100644
--- a/old-makefile
+++ b/old-makefile
@@ -33,6 +33,8 @@ SOURCES-$(DVBIN) += stream/dvb_tune.c \
stream/stream_dvb.c
SOURCES-$(DVDREAD) += stream/stream_dvd.c \
stream/stream_dvd_common.c
+SOURCES-$(DVDNAV) += stream/stream_dvdnav.c \
+ stream/stream_dvd_common.c
SOURCES-$(HAVE_SYS_MMAN_H) += audio/filter/af_export.c
SOURCES-$(LADSPA) += audio/filter/af_ladspa.c
@@ -215,6 +217,7 @@ SOURCES = audio/audio.c \
mpvcore/player/audio.c \
mpvcore/player/configfiles.c \
mpvcore/player/command.c \
+ mpvcore/player/dvdnav.c \
mpvcore/player/loadfile.c \
mpvcore/player/main.c \
mpvcore/player/misc.c \
diff --git a/stream/cache.c b/stream/cache.c
index 2f66ccedc3..930e2c4ba7 100644
--- a/stream/cache.c
+++ b/stream/cache.c
@@ -377,6 +377,7 @@ static bool control_needs_flush(int stream_ctrl)
case STREAM_CTRL_SEEK_TO_TIME:
case STREAM_CTRL_SEEK_TO_CHAPTER:
case STREAM_CTRL_SET_ANGLE:
+ case STREAM_CTRL_SET_CURRENT_TITLE:
return true;
}
return false;
diff --git a/stream/stream.c b/stream/stream.c
index 74715970af..b7c373b6d4 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -74,6 +74,7 @@ extern const stream_info_t stream_info_avdevice;
extern const stream_info_t stream_info_file;
extern const stream_info_t stream_info_ifo;
extern const stream_info_t stream_info_dvd;
+extern const stream_info_t stream_info_dvdnav;
extern const stream_info_t stream_info_bluray;
extern const stream_info_t stream_info_rar_filter;
extern const stream_info_t stream_info_rar_entry;
@@ -107,6 +108,9 @@ static const stream_info_t *const stream_list[] = {
&stream_info_ifo,
&stream_info_dvd,
#endif
+#if HAVE_DVDNAV
+ &stream_info_dvdnav,
+#endif
#if HAVE_LIBBLURAY
&stream_info_bluray,
#endif
diff --git a/stream/stream.h b/stream/stream.h
index 6d43f02a7c..6182d6414d 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -89,6 +89,7 @@ enum stream_ctrl {
STREAM_CTRL_GET_NUM_TITLES,
STREAM_CTRL_GET_LANG,
STREAM_CTRL_GET_CURRENT_TITLE,
+ STREAM_CTRL_SET_CURRENT_TITLE,
STREAM_CTRL_GET_CACHE_SIZE,
STREAM_CTRL_GET_CACHE_FILL,
STREAM_CTRL_GET_CACHE_IDLE,
@@ -101,6 +102,8 @@ enum stream_ctrl {
STREAM_CTRL_SET_CONTENTS,
STREAM_CTRL_GET_METADATA,
STREAM_CTRL_GET_BASE_FILENAME,
+ STREAM_CTRL_GET_NAV_EVENT, // struct mp_nav_event**
+ STREAM_CTRL_NAV_CMD, // struct mp_nav_cmd*
};
struct stream_lang_req {
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
new file mode 100644
index 0000000000..b6a5aae554
--- /dev/null
+++ b/stream/stream_dvdnav.c
@@ -0,0 +1,718 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#include <libavutil/common.h>
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <assert.h>
+
+#include <dvdnav/dvdnav.h>
+
+#include "mpvcore/options.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/input/input.h"
+#include "mpvcore/m_option.h"
+#include "osdep/timer.h"
+#include "stream.h"
+#include "demux/demux.h"
+#include "stream_dvdnav.h"
+#include "video/out/vo.h"
+#include "stream_dvd_common.h"
+
+struct priv {
+ dvdnav_t *dvdnav; // handle to libdvdnav stuff
+ char *filename; // path
+ unsigned int duration; // in milliseconds
+ int mousex, mousey;
+ int title;
+ uint32_t spu_clut[16];
+ bool spu_clut_valid;
+ dvdnav_highlight_event_t hlev;
+ int still_length; // still frame duration
+ unsigned long next_event; // bitmask of events to return to player
+ bool suspended_read;
+ bool nav_enabled;
+ bool had_initial_vts;
+
+ int track;
+ char *device;
+};
+
+#define OPT_BASE_STRUCT struct priv
+static const m_option_t stream_opts_fields[] = {
+ OPT_INTRANGE("title", track, 0, 1, 99),
+ OPT_STRING("device", device, 0),
+ {0}
+};
+
+#define DNE(e) [e] = # e
+static char *mp_dvdnav_events[] = {
+ DNE(DVDNAV_BLOCK_OK),
+ DNE(DVDNAV_NOP),
+ DNE(DVDNAV_STILL_FRAME),
+ DNE(DVDNAV_SPU_STREAM_CHANGE),
+ DNE(DVDNAV_AUDIO_STREAM_CHANGE),
+ DNE(DVDNAV_VTS_CHANGE),
+ DNE(DVDNAV_CELL_CHANGE),
+ DNE(DVDNAV_NAV_PACKET),
+ DNE(DVDNAV_STOP),
+ DNE(DVDNAV_HIGHLIGHT),
+ DNE(DVDNAV_SPU_CLUT_CHANGE),
+ DNE(DVDNAV_HOP_CHANNEL),
+ DNE(DVDNAV_WAIT),
+};
+
+static char *mp_nav_cmd_types[] = {
+ DNE(MP_NAV_CMD_NONE),
+ DNE(MP_NAV_CMD_ENABLE),
+ DNE(MP_NAV_CMD_DRAIN_OK),
+ DNE(MP_NAV_CMD_RESUME),
+ DNE(MP_NAV_CMD_MENU),
+ DNE(MP_NAV_CMD_MOUSE_POS),
+};
+
+static char *mp_nav_event_types[] = {
+ DNE(MP_NAV_EVENT_NONE),
+ DNE(MP_NAV_EVENT_RESET),
+ DNE(MP_NAV_EVENT_RESET_CLUT),
+ DNE(MP_NAV_EVENT_RESET_ALL),
+ DNE(MP_NAV_EVENT_DRAIN),
+ DNE(MP_NAV_EVENT_STILL_FRAME),
+ DNE(MP_NAV_EVENT_HIGHLIGHT),
+ DNE(MP_NAV_EVENT_MENU_MODE),
+ DNE(MP_NAV_EVENT_EOF),
+};
+
+#define LOOKUP_NAME(array, i) \
+ (((i) >= 0 && (i) < MP_ARRAY_SIZE(array)) ? array[(i)] : "?")
+
+static void dvdnav_get_highlight(struct priv *priv, int display_mode)
+{
+ pci_t *pnavpci = NULL;
+ dvdnav_highlight_event_t *hlev = &(priv->hlev);
+ int btnum;
+
+ if (!priv || !priv->dvdnav)
+ return;
+
+ pnavpci = dvdnav_get_current_nav_pci(priv->dvdnav);
+ if (!pnavpci)
+ return;
+
+ dvdnav_get_current_highlight(priv->dvdnav, &(hlev->buttonN));
+ hlev->display = display_mode; /* show */
+
+ if (hlev->buttonN > 0 && pnavpci->hli.hl_gi.btn_ns > 0 && hlev->display) {
+ for (btnum = 0; btnum < pnavpci->hli.hl_gi.btn_ns; btnum++) {
+ btni_t *btni = &(pnavpci->hli.btnit[btnum]);
+
+ if (hlev->buttonN == btnum + 1) {
+ hlev->sx = FFMIN(btni->x_start, btni->x_end);
+ hlev->ex = FFMAX(btni->x_start, btni->x_end);
+ hlev->sy = FFMIN(btni->y_start, btni->y_end);
+ hlev->ey = FFMAX(btni->y_start, btni->y_end);
+
+ hlev->palette = (btni->btn_coln == 0) ?
+ 0 : pnavpci->hli.btn_colit.btn_coli[btni->btn_coln - 1][0];
+ break;
+ }
+ }
+ } else { /* hide button or no button */
+ hlev->sx = hlev->ex = 0;
+ hlev->sy = hlev->ey = 0;
+ hlev->palette = hlev->buttonN = 0;
+ }
+}
+
+static inline int dvdnav_get_duration(int length)
+{
+ return (length == 255) ? 0 : length * 1000;
+}
+
+static void handle_menu_input(stream_t *stream, const char *cmd)
+{
+ struct priv *priv = stream->priv;
+ dvdnav_t *nav = priv->dvdnav;
+ dvdnav_status_t status = DVDNAV_STATUS_ERR;
+ pci_t *pci = dvdnav_get_current_nav_pci(nav);
+
+ mp_msg(MSGT_CPLAYER, MSGL_V, "DVDNAV: input '%s'\n", cmd);
+
+ if (!pci)