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?
2013-12-12 00:44:28 +00:00
|
|
|
/*
|
|
|
|
* 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>
|
|
|
|
|
2013-12-17 00:08:53 +00:00
|
|
|
#include "core.h"
|
2014-05-17 22:03:47 +00:00
|
|
|
#include "command.h"
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
|
2013-12-17 01:39:45 +00:00
|
|
|
#include "common/msg.h"
|
|
|
|
#include "common/common.h"
|
2013-12-17 00:23:09 +00:00
|
|
|
#include "input/input.h"
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
|
2014-03-30 02:42:49 +00:00
|
|
|
#include "stream/discnav.h"
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
|
|
|
|
#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;
|
|
|
|
|
2013-12-14 00:40:32 +00:00
|
|
|
int nav_still_frame;
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
bool nav_eof;
|
|
|
|
bool nav_menu;
|
2013-12-14 00:11:38 +00:00
|
|
|
bool nav_draining;
|
2014-01-18 00:19:20 +00:00
|
|
|
|
|
|
|
// Accessed by OSD (possibly separate thread)
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
int hi_visible;
|
|
|
|
int highlight[4]; // x0 y0 x1 y1
|
2014-01-18 00:19:20 +00:00
|
|
|
int vidsize[2];
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
int subsize[2];
|
|
|
|
struct sub_bitmap *hi_elem;
|
2014-03-28 15:00:02 +00:00
|
|
|
struct sub_bitmap *overlays[2];
|
|
|
|
struct sub_bitmap outputs[3];
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
};
|
|
|
|
|
2014-03-25 13:54:58 +00:00
|
|
|
static inline bool is_valid_size(int size[2]) {
|
|
|
|
return size[0] >= 1 && size[1] >= 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void update_resolution(struct MPContext *mpctx) {
|
|
|
|
struct mp_nav_state *nav = mpctx->nav_state;
|
|
|
|
if (!nav)
|
|
|
|
return;
|
|
|
|
if (mpctx->d_sub[0])
|
|
|
|
sub_control(mpctx->d_sub[0], SD_CTRL_GET_RESOLUTION, nav->vidsize);
|
|
|
|
if (!is_valid_size(nav->vidsize)) {
|
|
|
|
struct mp_image_params vid = {0};
|
|
|
|
if (mpctx->d_video)
|
|
|
|
vid = mpctx->d_video->decoder_output;
|
|
|
|
nav->vidsize[0] = vid.w;
|
|
|
|
nav->vidsize[1] = vid.h;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-17 22:03:47 +00:00
|
|
|
// Send update events and such.
|
|
|
|
static void update_state(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
mp_notify_property(mpctx, "disc-menu-active");
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return 1 if in menu, 0 if in video, or <0 if no navigation possible.
|
|
|
|
int mp_nav_in_menu(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
return mpctx->nav_state ? mpctx->nav_state->nav_menu : -1;
|
|
|
|
}
|
|
|
|
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
// 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
|
2013-12-13 21:41:21 +00:00
|
|
|
// navigation), this would skip some menu screens.
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
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);
|
2014-03-30 02:42:49 +00:00
|
|
|
mpctx->nav_state->log = mp_log_new(mpctx->nav_state, mpctx->log, "discnav");
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
|
|
|
|
MP_VERBOSE(mpctx->nav_state, "enabling\n");
|
|
|
|
|
2014-03-30 02:42:49 +00:00
|
|
|
mp_input_enable_section(mpctx->input, "discnav", 0);
|
|
|
|
mp_input_set_section_mouse_area(mpctx->input, "discnav-menu",
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
INT_MIN, INT_MIN, INT_MAX, INT_MAX);
|
2014-05-17 22:03:47 +00:00
|
|
|
|
|
|
|
update_state(mpctx);
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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);
|
2014-01-18 00:19:20 +00:00
|
|
|
osd_set_nav_highlight(mpctx->osd, NULL);
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
nav->hi_visible = 0;
|
|
|
|
nav->nav_menu = false;
|
2013-12-14 00:11:38 +00:00
|
|
|
nav->nav_draining = false;
|
2013-12-14 00:40:32 +00:00
|
|
|
nav->nav_still_frame = 0;
|
2014-03-30 02:42:49 +00:00
|
|
|
mp_input_disable_section(mpctx->input, "discnav-menu");
|
2013-12-14 00:11:38 +00:00
|
|
|
stream_control(mpctx->stream, STREAM_CTRL_RESUME_CACHE, NULL);
|
2014-05-17 22:03:47 +00:00
|
|
|
update_state(mpctx);
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void mp_nav_destroy(struct MPContext *mpctx)
|
|
|
|
{
|
2014-01-18 00:19:20 +00:00
|
|
|
osd_set_nav_highlight(mpctx->osd, NULL);
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
if (!mpctx->nav_state)
|
|
|
|
return;
|
2014-03-30 02:42:49 +00:00
|
|
|
mp_input_disable_section(mpctx->input, "discnav");
|
|
|
|
mp_input_disable_section(mpctx->input, "discnav-menu");
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
talloc_free(mpctx->nav_state);
|
|
|
|
mpctx->nav_state = NULL;
|
2014-05-17 22:03:47 +00:00
|
|
|
update_state(mpctx);
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void mp_nav_user_input(struct MPContext *mpctx, char *command)
|
|
|
|
{
|
|
|
|
struct mp_nav_state *nav = mpctx->nav_state;
|
|
|
|
if (!nav)
|
|
|
|
return;
|
2013-12-12 23:19:17 +00:00
|
|
|
if (strcmp(command, "mouse_move") == 0) {
|
|
|
|
struct mp_image_params vid = {0};
|
|
|
|
if (mpctx->d_video)
|
|
|
|
vid = mpctx->d_video->decoder_output;
|
|
|
|
struct mp_nav_cmd inp = {MP_NAV_CMD_MOUSE_POS};
|
|
|
|
int x, y;
|
|
|
|
mp_input_get_mouse_pos(mpctx->input, &x, &y);
|
|
|
|
osd_coords_to_video(mpctx->osd, vid.w, vid.h, &x, &y);
|
|
|
|
inp.u.mouse_pos.x = x;
|
|
|
|
inp.u.mouse_pos.y = y;
|
|
|
|
stream_control(mpctx->stream, STREAM_CTRL_NAV_CMD, &inp);
|
|
|
|
} else {
|
|
|
|
struct mp_nav_cmd inp = {MP_NAV_CMD_MENU};
|
|
|
|
inp.u.menu.action = command;
|
|
|
|
stream_control(mpctx->stream, STREAM_CTRL_NAV_CMD, &inp);
|
|
|
|
}
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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: {
|
2013-12-14 00:11:38 +00:00
|
|
|
nav->nav_draining = true;
|
|
|
|
MP_VERBOSE(nav, "drain requested\n");
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case MP_NAV_EVENT_RESET_ALL: {
|
|
|
|
mpctx->stop_play = PT_RELOAD_DEMUXER;
|
|
|
|
MP_VERBOSE(nav, "reload\n");
|
2014-03-25 13:41:28 +00:00
|
|
|
// return immediately.
|
|
|
|
// other events should be handled after reloaded.
|
2014-03-25 14:44:47 +00:00
|
|
|
talloc_free(ev);
|
2014-03-25 13:41:28 +00:00
|
|
|
return;
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
}
|
2013-12-14 00:40:32 +00:00
|
|
|
case MP_NAV_EVENT_RESET: {
|
|
|
|
nav->nav_still_frame = 0;
|
|
|
|
break;
|
|
|
|
}
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
case MP_NAV_EVENT_EOF:
|
|
|
|
nav->nav_eof = true;
|
|
|
|
break;
|
2013-12-14 00:40:32 +00:00
|
|
|
case MP_NAV_EVENT_STILL_FRAME: {
|
|
|
|
int len = ev->u.still_frame.seconds;
|
|
|
|
MP_VERBOSE(nav, "wait for %d seconds\n", len);
|
|
|
|
if (len > 0 && nav->nav_still_frame == 0)
|
|
|
|
nav->nav_still_frame = len;
|
|
|
|
break;
|
|
|
|
}
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
case MP_NAV_EVENT_MENU_MODE:
|
|
|
|
nav->nav_menu = ev->u.menu_mode.enable;
|
|
|
|
if (nav->nav_menu) {
|
2014-03-30 02:42:49 +00:00
|
|
|
mp_input_enable_section(mpctx->input, "discnav-menu",
|
2014-02-19 14:40:04 +00:00
|
|
|
MP_INPUT_ON_TOP);
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
} else {
|
2014-03-30 02:42:49 +00:00
|
|
|
mp_input_disable_section(mpctx->input, "discnav-menu");
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
}
|
2014-05-17 22:03:47 +00:00
|
|
|
update_state(mpctx);
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
break;
|
2014-01-18 00:19:20 +00:00
|
|
|
case MP_NAV_EVENT_HIGHLIGHT: {
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
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);
|
2014-01-18 00:19:20 +00:00
|
|
|
osd_set_nav_highlight(mpctx->osd, NULL);
|
2013-12-15 09:21:33 +00:00
|
|
|
nav->highlight[0] = ev->u.highlight.sx;
|
|
|
|
nav->highlight[1] = ev->u.highlight.sy;
|
|
|
|
nav->highlight[2] = ev->u.highlight.ex;
|
|
|
|
nav->highlight[3] = ev->u.highlight.ey;
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
nav->hi_visible = ev->u.highlight.display;
|
2014-03-25 13:54:58 +00:00
|
|
|
update_resolution(mpctx);
|
2014-01-18 00:19:20 +00:00
|
|
|
osd_set_nav_highlight(mpctx->osd, mpctx);
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
break;
|
2014-01-18 00:19:20 +00:00
|
|
|
}
|
2014-03-28 15:00:02 +00:00
|
|
|
case MP_NAV_EVENT_OVERLAY: {
|
|
|
|
osd_set_nav_highlight(mpctx->osd, NULL);
|
|
|
|
for (int i = 0; i < 2; i++) {
|
|
|
|
if (nav->overlays[i])
|
|
|
|
talloc_free(nav->overlays[i]);
|
|
|
|
nav->overlays[i] = talloc_steal(nav, ev->u.overlay.images[i]);
|
|
|
|
}
|
|
|
|
update_resolution(mpctx);
|
|
|
|
osd_set_nav_highlight(mpctx->osd, mpctx);
|
|
|
|
break;
|
|
|
|
}
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
default: ; // ignore
|
|
|
|
}
|
|
|
|
talloc_free(ev);
|
|
|
|
}
|
2013-12-14 00:40:32 +00:00
|
|
|
if (mpctx->stop_play == AT_END_OF_FILE) {
|
|
|
|
if (nav->nav_still_frame > 0) {
|
|
|
|
// gross hack
|
|
|
|
mpctx->time_frame += nav->nav_still_frame;
|
|
|
|
mpctx->playing_last_frame = true;
|
|
|
|
nav->nav_still_frame = -2;
|
|
|
|
} else if (nav->nav_still_frame == -2) {
|
|
|
|
struct mp_nav_cmd inp = {MP_NAV_CMD_SKIP_STILL};
|
|
|
|
stream_control(mpctx->stream, STREAM_CTRL_NAV_CMD, &inp);
|
|
|
|
}
|
|
|
|
}
|
2013-12-14 00:11:38 +00:00
|
|
|
if (nav->nav_draining && mpctx->stop_play == AT_END_OF_FILE) {
|
|
|
|
MP_VERBOSE(nav, "execute drain\n");
|
|
|
|
struct mp_nav_cmd inp = {MP_NAV_CMD_DRAIN_OK};
|
|
|
|
stream_control(mpctx->stream, STREAM_CTRL_NAV_CMD, &inp);
|
|
|
|
nav->nav_draining = false;
|
|
|
|
stream_control(mpctx->stream, STREAM_CTRL_RESUME_CACHE, NULL);
|
|
|
|
}
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
// 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.
|
2014-01-18 00:19:20 +00:00
|
|
|
void mp_nav_get_highlight(void *priv, struct mp_osd_res res,
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
struct sub_bitmaps *out_imgs)
|
|
|
|
{
|
2014-01-18 00:19:20 +00:00
|
|
|
struct MPContext *mpctx = priv;
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
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;
|
2014-03-25 13:54:58 +00:00
|
|
|
if (!is_valid_size(nav->vidsize)) {
|
|
|
|
update_resolution(mpctx);
|
|
|
|
if (!is_valid_size(nav->vidsize))
|
|
|
|
return;
|
|
|
|
}
|
2014-01-18 00:19:20 +00:00
|
|
|
int sizes[2] = {nav->vidsize[0], nav->vidsize[1]};
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
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));
|
2014-03-25 13:25:29 +00:00
|
|
|
nav->subsize[0] = sizes[0];
|
|
|
|
nav->subsize[1] = sizes[1];
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
}
|
|
|
|
|
2014-03-28 15:00:02 +00:00
|
|
|
out_imgs->num_parts = 0;
|
|
|
|
|
|
|
|
if (nav->hi_visible) {
|
|
|
|
sub->x = nav->highlight[0];
|
|
|
|
sub->y = nav->highlight[1];
|
|
|
|
sub->w = MPCLAMP(nav->highlight[2] - sub->x, 0, sizes[0]);
|
|
|
|
sub->h = MPCLAMP(nav->highlight[3] - sub->y, 0, sizes[1]);
|
|
|
|
sub->stride = sub->w * 4;
|
|
|
|
if (sub->w > 0 && sub->h > 0)
|
|
|
|
nav->outputs[out_imgs->num_parts++] = *sub;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nav->overlays[0])
|
|
|
|
nav->outputs[out_imgs->num_parts++] = *nav->overlays[0];
|
|
|
|
if (nav->overlays[1])
|
|
|
|
nav->outputs[out_imgs->num_parts++] = *nav->overlays[1];
|
|
|
|
|
|
|
|
if (out_imgs->num_parts) {
|
|
|
|
out_imgs->parts = nav->outputs;
|
|
|
|
out_imgs->format = SUBBITMAP_RGBA;
|
|
|
|
osd_rescale_bitmaps(out_imgs, sizes[0], sizes[1], res, -1);
|
|
|
|
}
|
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?
2013-12-12 00:44:28 +00:00
|
|
|
}
|