|author||wm4 <wm4@nowhere>||2013-12-12 01:44:28 +0100|
|committer||wm4 <wm4@nowhere>||2013-12-12 01:46:45 +0100|
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?
Diffstat (limited to 'demux/demux.c')
1 files changed, 3 insertions, 1 deletions
diff --git a/demux/demux.c b/demux/demux.c
index bfa999ab15..f1a468272d 100644
@@ -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",
@@ -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;
@@ -556,6 +557,7 @@ static struct demuxer *open_given_type(struct MPOpts *opts,
+ stream_seek(stream, stream->start_pos);