annotate stream/stream_dvdnav.c @ 35419:d86249ebbcca

Don't unconditionally reset Track, Chapter and Angle after playback. Only do so if they had been used (i.e. the current StreamType makes use of them).
author ib
date Thu, 29 Nov 2012 14:23:26 +0000
parents 26eddbd6353a
children b5abdfe9bc61
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
30426
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29920
diff changeset
1 /*
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29920
diff changeset
2 * This file is part of MPlayer.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29920
diff changeset
3 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29920
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29920
diff changeset
5 * it under the terms of the GNU General Public License as published by
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29920
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29920
diff changeset
7 * (at your option) any later version.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29920
diff changeset
8 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29920
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29920
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29920
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29920
diff changeset
12 * GNU General Public License for more details.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29920
diff changeset
13 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29920
diff changeset
14 * You should have received a copy of the GNU General Public License along
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29920
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29920
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29920
diff changeset
17 */
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29920
diff changeset
18
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
19 #include "config.h"
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
20
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
21 #include <stdlib.h>
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
22 #include <stdio.h>
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
23 #include <unistd.h>
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
24 #include <string.h>
25031
5e1e61012a05 report why the dvd couldn't be opened. Patch by Jan Knutar jknutar+nic+fi
nicodvb
parents: 25025
diff changeset
25 #include <errno.h>
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
26 #include "mp_msg.h"
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
27 #include "osdep/timer.h"
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
28 #include "input/input.h"
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
29 #include "stream.h"
19312
ab8d6b6deb63 proper inclusion of demuxer.h (including libmpdemux in Makefile only was to make previous split easier)
ben
parents: 19302
diff changeset
30 #include "libmpdemux/demuxer.h"
25539
47f2a9304623 include dvdnav.h from its installation directory rather than appending
nicodvb
parents: 25536
diff changeset
31 #include <dvdnav/dvdnav.h>
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
32 #include "stream_dvdnav.h"
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
33 #include "libvo/video_out.h"
21193
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
34 #include "libavutil/common.h"
32456
728bd5c2aea7 Move spudec.[ch] to the sub directory.
cigaes
parents: 31876
diff changeset
35 #include "sub/spudec.h"
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
36 #include "m_option.h"
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
37 #include "m_struct.h"
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
38 #include "help_mp.h"
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
39 #include "stream_dvd_common.h"
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
40
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
41 /* state flags */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
42 typedef enum {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
43 NAV_FLAG_EOF = 1 << 0, /* end of stream has been reached */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
44 NAV_FLAG_WAIT = 1 << 1, /* wait event */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
45 NAV_FLAG_WAIT_SKIP = 1 << 2, /* wait skip disable */
26985
9ab366f856c1 rename for consistency
ben
parents: 26984
diff changeset
46 NAV_FLAG_CELL_CHANGE = 1 << 3, /* cell change event */
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
47 NAV_FLAG_WAIT_READ_AUTO = 1 << 4, /* wait read auto mode */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
48 NAV_FLAG_WAIT_READ = 1 << 5, /* suspend read from stream */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
49 NAV_FLAG_VTS_DOMAIN = 1 << 6, /* vts domain */
25827
3fc9f549b5d0 remove the spu_set field, replaced by a flag
ben
parents: 25826
diff changeset
50 NAV_FLAG_SPU_SET = 1 << 7, /* spu_clut is valid */
25830
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
51 NAV_FLAG_STREAM_CHANGE = 1 << 8, /* title, chapter, audio or SPU */
26983
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
52 NAV_FLAG_AUDIO_CHANGE = 1 << 9, /* audio stream change event */
26984
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
53 NAV_FLAG_SPU_CHANGE = 1 << 10, /* spu stream change event */
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
54 } dvdnav_state_t;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
55
25536
a7eec00ebb9c private structures belong to the C file using them, not to header files included somewhere else
nicodvb
parents: 25296
diff changeset
56 typedef struct {
a7eec00ebb9c private structures belong to the C file using them, not to header files included somewhere else
nicodvb
parents: 25296
diff changeset
57 dvdnav_t * dvdnav; /* handle to libdvdnav stuff */
a7eec00ebb9c private structures belong to the C file using them, not to header files included somewhere else
nicodvb
parents: 25296
diff changeset
58 char * filename; /* path */
a7eec00ebb9c private structures belong to the C file using them, not to header files included somewhere else
nicodvb
parents: 25296
diff changeset
59 unsigned int duration; /* in milliseconds */
a7eec00ebb9c private structures belong to the C file using them, not to header files included somewhere else
nicodvb
parents: 25296
diff changeset
60 int mousex, mousey;
a7eec00ebb9c private structures belong to the C file using them, not to header files included somewhere else
nicodvb
parents: 25296
diff changeset
61 int title;
25827
3fc9f549b5d0 remove the spu_set field, replaced by a flag
ben
parents: 25826
diff changeset
62 unsigned int spu_clut[16];
25536
a7eec00ebb9c private structures belong to the C file using them, not to header files included somewhere else
nicodvb
parents: 25296
diff changeset
63 dvdnav_highlight_event_t hlev;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
64 int still_length; /* still frame duration */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
65 unsigned int state;
25536
a7eec00ebb9c private structures belong to the C file using them, not to header files included somewhere else
nicodvb
parents: 25296
diff changeset
66 } dvdnav_priv_t;
a7eec00ebb9c private structures belong to the C file using them, not to header files included somewhere else
nicodvb
parents: 25296
diff changeset
67
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
68 static struct stream_priv_s {
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
69 int track;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
70 char* device;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
71 } stream_priv_dflts = {
19764
499e5525d706 if no track number specified play the whole disc, or the menus can't be shown at start
nicodvb
parents: 19477
diff changeset
72 0,
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
73 NULL
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
74 };
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
75
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
76 #define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f)
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
77 /// URL definition
25242
371a40dcc1cc stream_opts arrays should be const
reimar
parents: 25211
diff changeset
78 static const m_option_t stream_opts_fields[] = {
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
79 {"filename", ST_OFF(device), CONF_TYPE_STRING, 0, 0, 0, NULL },
27235
ea35e46aa7af in dvd streams the title part ranges from 1 to 99
nicodvb
parents: 26990
diff changeset
80 {"hostname", ST_OFF(track), CONF_TYPE_INT, M_OPT_RANGE, 1, 99, NULL},
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
81 { NULL, NULL, 0, 0, 0, 0, NULL }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
82 };
25691
68015115f63a stream_opts should be const
reimar
parents: 25574
diff changeset
83 static const struct m_struct_st stream_opts = {
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
84 "dvd",
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
85 sizeof(struct stream_priv_s),
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
86 &stream_priv_dflts,
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
87 stream_opts_fields
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
88 };
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
89
19892
2c361743ce69 don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents: 19851
diff changeset
90 static int seek(stream_t *s, off_t newpos);
29130
33956c5f5005 Reemit the ID_AID_x_LANG for the track. This allows the identification of the
diego
parents: 29116
diff changeset
91 static void show_audio_subs_languages(dvdnav_t *nav);
19892
2c361743ce69 don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents: 19851
diff changeset
92
19914
dfd1bb3fc7c0 made file-static new_dvdnav_stream() and dvdnav_stream_read()
nicodvb
parents: 19912
diff changeset
93 static dvdnav_priv_t * new_dvdnav_stream(char * filename) {
25819
ecab5c5a5349 type expected by dvdnav_get_title_string() is const
ben
parents: 25818
diff changeset
94 const char * title_str;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
95 dvdnav_priv_t *priv;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
96
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
97 if (!filename)
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
98 return NULL;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
99
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
100 if (!(priv=calloc(1,sizeof(dvdnav_priv_t))))
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
101 return NULL;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
102
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
103 if (!(priv->filename=strdup(filename))) {
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
104 free(priv);
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
105 return NULL;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
106 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
107
29848
c20a30ebbe56 Move dvd_speed and dvd_set_speed to dvd_common and implement -dvd-speed
reimar
parents: 29847
diff changeset
108 dvd_set_speed(priv->filename, dvd_speed);
c20a30ebbe56 Move dvd_speed and dvd_set_speed to dvd_common and implement -dvd-speed
reimar
parents: 29847
diff changeset
109
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
110 if(dvdnav_open(&(priv->dvdnav),priv->filename)!=DVDNAV_STATUS_OK)
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
111 {
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
112 free(priv->filename);
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
113 free(priv);
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
114 return NULL;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
115 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
116
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
117 if (!priv->dvdnav) {
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
118 free(priv);
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
119 return NULL;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
120 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
121
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
122 if(1) //from vlc: if not used dvdnav from cvs will fail
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
123 {
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
124 int len, event;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
125 char buf[2048];
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
126
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
127 dvdnav_get_next_block(priv->dvdnav,buf,&event,&len);
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
128 dvdnav_sector_search(priv->dvdnav, 0, SEEK_SET);
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
129 }
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
130
19454
b9a62caeb61b corrected _very_ misleading comment
nicodvb
parents: 19453
diff changeset
131 /* turn off dvdnav caching */
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
132 dvdnav_set_readahead_flag(priv->dvdnav, 0);
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
133 if(dvdnav_set_PGC_positioning_flag(priv->dvdnav, 1) != DVDNAV_STATUS_OK)
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
134 mp_msg(MSGT_OPEN,MSGL_ERR,"stream_dvdnav, failed to set PGC positioning\n");
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
135 /* report the title?! */
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
136 if (dvdnav_get_title_string(priv->dvdnav,&title_str)==DVDNAV_STATUS_OK) {
32994
eba7d1dc92a6 Output ID_DVD_VOLUME_ID also for dvdnav://.
cehoyos
parents: 32895
diff changeset
137 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DVD_VOLUME_ID=%s\n", title_str);
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
138 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
139
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
140 //dvdnav_event_clear(priv);
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
141
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
142 return priv;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
143 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
144
21219
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
145 static void dvdnav_get_highlight (dvdnav_priv_t *priv, int display_mode) {
21193
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
146 pci_t *pnavpci = NULL;
21219
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
147 dvdnav_highlight_event_t *hlev = &(priv->hlev);
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
148 int btnum;
21198
fbe50a67612a COSMETICS: consistently reformatted after ben's mess
nicodvb
parents: 21197
diff changeset
149
21219
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
150 if (!priv || !priv->dvdnav)
21193
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
151 return;
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
152
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
153 pnavpci = dvdnav_get_current_nav_pci (priv->dvdnav);
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
154 if (!pnavpci)
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
155 return;
21198
fbe50a67612a COSMETICS: consistently reformatted after ben's mess
nicodvb
parents: 21197
diff changeset
156
21193
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
157 dvdnav_get_current_highlight (priv->dvdnav, &(hlev->buttonN));
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
158 hlev->display = display_mode; /* show */
21198
fbe50a67612a COSMETICS: consistently reformatted after ben's mess
nicodvb
parents: 21197
diff changeset
159
21193
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
160 if (hlev->buttonN > 0 && pnavpci->hli.hl_gi.btn_ns > 0 && hlev->display) {
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
161 for (btnum = 0; btnum < pnavpci->hli.hl_gi.btn_ns; btnum++) {
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
162 btni_t *btni = &(pnavpci->hli.btnit[btnum]);
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
163
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
164 if (hlev->buttonN == btnum + 1) {
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
165 hlev->sx = FFMIN (btni->x_start, btni->x_end);
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
166 hlev->ex = FFMAX (btni->x_start, btni->x_end);
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
167 hlev->sy = FFMIN (btni->y_start, btni->y_end);
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
168 hlev->ey = FFMAX (btni->y_start, btni->y_end);
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
169
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
170 hlev->palette = (btni->btn_coln == 0) ? 0 :
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
171 pnavpci->hli.btn_colit.btn_coli[btni->btn_coln - 1][0];
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
172 break;
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
173 }
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
174 }
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
175 } else { /* hide button or no button */
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
176 hlev->sx = hlev->ex = 0;
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
177 hlev->sy = hlev->ey = 0;
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
178 hlev->palette = hlev->buttonN = 0;
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
179 }
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
180 }
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
181
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
182 static inline int dvdnav_get_duration (int length) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
183 return (length == 255) ? 0 : length * 1000;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
184 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
185
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
186 static int dvdnav_stream_read(dvdnav_priv_t * priv, unsigned char *buf, int *len) {
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
187 int event = DVDNAV_NOP;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
188
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
189 *len=-1;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
190 if (dvdnav_get_next_block(priv->dvdnav,buf,&event,len)!=DVDNAV_STATUS_OK) {
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
191 mp_msg(MSGT_OPEN,MSGL_V, "Error getting next block from DVD %d (%s)\n",event, dvdnav_err_to_string(priv->dvdnav) );
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
192 *len=-1;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
193 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
194 else if (event!=DVDNAV_BLOCK_OK) {
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
195 // need to handle certain events internally (like skipping stills)
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
196 switch (event) {
21332
7f53c807d593 feed the content of NAV_PACKET to the demuxer
nicodvb
parents: 21219
diff changeset
197 case DVDNAV_NAV_PACKET:
7f53c807d593 feed the content of NAV_PACKET to the demuxer
nicodvb
parents: 21219
diff changeset
198 return event;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
199 case DVDNAV_STILL_FRAME: {
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
200 dvdnav_still_event_t *still_event = (dvdnav_still_event_t *) buf;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
201 priv->still_length = still_event->length;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
202 /* set still frame duration */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
203 priv->duration = dvdnav_get_duration (priv->still_length);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
204 if (priv->still_length <= 1) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
205 pci_t *pnavpci = dvdnav_get_current_nav_pci (priv->dvdnav);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
206 priv->duration = mp_dvdtimetomsec (&pnavpci->pci_gi.e_eltm);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
207 }
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
208 break;
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
209 }
21193
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
210 case DVDNAV_HIGHLIGHT: {
21219
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
211 dvdnav_get_highlight (priv, 1);
21193
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
212 break;
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
213 }
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
214 case DVDNAV_CELL_CHANGE: {
19453
087d4a916ea3 implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents: 19452
diff changeset
215 dvdnav_cell_change_event_t *ev = (dvdnav_cell_change_event_t*)buf;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
216 uint32_t nextstill;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
217
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
218 priv->state &= ~NAV_FLAG_WAIT_SKIP;
25830
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
219 priv->state |= NAV_FLAG_STREAM_CHANGE;
19453
087d4a916ea3 implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents: 19452
diff changeset
220 if(ev->pgc_length)
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
221 priv->duration = ev->pgc_length/90;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
222
29116
2cd8c5f81281 Add a -indentify message that indicates if the current DVDNAV title is
reimar
parents: 28576
diff changeset
223 if (dvdnav_is_domain_vts(priv->dvdnav)) {
2cd8c5f81281 Add a -indentify message that indicates if the current DVDNAV title is
reimar
parents: 28576
diff changeset
224 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "DVDNAV_TITLE_IS_MOVIE\n");
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
225 priv->state &= ~NAV_FLAG_VTS_DOMAIN;
29116
2cd8c5f81281 Add a -indentify message that indicates if the current DVDNAV title is
reimar
parents: 28576
diff changeset
226 } else {
2cd8c5f81281 Add a -indentify message that indicates if the current DVDNAV title is
reimar
parents: 28576
diff changeset
227 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "DVDNAV_TITLE_IS_MENU\n");
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
228 priv->state |= NAV_FLAG_VTS_DOMAIN;
29116
2cd8c5f81281 Add a -indentify message that indicates if the current DVDNAV title is
reimar
parents: 28576
diff changeset
229 }
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
230
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
231 nextstill = dvdnav_get_next_still_flag (priv->dvdnav);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
232 if (nextstill) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
233 priv->duration = dvdnav_get_duration (nextstill);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
234 priv->still_length = nextstill;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
235 if (priv->still_length <= 1) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
236 pci_t *pnavpci = dvdnav_get_current_nav_pci (priv->dvdnav);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
237 priv->duration = mp_dvdtimetomsec (&pnavpci->pci_gi.e_eltm);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
238 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
239 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
240
19453
087d4a916ea3 implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents: 19452
diff changeset
241 break;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
242 }
21538
c9b6588932b5 export spu palette; part of a patch by Otvos Attila
nicodvb
parents: 21424
diff changeset
243 case DVDNAV_SPU_CLUT_CHANGE: {
c9b6588932b5 export spu palette; part of a patch by Otvos Attila
nicodvb
parents: 21424
diff changeset
244 memcpy(priv->spu_clut, buf, 16*sizeof(unsigned int));
25827
3fc9f549b5d0 remove the spu_set field, replaced by a flag
ben
parents: 25826
diff changeset
245 priv->state |= NAV_FLAG_SPU_SET;
21538
c9b6588932b5 export spu palette; part of a patch by Otvos Attila
nicodvb
parents: 21424
diff changeset
246 break;
c9b6588932b5 export spu palette; part of a patch by Otvos Attila
nicodvb
parents: 21424
diff changeset
247 }
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
248 case DVDNAV_WAIT: {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
249 if ((priv->state & NAV_FLAG_WAIT_SKIP) &&
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
250 !(priv->state & NAV_FLAG_WAIT))
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
251 dvdnav_wait_skip (priv->dvdnav);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
252 else
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
253 priv->state |= NAV_FLAG_WAIT;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
254 break;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
255 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
256 case DVDNAV_VTS_CHANGE: {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
257 priv->state &= ~NAV_FLAG_WAIT_SKIP;
25830
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
258 priv->state |= NAV_FLAG_STREAM_CHANGE;
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
259 break;
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
260 }
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
261 case DVDNAV_SPU_STREAM_CHANGE: {
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
262 priv->state |= NAV_FLAG_STREAM_CHANGE;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
263 break;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
264 }
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
265 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
266
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
267 *len=0;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
268 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
269 return event;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
270 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
271
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
272 static void update_title_len(stream_t *stream) {
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
273 dvdnav_priv_t *priv = stream->priv;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
274 dvdnav_status_t status;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
275 uint32_t pos = 0, len = 0;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
276
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
277 status = dvdnav_get_position(priv->dvdnav, &pos, &len);
19892
2c361743ce69 don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents: 19851
diff changeset
278 if(status == DVDNAV_STATUS_OK && len) {
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
279 stream->end_pos = (off_t) len * 2048;
19892
2c361743ce69 don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents: 19851
diff changeset
280 stream->seek = seek;
2c361743ce69 don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents: 19851
diff changeset
281 } else {
2c361743ce69 don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents: 19851
diff changeset
282 stream->seek = NULL;
2c361743ce69 don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents: 19851
diff changeset
283 stream->end_pos = 0;
2c361743ce69 don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents: 19851
diff changeset
284 }
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
285 }
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
286
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
287
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
288 static int seek(stream_t *s, off_t newpos) {
23990
f57dacd8c419 removed unused variables
nicodvb
parents: 23902
diff changeset
289 uint32_t sector = 0;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
290 dvdnav_priv_t *priv = s->priv;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
291
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29130
diff changeset
292 if(s->end_pos && newpos > s->end_pos)
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
293 newpos = s->end_pos;
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
294 sector = newpos / 2048ULL;
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
295 if(dvdnav_sector_search(priv->dvdnav, (uint64_t) sector, SEEK_SET) != DVDNAV_STATUS_OK)
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
296 goto fail;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
297
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
298 s->pos = newpos;
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
299
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
300 return 1;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
301
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
302 fail:
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
303 mp_msg(MSGT_STREAM,MSGL_INFO,"dvdnav_stream, seeking to %"PRIu64" failed: %s\n", newpos, dvdnav_err_to_string(priv->dvdnav));
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
304
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
305 return 1;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
306 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
307
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
308 static void stream_dvdnav_close(stream_t *s) {
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
309 dvdnav_priv_t *priv = s->priv;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
310 dvdnav_close(priv->dvdnav);
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
311 priv->dvdnav = NULL;
29848
c20a30ebbe56 Move dvd_speed and dvd_set_speed to dvd_common and implement -dvd-speed
reimar
parents: 29847
diff changeset
312 dvd_set_speed(priv->filename, -1);
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
313 free(priv);
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
314 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
315
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
316
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
317 static int fill_buffer(stream_t *s, char *but, int len)
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
318 {
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
319 int event;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
320
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
321 dvdnav_priv_t* priv=s->priv;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
322 if (priv->state & NAV_FLAG_WAIT_READ) /* read is suspended */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
323 return -1;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
324 len=0;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
325 if(!s->end_pos)
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
326 update_title_len(s);
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
327 while(!len) /* grab all event until DVDNAV_BLOCK_OK (len=2048), DVDNAV_STOP or DVDNAV_STILL_FRAME */
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
328 {
20810
4d2c03da592c one more deuglification
nicodvb
parents: 20809
diff changeset
329 event=dvdnav_stream_read(priv, s->buffer, &len);
4d2c03da592c one more deuglification
nicodvb
parents: 20809
diff changeset
330 if(event==-1 || len==-1)
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
331 {
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
332 mp_msg(MSGT_CPLAYER,MSGL_ERR, "DVDNAV stream read error!\n");
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
333 return 0;
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
334 }
25825
4c17a62383a4 automatically set spu button highlight when nav cell has changed
ben
parents: 25824
diff changeset
335 if (event != DVDNAV_BLOCK_OK)
4c17a62383a4 automatically set spu button highlight when nav cell has changed
ben
parents: 25824
diff changeset
336 dvdnav_get_highlight (priv, 1);
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
337 switch (event) {
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
338 case DVDNAV_STOP: {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
339 priv->state |= NAV_FLAG_EOF;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
340 return len;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
341 }
21333
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
342 case DVDNAV_BLOCK_OK:
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
343 case DVDNAV_NAV_PACKET:
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
344 case DVDNAV_STILL_FRAME:
21333
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
345 return len;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
346 case DVDNAV_WAIT: {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
347 if (priv->state & NAV_FLAG_WAIT)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
348 return len;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
349 break;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
350 }
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
351 case DVDNAV_VTS_CHANGE: {
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
352 int tit = 0, part = 0;
23043
4038852b041e after a DVDNAV_VTS_CHANGE event report the title being played
nicodvb
parents: 22936
diff changeset
353 dvdnav_vts_change_event_t *vts_event = (dvdnav_vts_change_event_t *)s->buffer;
4038852b041e after a DVDNAV_VTS_CHANGE event report the title being played
nicodvb
parents: 22936
diff changeset
354 mp_msg(MSGT_CPLAYER,MSGL_INFO, "DVDNAV, switched to title: %d\r\n", vts_event->new_vtsN);
26985
9ab366f856c1 rename for consistency
ben
parents: 26984
diff changeset
355 priv->state |= NAV_FLAG_CELL_CHANGE;
26983
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
356 priv->state |= NAV_FLAG_AUDIO_CHANGE;
26984
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
357 priv->state |= NAV_FLAG_SPU_CHANGE;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
358 priv->state &= ~NAV_FLAG_WAIT_SKIP;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
359 priv->state &= ~NAV_FLAG_WAIT;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
360 s->end_pos = 0;
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
361 update_title_len(s);
29130
33956c5f5005 Reemit the ID_AID_x_LANG for the track. This allows the identification of the
diego
parents: 29116
diff changeset
362 show_audio_subs_languages(priv->dvdnav);
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
363 if (priv->state & NAV_FLAG_WAIT_READ_AUTO)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
364 priv->state |= NAV_FLAG_WAIT_READ;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
365 if(dvdnav_current_title_info(priv->dvdnav, &tit, &part) == DVDNAV_STATUS_OK) {
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
366 mp_msg(MSGT_CPLAYER,MSGL_V, "\r\nDVDNAV, NEW TITLE %d\r\n", tit);
21219
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
367 dvdnav_get_highlight (priv, 0);
29851
eaa7bfc52c2c Set the EOF flag when dvdnav reached the end of the requested title.
reimar
parents: 29848
diff changeset
368 if(priv->title > 0 && tit != priv->title) {
eaa7bfc52c2c Set the EOF flag when dvdnav reached the end of the requested title.
reimar
parents: 29848
diff changeset
369 priv->state |= NAV_FLAG_EOF;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
370 return 0;
29851
eaa7bfc52c2c Set the EOF flag when dvdnav reached the end of the requested title.
reimar
parents: 29848
diff changeset
371 }
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
372 }
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
373 break;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
374 }
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
375 case DVDNAV_CELL_CHANGE: {
26985
9ab366f856c1 rename for consistency
ben
parents: 26984
diff changeset
376 priv->state |= NAV_FLAG_CELL_CHANGE;
26983
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
377 priv->state |= NAV_FLAG_AUDIO_CHANGE;
26984
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
378 priv->state |= NAV_FLAG_SPU_CHANGE;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
379 priv->state &= ~NAV_FLAG_WAIT_SKIP;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
380 priv->state &= ~NAV_FLAG_WAIT;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
381 if (priv->state & NAV_FLAG_WAIT_READ_AUTO)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
382 priv->state |= NAV_FLAG_WAIT_READ;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
383 if(priv->title > 0 && dvd_last_chapter > 0) {
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
384 int tit=0, part=0;
29851
eaa7bfc52c2c Set the EOF flag when dvdnav reached the end of the requested title.
reimar
parents: 29848
diff changeset
385 if(dvdnav_current_title_info(priv->dvdnav, &tit, &part) == DVDNAV_STATUS_OK && part > dvd_last_chapter) {
eaa7bfc52c2c Set the EOF flag when dvdnav reached the end of the requested title.
reimar
parents: 29848
diff changeset
386 priv->state |= NAV_FLAG_EOF;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
387 return 0;
29851
eaa7bfc52c2c Set the EOF flag when dvdnav reached the end of the requested title.
reimar
parents: 29848
diff changeset
388 }
25826
d8ed72fc61f8 this end brace was not correctly indented
ben
parents: 25825
diff changeset
389 }
25825
4c17a62383a4 automatically set spu button highlight when nav cell has changed
ben
parents: 25824
diff changeset
390 dvdnav_get_highlight (priv, 1);
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
391 }
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
392 break;
26983
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
393 case DVDNAV_AUDIO_STREAM_CHANGE:
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
394 priv->state |= NAV_FLAG_AUDIO_CHANGE;
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
395 break;
26984
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
396 case DVDNAV_SPU_STREAM_CHANGE:
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
397 priv->state |= NAV_FLAG_SPU_CHANGE;
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
398 break;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
399 }
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
400 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
401 mp_msg(MSGT_STREAM,MSGL_DBG2,"DVDNAV fill_buffer len: %d\n",len);
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
402 return len;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
403 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
404
34648
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
405 static int mp_dvdnav_lang_from_sid(stream_t *stream, int sid);
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
406 static int mp_dvdnav_lang_from_aid(stream_t *stream, int sid);
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
407
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
408 static int control(stream_t *stream, int cmd, void* arg) {
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
409 dvdnav_priv_t* priv=stream->priv;
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
410 int tit, part;
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
411
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29130
diff changeset
412 switch(cmd)
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
413 {
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
414 case STREAM_CTRL_SEEK_TO_CHAPTER:
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
415 {
33516
88cd23eb505d Remove pointless ().
reimar
parents: 33034
diff changeset
416 int chap = *(unsigned int *)arg+1;
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
417
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
418 if(chap < 1 || dvdnav_current_title_info(priv->dvdnav, &tit, &part) != DVDNAV_STATUS_OK)
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
419 break;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
420 if(dvdnav_part_play(priv->dvdnav, tit, chap) != DVDNAV_STATUS_OK)
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
421 break;
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
422 return 1;
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
423 }
19477
2a6520a36e96 implemented STREAM_CTRL_GET_NUM_CHAPTERS
nicodvb
parents: 19454
diff changeset
424 case STREAM_CTRL_GET_NUM_CHAPTERS:
2a6520a36e96 implemented STREAM_CTRL_GET_NUM_CHAPTERS
nicodvb
parents: 19454
diff changeset
425 {
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
426 if(dvdnav_current_title_info(priv->dvdnav, &tit, &part) != DVDNAV_STATUS_OK)
19477
2a6520a36e96 implemented STREAM_CTRL_GET_NUM_CHAPTERS
nicodvb
parents: 19454
diff changeset
427 break;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
428 if(dvdnav_get_number_of_parts(priv->dvdnav, tit, &part) != DVDNAV_STATUS_OK)
19477
2a6520a36e96 implemented STREAM_CTRL_GET_NUM_CHAPTERS
nicodvb
parents: 19454
diff changeset
429 break;
2a6520a36e96 implemented STREAM_CTRL_GET_NUM_CHAPTERS
nicodvb
parents: 19454
diff changeset
430 if(!part)
2a6520a36e96 implemented STREAM_CTRL_GET_NUM_CHAPTERS
nicodvb
parents: 19454
diff changeset
431 break;
33516
88cd23eb505d Remove pointless ().
reimar
parents: 33034
diff changeset
432 *(unsigned int *)arg = part;
19477
2a6520a36e96 implemented STREAM_CTRL_GET_NUM_CHAPTERS
nicodvb
parents: 19454
diff changeset
433 return 1;
2a6520a36e96 implemented STREAM_CTRL_GET_NUM_CHAPTERS
nicodvb
parents: 19454
diff changeset
434 }
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
435 case STREAM_CTRL_GET_CURRENT_CHAPTER:
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
436 {
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
437 if(dvdnav_current_title_info(priv->dvdnav, &tit, &part) != DVDNAV_STATUS_OK)
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
438 break;
33516
88cd23eb505d Remove pointless ().
reimar
parents: 33034
diff changeset
439 *(unsigned int *)arg = part - 1;
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
440 return 1;
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
441 }
19453
087d4a916ea3 implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents: 19452
diff changeset
442 case STREAM_CTRL_GET_TIME_LENGTH:
087d4a916ea3 implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents: 19452
diff changeset
443 {
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
444 if(priv->duration || priv->still_length)
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
445 {
33516
88cd23eb505d Remove pointless ().
reimar
parents: 33034
diff changeset
446 *(double *)arg = (double)priv->duration / 1000.0;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
447 return 1;
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
448 }
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
449 break;
19453
087d4a916ea3 implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents: 19452
diff changeset
450 }
24303
21d181441aa4 implemented STREAM_CTRL_GET_ASPECT_RATIO
nicodvb
parents: 24257
diff changeset
451 case STREAM_CTRL_GET_ASPECT_RATIO:
21d181441aa4 implemented STREAM_CTRL_GET_ASPECT_RATIO
nicodvb
parents: 24257
diff changeset
452 {
21d181441aa4 implemented STREAM_CTRL_GET_ASPECT_RATIO
nicodvb
parents: 24257
diff changeset
453 uint8_t ar = dvdnav_get_video_aspect(priv->dvdnav);
33516
88cd23eb505d Remove pointless ().
reimar
parents: 33034
diff changeset
454 *(double *)arg = !ar ? 4.0/3.0 : 16.0/9.0;
24303
21d181441aa4 implemented STREAM_CTRL_GET_ASPECT_RATIO
nicodvb
parents: 24257
diff changeset
455 return 1;
21d181441aa4 implemented STREAM_CTRL_GET_ASPECT_RATIO
nicodvb
parents: 24257
diff changeset
456 }
22936
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
457 case STREAM_CTRL_GET_CURRENT_TIME:
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
458 {
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
459 double tm;
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
460 tm = dvdnav_get_current_time(priv->dvdnav)/90000.0f;
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
461 if(tm != -1)
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
462 {
33516
88cd23eb505d Remove pointless ().
reimar
parents: 33034
diff changeset
463 *(double *)arg = tm;
22936
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
464 return 1;
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
465 }
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
466 break;
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
467 }
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
468 case STREAM_CTRL_SEEK_TO_TIME:
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
469 {
33034
e97e23af7e8f Use fewer () to make code more readable.
reimar
parents: 32994
diff changeset
470 uint64_t tm = *(double *)arg * 90000;
22936
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
471 if(dvdnav_time_search(priv->dvdnav, tm) == DVDNAV_STATUS_OK)
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
472 return 1;
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
473 break;
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
474 }
25574
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
475 case STREAM_CTRL_GET_NUM_ANGLES:
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
476 {
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
477 uint32_t curr, angles;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
478 if(dvdnav_get_angle_info(priv->dvdnav, &curr, &angles) != DVDNAV_STATUS_OK)
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
479 break;
33516
88cd23eb505d Remove pointless ().
reimar
parents: 33034
diff changeset
480 *(int *)arg = angles;
25574
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
481 return 1;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
482 }
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
483 case STREAM_CTRL_GET_ANGLE:
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
484 {
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
485 uint32_t curr, angles;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
486 if(dvdnav_get_angle_info(priv->dvdnav, &curr, &angles) != DVDNAV_STATUS_OK)
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
487 break;
33516
88cd23eb505d Remove pointless ().
reimar
parents: 33034
diff changeset
488 *(int *)arg = curr;
25574
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
489 return 1;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
490 }
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
491 case STREAM_CTRL_SET_ANGLE:
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
492 {
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
493 uint32_t curr, angles;
33516
88cd23eb505d Remove pointless ().
reimar
parents: 33034
diff changeset
494 int new_angle = *(int *)arg;
25574
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
495 if(dvdnav_get_angle_info(priv->dvdnav, &curr, &angles) != DVDNAV_STATUS_OK)
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
496 break;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
497 if(new_angle>angles || new_angle<1)
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
498 break;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
499 if(dvdnav_angle_change(priv->dvdnav, new_angle) != DVDNAV_STATUS_OK)
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
500 return 1;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
501 }
34648
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
502 case STREAM_CTRL_GET_LANG:
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
503 {
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
504 struct stream_lang_req *req = arg;
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
505 int lang = 0;
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
506 switch(req->type) {
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
507 case stream_ctrl_audio:
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
508 lang = mp_dvdnav_lang_from_aid(stream, req->id);
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
509 break;
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
510 case stream_ctrl_sub:
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
511 lang = mp_dvdnav_lang_from_sid(stream, req->id);
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
512 break;
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
513 }
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
514 if (!lang)
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
515 break;
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
516 req->buf[0] = lang >> 8;
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
517 req->buf[1] = lang;
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
518 req->buf[2] = 0;
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
519 return STREAM_OK;
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
520 }
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
521 }
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
522
24257
d261f5109660 cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
diego
parents: 24109
diff changeset
523 return STREAM_UNSUPPORTED;
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
524 }
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
525
25165
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
526 static void identify_chapters(dvdnav_t *nav, uint32_t title)
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
527 {
25177
a43d99a80f4a -identify also shows the duration(s) of the title(s)
nicodvb
parents: 25176
diff changeset
528 uint64_t *parts=NULL, duration=0;
25165
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
529 uint32_t n, i, t;
25177
a43d99a80f4a -identify also shows the duration(s) of the title(s)
nicodvb
parents: 25176
diff changeset
530 n = dvdnav_describe_title_chapters(nav, title, &parts, &duration);
25165
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
531 if(parts) {
25177
a43d99a80f4a -identify also shows the duration(s) of the title(s)
nicodvb
parents: 25176
diff changeset
532 t = duration / 90;
a43d99a80f4a -identify also shows the duration(s) of the title(s)
nicodvb
parents: 25176
diff changeset
533 mp_msg(MSGT_IDENTIFY, MSGL_V, "ID_DVD_TITLE_%d_LENGTH=%d.%03d\n", title, t / 1000, t % 1000);
32895
8851bf29c1ae Add ID_DVD_TITLE_x_CHAPTERS and ID_DVD_CURRENT_TITLE to the output of
cehoyos
parents: 32857
diff changeset
534 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DVD_TITLE_%d_CHAPTERS=%d\n", title, n);
25167
89b5a20fc346 with -identify show the title being described
nicodvb
parents: 25165
diff changeset
535 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "TITLE %u, CHAPTERS: ", title);
32895
8851bf29c1ae Add ID_DVD_TITLE_x_CHAPTERS and ID_DVD_CURRENT_TITLE to the output of
cehoyos
parents: 32857
diff changeset
536
25165
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
537 for(i=0; i<n; i++) {
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
538 t = parts[i] / 90000;
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
539 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "%02d:%02d:%02d,", t/3600, (t/60)%60, t%60);
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
540 }
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
541 free(parts);
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
542 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "\n");
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
543 }
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
544 }
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
545
25176
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
546 static void identify(dvdnav_priv_t *priv, struct stream_priv_s *p)
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
547 {
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
548 uint32_t titles=0, i;
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
549 if(p->track <= 0) {
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
550 dvdnav_get_number_of_titles(priv->dvdnav, &titles);
32857
a043645045bf "FIx" chapter references (make them identical to dvd).
cehoyos
parents: 32456
diff changeset
551 for(i=1; i<=titles; i++)
25176
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
552 identify_chapters(priv->dvdnav, i);
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
553 }
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
554 else
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
555 identify_chapters(priv->dvdnav, p->track);
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
556 }
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
557
25196
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
558 static void show_audio_subs_languages(dvdnav_t *nav)
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
559 {
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
560 uint8_t lg;
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
561 uint16_t i, lang, format, id, channels;
25820
b43eaaa94dd3 array was defined for 6 elements while 7 were declared
ben
parents: 25819
diff changeset
562 int base[7] = {128, 0, 0, 0, 160, 136, 0};
25196
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
563 for(i=0; i<8; i++)
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
564 {
29787
efe4987aac4d Make the dvdnav stream language information output more similar to the dvd one.
reimar
parents: 29786
diff changeset
565 char tmp[] = "unknown";
25196
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
566 lg = dvdnav_get_audio_logical_stream(nav, i);
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
567 if(lg == 0xff) continue;
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
568 channels = dvdnav_audio_stream_channels(nav, lg);
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
569 if(channels == 0xFFFF)
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
570 channels = 2; //unknown
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
571 else
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
572 channels--;
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
573 lang = dvdnav_audio_stream_to_lang(nav, lg);
29787
efe4987aac4d Make the dvdnav stream language information output more similar to the dvd one.
reimar
parents: 29786
diff changeset
574 if(lang != 0xFFFF)
25196
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
575 {
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
576 tmp[0] = lang >> 8;
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
577 tmp[1] = lang & 0xFF;
29787
efe4987aac4d Make the dvdnav stream language information output more similar to the dvd one.
reimar
parents: 29786
diff changeset
578 tmp[2] = 0;
25196
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
579 }
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
580 format = dvdnav_audio_stream_format(nav, lg);
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
581 if(format == 0xFFFF || format > 6)
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
582 format = 1; //unknown
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
583 id = i + base[format];
29789
9fbb75fb4e2d Cosmetics: indentation, merge two consecutive ifs.
reimar
parents: 29788
diff changeset
584 mp_msg(MSGT_OPEN,MSGL_STATUS,MSGTR_DVDaudioStreamInfo, i,
9fbb75fb4e2d Cosmetics: indentation, merge two consecutive ifs.
reimar
parents: 29788
diff changeset
585 dvd_audio_stream_types[format], dvd_audio_stream_channels[channels], tmp, id);
9fbb75fb4e2d Cosmetics: indentation, merge two consecutive ifs.
reimar
parents: 29788
diff changeset
586 if (lang != 0xFFFF && lang && tmp[0])
29130
33956c5f5005 Reemit the ID_AID_x_LANG for the track. This allows the identification of the
diego
parents: 29116
diff changeset
587 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_LANG=%s\n", id, tmp);
25196
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
588 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29130
diff changeset
589
25196
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
590 for(i=0; i<32; i++)
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
591 {
29787
efe4987aac4d Make the dvdnav stream language information output more similar to the dvd one.
reimar
parents: 29786
diff changeset
592 char tmp[] = "unknown";
25196
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
593 lg = dvdnav_get_spu_logical_stream(nav, i);
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
594 if(lg == 0xff) continue;
29816
94bde7a3ac51 Fixup the dvdnav <-> sid mapping, dvdnav_spu_stream_to_lang and
reimar
parents: 29790
diff changeset
595 lang = dvdnav_spu_stream_to_lang(nav, i);
29787
efe4987aac4d Make the dvdnav stream language information output more similar to the dvd one.
reimar
parents: 29786
diff changeset
596 if(lang != 0xFFFF)
25196
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
597 {
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
598 tmp[0] = lang >> 8;
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
599 tmp[1] = lang & 0xFF;
29787
efe4987aac4d Make the dvdnav stream language information output more similar to the dvd one.
reimar
parents: 29786
diff changeset
600 tmp[2] = 0;
25196
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
601 }
29816
94bde7a3ac51 Fixup the dvdnav <-> sid mapping, dvdnav_spu_stream_to_lang and
reimar
parents: 29790
diff changeset
602 mp_msg(MSGT_OPEN,MSGL_STATUS,MSGTR_DVDsubtitleLanguage, lg, tmp);
29790
f23da710dc29 dvdnav: print ID_SID_..._LANG, just like dvd://
reimar
parents: 29789
diff changeset
603 if (lang != 0xFFFF && lang && tmp[0])
29816
94bde7a3ac51 Fixup the dvdnav <-> sid mapping, dvdnav_spu_stream_to_lang and
reimar
parents: 29790
diff changeset
604 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", lg, tmp);
25196
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
605 }
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
606 }
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
607
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
608 static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
609 struct stream_priv_s* p = (struct stream_priv_s*)opts;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
610 char *filename;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
611 dvdnav_priv_t *priv;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
612
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29130
diff changeset
613 if(p->device) filename = p->device;
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29130
diff changeset
614 else if(dvd_device) filename= dvd_device;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
615 else filename = DEFAULT_DVD_DEVICE;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
616 if(!(priv=new_dvdnav_stream(filename))) {
25031
5e1e61012a05 report why the dvd couldn't be opened. Patch by Jan Knutar jknutar+nic+fi
nicodvb
parents: 25025
diff changeset
617 mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_CantOpenDVD,filename, strerror(errno));
24257
d261f5109660 cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
diego
parents: 24109
diff changeset
618 return STREAM_UNSUPPORTED;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
619 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
620
19764
499e5525d706 if no track number specified play the whole disc, or the menus can't be shown at start
nicodvb
parents: 19477
diff changeset
621 if(p->track > 0) {
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
622 priv->title = p->track;
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
623 if(dvdnav_title_play(priv->dvdnav, p->track) != DVDNAV_STATUS_OK) {
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
624 mp_msg(MSGT_OPEN,MSGL_FATAL,"dvdnav_stream, couldn't select title %d, error '%s'\n", p->track, dvdnav_err_to_string(priv->dvdnav));
24257
d261f5109660 cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
diego
parents: 24109
diff changeset
625 return STREAM_UNSUPPORTED;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
626 }
32895
8851bf29c1ae Add ID_DVD_TITLE_x_CHAPTERS and ID_DVD_CURRENT_TITLE to the output of
cehoyos
parents: 32857
diff changeset
627 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DVD_CURRENT_TITLE=%d\n", p->track);
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
628 } else if (p->track == 0) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
629 if(dvdnav_menu_call(priv->dvdnav, DVD_MENU_Root) != DVDNAV_STATUS_OK)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
630 dvdnav_menu_call(priv->dvdnav, DVD_MENU_Title);
19842
a43fa4ad378e at start, when not playing a specific titleset, try to call the Title menu (as is common practice among players)
nicodvb
parents: 19840
diff changeset
631 }
25176
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
632 if(mp_msg_test(MSGT_IDENTIFY, MSGL_INFO))
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
633 identify(priv, p);
25196
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
634 if(p->track > 0)
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
635 show_audio_subs_languages(priv->dvdnav);
20754
da4c2344a97c support for -dvdangle
nicodvb
parents: 20409
diff changeset
636 if(dvd_angle > 1)
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
637 dvdnav_angle_change(priv->dvdnav, dvd_angle);
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
638
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
639 stream->sector_size = 2048;
29920
4f740437ed2b Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
reimar
parents: 29851
diff changeset
640 stream->flags = STREAM_READ | MP_STREAM_SEEK;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
641 stream->fill_buffer = fill_buffer;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
642 stream->seek = seek;
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
643 stream->control = control;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
644 stream->close = stream_dvdnav_close;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
645 stream->type = STREAMTYPE_DVDNAV;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
646 stream->priv=(void*)priv;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
647 *file_format = DEMUXER_TYPE_MPEG_PS;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
648
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
649 update_title_len(stream);
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
650 if(!stream->pos && p->track > 0)
24109
4565ffb49fda Removed uninitialized variable.
cehoyos
parents: 23991
diff changeset
651 mp_msg(MSGT_OPEN,MSGL_ERR, "INIT ERROR: couldn't get init pos %s\r\n", dvdnav_err_to_string(priv->dvdnav));
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
652
20406
831cd8cbf58a spell fix
nicodvb
parents: 20405
diff changeset
653 mp_msg(MSGT_OPEN,MSGL_INFO, "Remember to disable MPlayer's cache when playing dvdnav:// streams (adding -nocache to your command line)\r\n");
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
654
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
655 return STREAM_OK;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
656 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
657
19768
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
658
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
659 void mp_dvdnav_handle_input(stream_t *stream, int cmd, int *button) {
25829
c0b5ff39e928 remove useless casts
ben
parents: 25828
diff changeset
660 dvdnav_priv_t * priv = stream->priv;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
661 dvdnav_t *nav = priv->dvdnav;
19908
b6aa47caeb72 §Ænitial button value is -1. Only (button>0) is a correct button selection.
jonas
parents: 19895
diff changeset
662 dvdnav_status_t status=DVDNAV_STATUS_ERR;
19768
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
663 pci_t *pci = dvdnav_get_current_nav_pci(nav);
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
664
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
665 if(cmd != MP_CMD_DVDNAV_SELECT && !pci)
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
666 return;
19768
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
667
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
668 switch(cmd) {
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
669 case MP_CMD_DVDNAV_UP:
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
670 status = dvdnav_upper_button_select(nav, pci);
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
671 break;
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
672 case MP_CMD_DVDNAV_DOWN:
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
673 status = dvdnav_lower_button_select(nav, pci);
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
674 break;
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
675 case MP_CMD_DVDNAV_LEFT:
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
676 status = dvdnav_left_button_select(nav, pci);
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
677 break;
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
678 case MP_CMD_DVDNAV_RIGHT:
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
679 status = dvdnav_right_button_select(nav, pci);
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
680 break;
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
681 case MP_CMD_DVDNAV_MENU:
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
682 status = dvdnav_menu_call(nav,DVD_MENU_Root);
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
683 break;
19777
bb1b570ac7c1 permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents: 19774
diff changeset
684 case MP_CMD_DVDNAV_PREVMENU: {
bb1b570ac7c1 permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents: 19774
diff changeset
685 int title=0, part=0;
bb1b570ac7c1 permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents: 19774
diff changeset
686
bb1b570ac7c1 permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents: 19774
diff changeset
687 dvdnav_current_title_info(nav, &title, &part);
bb1b570ac7c1 permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents: 19774
diff changeset
688 if(title) {
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
689 if((status=dvdnav_menu_call(nav, DVD_MENU_Part)) == DVDNAV_STATUS_OK)
19777
bb1b570ac7c1 permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents: 19774
diff changeset
690 break;
bb1b570ac7c1 permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents: 19774
diff changeset
691 }
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
692 if((status=dvdnav_menu_call(nav, DVD_MENU_Title)) == DVDNAV_STATUS_OK)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
693 break;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
694 status=dvdnav_menu_call(nav, DVD_MENU_Root);
19777
bb1b570ac7c1 permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents: 19774
diff changeset
695 }
bb1b570ac7c1 permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents: 19774
diff changeset
696 break;
19768
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
697 case MP_CMD_DVDNAV_SELECT:
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
698 status = dvdnav_button_activate(nav, pci);
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
699 break;
19912
3fdb44285fe7 introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents: 19909
diff changeset
700 case MP_CMD_DVDNAV_MOUSECLICK:
3fdb44285fe7 introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents: 19909
diff changeset
701 /*
3fdb44285fe7 introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents: 19909
diff changeset
702 this is a workaround: in theory the simple dvdnav_lower_button_select()+dvdnav_button_activate()
3fdb44285fe7 introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents: 19909
diff changeset
703 should be enough (and generally it is), but there are cases when the calls to dvdnav_lower_button_select()
3fdb44285fe7 introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents: 19909
diff changeset
704 and friends fail! Hence we have to call dvdnav_mouse_activate(priv->mousex, priv->mousey) with
3fdb44285fe7 introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents: 19909
diff changeset
705 the coodinates saved by mp_dvdnav_update_mouse_pos().
3fdb44285fe7 introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents: 19909
diff changeset
706 This last call always works well
3fdb44285fe7 introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents: 19909
diff changeset
707 */
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
708 status = dvdnav_mouse_activate(nav, pci, priv->mousex, priv->mousey);
19912
3fdb44285fe7 introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents: 19909
diff changeset
709 break;
19768
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
710 default:
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
711 mp_msg(MSGT_CPLAYER, MSGL_V, "Unknown DVDNAV cmd %d\n", cmd);
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
712 break;
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
713 }
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
714
19840
ba3b77867047 in mp_dvdnav_handle_input() update current button only if the status of the previous operation succeeded; patch by Jonas Jermann
nicodvb
parents: 19839
diff changeset
715 if(status == DVDNAV_STATUS_OK)
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
716 dvdnav_get_current_highlight(nav, button);
19768
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
717 }
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
718
19851
adfd08588514 report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents: 19842
diff changeset
719 void mp_dvdnav_update_mouse_pos(stream_t *stream, int32_t x, int32_t y, int* button) {
25829
c0b5ff39e928 remove useless casts
ben
parents: 25828
diff changeset
720 dvdnav_priv_t * priv = stream->priv;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
721 dvdnav_t *nav = priv->dvdnav;
19851
adfd08588514 report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents: 19842
diff changeset
722 dvdnav_status_t status;
adfd08588514 report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents: 19842
diff changeset
723 pci_t *pci = dvdnav_get_current_nav_pci(nav);
adfd08588514 report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents: 19842
diff changeset
724
adfd08588514 report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents: 19842
diff changeset
725 if(!pci) return;
adfd08588514 report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents: 19842
diff changeset
726
adfd08588514 report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents: 19842
diff changeset
727 status = dvdnav_mouse_select(nav, pci, x, y);
adfd08588514 report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents: 19842
diff changeset
728 if(status == DVDNAV_STATUS_OK) dvdnav_get_current_highlight(nav, button);
adfd08588514 report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents: 19842
diff changeset
729 else *button = -1;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
730 priv->mousex = x;
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
731 priv->mousey = y;
19851
adfd08588514 report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents: 19842
diff changeset
732 }
adfd08588514 report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents: 19842
diff changeset
733
26990
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
734 static int mp_dvdnav_get_aid_from_format (stream_t *stream, int index, uint8_t lg) {
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
735 dvdnav_priv_t * priv = stream->priv;
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
736 uint8_t format;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29130
diff changeset
737
26990
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
738 format = dvdnav_audio_stream_format(priv->dvdnav, lg);
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
739 switch(format) {
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
740 case DVDNAV_FORMAT_AC3:
29717
afc8b80eb027 cosmetics: Remove some pointless parentheses from return calls.
diego
parents: 29263
diff changeset
741 return index + 128;
26990
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
742 case DVDNAV_FORMAT_DTS:
29717
afc8b80eb027 cosmetics: Remove some pointless parentheses from return calls.
diego
parents: 29263
diff changeset
743 return index + 136;
26990
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
744 case DVDNAV_FORMAT_LPCM:
29717
afc8b80eb027 cosmetics: Remove some pointless parentheses from return calls.
diego
parents: 29263
diff changeset
745 return index + 160;
26990
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
746 case DVDNAV_FORMAT_MPEGAUDIO:
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
747 return index;
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
748 default:
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
749 return -1;
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
750 }
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
751
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
752 return -1;
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
753 }
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
754
21424
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
755 /**
26986
4bee4b9ec054 Rename some functions as they are mplayer related and not
ben
parents: 26985
diff changeset
756 * \brief mp_dvdnav_aid_from_lang() returns the audio id corresponding to the language code 'lang'
21600
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
757 * \param stream: - stream pointer
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
758 * \param lang: 2-characters language code[s], eventually separated by spaces of commas
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
759 * \return -1 on error, current subtitle id if successful
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
760 */
31876
c52e80f24086 Add const qualifiers to function string arguments as appropriate.
reimar
parents: 30612
diff changeset
761 int mp_dvdnav_aid_from_lang(stream_t *stream, const unsigned char *language) {
25829
c0b5ff39e928 remove useless casts
ben
parents: 25828
diff changeset
762 dvdnav_priv_t * priv = stream->priv;
21600
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
763 int k;
26990
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
764 uint8_t lg;
28576
a6b506faeb34 Replace double semicolon by single semicolon.
diego
parents: 27235
diff changeset
765 uint16_t lang, lcode;
21600
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
766
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
767 while(language && strlen(language)>=2) {
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
768 lcode = (language[0] << 8) | (language[1]);
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
769 for(k=0; k<32; k++) {
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
770 lg = dvdnav_get_audio_logical_stream(priv->dvdnav, k);
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
771 if(lg == 0xff) continue;
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
772 lang = dvdnav_audio_stream_to_lang(priv->dvdnav, lg);
26990
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
773 if(lang != 0xFFFF && lang == lcode)
9077741c9ed6 Factorizes dvdnav aid retrieval code.
ben
parents: 26989
diff changeset
774 return mp_dvdnav_get_aid_from_format (stream, k, lg);
21600
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
775 }
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
776 language += 2;
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
777 while(language[0]==',' || language[0]==' ') ++language;
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
778 }
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
779 return -1;
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
780 }
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
781
21603
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
782 /**
34648
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
783 * \brief mp_dvdnav_lang_from_aid() returns the language corresponding to audio id 'aid'
21603
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
784 * \param stream: - stream pointer
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
785 * \param sid: physical subtitle id
34648
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
786 * \return 0 on error, otherwise language id
21603
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
787 */
34648
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
788 static int mp_dvdnav_lang_from_aid(stream_t *stream, int aid) {
21603
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
789 uint8_t lg;
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
790 uint16_t lang;
25829
c0b5ff39e928 remove useless casts
ben
parents: 25828
diff changeset
791 dvdnav_priv_t * priv = stream->priv;
21603
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
792
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
793 if(aid < 0)
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
794 return 0;
21613
8547ae79e74b simplified aid management in dvdnav_lang_from_aid(); patch by Joakim Patte
nicodvb
parents: 21603
diff changeset
795 lg = dvdnav_get_audio_logical_stream(priv->dvdnav, aid & 0x7);
21603
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
796 if(lg == 0xff) return 0;
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
797 lang = dvdnav_audio_stream_to_lang(priv->dvdnav, lg);
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
798 if(lang == 0xffff) return 0;
34648
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
799 return lang;
21603
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
800 }
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
801
21600
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
802
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
803 /**
26986
4bee4b9ec054 Rename some functions as they are mplayer related and not
ben
parents: 26985
diff changeset
804 * \brief mp_dvdnav_sid_from_lang() returns the subtitle id corresponding to the language code 'lang'
21424
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
805 * \param stream: - stream pointer
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
806 * \param lang: 2-characters language code[s], eventually separated by spaces of commas
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
807 * \return -1 on error, current subtitle id if successful
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
808 */
31876
c52e80f24086 Add const qualifiers to function string arguments as appropriate.
reimar
parents: 30612
diff changeset
809 int mp_dvdnav_sid_from_lang(stream_t *stream, const unsigned char *language) {
25829
c0b5ff39e928 remove useless casts
ben
parents: 25828
diff changeset
810 dvdnav_priv_t * priv = stream->priv;
23990
f57dacd8c419 removed unused variables
nicodvb
parents: 23902
diff changeset
811 uint8_t lg, k;
21204
1ddb1a86e419 support for comma-separated language codes in -slang
nicodvb
parents: 21200
diff changeset
812 uint16_t lang, lcode;
21197
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
813
21204
1ddb1a86e419 support for comma-separated language codes in -slang
nicodvb
parents: 21200
diff changeset
814 while(language && strlen(language)>=2) {
21333
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
815 lcode = (language[0] << 8) | (language[1]);
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
816 for(k=0; k<32; k++) {
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
817 lg = dvdnav_get_spu_logical_stream(priv->dvdnav, k);
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
818 if(lg == 0xff) continue;
29816
94bde7a3ac51 Fixup the dvdnav <-> sid mapping, dvdnav_spu_stream_to_lang and
reimar
parents: 29790
diff changeset
819 lang = dvdnav_spu_stream_to_lang(priv->dvdnav, k);
21333
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
820 if(lang != 0xFFFF && lang == lcode) {
29816
94bde7a3ac51 Fixup the dvdnav <-> sid mapping, dvdnav_spu_stream_to_lang and
reimar
parents: 29790
diff changeset
821 return lg;
21333
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
822 }
21197
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
823 }
21333
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
824 language += 2;
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
825 while(language[0]==',' || language[0]==' ') ++language;
21204
1ddb1a86e419 support for comma-separated language codes in -slang
nicodvb
parents: 21200
diff changeset
826 }
21197
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
827 return -1;
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
828 }
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
829
21424
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
830 /**
34648
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
831 * \brief mp_dvdnav_lang_from_sid() returns the language corresponding to subtitle id 'sid'
21560
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
832 * \param stream: - stream pointer
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
833 * \param sid: physical subtitle id
34648
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
834 * \return 0 on error, otherwise language id
21560
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
835 */
34648
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
836 static int mp_dvdnav_lang_from_sid(stream_t *stream, int sid) {
29844
ab281bcfecb9 Remove an unused variable.
reimar
parents: 29817
diff changeset
837 uint8_t k;
21560
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
838 uint16_t lang;
25829
c0b5ff39e928 remove useless casts
ben
parents: 25828
diff changeset
839 dvdnav_priv_t *priv = stream->priv;
21560
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
840 if(sid < 0) return 0;
29816
94bde7a3ac51 Fixup the dvdnav <-> sid mapping, dvdnav_spu_stream_to_lang and
reimar
parents: 29790
diff changeset
841 for (k=0; k<32; k++)
94bde7a3ac51 Fixup the dvdnav <-> sid mapping, dvdnav_spu_stream_to_lang and
reimar
parents: 29790
diff changeset
842 if (dvdnav_get_spu_logical_stream(priv->dvdnav, k) == sid)
94bde7a3ac51 Fixup the dvdnav <-> sid mapping, dvdnav_spu_stream_to_lang and
reimar
parents: 29790
diff changeset
843 break;
94bde7a3ac51 Fixup the dvdnav <-> sid mapping, dvdnav_spu_stream_to_lang and
reimar
parents: 29790
diff changeset
844 if (k == 32)
94bde7a3ac51 Fixup the dvdnav <-> sid mapping, dvdnav_spu_stream_to_lang and
reimar
parents: 29790
diff changeset
845 return 0;
94bde7a3ac51 Fixup the dvdnav <-> sid mapping, dvdnav_spu_stream_to_lang and
reimar
parents: 29790
diff changeset
846 lang = dvdnav_spu_stream_to_lang(priv->dvdnav, k);
21560
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
847 if(lang == 0xffff) return 0;
34648
26eddbd6353a Code cleanup: Use a stream_control instead of global functions to
reimar
parents: 33516
diff changeset
848 return lang;
21560
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
849 }
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
850
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
851 /**
26986
4bee4b9ec054 Rename some functions as they are mplayer related and not
ben
parents: 26985
diff changeset
852 * \brief mp_dvdnav_number_of_subs() returns the count of available subtitles
21424
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
853 * \param stream: - stream pointer
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
854 * \return 0 on error, something meaningful otherwise
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
855 */
26986
4bee4b9ec054 Rename some functions as they are mplayer related and not
ben
parents: 26985
diff changeset
856 int mp_dvdnav_number_of_subs(stream_t *stream) {
25829
c0b5ff39e928 remove useless casts
ben
parents: 25828
diff changeset
857 dvdnav_priv_t * priv = stream->priv;
21197
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
858 uint8_t lg, k, n=0;
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
859
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
860 if (priv->state & NAV_FLAG_VTS_DOMAIN) return 0;
21197
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
861 for(k=0; k<32; k++) {
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
862 lg = dvdnav_get_spu_logical_stream(priv->dvdnav, k);
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
863 if(lg == 0xff) continue;
29816
94bde7a3ac51 Fixup the dvdnav <-> sid mapping, dvdnav_spu_stream_to_lang and
reimar
parents: 29790
diff changeset
864 if(lg >= n) n = lg + 1;
21197
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
865 }
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
866 return n;
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
867 }
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
868
23902
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
869 /**
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
870 * \brief mp_dvdnav_get_spu_clut() returns the spu clut
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
871 * \param stream: - stream pointer
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
872 * \return spu clut pointer
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
873 */
21538
c9b6588932b5 export spu palette; part of a patch by Otvos Attila
nicodvb
parents: 21424
diff changeset
874 unsigned int *mp_dvdnav_get_spu_clut(stream_t *stream) {
25829
c0b5ff39e928 remove useless casts
ben
parents: 25828
diff changeset
875 dvdnav_priv_t *priv = stream->priv;
25828
8a1627f693a6 simplify by a one-liner
ben
parents: 25827
diff changeset
876 return (priv->state & NAV_FLAG_SPU_SET) ? priv->spu_clut : NULL;
21538
c9b6588932b5 export spu palette; part of a patch by Otvos Attila
nicodvb
parents: 21424
diff changeset
877 }
c9b6588932b5 export spu palette; part of a patch by Otvos Attila
nicodvb
parents: 21424
diff changeset
878
23902
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
879 /**
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
880 * \brief mp_dvdnav_get_highlight() get dvdnav highlight struct
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
881 * \param stream: - stream pointer
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
882 * \param hl : - highlight struct pointer
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
883 */
21219
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
884 void mp_dvdnav_get_highlight (stream_t *stream, nav_highlight_t *hl) {
25829
c0b5ff39e928 remove useless casts
ben
parents: 25828
diff changeset
885 dvdnav_priv_t *priv = stream->priv;
21219
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
886 dvdnav_highlight_event_t hlev = priv->hlev;
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
887
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
888 hl->sx = hlev.sx;
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
889 hl->sy = hlev.sy;
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
890 hl->ex = hlev.ex;
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
891 hl->ey = hlev.ey;
26973
2b6d87a07612 Save DVDNAV palette info.
ben
parents: 25955
diff changeset
892 hl->palette = hlev.palette;
21200
c7b5dd2b2291 better nav highlight handling
ben
parents: 21199
diff changeset
893 }
19851
adfd08588514 report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents: 19842
diff changeset
894
25817
883c6c3ae041 Add new command to switch between dvdnav titles
ben
parents: 25691
diff changeset
895 void mp_dvdnav_switch_title (stream_t *stream, int title) {
25829
c0b5ff39e928 remove useless casts
ben
parents: 25828
diff changeset
896 dvdnav_priv_t *priv = stream->priv;
25817
883c6c3ae041 Add new command to switch between dvdnav titles
ben
parents: 25691
diff changeset
897 uint32_t titles;
883c6c3ae041 Add new command to switch between dvdnav titles
ben
parents: 25691
diff changeset
898
883c6c3ae041 Add new command to switch between dvdnav titles
ben
parents: 25691
diff changeset
899 dvdnav_get_number_of_titles (priv->dvdnav, &titles);
883c6c3ae041 Add new command to switch between dvdnav titles
ben
parents: 25691
diff changeset
900 if (title > 0 && title <= titles)
883c6c3ae041 Add new command to switch between dvdnav titles
ben
parents: 25691
diff changeset
901 dvdnav_title_play (priv->dvdnav, title);
883c6c3ae041 Add new command to switch between dvdnav titles
ben
parents: 25691
diff changeset
902 }
883c6c3ae041 Add new command to switch between dvdnav titles
ben
parents: 25691
diff changeset
903
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
904 /**
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
905 * \brief Check if end of stream has been reached
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
906 * \param stream: - stream pointer
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
907 * \return 1 on really eof
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
908 */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
909 int mp_dvdnav_is_eof (stream_t *stream) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
910 return ((dvdnav_priv_t *) stream->priv)->state & NAV_FLAG_EOF;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
911 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
912
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
913 /**
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
914 * \brief Skip still frame
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
915 * \param stream: - stream pointer
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
916 * \return 0 on success
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
917 */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
918 int mp_dvdnav_skip_still (stream_t *stream) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
919 dvdnav_priv_t *priv = stream->priv;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
920 if (priv->still_length == 0xff)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
921 return 1;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
922 dvdnav_still_skip(priv->dvdnav);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
923 return 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
924 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
925
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
926 /**
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
927 * \brief Skip wait event
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
928 * \param stream: - stream pointer
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
929 * \return 0 on success
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
930 */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
931 int mp_dvdnav_skip_wait (stream_t *stream) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
932 dvdnav_priv_t *priv = stream->priv;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
933 if (!(priv->state & NAV_FLAG_WAIT))
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
934 return 1;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
935 priv->state &= ~NAV_FLAG_WAIT;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
936 dvdnav_wait_skip(priv->dvdnav);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
937 return 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
938 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
939
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
940 /**
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
941 * \brief Set wait mode
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
942 * \param stream : - stream pointer
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
943 * \param mode : - if true, then suspend block read
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
944 * \param automode: - if true, then VTS or cell change set wait mode
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
945 */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
946 void mp_dvdnav_read_wait (stream_t *stream, int mode, int automode) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
947 dvdnav_priv_t *priv = stream->priv;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
948 if (mode == 0)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
949 priv->state &= ~NAV_FLAG_WAIT_READ;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
950 if (mode > 0)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
951 priv->state |= NAV_FLAG_WAIT_READ;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
952 if (automode == 0)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
953 priv->state &= ~NAV_FLAG_WAIT_READ_AUTO;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
954 if (automode > 0)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
955 priv->state |= NAV_FLAG_WAIT_READ_AUTO;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
956 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
957
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
958 /**
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
959 * \brief Check if cell has changed
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
960 * \param stream: - stream pointer
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
961 * \param clear : - if true, then clear cell change flag
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
962 * \return 1 if cell has changed
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
963 */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
964 int mp_dvdnav_cell_has_changed (stream_t *stream, int clear) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
965 dvdnav_priv_t *priv = stream->priv;
26985
9ab366f856c1 rename for consistency
ben
parents: 26984
diff changeset
966 if (!(priv->state & NAV_FLAG_CELL_CHANGE))
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
967 return 0;
25832
8601206c2ffc factorize 2 tests
ben
parents: 25830
diff changeset
968 if (clear) {
26985
9ab366f856c1 rename for consistency
ben
parents: 26984
diff changeset
969 priv->state &= ~NAV_FLAG_CELL_CHANGE;
25832
8601206c2ffc factorize 2 tests
ben
parents: 25830
diff changeset
970 priv->state |= NAV_FLAG_STREAM_CHANGE;
8601206c2ffc factorize 2 tests
ben
parents: 25830
diff changeset
971 }
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
972 return 1;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
973 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
974
26983
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
975 /**
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
976 * \brief Check if audio has changed
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
977 * \param stream: - stream pointer
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
978 * \param clear : - if true, then clear audio change flag
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
979 * \return 1 if audio has changed
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
980 */
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
981 int mp_dvdnav_audio_has_changed (stream_t *stream, int clear) {
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
982 dvdnav_priv_t *priv = stream->priv;
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
983
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
984 if (!(priv->state & NAV_FLAG_AUDIO_CHANGE))
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
985 return 0;
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
986
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
987 if (clear)
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
988 priv->state &= ~NAV_FLAG_AUDIO_CHANGE;
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
989
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
990 return 1;
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
991 }
a9626d7ae755 Add routine to determine if audio has changed in dvdnav stream.
ben
parents: 26973
diff changeset
992
26984
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
993 /**
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
994 * \brief Check if SPU has changed
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
995 * \param stream: - stream pointer
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
996 * \param clear : - if true, then clear spu change flag
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
997 * \return 1 if spu has changed
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
998 */
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
999 int mp_dvdnav_spu_has_changed (stream_t *stream, int clear) {
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
1000 dvdnav_priv_t *priv = stream->priv;
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
1001
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
1002 if (!(priv->state & NAV_FLAG_SPU_CHANGE))
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
1003 return 0;
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
1004
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
1005 if (clear)
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
1006 priv->state &= ~NAV_FLAG_SPU_CHANGE;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29130
diff changeset
1007
26984
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
1008 return 1;
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
1009 }
540400f89398 Add routine to determine if SPU has changed in dvdnav stream.
ben
parents: 26983
diff changeset
1010
25830
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
1011 /* Notify if something has changed in stream
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
1012 * Can be related to title, chapter, audio or SPU
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
1013 */
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
1014 int mp_dvdnav_stream_has_changed (stream_t *stream) {
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
1015 dvdnav_priv_t *priv = stream->priv;
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
1016
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
1017 if (!(priv->state & NAV_FLAG_STREAM_CHANGE))
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
1018 return 0;
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
1019
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
1020 priv->state &= ~NAV_FLAG_STREAM_CHANGE;
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
1021 return 1;
32acf35f74e1 add a new state flag to dvdnav in order to notify if
ben
parents: 25829
diff changeset
1022 }
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
1023
25211
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25196
diff changeset
1024 const stream_info_t stream_info_dvdnav = {
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
1025 "DVDNAV stream",
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
1026 "null",
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
1027 "",
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
1028 "",
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
1029 open_s,
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
1030 { "dvdnav", NULL },
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
1031 &stream_opts,
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
1032 1 // Urls are an option string
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
1033 };