mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

stream_dvd/stream_dvdnav: make disc-title for DVDs start from 0

Browse Source 
This commit makes 'disc-title' properties for DVDs start from 0.
There was an inconsistency around 'disc-title' property between
DVDs (from 1) and Blu-rays (from 0). This fixes #648.

Signed-off-by: wm4 <wm4@nowhere>
This commit is contained in:
xylosper 2014-03-17 21:37:45 +09:00 committed by wm4
parent 065c301739
commit f811d43061
2 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
stream/stream_dvd.c
View File

@ -64,13 +64,13 @@ int dvd_angle=1;
static const dvd_priv_t stream_priv_dflts = { static const dvd_priv_t stream_priv_dflts = {
.cfg_title = 1, .cfg_title = 0,
}; };
#define OPT_BASE_STRUCT dvd_priv_t #define OPT_BASE_STRUCT dvd_priv_t
/// URL definition /// URL definition
static const m_option_t stream_opts_fields[] = { static const m_option_t stream_opts_fields[] = {
OPT_INTRANGE("title", cfg_title, 0, 1, 99), OPT_INTRANGE("title", cfg_title, 0, 0, 99),
OPT_STRING("device", cfg_device, 0), OPT_STRING("device", cfg_device, 0),
{0} {0}
}; };
@ -404,7 +404,7 @@ static int mp_describe_titleset(stream_t *stream, dvd_reader_t *dvd, tt_srpt_t *
if (tt_srpt->title[title_no].title_set_nr != vts_no) if (tt_srpt->title[title_no].title_set_nr != vts_no)
continue; continue;
msec = mp_get_titleset_length(vts_file, tt_srpt, title_no); msec = mp_get_titleset_length(vts_file, tt_srpt, title_no);
MP_SMODE(stream, "ID_DVD_TITLE_%d_LENGTH=%d.%03d\n", title_no + 1, msec / 1000, msec % 1000); MP_SMODE(stream, "ID_DVD_TITLE_%d_LENGTH=%d.%03d\n", title_no, msec / 1000, msec % 1000);
} }
ifoClose(vts_file); ifoClose(vts_file);
return 1; return 1;
@ -555,7 +555,7 @@ static int dvd_seek_to_time(stream_t *stream, ifo_handle_t *vts_file, double sec
if(!vts_file->vts_tmapt || sec < 0) if(!vts_file->vts_tmapt || sec < 0)
return 0; return 0;
duration = (double) mp_get_titleset_length(d->vts_file, d->tt_srpt, d->cur_title-1) / 1000.0f; duration = (double) mp_get_titleset_length(d->vts_file, d->tt_srpt, d->cur_title) / 1000.0f;
if(sec > duration) if(sec > duration)
return 0; return 0;
@ -614,7 +614,7 @@ static int control(stream_t *stream,int cmd,void* arg)
{ {
case STREAM_CTRL_GET_TIME_LENGTH: case STREAM_CTRL_GET_TIME_LENGTH:
{ {
*((double *)arg) = (double) mp_get_titleset_length(d->vts_file, d->tt_srpt, d->cur_title-1)/1000.0; *((double *)arg) = (double) mp_get_titleset_length(d->vts_file, d->tt_srpt, d->cur_title)/1000.0;
return 1; return 1;
} }
case STREAM_CTRL_GET_START_TIME: case STREAM_CTRL_GET_START_TIME:
@ -630,7 +630,7 @@ static int control(stream_t *stream,int cmd,void* arg)
case STREAM_CTRL_GET_NUM_CHAPTERS: case STREAM_CTRL_GET_NUM_CHAPTERS:
{ {
int r; int r;
r = get_num_chapter(d->vts_file, d->tt_srpt, d->cur_title-1); r = get_num_chapter(d->vts_file, d->tt_srpt, d->cur_title);
if(! r) return STREAM_UNSUPPORTED; if(! r) return STREAM_UNSUPPORTED;
*((unsigned int *)arg) = r; *((unsigned int *)arg) = r;
return 1; return 1;
@ -638,26 +638,26 @@ static int control(stream_t *stream,int cmd,void* arg)
case STREAM_CTRL_GET_CHAPTER_TIME: case STREAM_CTRL_GET_CHAPTER_TIME:
{ {
int r; int r;
r = get_chapter_time(d->vts_file, d->tt_srpt, d->cur_title-1, (double *)arg); r = get_chapter_time(d->vts_file, d->tt_srpt, d->cur_title, (double *)arg);
if(! r) return STREAM_UNSUPPORTED; if(! r) return STREAM_UNSUPPORTED;
return 1; return 1;
} }
case STREAM_CTRL_SEEK_TO_CHAPTER: case STREAM_CTRL_SEEK_TO_CHAPTER:
{ {
int r; int r;
r = seek_to_chapter(stream, d->vts_file, d->tt_srpt, d->cur_title-1, *((unsigned int *)arg)); r = seek_to_chapter(stream, d->vts_file, d->tt_srpt, d->cur_title, *((unsigned int *)arg));
if(! r) return STREAM_UNSUPPORTED; if(! r) return STREAM_UNSUPPORTED;
return 1; return 1;
} }
case STREAM_CTRL_GET_CURRENT_TITLE: case STREAM_CTRL_GET_CURRENT_TITLE:
{ {
*((unsigned int *)arg) = d->cur_title - 1; *((unsigned int *)arg) = d->cur_title;
return 1; return 1;
} }
case STREAM_CTRL_GET_CURRENT_CHAPTER: case STREAM_CTRL_GET_CURRENT_CHAPTER:
{ {
*((unsigned int *)arg) = dvd_chapter_from_cell(d, d->cur_title-1, d->cur_cell); *((unsigned int *)arg) = dvd_chapter_from_cell(d, d->cur_title, d->cur_cell);
return 1; return 1;
} }
case STREAM_CTRL_GET_CURRENT_TIME: case STREAM_CTRL_GET_CURRENT_TIME:
@ -749,7 +749,7 @@ static int open_s(stream_t *stream, int mode)
dvd_priv_t *d = stream->priv; dvd_priv_t *d = stream->priv;
MP_VERBOSE(stream, "URL: %s\n", stream->url); MP_VERBOSE(stream, "URL: %s\n", stream->url);
dvd_title = d->cfg_title; dvd_title = d->cfg_title + 1;
if(1){ if(1){
//int ret,ret2; //int ret,ret2;
int ttn,pgc_id,pgn; int ttn,pgc_id,pgn;
@ -828,8 +828,8 @@ static int open_s(stream_t *stream, int mode)
MP_SMODE(stream, "ID_DVD_TITLES=%d\n", tt_srpt->nr_of_srpts); MP_SMODE(stream, "ID_DVD_TITLES=%d\n", tt_srpt->nr_of_srpts);
for (title_no = 0; title_no < tt_srpt->nr_of_srpts; title_no++) for (title_no = 0; title_no < tt_srpt->nr_of_srpts; title_no++)
{ {
MP_SMODE(stream, "ID_DVD_TITLE_%d_CHAPTERS=%d\n", title_no + 1, tt_srpt->title[title_no].nr_of_ptts); MP_SMODE(stream, "ID_DVD_TITLE_%d_CHAPTERS=%d\n", title_no, tt_srpt->title[title_no].nr_of_ptts);
MP_SMODE(stream, "ID_DVD_TITLE_%d_ANGLES=%d\n", title_no + 1, tt_srpt->title[title_no].nr_of_angles); MP_SMODE(stream, "ID_DVD_TITLE_%d_ANGLES=%d\n", title_no, tt_srpt->title[title_no].nr_of_angles);
} }
} }
if (mp_msg_test(stream->log, MSGL_SMODE)) if (mp_msg_test(stream->log, MSGL_SMODE))
@ -897,7 +897,7 @@ static int open_s(stream_t *stream, int mode)
d->vmg_file=vmg_file; d->vmg_file=vmg_file;
d->tt_srpt=tt_srpt; d->tt_srpt=tt_srpt;
d->vts_file=vts_file; d->vts_file=vts_file;
d->cur_title = dvd_title+1; d->cur_title = dvd_title;
pgc = vts_file->vts_pgcit ? vts_file->vts_pgcit->pgci_srp[ttn].pgc : NULL; pgc = vts_file->vts_pgcit ? vts_file->vts_pgcit->pgci_srp[ttn].pgc : NULL;
/** /**
@ -1073,10 +1073,10 @@ static int ifo_stream_open (stream_t *stream, int mode)
priv->cfg_device = talloc_strdup(NULL, dirname(stream->path)); priv->cfg_device = talloc_strdup(NULL, dirname(stream->path));
if(!strncasecmp(filename,"vts_",4)) if(!strncasecmp(filename,"vts_",4))
{ {
if(sscanf(filename+3, "_%02d_", &priv->cfg_title)!=1) if(sscanf(filename+3, "_%02d_", &priv->cfg_title)!=0)
priv->cfg_title = 1; priv->cfg_title = 0;
}else }else
priv->cfg_title = 1; priv->cfg_title = 0;
free(filename); free(filename);
stream->url=talloc_strdup(stream, "dvd://"); stream->url=talloc_strdup(stream, "dvd://");

28
stream/stream_dvdnav.c
View File

@ -39,6 +39,9 @@
#include "video/out/vo.h" #include "video/out/vo.h"
#include "stream_dvd_common.h" #include "stream_dvd_common.h"
#define TITLE_MENU -1
#define TITLE_LONGEST -2
struct priv { struct priv {
dvdnav_t *dvdnav; // handle to libdvdnav stuff dvdnav_t *dvdnav; // handle to libdvdnav stuff
char *filename; // path char *filename; // path
@ -58,11 +61,15 @@ struct priv {
char *device; char *device;
}; };
static const struct priv stream_priv_dflts = {
.track = TITLE_LONGEST,
};
#define OPT_BASE_STRUCT struct priv #define OPT_BASE_STRUCT struct priv
static const m_option_t stream_opts_fields[] = { static const m_option_t stream_opts_fields[] = {
OPT_CHOICE_OR_INT("title", track, 0, 1, 99, OPT_CHOICE_OR_INT("title", track, 0, 0, 99,
({"menu", -1}, ({"menu", TITLE_MENU},
{"longest", 0})), {"longest", TITLE_LONGEST})),
OPT_STRING("device", device, 0), OPT_STRING("device", device, 0),
{0} {0}
}; };
@ -532,12 +539,12 @@ static int control(stream_t *stream, int cmd, void *arg)
case STREAM_CTRL_GET_CURRENT_TITLE: { case STREAM_CTRL_GET_CURRENT_TITLE: {
if (dvdnav_current_title_info(dvdnav, &tit, &part) != DVDNAV_STATUS_OK) if (dvdnav_current_title_info(dvdnav, &tit, &part) != DVDNAV_STATUS_OK)
break; break;
*((unsigned int *) arg) = tit; *((unsigned int *) arg) = tit - 1;
return STREAM_OK; return STREAM_OK;
} }
case STREAM_CTRL_SET_CURRENT_TITLE: { case STREAM_CTRL_SET_CURRENT_TITLE: {
int title = *((unsigned int *) arg); int title = *((unsigned int *) arg);
if (dvdnav_title_play(priv->dvdnav, title) != DVDNAV_STATUS_OK) if (dvdnav_title_play(priv->dvdnav, title + 1) != DVDNAV_STATUS_OK)
break; break;
stream_drop_buffers(stream); stream_drop_buffers(stream);
return STREAM_OK; return STREAM_OK;
@ -681,7 +688,7 @@ static int open_s(stream_t *stream, int mode)
return STREAM_UNSUPPORTED; return STREAM_UNSUPPORTED;
} }
if (p->track == 0) { if (p->track == TITLE_LONGEST) { // longest
dvdnav_t *dvdnav = priv->dvdnav; dvdnav_t *dvdnav = priv->dvdnav;
uint64_t best_length = 0; uint64_t best_length = 0;
int best_title = -1; int best_title = -1;
@ -699,13 +706,13 @@ static int open_s(stream_t *stream, int mode)
} }
} }
} }
MP_INFO(stream, "Selecting title %d.\n", best_title); p->track = best_title - 1;
p->track = best_title; MP_INFO(stream, "Selecting title %d.\n", p->track);
} }
if (p->track > 0) { if (p->track >= 0) {
priv->title = p->track; priv->title = p->track;
if (dvdnav_title_play(priv->dvdnav, p->track) != DVDNAV_STATUS_OK) { if (dvdnav_title_play(priv->dvdnav, p->track + 1) != DVDNAV_STATUS_OK) {
MP_FATAL(stream, "dvdnav_stream, couldn't select title %d, error '%s'\n", MP_FATAL(stream, "dvdnav_stream, couldn't select title %d, error '%s'\n",
p->track, dvdnav_err_to_string(priv->dvdnav)); p->track, dvdnav_err_to_string(priv->dvdnav));
return STREAM_UNSUPPORTED; return STREAM_UNSUPPORTED;
@ -736,6 +743,7 @@ const stream_info_t stream_info_dvdnav = {
.open = open_s, .open = open_s,
.protocols = (const char*[]){ "dvdnav", NULL }, .protocols = (const char*[]){ "dvdnav", NULL },
.priv_size = sizeof(struct priv), .priv_size = sizeof(struct priv),
.priv_defaults = &stream_priv_dflts,
.options = stream_opts_fields, .options = stream_opts_fields,
.url_options = (const char*[]){ .url_options = (const char*[]){
"hostname=title", "hostname=title",