Mercurial > mplayer.hg
annotate mplayer.c @ 33461:175e9084ee62
Remove needless explicit initialization of Display variables.
author | ib |
---|---|
date | Fri, 03 Jun 2011 14:25:43 +0000 |
parents | f33d61bf5da0 |
children | 45d8bfbd27bc |
rev | line source |
---|---|
30429
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
1 /* |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
2 * This file is part of MPlayer. |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
3 * |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
7 * (at your option) any later version. |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
8 * |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
12 * GNU General Public License for more details. |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
13 * |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
17 */ |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
18 |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
19 #include "config.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
20 |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
21 #include <errno.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
22 #include <fcntl.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
23 #include <limits.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
24 #include <signal.h> |
1430 | 25 #include <stdio.h> |
26 #include <stdlib.h> | |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
27 #include <string.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
28 #include <time.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
29 #include <unistd.h> |
32724
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
30 #include <assert.h> |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
31 #include <sys/stat.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
32 #include <sys/time.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
33 #include <sys/types.h> |
12360 | 34 |
27727
48c1ae64255b
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents:
27635
diff
changeset
|
35 #if defined(__MINGW32__) || defined(__CYGWIN__) |
12358
133e0ebde74d
Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
faust3
parents:
12332
diff
changeset
|
36 #define _UWIN 1 /*disable Non-underscored versions of non-ANSI functions as otherwise int eof would conflict with eof()*/ |
133e0ebde74d
Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
faust3
parents:
12332
diff
changeset
|
37 #include <windows.h> |
133e0ebde74d
Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
faust3
parents:
12332
diff
changeset
|
38 #endif |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
39 |
9831 | 40 #ifndef __MINGW32__ |
41 #include <sys/ioctl.h> | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
42 #include <sys/wait.h> |
9831 | 43 #else |
33363 | 44 #define SIGHUP 1 /* hangup */ |
45 #define SIGQUIT 3 /* quit */ | |
46 #define SIGKILL 9 /* kill (cannot be caught or ignored) */ | |
47 #define SIGBUS 10 /* bus error */ | |
48 #define SIGPIPE 13 /* broken pipe */ | |
9831 | 49 #endif |
50 | |
3015 | 51 #ifdef HAVE_RTC |
14381
dc7b86065e3c
RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents:
14296
diff
changeset
|
52 #ifdef __linux__ |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
53 #include <linux/rtc.h> |
14381
dc7b86065e3c
RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents:
14296
diff
changeset
|
54 #else |
dc7b86065e3c
RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents:
14296
diff
changeset
|
55 #include <rtc.h> |
dc7b86065e3c
RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents:
14296
diff
changeset
|
56 #define RTC_IRQP_SET RTCIO_IRQP_SET |
dc7b86065e3c
RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents:
14296
diff
changeset
|
57 #define RTC_PIE_ON RTCIO_PIE_ON |
16490
f17b3c152fd6
Add comments to a few #endif statements in order to make clear which
diego
parents:
16489
diff
changeset
|
58 #endif /* __linux__ */ |
f17b3c152fd6
Add comments to a few #endif statements in order to make clear which
diego
parents:
16489
diff
changeset
|
59 #endif /* HAVE_RTC */ |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
60 |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
61 /* |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
62 * In Mac OS X the SDL-lib is built upon Cocoa. The easiest way to |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
63 * make it all work is to use the builtin SDL-bootstrap code, which |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
64 * will be done automatically by replacing our main() if we include SDL.h. |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
65 */ |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
66 #if defined(__APPLE__) && defined(CONFIG_SDL) |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
67 #ifdef CONFIG_SDL_SDL_H |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
68 #include <SDL/SDL.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
69 #else |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
70 #include <SDL.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
71 #endif |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
72 #endif |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
73 |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
74 #include "gui/interface.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
75 #include "input/input.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
76 #include "libao2/audio_out.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
77 #include "libavutil/avstring.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
78 #include "libavutil/intreadwrite.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
79 #include "libmenu/menu.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
80 #include "libmpcodecs/dec_audio.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
81 #include "libmpcodecs/dec_video.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
82 #include "libmpcodecs/mp_image.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
83 #include "libmpcodecs/vd.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
84 #include "libmpcodecs/vf.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
85 #include "libmpdemux/demuxer.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
86 #include "libmpdemux/stheader.h" |
32466
9e627a1793b1
Move font_load.[ch], font_load_ft.c and osd_font.h from libvo to sub.
cigaes
parents:
32461
diff
changeset
|
87 #include "sub/font_load.h" |
32467 | 88 #include "sub/sub.h" |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
89 #include "libvo/video_out.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
90 #include "stream/cache2.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
91 #include "stream/stream.h" |
31877
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31839
diff
changeset
|
92 #include "stream/stream_bd.h" |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
93 #include "stream/stream_dvdnav.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
94 #include "stream/stream_radio.h" |
19271
64d82a45a05d
introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents:
19227
diff
changeset
|
95 #include "stream/tv.h" |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
96 #include "access_mpcontext.h" |
32461 | 97 #include "sub/ass_mp.h" |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
98 #include "cfg-mplayer-def.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
99 #include "codec-cfg.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
100 #include "command.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
101 #include "edl.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
102 #include "help_mp.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
103 #include "m_config.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
104 #include "m_option.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
105 #include "m_property.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
106 #include "m_struct.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
107 #include "metadata.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
108 #include "mixer.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
109 #include "mp_core.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
110 #include "mp_fifo.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
111 #include "mp_msg.h" |
32889
db45f9bd690d
10l: forgot mp_strings.h header include with mp_asprintf prototype.
cboesch
parents:
32886
diff
changeset
|
112 #include "mp_strings.h" |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
113 #include "mpcommon.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
114 #include "mplayer.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
115 #include "osdep/getch2.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
116 #include "osdep/timer.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
117 #include "parser-cfg.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
118 #include "parser-mpcmd.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
119 #include "path.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
120 #include "playtree.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
121 #include "playtreeparser.h" |
32456 | 122 #include "sub/spudec.h" |
32454
69d3be4d52a2
Create a new directory, "sub", for subtitles and OSD related code.
cigaes
parents:
32438
diff
changeset
|
123 #include "sub/subreader.h" |
32459
1a605463f62b
Move vobsub.[ch] and unrar_exec.[ch] to the sub directory.
cigaes
parents:
32456
diff
changeset
|
124 #include "sub/vobsub.h" |
32460 | 125 #include "sub/eosd.h" |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
126 #include "osdep/getch2.h" |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
127 #include "osdep/timer.h" |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
128 |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
129 #include "udp_sync.h" |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
130 |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
131 #ifdef CONFIG_X11 |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
132 #include "libvo/x11_common.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
133 #endif |
29432 | 134 #ifdef CONFIG_DVBIN |
19271
64d82a45a05d
introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents:
19227
diff
changeset
|
135 #include "stream/dvbin.h" |
29432 | 136 #endif |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
137 #ifdef CONFIG_DVDREAD |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
138 #include "stream/stream_dvd.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
139 #endif |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
140 |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
141 int slave_mode; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
142 int player_idle_mode; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
143 int quiet; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
144 int enable_mouse_movements; |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
145 float start_volume = -1; |
33363 | 146 double start_pts = MP_NOPTS_VALUE; |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
147 char *heartbeat_cmd; |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
148 |
33363 | 149 m_config_t *mconfig; |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
150 |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
151 //**************************************************************************// |
258 | 152 // Config file |
153 //**************************************************************************// | |
154 | |
33363 | 155 static int cfg_inc_verbose(m_option_t *conf) |
156 { | |
157 ++verbose; | |
158 return 0; | |
159 } | |
160 | |
161 static int cfg_include(m_option_t *conf, char *filename) | |
162 { | |
163 return m_config_parse_config_file(mconfig, filename); | |
162 | 164 } |
165 | |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
166 static int max_framesize; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
167 |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
168 int noconsolecontrols; |
1 | 169 //**************************************************************************// |
170 | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
171 // Not all functions in mplayer.c take the context as an argument yet |
22993 | 172 static MPContext mpctx_s = { |
33363 | 173 .osd_function = OSD_PLAY, |
174 .begin_skip = MP_NOPTS_VALUE, | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
175 .play_tree_step = 1, |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
176 .global_sub_pos = -1, |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
177 .set_of_sub_pos = -1, |
33363 | 178 .file_format = DEMUXER_TYPE_UNKNOWN, |
179 .loop_times = -1, | |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27359
diff
changeset
|
180 #ifdef CONFIG_DVBIN |
33363 | 181 .last_dvb_step = 1, |
22281 | 182 #endif |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
183 }; |
1 | 184 |
22993 | 185 static MPContext *mpctx = &mpctx_s; |
186 | |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
187 int fixed_vo; |
7677
33562a65e9e8
_EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents:
7628
diff
changeset
|
188 |
2557 | 189 // benchmark: |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
190 double video_time_usage; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
191 double vout_time_usage; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
192 static double audio_time_usage; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
193 static int total_time_usage_start; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
194 static int total_frame_cnt; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
195 static int drop_frame_cnt; // total number of dropped frames |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
196 int benchmark; |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
197 |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
198 // options: |
30176
6fb92182aff3
At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents:
30175
diff
changeset
|
199 #define DEFAULT_STARTUP_DECODE_RETRY 8 |
33363 | 200 int auto_quality; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
201 static int output_quality; |
1439 | 202 |
33363 | 203 float playback_speed = 1.0; |
7605
c3bbe602aff3
new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents:
7604
diff
changeset
|
204 |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
205 int use_gui; |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
206 |
27343 | 207 #ifdef CONFIG_GUI |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
208 int enqueue; |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
209 #endif |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
210 |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
211 static int list_properties; |
17914
f9cb6fc1608a
Add an option to list the properties: -list-properties
albeu
parents:
17911
diff
changeset
|
212 |
33363 | 213 int osd_level = 1; |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18286
diff
changeset
|
214 // if nonzero, hide current OSD contents when GetTimerMS() reaches this |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18286
diff
changeset
|
215 unsigned int osd_visible; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
216 int osd_duration = 1000; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
217 int osd_fractions; // determines how fractions of seconds are displayed |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
218 // on OSD |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
219 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
220 int term_osd = 1; |
33363 | 221 static char *term_osd_esc = "\x1b[A\r\x1b[K"; |
222 static char *playing_msg; | |
2557 | 223 // seek: |
22312 | 224 static double seek_to_sec; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
225 static off_t seek_to_byte; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
226 static off_t step_sec; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
227 static int loop_seek; |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
228 |
19973
02a18c52a42a
after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents:
19946
diff
changeset
|
229 static m_time_size_t end_at = { .type = END_AT_NONE, .pos = 0 }; |
02a18c52a42a
after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents:
19946
diff
changeset
|
230 |
7576
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
231 // A/V sync: |
33363 | 232 int autosync; // 30 might be a good default value. |
7576
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
233 |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
234 // may be changed by GUI: (FIXME!) |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
235 float rel_seek_secs; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
236 int abs_seek_pos; |
2557 | 237 |
238 // codecs: | |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
239 char **audio_codec_list; // override audio codec |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
240 char **video_codec_list; // override video codec |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
241 char **audio_fm_list; // override audio codec family |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
242 char **video_fm_list; // override video codec family |
1285
202d9e2dc202
-vcodec option (maybe some other name would be better though) to select between driver types without editing codecs.conf. mplayer will default to normal codec search loop if it does not find codec for the specified driver type. config range checking for the parameter (an integer) should be cleaned, IMHO
lgb
parents:
1255
diff
changeset
|
243 |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
244 // streaming: |
33363 | 245 int audio_id = -1; |
246 int video_id = -1; | |
247 int dvdsub_id = -1; | |
29855
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
248 // this dvdsub_id was selected via slang |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
249 // use this to allow dvdnav to follow -slang across stream resets, |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
250 // in particular the subtitle ID for a language changes |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
251 int dvdsub_lang_id; |
33363 | 252 int vobsub_id = -1; |
253 char *audio_lang; | |
254 char *dvdsub_lang; | |
255 static char *spudec_ifo; | |
256 char *filename; | |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
257 int forced_subs_only; |
33363 | 258 int file_filter = 1; |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
259 |
2353 | 260 // cache2: |
33363 | 261 int stream_cache_size = -1; |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
262 #ifdef CONFIG_STREAM_CACHE |
33363 | 263 float stream_cache_min_percent = 20.0; |
264 float stream_cache_seek_min_percent = 50.0; | |
2353 | 265 #endif |
266 | |
2557 | 267 // dump: |
32438
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32415
diff
changeset
|
268 char *stream_dump_name = "stream.dump"; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
269 int stream_dump_type; |
33390 | 270 uint64_t stream_dump_count; |
271 unsigned stream_dump_start_time; | |
272 unsigned stream_dump_last_print_time; | |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
273 int capture_dump; |
2557 | 274 |
275 // A-V sync: | |
33363 | 276 static float default_max_pts_correction = -1; |
277 static float max_pts_correction; //default_max_pts_correction; | |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
278 static float c_total; |
33363 | 279 float audio_delay; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
280 static int ignore_start; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
281 |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
282 static int softsleep; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
283 |
33363 | 284 double force_fps; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
285 static int force_srate; |
33363 | 286 static int audio_output_format = -1; // AF_FORMAT_UNKNOWN |
287 int frame_dropping; // option 0=no drop 1= drop vo 2= drop decode | |
288 static int play_n_frames = -1; | |
289 static int play_n_frames_mf = -1; | |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
290 |
1 | 291 // screen info: |
33363 | 292 char **video_driver_list; |
293 char **audio_driver_list; | |
5075 | 294 |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
295 // sub: |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
296 char *font_name; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
297 char *sub_font_name; |
33363 | 298 float font_factor = 0.75; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
299 char **sub_name; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
300 char **sub_paths; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
301 float sub_delay; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
302 float sub_fps; |
33363 | 303 int sub_auto = 1; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
304 char *vobsub_name; |
33363 | 305 int subcc_enabled; |
8361
2202c00001e3
overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
arpi
parents:
8360
diff
changeset
|
306 int suboverlap_enabled = 1; |
21140 | 307 |
33363 | 308 char *current_module; // for debugging |
6781 | 309 |
27345
b597fd2924b4
Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents:
27343
diff
changeset
|
310 #ifdef CONFIG_MENU |
33363 | 311 static const vf_info_t *const libmenu_vfs[] = { |
312 &vf_info_menu, | |
313 NULL | |
8198 | 314 }; |
33363 | 315 static vf_instance_t *vf_menu; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
316 int use_menu; |
33363 | 317 static char *menu_cfg; |
318 static char *menu_root = "main"; | |
8198 | 319 #endif |
320 | |
5055 | 321 #ifdef HAVE_RTC |
19756 | 322 static int nortc = 1; |
33363 | 323 static char *rtc_device; |
5055 | 324 #endif |
325 | |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
326 edl_record_ptr edl_records; ///< EDL entries memory area |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
327 edl_record_ptr next_edl_record; ///< only for traversing edl_records |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
328 short edl_decision; ///< 1 when an EDL operation has been made. |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
329 short edl_needs_reset; ///< 1 if we need to reset EDL next pointer |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
330 short edl_backward; ///< 1 if we need to skip to the beginning of the next EDL record |
33363 | 331 FILE *edl_fd; ///< fd to write to when in -edlout mode. |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
332 // Number of seconds to add to the seek when jumping out |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
333 // of EDL scene in backward direction. This is needed to |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
334 // have some time after the seek to decide what to do next |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
335 // (next seek, pause,...), otherwise after the seek it will |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
336 // enter the same scene again and skip forward immediately |
31580
b6c2b541e1a6
Implement edl-backward-delay to avoid jumping right over an
reynaldo
parents:
31515
diff
changeset
|
337 float edl_backward_delay = 2; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
338 int edl_start_pts; ///< Automatically add/sub this from EDL start/stop pos |
20251
2971196cd8c6
Disable loading of file-specific configuration file from the same
rtogni
parents:
20207
diff
changeset
|
339 int use_filedir_conf; |
29862
fbb1f57a313e
Added -name, -title and -use-filename-title options and implementation in X11 vos
ptt
parents:
29857
diff
changeset
|
340 int use_filename_title; |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
341 |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
342 static unsigned int initialized_flags; |
31514
c6195b5575cc
cosmetics: Move volstep global var to the top where all other global vars live.
diego
parents:
31513
diff
changeset
|
343 |
33287 | 344 int volstep = 3; ///< step size of mixer changes |
31514
c6195b5575cc
cosmetics: Move volstep global var to the top where all other global vars live.
diego
parents:
31513
diff
changeset
|
345 |
31801 | 346 #ifdef CONFIG_CRASH_DEBUG |
347 static char *prog_path; | |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
348 static int crash_debug; |
31801 | 349 #endif |
350 | |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
351 /* This header requires all the global variable declarations. */ |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
352 #include "cfg-mplayer.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
353 |
25765
304fc0bbefe1
audio_out / video_out structs should be treated as const
reimar
parents:
25658
diff
changeset
|
354 const void *mpctx_get_video_out(MPContext *mpctx) |
22284 | 355 { |
356 return mpctx->video_out; | |
357 } | |
358 | |
28259
f313c0ff6882
Add missing const qualifier to mpctx_get_audio_out function declaration.
diego
parents:
28185
diff
changeset
|
359 const void *mpctx_get_audio_out(MPContext *mpctx) |
22286 | 360 { |
22411
cf4c052b6d60
Fix copy-paste bug (must have broken something in the GUI)
uau
parents:
22365
diff
changeset
|
361 return mpctx->audio_out; |
22286 | 362 } |
363 | |
25364 | 364 void *mpctx_get_demuxer(MPContext *mpctx) |
365 { | |
366 return mpctx->demuxer; | |
367 } | |
368 | |
22284 | 369 void *mpctx_get_playtree_iter(MPContext *mpctx) |
370 { | |
371 return mpctx->playtree_iter; | |
372 } | |
373 | |
22286 | 374 void *mpctx_get_mixer(MPContext *mpctx) |
375 { | |
376 return &mpctx->mixer; | |
377 } | |
378 | |
22290 | 379 int mpctx_get_global_sub_size(MPContext *mpctx) |
22286 | 380 { |
381 return mpctx->global_sub_size; | |
382 } | |
383 | |
25026
afead6ecb8ba
Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents:
24982
diff
changeset
|
384 int mpctx_get_osd_function(MPContext *mpctx) |
afead6ecb8ba
Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents:
24982
diff
changeset
|
385 { |
afead6ecb8ba
Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents:
24982
diff
changeset
|
386 return mpctx->osd_function; |
afead6ecb8ba
Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents:
24982
diff
changeset
|
387 } |
afead6ecb8ba
Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents:
24982
diff
changeset
|
388 |
33363 | 389 static int is_valid_metadata_type(metadata_t type) |
390 { | |
391 switch (type) { | |
392 /* check for valid video stream */ | |
393 case META_VIDEO_CODEC: | |
394 case META_VIDEO_BITRATE: | |
395 case META_VIDEO_RESOLUTION: | |
396 if (!mpctx->sh_video) | |
397 return 0; | |
398 break; | |
399 | |
400 /* check for valid audio stream */ | |
401 case META_AUDIO_CODEC: | |
402 case META_AUDIO_BITRATE: | |
403 case META_AUDIO_SAMPLES: | |
404 if (!mpctx->sh_audio) | |
405 return 0; | |
406 break; | |
407 | |
408 /* check for valid demuxer */ | |
409 case META_INFO_TITLE: | |
410 case META_INFO_ARTIST: | |
411 case META_INFO_ALBUM: | |
412 case META_INFO_YEAR: | |
413 case META_INFO_COMMENT: | |
414 case META_INFO_TRACK: | |
415 case META_INFO_GENRE: | |
416 if (!mpctx->demuxer) | |
417 return 0; | |
418 break; | |
419 | |
420 default: | |
421 break; | |
422 } | |
423 | |
424 return 1; | |
425 } | |
426 | |
427 static char *get_demuxer_info(char *tag) | |
428 { | |
429 char **info = mpctx->demuxer->info; | |
430 int n; | |
431 | |
432 if (!info || !tag) | |
433 return NULL; | |
434 | |
435 for (n = 0; info[2 * n] != NULL; n++) | |
436 if (!strcasecmp(info[2 * n], tag)) | |
437 break; | |
438 | |
439 return info[2 * n + 1] ? strdup(info[2 * n + 1]) : NULL; | |
19532
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
440 } |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
441 |
33363 | 442 char *get_metadata(metadata_t type) |
443 { | |
444 sh_audio_t *const sh_audio = mpctx->sh_audio; | |
445 sh_video_t *const sh_video = mpctx->sh_video; | |
446 | |
447 if (!is_valid_metadata_type(type)) | |
448 return NULL; | |
449 | |
450 switch (type) { | |
451 case META_NAME: | |
452 return strdup(mp_basename(filename)); | |
453 | |
454 case META_VIDEO_CODEC: | |
455 if (sh_video->format == 0x10000001) | |
456 return strdup("mpeg1"); | |
457 else if (sh_video->format == 0x10000002) | |
458 return strdup("mpeg2"); | |
459 else if (sh_video->format == 0x10000004) | |
460 return strdup("mpeg4"); | |
461 else if (sh_video->format == 0x10000005) | |
462 return strdup("h264"); | |
463 else if (sh_video->format >= 0x20202020) | |
464 return mp_asprintf("%.4s", (char *)&sh_video->format); | |
465 return mp_asprintf("0x%08X", sh_video->format); | |
466 | |
467 case META_VIDEO_BITRATE: | |
468 return mp_asprintf("%d kbps", (int)(sh_video->i_bps * 8 / 1024)); | |
469 | |
470 case META_VIDEO_RESOLUTION: | |
471 return mp_asprintf("%d x %d", sh_video->disp_w, sh_video->disp_h); | |
472 | |
473 case META_AUDIO_CODEC: | |
474 if (sh_audio->codec && sh_audio->codec->name) | |
475 return strdup(sh_audio->codec->name); | |
476 break; | |
477 | |
478 case META_AUDIO_BITRATE: | |
479 return mp_asprintf("%d kbps", (int)(sh_audio->i_bps * 8 / 1000)); | |
480 | |
481 case META_AUDIO_SAMPLES: | |
482 return mp_asprintf("%d Hz, %d ch.", sh_audio->samplerate, sh_audio->channels); | |
483 | |
484 /* check for valid demuxer */ | |
485 case META_INFO_TITLE: | |
486 return get_demuxer_info("Title"); | |
487 | |
488 case META_INFO_ARTIST: | |
489 return get_demuxer_info("Artist"); | |
490 | |
491 case META_INFO_ALBUM: | |
492 return get_demuxer_info("Album"); | |
493 | |
494 case META_INFO_YEAR: | |
495 return get_demuxer_info("Year"); | |
496 | |
497 case META_INFO_COMMENT: | |
498 return get_demuxer_info("Comment"); | |
499 | |
500 case META_INFO_TRACK: | |
501 return get_demuxer_info("Track"); | |
502 | |
503 case META_INFO_GENRE: | |
504 return get_demuxer_info("Genre"); | |
505 | |
506 default: | |
507 break; | |
508 } | |
509 | |
19532
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
510 return NULL; |
19529
9a59c33bee29
new option for libmenu that allow display of properties and metadata of currently played stream
ben
parents:
19521
diff
changeset
|
511 } |
9a59c33bee29
new option for libmenu that allow display of properties and metadata of currently played stream
ben
parents:
19521
diff
changeset
|
512 |
31277
5d5bda998a2f
Move code printing -identify output for a file to a separate function.
reimar
parents:
31262
diff
changeset
|
513 static void print_file_properties(const MPContext *mpctx, const char *filename) |
5d5bda998a2f
Move code printing -identify output for a file to a separate function.
reimar
parents:
31262
diff
changeset
|
514 { |
33363 | 515 double video_start_pts = MP_NOPTS_VALUE; |
516 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FILENAME=%s\n", | |
517 filename_recode(filename)); | |
518 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DEMUXER=%s\n", mpctx->demuxer->desc->name); | |
519 if (mpctx->sh_video) { | |
520 /* Assume FOURCC if all bytes >= 0x20 (' ') */ | |
521 if (mpctx->sh_video->format >= 0x20202020) | |
522 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_FORMAT=%.4s\n", (char *)&mpctx->sh_video->format); | |
523 else | |
524 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_FORMAT=0x%08X\n", mpctx->sh_video->format); | |
525 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_BITRATE=%d\n", mpctx->sh_video->i_bps * 8); | |
526 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_WIDTH=%d\n", mpctx->sh_video->disp_w); | |
527 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_HEIGHT=%d\n", mpctx->sh_video->disp_h); | |
528 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_FPS=%5.3f\n", mpctx->sh_video->fps); | |
529 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ASPECT=%1.4f\n", mpctx->sh_video->aspect); | |
530 video_start_pts = ds_get_next_pts(mpctx->d_video); | |
531 } | |
532 if (mpctx->sh_audio) { | |
533 /* Assume FOURCC if all bytes >= 0x20 (' ') */ | |
534 if (mpctx->sh_audio->format >= 0x20202020) | |
535 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_FORMAT=%.4s\n", (char *)&mpctx->sh_audio->format); | |
536 else | |
537 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_FORMAT=%d\n", mpctx->sh_audio->format); | |
538 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_BITRATE=%d\n", mpctx->sh_audio->i_bps * 8); | |
539 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_RATE=%d\n", mpctx->sh_audio->samplerate); | |
540 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_NCH=%d\n", mpctx->sh_audio->channels); | |
541 start_pts = ds_get_next_pts(mpctx->d_audio); | |
542 } | |
543 if (video_start_pts != MP_NOPTS_VALUE) { | |
544 if (start_pts == MP_NOPTS_VALUE || !mpctx->sh_audio || | |
545 (mpctx->sh_video && video_start_pts < start_pts)) | |
546 start_pts = video_start_pts; | |
547 } | |
548 if (start_pts != MP_NOPTS_VALUE) | |
549 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_START_TIME=%.2f\n", start_pts); | |
31277
5d5bda998a2f
Move code printing -identify output for a file to a separate function.
reimar
parents:
31262
diff
changeset
|
550 else |
33363 | 551 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_START_TIME=unknown\n"); |
552 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_LENGTH=%.2f\n", demuxer_get_time_length(mpctx->demuxer)); | |
553 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SEEKABLE=%d\n", | |
554 mpctx->stream->seek && (!mpctx->demuxer || mpctx->demuxer->seekable)); | |
555 if (mpctx->demuxer) { | |
556 if (mpctx->demuxer->num_chapters == 0) | |
557 stream_control(mpctx->demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS, &mpctx->demuxer->num_chapters); | |
558 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTERS=%d\n", mpctx->demuxer->num_chapters); | |
559 } | |
31277
5d5bda998a2f
Move code printing -identify output for a file to a separate function.
reimar
parents:
31262
diff
changeset
|
560 } |
5d5bda998a2f
Move code printing -identify output for a file to a separate function.
reimar
parents:
31262
diff
changeset
|
561 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
562 #ifdef CONFIG_DVDNAV |
33363 | 563 static void mp_dvdnav_context_free(MPContext *ctx) |
564 { | |
565 if (ctx->nav_smpi) | |
566 free_mp_image(ctx->nav_smpi); | |
25824 | 567 ctx->nav_smpi = NULL; |
32511
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32467
diff
changeset
|
568 free(ctx->nav_buffer); |
33363 | 569 ctx->nav_buffer = NULL; |
570 ctx->nav_start = NULL; | |
25824 | 571 ctx->nav_in_size = 0; |
572 } | |
33363 | 573 |
8198 | 574 #endif |
33363 | 575 |
576 void uninit_player(unsigned int mask) | |
577 { | |
578 mask &= initialized_flags; | |
579 | |
580 mp_msg(MSGT_CPLAYER, MSGL_DBG2, "\n*** uninit(0x%X)\n", mask); | |
581 | |
582 if (mask & INITIALIZED_ACODEC) { | |
583 initialized_flags &= ~INITIALIZED_ACODEC; | |
584 current_module = "uninit_acodec"; | |
585 if (mpctx->sh_audio) | |
586 uninit_audio(mpctx->sh_audio); | |
587 #ifdef CONFIG_GUI | |
588 if (use_gui) | |
589 guiGetEvent(guiSetAfilter, (char *)NULL); | |
590 #endif | |
591 mpctx->sh_audio = NULL; | |
592 mpctx->mixer.afilter = NULL; | |
8023 | 593 } |
33363 | 594 |
595 if (mask & INITIALIZED_VCODEC) { | |
596 initialized_flags &= ~INITIALIZED_VCODEC; | |
597 current_module = "uninit_vcodec"; | |
598 if (mpctx->sh_video) | |
599 uninit_video(mpctx->sh_video); | |
600 mpctx->sh_video = NULL; | |
601 #ifdef CONFIG_MENU | |
602 vf_menu = NULL; | |
25824 | 603 #endif |
33363 | 604 } |
605 | |
606 if (mask & INITIALIZED_DEMUXER) { | |
607 initialized_flags &= ~INITIALIZED_DEMUXER; | |
608 current_module = "free_demuxer"; | |
609 if (mpctx->demuxer) { | |
610 mpctx->stream = mpctx->demuxer->stream; | |
611 free_demuxer(mpctx->demuxer); | |
612 } | |
613 mpctx->demuxer = NULL; | |
31839
5edb6679ccad
100l, do not free vo_spudec if e.g. just the audio is reinitialized.
reimar
parents:
31837
diff
changeset
|
614 } |
33363 | 615 |
616 // kill the cache process: | |
617 if (mask & INITIALIZED_STREAM) { | |
618 initialized_flags &= ~INITIALIZED_STREAM; | |
619 current_module = "uninit_stream"; | |
620 if (mpctx->stream) | |
621 free_stream(mpctx->stream); | |
622 mpctx->stream = NULL; | |
623 } | |
624 | |
625 if (mask & INITIALIZED_VO) { | |
626 initialized_flags &= ~INITIALIZED_VO; | |
627 current_module = "uninit_vo"; | |
628 mpctx->video_out->uninit(); | |
629 mpctx->video_out = NULL; | |
630 #ifdef CONFIG_DVDNAV | |
631 mp_dvdnav_context_free(mpctx); | |
33276
e7f4c0ae303d
Move freeing of subtitle data to uninit_player so it not only happens
reimar
parents:
33257
diff
changeset
|
632 #endif |
33363 | 633 if (vo_spudec) { |
634 current_module = "uninit_spudec"; | |
635 spudec_free(vo_spudec); | |
636 vo_spudec = NULL; | |
637 } | |
33276
e7f4c0ae303d
Move freeing of subtitle data to uninit_player so it not only happens
reimar
parents:
33257
diff
changeset
|
638 } |
33363 | 639 |
640 // Must be after libvo uninit, as few vo drivers (svgalib) have tty code. | |
641 if (mask & INITIALIZED_GETCH2) { | |
642 initialized_flags &= ~INITIALIZED_GETCH2; | |
643 current_module = "uninit_getch2"; | |
644 mp_msg(MSGT_CPLAYER, MSGL_DBG2, "\n[[[uninit getch2]]]\n"); | |
645 // restore terminal: | |
646 getch2_disable(); | |
647 } | |
648 | |
649 if (mask & INITIALIZED_SUBS) { | |
650 initialized_flags &= ~INITIALIZED_SUBS; | |
651 if (mpctx->set_of_sub_size > 0) { | |
652 int i; | |
653 current_module = "sub_free"; | |
654 for (i = 0; i < mpctx->set_of_sub_size; ++i) { | |
655 sub_free(mpctx->set_of_subtitles[i]); | |
33276
e7f4c0ae303d
Move freeing of subtitle data to uninit_player so it not only happens
reimar
parents:
33257
diff
changeset
|
656 #ifdef CONFIG_ASS |
33363 | 657 if (mpctx->set_of_ass_tracks[i]) |
658 ass_free_track(mpctx->set_of_ass_tracks[i]); | |
33276
e7f4c0ae303d
Move freeing of subtitle data to uninit_player so it not only happens
reimar
parents:
33257
diff
changeset
|
659 #endif |
33363 | 660 } |
661 mpctx->set_of_sub_size = 0; | |
662 } | |
663 vo_sub_last = vo_sub = NULL; | |
664 subdata = NULL; | |
665 #ifdef CONFIG_ASS | |
666 ass_track = NULL; | |
667 if (ass_library) | |
668 ass_clear_fonts(ass_library); | |
669 #endif | |
670 } | |
671 | |
672 if (mask & INITIALIZED_VOBSUB) { | |
673 initialized_flags &= ~INITIALIZED_VOBSUB; | |
674 current_module = "uninit_vobsub"; | |
675 if (vo_vobsub) | |
676 vobsub_close(vo_vobsub); | |
677 vo_vobsub = NULL; | |
678 } | |
679 | |
680 if (mask & INITIALIZED_AO) { | |
681 initialized_flags &= ~INITIALIZED_AO; | |
682 current_module = "uninit_ao"; | |
683 if (mpctx->edl_muted) | |
684 mixer_mute(&mpctx->mixer); | |
685 if (mpctx->audio_out) | |
686 mpctx->audio_out->uninit(mpctx->eof ? 0 : 1); | |
687 mpctx->audio_out = NULL; | |
688 } | |
1856 | 689 |
27343 | 690 #ifdef CONFIG_GUI |
33363 | 691 if (mask & INITIALIZED_GUI) { |
692 initialized_flags &= ~INITIALIZED_GUI; | |
693 current_module = "uninit_gui"; | |
694 guiDone(); | |
695 } | |
1856 | 696 #endif |
697 | |
33363 | 698 if (mask & INITIALIZED_INPUT) { |
699 initialized_flags &= ~INITIALIZED_INPUT; | |
700 current_module = "uninit_input"; | |
701 mp_input_uninit(); | |
27345
b597fd2924b4
Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents:
27343
diff
changeset
|
702 #ifdef CONFIG_MENU |
33363 | 703 if (use_menu) |
704 menu_uninit(); | |
25433 | 705 #endif |
33363 | 706 } |
707 | |
708 current_module = NULL; | |
1856 | 709 } |
710 | |
30518
654cad7ea876
Rename exit_reason_t enum to exit_reason and do not typedef it.
diego
parents:
30506
diff
changeset
|
711 void exit_player_with_rc(enum exit_reason how, int rc) |
654cad7ea876
Rename exit_reason_t enum to exit_reason and do not typedef it.
diego
parents:
30506
diff
changeset
|
712 { |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
713 #ifdef CONFIG_NETWORKING |
33363 | 714 if (udp_master) |
715 send_udp(udp_ip, udp_port, "bye"); | |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
716 #endif /* CONFIG_NETWORKING */ |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
717 |
33363 | 718 if (mpctx->user_muted && !mpctx->edl_muted) |
719 mixer_mute(&mpctx->mixer); | |
720 uninit_player(INITIALIZED_ALL); | |
27727
48c1ae64255b
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents:
27635
diff
changeset
|
721 #if defined(__MINGW32__) || defined(__CYGWIN__) |
33363 | 722 timeEndPeriod(1); |
26689
4cf30c0ca561
Request a timer resolution of 1 ms on Windows, the default of
reimar
parents:
26479
diff
changeset
|
723 #endif |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27370
diff
changeset
|
724 #ifdef CONFIG_X11 |
27343 | 725 #ifdef CONFIG_GUI |
33363 | 726 if (!use_gui) |
6016 | 727 #endif |
33363 | 728 vo_uninit(); // Close the X11 connection (if any is open). |
6015 | 729 #endif |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
730 |
27393 | 731 #ifdef CONFIG_FREETYPE |
33363 | 732 current_module = "uninit_font"; |
733 if (sub_font && sub_font != vo_font) | |
734 free_font_desc(sub_font); | |
735 sub_font = NULL; | |
736 if (vo_font) | |
737 free_font_desc(vo_font); | |
738 vo_font = NULL; | |
739 done_freetype(); | |
13956
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
740 #endif |
33363 | 741 free_osd_list(); |
13956
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
742 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
743 #ifdef CONFIG_ASS |
33363 | 744 ass_library_done(ass_library); |
745 ass_library = NULL; | |
20477 | 746 #endif |
747 | |
33363 | 748 current_module = "exit_player"; |
749 | |
750 if (mpctx->playtree_iter) | |
751 play_tree_iter_free(mpctx->playtree_iter); | |
752 mpctx->playtree_iter = NULL; | |
753 if (mpctx->playtree) | |
754 play_tree_free(mpctx->playtree, 1); | |
755 mpctx->playtree = NULL; | |
756 | |
757 free(edl_records); // free mem allocated for EDL | |
758 edl_records = NULL; | |
759 switch (how) { | |
760 case EXIT_QUIT: | |
761 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_ExitingHow, MSGTR_Exit_quit); | |
762 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_EXIT=QUIT\n"); | |
763 break; | |
764 case EXIT_EOF: | |
765 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_ExitingHow, MSGTR_Exit_eof); | |
766 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_EXIT=EOF\n"); | |
767 break; | |
768 case EXIT_ERROR: | |
769 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_ExitingHow, MSGTR_Exit_error); | |
770 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_EXIT=ERROR\n"); | |
771 break; | |
772 default: | |
773 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_EXIT=NONE\n"); | |
774 } | |
775 mp_msg(MSGT_CPLAYER, MSGL_DBG2, "max framesize was %d bytes\n", max_framesize); | |
776 | |
777 // must be last since e.g. mp_msg uses option values | |
778 // that will be freed by this. | |
779 if (mconfig) | |
780 m_config_free(mconfig); | |
781 mconfig = NULL; | |
782 | |
783 exit(rc); | |
8644
0bfd73828e33
This patch fixes so that the exit code (or return code if you like) is set
arpi
parents:
8635
diff
changeset
|
784 } |
0bfd73828e33
This patch fixes so that the exit code (or return code if you like) is set
arpi
parents:
8635
diff
changeset
|
785 |
30518
654cad7ea876
Rename exit_reason_t enum to exit_reason and do not typedef it.
diego
parents:
30506
diff
changeset
|
786 void exit_player(enum exit_reason how) |
654cad7ea876
Rename exit_reason_t enum to exit_reason and do not typedef it.
diego
parents:
30506
diff
changeset
|
787 { |
33363 | 788 exit_player_with_rc(how, 1); |
1156 | 789 } |
790 | |
13391 | 791 #ifndef __MINGW32__ |
33363 | 792 static void child_sighandler(int x) |
793 { | |
794 pid_t pid; | |
795 while ((pid = waitpid(-1, NULL, WNOHANG)) > 0) ; | |
13391 | 796 } |
33363 | 797 |
13794 | 798 #endif |
33363 | 799 |
800 static void exit_sighandler(int x) | |
801 { | |
802 static int sig_count; | |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27393
diff
changeset
|
803 #ifdef CONFIG_CRASH_DEBUG |
33363 | 804 if (!crash_debug || x != SIGTRAP) |
805 #endif | |
806 ++sig_count; | |
807 if (initialized_flags == 0 && sig_count > 1) | |
808 exit(1); | |
809 if (sig_count == 5) { | |
810 /* We're crashing bad and can't uninit cleanly :( | |
811 * by popular request, we make one last (dirty) | |
812 * effort to restore the user's | |
813 * terminal. */ | |
814 getch2_disable(); | |
815 exit(1); | |
816 } | |
817 if (sig_count == 6) | |
818 exit(1); | |
819 if (sig_count > 6) { | |
820 // can't stop :( | |
821 #ifndef __MINGW32__ | |
822 kill(getpid(), SIGKILL); | |
823 #endif | |
824 } | |
825 mp_msg(MSGT_CPLAYER, MSGL_FATAL, "\n" MSGTR_IntBySignal, x, | |
826 current_module ? current_module : "unknown" | |
827 ); | |
828 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SIGNAL=%d\n", x); | |
829 if (sig_count <= 1) | |
830 switch (x) { | |
831 case SIGINT: | |
832 case SIGPIPE: | |
833 case SIGQUIT: | |
834 case SIGTERM: | |
835 case SIGKILL: | |
836 async_quit_request = 1; | |
837 return; // killed from keyboard (^C) or killed [-9] | |
838 case SIGILL: | |
839 #if CONFIG_RUNTIME_CPUDETECT | |
840 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGILL_RTCpuSel); | |
841 #else | |
842 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGILL); | |
843 #endif | |
844 case SIGFPE: | |
845 case SIGSEGV: | |
846 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGSEGV_SIGFPE); | |
847 default: | |
848 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGCRASH); | |
849 #ifdef CONFIG_CRASH_DEBUG | |
850 if (crash_debug) { | |
851 int gdb_pid; | |
852 mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forking...\n"); | |
853 gdb_pid = fork(); | |
854 mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forked...\n"); | |
855 if (gdb_pid == 0) { // We are the child | |
856 char spid[20]; | |
857 snprintf(spid, sizeof(spid), "%i", getppid()); | |
858 getch2_disable(); // allow terminal to work properly with gdb | |
859 if (execlp("gdb", "gdb", prog_path, spid, "-ex", "bt", NULL) == -1) | |
860 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't start gdb\n"); | |
861 } else if (gdb_pid < 0) | |
862 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't fork\n"); | |
863 else { | |
864 waitpid(gdb_pid, NULL, 0); | |
865 } | |
866 if (x == SIGTRAP) | |
867 return; | |
868 } | |
869 #endif | |
13794 | 870 } |
33363 | 871 getch2_disable(); |
872 exit(1); | |
1156 | 873 } |
874 | |
33363 | 875 static void parse_cfgfiles(m_config_t *conf) |
723 | 876 { |
33363 | 877 char *conffile; |
878 int conffile_fd; | |
879 if (!disable_system_conf && | |
880 m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mplayer.conf") < 0) | |
881 exit_player(EXIT_NONE); | |
882 if ((conffile = get_path("")) == NULL) { | |
883 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_NoHomeDir); | |
884 } else { | |
9831 | 885 #ifdef __MINGW32__ |
33363 | 886 mkdir(conffile); |
9831 | 887 #else |
33363 | 888 mkdir(conffile, 0777); |
9831 | 889 #endif |
33363 | 890 free(conffile); |
891 if ((conffile = get_path("config")) == NULL) { | |
892 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_GetpathProblem); | |
893 } else { | |
894 if ((conffile_fd = open(conffile, O_CREAT | O_EXCL | O_WRONLY, 0666)) != -1) { | |
895 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CreatingCfgFile, conffile); | |
896 write(conffile_fd, default_config, strlen(default_config)); | |
897 close(conffile_fd); | |
898 } | |
899 if (!disable_user_conf && | |
900 m_config_parse_config_file(conf, conffile) < 0) | |
901 exit_player(EXIT_NONE); | |
902 free(conffile); | |
903 } | |
178 | 904 } |
1 | 905 } |
906 | |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
907 #define PROFILE_CFG_PROTOCOL "protocol." |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
908 |
33363 | 909 static void load_per_protocol_config(m_config_t *conf, const char *const file) |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
910 { |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
911 char *str; |
33363 | 912 char protocol[strlen(PROFILE_CFG_PROTOCOL) + strlen(file) + 1]; |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
913 m_profile_t *p; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
914 |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
915 /* does filename actually uses a protocol ? */ |
33363 | 916 str = strstr(file, "://"); |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
917 if (!str) |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
918 return; |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
919 |
33363 | 920 sprintf(protocol, "%s%s", PROFILE_CFG_PROTOCOL, file); |
921 protocol[strlen(PROFILE_CFG_PROTOCOL) + strlen(file) - strlen(str)] = '\0'; | |
922 p = m_config_get_profile(conf, protocol); | |
923 if (p) { | |
924 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingProtocolProfile, protocol); | |
925 m_config_set_profile(conf, p); | |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
926 } |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
927 } |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
928 |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
929 #define PROFILE_CFG_EXTENSION "extension." |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
930 |
33363 | 931 static void load_per_extension_config(m_config_t *conf, const char *const file) |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
932 { |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
933 char *str; |
33363 | 934 char extension[strlen(PROFILE_CFG_EXTENSION) + 8]; |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
935 m_profile_t *p; |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
936 |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
937 /* does filename actually have an extension ? */ |
33363 | 938 str = strrchr(filename, '.'); |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
939 if (!str) |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
940 return; |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
941 |
33363 | 942 sprintf(extension, PROFILE_CFG_EXTENSION); |
943 strncat(extension, ++str, 7); | |
944 p = m_config_get_profile(conf, extension); | |
945 if (p) { | |
946 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingExtensionProfile, extension); | |
947 m_config_set_profile(conf, p); | |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
948 } |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
949 } |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
950 |
25641 | 951 #define PROFILE_CFG_VO "vo." |
952 #define PROFILE_CFG_AO "ao." | |
953 | |
33363 | 954 static void load_per_output_config(m_config_t *conf, char *cfg, char *out) |
25641 | 955 { |
33363 | 956 char profile[strlen(cfg) + strlen(out) + 1]; |
25641 | 957 m_profile_t *p; |
958 | |
33363 | 959 sprintf(profile, "%s%s", cfg, out); |
960 p = m_config_get_profile(conf, profile); | |
961 if (p) { | |
962 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingExtensionProfile, profile); | |
963 m_config_set_profile(conf, p); | |
25641 | 964 } |
965 } | |
966 | |
29561
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
967 /** |
33287 | 968 * @brief Tries to load a config file. |
29561
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
969 * @return 0 if file was not found, 1 otherwise |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
970 */ |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
971 static int try_load_config(m_config_t *conf, const char *file) |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
972 { |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
973 struct stat st; |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
974 if (stat(file, &st)) |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
975 return 0; |
33363 | 976 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingConfig, file); |
977 m_config_parse_config_file(conf, file); | |
29561
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
978 return 1; |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
979 } |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
980 |
33363 | 981 static void load_per_file_config(m_config_t *conf, const char *const file) |
8614
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
982 { |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
983 char *confpath; |
29594
331320b4557b
Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents:
29592
diff
changeset
|
984 char cfg[PATH_MAX]; |
32588 | 985 const char *name; |
8614
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
986 |
29594
331320b4557b
Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents:
29592
diff
changeset
|
987 if (strlen(file) > PATH_MAX - 14) { |
331320b4557b
Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents:
29592
diff
changeset
|
988 mp_msg(MSGT_CPLAYER, MSGL_WARN, "Filename is too long, can not load file or directory specific config files\n"); |
331320b4557b
Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents:
29592
diff
changeset
|
989 return; |
331320b4557b
Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents:
29592
diff
changeset
|
990 } |
33363 | 991 sprintf(cfg, "%s.conf", file); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
992 |
32588 | 993 name = mp_basename(cfg); |
29592
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
994 if (use_filedir_conf) { |
29594
331320b4557b
Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents:
29592
diff
changeset
|
995 char dircfg[PATH_MAX]; |
29592
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
996 strcpy(dircfg, cfg); |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
997 strcpy(dircfg + (name - cfg), "mplayer.conf"); |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
998 try_load_config(conf, dircfg); |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
999 |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
1000 if (try_load_config(conf, cfg)) |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
1001 return; |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
1002 } |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
1003 |
33363 | 1004 if ((confpath = get_path(name)) != NULL) { |
1005 try_load_config(conf, confpath); | |
1006 | |
1007 free(confpath); | |
8614
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
1008 } |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
1009 } |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
1010 |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1011 /* When libmpdemux performs a blocking operation (network connection or |
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1012 * cache filling) if the operation fails we use this function to check |
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1013 * if it was interrupted by the user. |
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1014 * The function returns a new value for eof. */ |
33363 | 1015 static int libmpdemux_was_interrupted(int eof) |
1016 { | |
1017 mp_cmd_t *cmd; | |
1018 if ((cmd = mp_input_get_cmd(0, 0, 0)) != NULL) { | |
1019 switch (cmd->id) { | |
1020 case MP_CMD_QUIT: | |
1021 run_command(mpctx, cmd); | |
1022 case MP_CMD_PLAY_TREE_STEP: | |
1023 eof = (cmd->args[0].v.i > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY; | |
1024 mpctx->play_tree_step = (cmd->args[0].v.i == 0) ? 1 : cmd->args[0].v.i; | |
1025 break; | |
1026 case MP_CMD_PLAY_TREE_UP_STEP: | |
1027 eof = (cmd->args[0].v.i > 0) ? PT_UP_NEXT : PT_UP_PREV; | |
1028 break; | |
1029 case MP_CMD_PLAY_ALT_SRC_STEP: | |
1030 eof = (cmd->args[0].v.i > 0) ? PT_NEXT_SRC : PT_PREV_SRC; | |
1031 break; | |
1032 } | |
1033 mp_cmd_free(cmd); | |
1034 } | |
1035 return eof; | |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
1036 } |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
1037 |
33363 | 1038 static int playtree_add_playlist(play_tree_t *entry) |
8925
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1039 { |
33363 | 1040 play_tree_add_bpf(entry, filename); |
9301
7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents:
9291
diff
changeset
|
1041 |
27343 | 1042 #ifdef CONFIG_GUI |
33363 | 1043 if (use_gui) { |
1044 if (entry) { | |
1045 import_playtree_playlist_into_gui(entry, mconfig); | |
1046 play_tree_free_list(entry, 1); | |
1047 } | |
1048 } else | |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
1049 #endif |
33363 | 1050 { |
1051 if (!entry) { | |
1052 entry = mpctx->playtree_iter->tree; | |
1053 if (play_tree_iter_step(mpctx->playtree_iter, 1, 0) != PLAY_TREE_ITER_ENTRY) { | |
1054 return PT_NEXT_ENTRY; | |
1055 } | |
1056 if (mpctx->playtree_iter->tree == entry) { // Loop with a single file | |
1057 if (play_tree_iter_up_step(mpctx->playtree_iter, 1, 0) != PLAY_TREE_ITER_ENTRY) { | |
1058 return PT_NEXT_ENTRY; | |
1059 } | |
1060 } | |
1061 play_tree_remove(entry, 1, 1); | |
1062 return PT_NEXT_SRC; | |
1063 } | |
1064 play_tree_insert_entry(mpctx->playtree_iter->tree, entry); | |
1065 play_tree_set_params_from(entry, mpctx->playtree_iter->tree); | |
1066 entry = mpctx->playtree_iter->tree; | |
1067 if (play_tree_iter_step(mpctx->playtree_iter, 1, 0) != PLAY_TREE_ITER_ENTRY) { | |
1068 return PT_NEXT_ENTRY; | |
1069 } | |
1070 play_tree_remove(entry, 1, 1); | |
8925
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1071 } |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1072 return PT_NEXT_SRC; |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1073 } |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1074 |
25264
42aa06653705
When auto loading subs, log warning instead of error for load failure.
ulion
parents:
25251
diff
changeset
|
1075 void add_subtitles(char *filename, float fps, int noerr) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1076 { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1077 sub_data *subd; |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1078 #ifdef CONFIG_ASS |
31792
55dacfca4a43
Rename libass types to match upstream libass >= 0.9.7
greg
parents:
31762
diff
changeset
|
1079 ASS_Track *asst = 0; |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1080 #endif |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1081 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1082 if (filename == NULL || mpctx->set_of_sub_size >= MAX_SUBTITLE_FILES) { |
33363 | 1083 return; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1084 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1085 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1086 subd = sub_read_file(filename, fps); |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1087 #ifdef CONFIG_ASS |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1088 if (ass_enabled) |
27393 | 1089 #ifdef CONFIG_ICONV |
30473
7446f58b6899
Add support for loading ASS subtitles through the stream layer and thus e.g.
reimar
parents:
30429
diff
changeset
|
1090 asst = ass_read_stream(ass_library, filename, sub_cp); |
20477 | 1091 #else |
30473
7446f58b6899
Add support for loading ASS subtitles through the stream layer and thus e.g.
reimar
parents:
30429
diff
changeset
|
1092 asst = ass_read_stream(ass_library, filename, 0); |
20477 | 1093 #endif |
19468 | 1094 if (ass_enabled && subd && !asst) |
20477 | 1095 asst = ass_read_subdata(ass_library, subd, fps); |
19401
c0c3a2f8bb32
Add subdata to ass_track conversion for external subtitles.
eugeni
parents:
19380
diff
changeset
|
1096 |
25264
42aa06653705
When auto loading subs, log warning instead of error for load failure.
ulion
parents:
25251
diff
changeset
|
1097 if (!asst && !subd) |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1098 #else |
33363 | 1099 if (!subd) |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1100 #endif |
25264
42aa06653705
When auto loading subs, log warning instead of error for load failure.
ulion
parents:
25251
diff
changeset
|
1101 mp_msg(MSGT_CPLAYER, noerr ? MSGL_WARN : MSGL_ERR, MSGTR_CantLoadSub, |
33363 | 1102 filename_recode(filename)); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1103 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1104 #ifdef CONFIG_ASS |
33363 | 1105 if (!asst && !subd) |
1106 return; | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1107 mpctx->set_of_ass_tracks[mpctx->set_of_sub_size] = asst; |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1108 #else |
33363 | 1109 if (!subd) |
1110 return; | |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1111 #endif |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1112 mpctx->set_of_subtitles[mpctx->set_of_sub_size] = subd; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1113 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FILE_SUB_ID=%d\n", mpctx->set_of_sub_size); |
22002
ebd2d5efb11b
filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents:
21930
diff
changeset
|
1114 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FILE_SUB_FILENAME=%s\n", |
33363 | 1115 filename_recode(filename)); |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1116 ++mpctx->set_of_sub_size; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1117 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AddedSubtitleFile, mpctx->set_of_sub_size, |
33363 | 1118 filename_recode(filename)); |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1119 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1120 |
33363 | 1121 static int add_vob_subtitle(const char *vobname, const char *const ifo, int force, void *spu) |
32724
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1122 { |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1123 if (!vobname) |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1124 return 0; |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1125 |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1126 assert(!vo_vobsub); |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1127 |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1128 vo_vobsub = vobsub_open(vobname, ifo, force, spu); |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1129 |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1130 if (!vo_vobsub && force) |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1131 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantLoadSub, |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1132 filename_recode(vobname)); |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1133 |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1134 return !!vo_vobsub; |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1135 } |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1136 |
13501
a5004eb92a79
fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents:
13500
diff
changeset
|
1137 // FIXME: if/when the GUI calls this, global sub numbering gets (potentially) broken. |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17553
diff
changeset
|
1138 void update_set_of_subtitles(void) |
33363 | 1139 { |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1140 // subdata was changed, set_of_sub... have to be updated. |
33363 | 1141 sub_data **const set_of_subtitles = mpctx->set_of_subtitles; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1142 int i; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1143 if (mpctx->set_of_sub_size > 0 && subdata == NULL) { // *subdata was deleted |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1144 for (i = mpctx->set_of_sub_pos + 1; i < mpctx->set_of_sub_size; ++i) |
33363 | 1145 set_of_subtitles[i - 1] = set_of_subtitles[i]; |
1146 set_of_subtitles[mpctx->set_of_sub_size - 1] = NULL; | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1147 --mpctx->set_of_sub_size; |
33363 | 1148 if (mpctx->set_of_sub_size > 0) |
1149 subdata = set_of_subtitles[mpctx->set_of_sub_pos = 0]; | |
1150 } else if (mpctx->set_of_sub_size > 0 && subdata != NULL) { // *subdata was changed | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1151 set_of_subtitles[mpctx->set_of_sub_pos] = subdata; |
33363 | 1152 } else if (mpctx->set_of_sub_size <= 0 && subdata != NULL) { // *subdata was added |
1153 set_of_subtitles[mpctx->set_of_sub_pos = mpctx->set_of_sub_size] = subdata; | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1154 ++mpctx->set_of_sub_size; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1155 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1156 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1157 |
33363 | 1158 void init_vo_spudec(void) |
1159 { | |
1160 spudec_free(vo_spudec); | |
1161 vo_spudec = NULL; | |
1162 | |
1163 // we currently can't work without video stream | |
1164 if (!mpctx->sh_video) | |
1165 return; | |
1166 | |
1167 if (spudec_ifo) { | |
1168 unsigned int palette[16], width, height; | |
1169 current_module = "spudec_init_vobsub"; | |
1170 if (vobsub_parse_ifo(NULL, spudec_ifo, palette, &width, &height, 1, -1, NULL) >= 0) | |
1171 vo_spudec = spudec_new_scaled(palette, width, height, NULL, 0); | |
1172 } | |
21119
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1173 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1174 #ifdef CONFIG_DVDREAD |
33363 | 1175 if (vo_spudec == NULL && mpctx->stream->type == STREAMTYPE_DVD) { |
1176 current_module = "spudec_init_dvdread"; | |
1177 vo_spudec = spudec_new_scaled(((dvd_priv_t *)(mpctx->stream->priv))->cur_pgc->palette, | |
1178 mpctx->sh_video->disp_w, mpctx->sh_video->disp_h, | |
1179 NULL, 0); | |
1180 } | |
21119
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1181 #endif |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1182 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1183 #ifdef CONFIG_DVDNAV |
33363 | 1184 if (vo_spudec == NULL && mpctx->stream->type == STREAMTYPE_DVDNAV) { |
1185 unsigned int *palette = mp_dvdnav_get_spu_clut(mpctx->stream); | |
1186 current_module = "spudec_init_dvdnav"; | |
1187 vo_spudec = spudec_new_scaled(palette, mpctx->sh_video->disp_w, mpctx->sh_video->disp_h, NULL, 0); | |
1188 } | |
21203
235a8e71ed6f
support for -slang and subtitles in dvdnav; patch by Attila Otvos (oattila chello hu) and me. No palette yet
nicodvb
parents:
21200
diff
changeset
|
1189 #endif |
235a8e71ed6f
support for -slang and subtitles in dvdnav; patch by Attila Otvos (oattila chello hu) and me. No palette yet
nicodvb
parents:
21200
diff
changeset
|
1190 |
33363 | 1191 if (vo_spudec == NULL) { |
1192 sh_sub_t *sh = mpctx->d_sub->sh; | |
1193 current_module = "spudec_init_normal"; | |
1194 vo_spudec = spudec_new_scaled(NULL, mpctx->sh_video->disp_w, mpctx->sh_video->disp_h, sh->extradata, sh->extradata_len); | |
1195 spudec_set_font_factor(vo_spudec, font_factor); | |
1196 } | |
1197 | |
1198 if (vo_spudec != NULL) { | |
1199 mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx); | |
1200 } | |
21119
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1201 } |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1202 |
13710 | 1203 /** |
33287 | 1204 * @brief Append a formatted string. |
1205 * @param buf buffer to print into | |
1206 * @param pos position of terminating 0 in buf | |
1207 * @param len maximum number of characters in buf, not including terminating 0 | |
1208 * @param format printf format string | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1209 */ |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1210 static void saddf(char *buf, unsigned *pos, int len, const char *format, ...) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1211 { |
33363 | 1212 va_list va; |
1213 va_start(va, format); | |
1214 *pos += vsnprintf(&buf[*pos], len - *pos, format, va); | |
1215 va_end(va); | |
1216 if (*pos >= len) { | |
1217 buf[len] = 0; | |
1218 *pos = len; | |
1219 } | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1220 } |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1221 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1222 /** |
33287 | 1223 * @brief Append time in the hh:mm:ss.f format. |
1224 * @param buf buffer to print into | |
1225 * @param pos position of terminating 0 in buf | |
1226 * @param len maximum number of characters in buf, not including terminating 0 | |
1227 * @param time time value to convert/append | |
16654 | 1228 */ |
33363 | 1229 static void sadd_hhmmssf(char *buf, unsigned *pos, int len, float time) |
1230 { | |
1231 int64_t tenths = 10 * time; | |
1232 int f1 = tenths % 10; | |
1233 int ss = (tenths / 10) % 60; | |
1234 int mm = (tenths / 600) % 60; | |
1235 int hh = tenths / 36000; | |
1236 if (time <= 0) { | |
1237 saddf(buf, pos, len, "unknown"); | |
1238 return; | |
1239 } | |
1240 if (hh > 0) | |
1241 saddf(buf, pos, len, "%2d:", hh); | |
1242 if (hh > 0 || mm > 0) | |
1243 saddf(buf, pos, len, "%02d:", mm); | |
1244 saddf(buf, pos, len, "%02d.%1d", ss, f1); | |
16654 | 1245 } |
1246 | |
1247 /** | |
33287 | 1248 * @brief Print the status line. |
1249 * @param a_pos audio position | |
1250 * @param a_v A-V desynchronization | |
1251 * @param corr amount out A-V synchronization | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1252 */ |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1253 static void print_status(float a_pos, float a_v, float corr) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1254 { |
33363 | 1255 sh_video_t *const sh_video = mpctx->sh_video; |
1256 int width; | |
1257 char *line; | |
1258 unsigned pos = 0; | |
1259 get_screen_size(); | |
1260 if (screen_width > 0) | |
1261 width = screen_width; | |
1262 else | |
1263 width = 80; | |
27727
48c1ae64255b
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents:
27635
diff
changeset
|
1264 #if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__OS2__) |
33363 | 1265 /* Windows command line is broken (MinGW's rxvt works, but we |
1266 * should not depend on that). */ | |
1267 width--; | |
13928 | 1268 #endif |
33363 | 1269 line = malloc(width + 1); // one additional char for the terminating null |
1270 | |
1271 // Audio time | |
1272 if (mpctx->sh_audio) { | |
1273 saddf(line, &pos, width, "A:%6.1f ", a_pos); | |
1274 if (!sh_video) { | |
1275 float len = demuxer_get_time_length(mpctx->demuxer); | |
1276 saddf(line, &pos, width, "("); | |
1277 sadd_hhmmssf(line, &pos, width, a_pos); | |
1278 saddf(line, &pos, width, ") of %.1f (", len); | |
1279 sadd_hhmmssf(line, &pos, width, len); | |
1280 saddf(line, &pos, width, ") "); | |
1281 } | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1282 } |
33363 | 1283 |
1284 // Video time | |
1285 if (sh_video) | |
1286 saddf(line, &pos, width, "V:%6.1f ", sh_video->pts); | |
1287 | |
1288 // A-V sync | |
1289 if (mpctx->sh_audio && sh_video) | |
1290 saddf(line, &pos, width, "A-V:%7.3f ct:%7.3f ", a_v, corr); | |
1291 | |
1292 // Video stats | |
1293 if (sh_video) | |
1294 saddf(line, &pos, width, "%3d/%3d ", | |
1295 (int)sh_video->num_frames, | |
1296 (int)sh_video->num_frames_decoded); | |
1297 | |
1298 // CPU usage | |
1299 if (sh_video) { | |
1300 if (sh_video->timer > 0.5) | |
1301 saddf(line, &pos, width, "%2d%% %2d%% %4.1f%% ", | |
1302 (int)(100.0 * video_time_usage * playback_speed / (double)sh_video->timer), | |
1303 (int)(100.0 * vout_time_usage * playback_speed / (double)sh_video->timer), | |
1304 (100.0 * audio_time_usage * playback_speed / (double)sh_video->timer)); | |
1305 else | |
1306 saddf(line, &pos, width, "??%% ??%% ??,?%% "); | |
1307 } else if (mpctx->sh_audio) { | |
1308 if (mpctx->delay > 0.5) | |
1309 saddf(line, &pos, width, "%4.1f%% ", | |
1310 100.0 * audio_time_usage / (double)mpctx->delay); | |
1311 else | |
1312 saddf(line, &pos, width, "??,?%% "); | |
1313 } | |
1314 | |
1315 // VO stats | |
1316 if (sh_video) | |
1317 saddf(line, &pos, width, "%d %d ", drop_frame_cnt, output_quality); | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1318 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1319 #ifdef CONFIG_STREAM_CACHE |
33363 | 1320 // cache stats |
1321 if (stream_cache_size > 0) | |
1322 saddf(line, &pos, width, "%d%% ", cache_fill_status(mpctx->stream)); | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1323 #endif |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1324 |
33363 | 1325 // other |
1326 if (playback_speed != 1) | |
1327 saddf(line, &pos, width, "%4.2fx ", playback_speed); | |
1328 | |
1329 // end | |
1330 if (erase_to_end_of_line) { | |
1331 line[pos] = 0; | |
1332 mp_msg(MSGT_STATUSLINE, MSGL_STATUS, "%s%s\r", line, erase_to_end_of_line); | |
1333 } else { | |
1334 memset(&line[pos], ' ', width - pos); | |
1335 line[width] = 0; | |
1336 mp_msg(MSGT_STATUSLINE, MSGL_STATUS, "%s\r", line); | |
1337 } | |
1338 free(line); | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1339 } |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1340 |
33390 | 1341 static void stream_dump_progress_start(void) |
1342 { | |
1343 stream_dump_start_time = stream_dump_last_print_time = GetTimerMS(); | |
1344 } | |
1345 | |
1346 static void stream_dump_progress(uint64_t len, stream_t *stream) | |
1347 { | |
1348 unsigned t = GetTimerMS(); | |
1349 uint64_t start = stream->start_pos; | |
1350 uint64_t end = stream->end_pos; | |
1351 uint64_t pos = stream->pos; | |
1352 | |
1353 stream_dump_count += len; | |
1354 if (t - stream_dump_last_print_time - 1000 > UINT_MAX / 2) | |
1355 return; | |
1356 stream_dump_last_print_time = t; | |
1357 /* TODO: pretty print sizes; ETA */ | |
1358 if (end > start && pos >= start && pos <= end) { | |
1359 mp_msg(MSGT_STATUSLINE, MSGL_STATUS, MSGTR_DumpBytesWrittenPercent, | |
1360 stream_dump_count, 100.0 * (pos - start) / (end - start)); | |
1361 } else { | |
1362 mp_msg(MSGT_STATUSLINE, MSGL_STATUS, MSGTR_DumpBytesWritten, | |
1363 stream_dump_count); | |
1364 } | |
1365 } | |
1366 | |
1367 static void stream_dump_progress_end(void) | |
1368 { | |
1369 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_DumpBytesWrittenTo, | |
1370 stream_dump_count, stream_dump_name); | |
1371 } | |
1372 | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1373 /** |
33287 | 1374 * @brief Build a chain of audio filters that converts the input format. |
13710 | 1375 * to the ao's format, taking into account the current playback_speed. |
33287 | 1376 * @param sh_audio describes the requested input format of the chain. |
1377 * @param ao_data describes the requested output format of the chain. | |
13710 | 1378 */ |
32561
17bb5a38ae2e
build_afilter_chain is not safe to use directly, thus make it
reimar
parents:
32543
diff
changeset
|
1379 static int build_afilter_chain(sh_audio_t *sh_audio, ao_data_t *ao_data) |
13710 | 1380 { |
33363 | 1381 int new_srate; |
1382 int result; | |
1383 if (!sh_audio) { | |
27343 | 1384 #ifdef CONFIG_GUI |
33363 | 1385 if (use_gui) |
1386 guiGetEvent(guiSetAfilter, (char *)NULL); | |
14254 | 1387 #endif |
33363 | 1388 mpctx->mixer.afilter = NULL; |
1389 return 0; | |
24896 | 1390 } |
33363 | 1391 if (af_control_any_rev(sh_audio->afilter, |
1392 AF_CONTROL_PLAYBACK_SPEED | AF_CONTROL_SET, | |
1393 &playback_speed)) { | |
1394 new_srate = sh_audio->samplerate; | |
1395 } else { | |
1396 new_srate = sh_audio->samplerate * playback_speed; | |
1397 if (new_srate != ao_data->samplerate) { | |
1398 // limits are taken from libaf/af_resample.c | |
1399 if (new_srate < 8000) | |
1400 new_srate = 8000; | |
1401 if (new_srate > 192000) | |
1402 new_srate = 192000; | |
1403 playback_speed = (float)new_srate / (float)sh_audio->samplerate; | |
1404 } | |
1405 } | |
1406 result = init_audio_filters(sh_audio, new_srate, | |
1407 &ao_data->samplerate, &ao_data->channels, &ao_data->format); | |
1408 mpctx->mixer.afilter = sh_audio->afilter; | |
27343 | 1409 #ifdef CONFIG_GUI |
33363 | 1410 if (use_gui) |
1411 guiGetEvent(guiSetAfilter, (char *)sh_audio->afilter); | |
14254 | 1412 #endif |
33363 | 1413 return result; |
13710 | 1414 } |
8800 | 1415 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1416 typedef struct mp_osd_msg mp_osd_msg_t; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1417 struct mp_osd_msg { |
33363 | 1418 mp_osd_msg_t *prev; ///< Previous message on the stack |
33287 | 1419 char msg[128]; ///< Message text |
33363 | 1420 int id, level, started; |
1421 unsigned time; ///< Display duration in ms | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1422 }; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1423 |
33363 | 1424 static mp_osd_msg_t *osd_msg_stack; ///< OSD message stack |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1425 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1426 /** |
33287 | 1427 * @brief Add a message on the OSD message stack. |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1428 * |
33287 | 1429 * If a message with the same id is already present in the stack |
1430 * it is pulled on top of the stack, otherwise a new message is created. | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1431 */ |
33363 | 1432 void set_osd_msg(int id, int level, int time, const char *fmt, ...) |
1433 { | |
1434 mp_osd_msg_t *msg, *last = NULL; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1435 va_list va; |
17929
6fe95ee39422
Fix osd_show_msg alignment and make sure msg strings
albeu
parents:
17928
diff
changeset
|
1436 int r; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1437 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1438 // look if the id is already in the stack |
33363 | 1439 for (msg = osd_msg_stack; msg && msg->id != id; |
1440 last = msg, msg = msg->prev) ; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1441 // not found: alloc it |
33363 | 1442 if (!msg) { |
1443 msg = calloc(1, sizeof(mp_osd_msg_t)); | |
1444 msg->prev = osd_msg_stack; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1445 osd_msg_stack = msg; |
33363 | 1446 } else if (last) { // found, but it's not on top of the stack |
1447 last->prev = msg->prev; | |
1448 msg->prev = osd_msg_stack; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1449 osd_msg_stack = msg; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1450 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1451 // write the msg |
33363 | 1452 va_start(va, fmt); |
28378 | 1453 r = vsnprintf(msg->msg, 128, fmt, va); |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1454 va_end(va); |
33363 | 1455 if (r >= 128) |
1456 msg->msg[127] = 0; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1457 // set id and time |
33363 | 1458 msg->id = id; |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1459 msg->level = level; |
33363 | 1460 msg->time = time; |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1461 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1462 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1463 /** |
33287 | 1464 * @brief Remove a message from the OSD stack. |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1465 * |
33287 | 1466 * This function can be used to get rid of a message right away. |
17057
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1467 */ |
33363 | 1468 void rm_osd_msg(int id) |
1469 { | |
1470 mp_osd_msg_t *msg, *last = NULL; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1471 |
17057
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1472 // Search for the msg |
33363 | 1473 for (msg = osd_msg_stack; msg && msg->id != id; |
1474 last = msg, msg = msg->prev) ; | |
1475 if (!msg) | |
1476 return; | |
17057
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1477 |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1478 // Detach it from the stack and free it |
33363 | 1479 if (last) |
17057
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1480 last->prev = msg->prev; |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1481 else |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1482 osd_msg_stack = msg->prev; |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1483 free(msg); |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1484 } |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1485 |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1486 /** |
33287 | 1487 * @brief Remove all messages from the OSD stack. |
17938 | 1488 */ |
33363 | 1489 static void clear_osd_msgs(void) |
1490 { | |
1491 mp_osd_msg_t *msg = osd_msg_stack, *prev = NULL; | |
1492 while (msg) { | |
17938 | 1493 prev = msg->prev; |
1494 free(msg); | |
1495 msg = prev; | |
1496 } | |
1497 osd_msg_stack = NULL; | |
1498 } | |
1499 | |
1500 /** | |
33287 | 1501 * @brief Get the current message from the OSD stack. |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1502 * |
33287 | 1503 * This function decrements the message timer and destroys the old ones. |
1504 * The message that should be displayed is returned (if any). | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1505 */ |
33363 | 1506 static mp_osd_msg_t *get_osd_msg(void) |
1507 { | |
1508 mp_osd_msg_t *msg, *prev, *last = NULL; | |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
1509 static unsigned last_update; |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1510 unsigned now = GetTimerMS(); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1511 unsigned diff; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1512 char hidden_dec_done = 0; |
24091 | 1513 |
1514 if (osd_visible) { | |
33363 | 1515 // 36000000 means max timed visibility is 1 hour into the future, if |
1516 // the difference is greater assume it's wrapped around from below 0 | |
1517 if (osd_visible - now > 36000000) { | |
1518 osd_visible = 0; | |
1519 vo_osd_progbar_type = -1; // disable | |
1520 vo_osd_changed(OSDTYPE_PROGBAR); | |
1521 if (mpctx->osd_function != OSD_PAUSE) | |
1522 mpctx->osd_function = OSD_PLAY; | |
1523 } | |
24091 | 1524 } |
1525 | |
33363 | 1526 if (!last_update) |
1527 last_update = now; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1528 diff = now >= last_update ? now - last_update : 0; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1529 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1530 last_update = now; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1531 |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1532 // Look for the first message in the stack with high enough level. |
33363 | 1533 for (msg = osd_msg_stack; msg; last = msg, msg = prev) { |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1534 prev = msg->prev; |
33363 | 1535 if (msg->level > osd_level && hidden_dec_done) |
1536 continue; | |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1537 // The message has a high enough level or it is the first hidden one |
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1538 // in both cases we decrement the timer or kill it. |
33363 | 1539 if (!msg->started || msg->time > diff) { |
1540 if (msg->started) | |
1541 msg->time -= diff; | |
1542 else | |
1543 msg->started = 1; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1544 // display it |
33363 | 1545 if (msg->level <= osd_level) |
1546 return msg; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1547 hidden_dec_done = 1; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1548 continue; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1549 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1550 // kill the message |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1551 free(msg); |
33363 | 1552 if (last) { |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1553 last->prev = prev; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1554 msg = last; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1555 } else { |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1556 osd_msg_stack = prev; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1557 msg = NULL; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1558 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1559 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1560 // Nothing found |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1561 return NULL; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1562 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1563 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1564 /** |
33287 | 1565 * @brief Display the OSD bar. |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1566 * |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1567 * Display the OSD bar or fall back on a simple message. |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1568 */ |
33363 | 1569 void set_osd_bar(int type, const char *name, double min, double max, double val) |
1570 { | |
1571 if (osd_level < 1) | |
1572 return; | |
1573 | |
1574 if (mpctx->sh_video) { | |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18286
diff
changeset
|
1575 osd_visible = (GetTimerMS() + 1000) | 1; |
33363 | 1576 vo_osd_progbar_type = type; |
1577 vo_osd_progbar_value = 256 * (val - min) / (max - min); | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1578 vo_osd_changed(OSDTYPE_PROGBAR); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1579 return; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1580 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1581 |
33363 | 1582 set_osd_msg(OSD_MSG_BAR, 1, osd_duration, "%s: %d %%", |
1583 name, ROUND(100 * (val - min) / (max - min))); | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1584 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1585 |
29670
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1586 /** |
33287 | 1587 * @brief Display text subtitles on the OSD. |
29670
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1588 */ |
33363 | 1589 void set_osd_subtitle(subtitle *subs) |
1590 { | |
29670
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1591 int i; |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1592 vo_sub = subs; |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1593 vo_osd_changed(OSDTYPE_SUBTITLE); |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1594 if (!mpctx->sh_video) { |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1595 // reverse order, since newest set_osd_msg is displayed first |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1596 for (i = SUB_MAX_TEXT - 1; i >= 0; i--) { |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1597 if (!subs || i >= subs->lines || !subs->text[i]) |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1598 rm_osd_msg(OSD_MSG_SUB_BASE + i); |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1599 else { |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1600 // HACK: currently display time for each sub line except the last is set to 2 seconds. |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1601 int display_time = i == subs->lines - 1 ? 180000 : 2000; |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1602 set_osd_msg(OSD_MSG_SUB_BASE + i, 1, display_time, "%s", subs->text[i]); |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1603 } |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1604 } |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1605 } |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1606 } |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1607 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1608 /** |
33287 | 1609 * @brief Update the OSD message line. |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1610 * |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1611 * This function displays the current message on the vo OSD or on the term. |
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1612 * If the stack is empty and the OSD level is high enough the timer |
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1613 * is displayed (only on the vo OSD). |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1614 */ |
33363 | 1615 static void update_osd_msg(void) |
1616 { | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1617 mp_osd_msg_t *msg; |
28378 | 1618 static char osd_text[128] = ""; |
1619 static char osd_text_timer[128]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1620 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1621 // we need some mem for vo_osd_text |
33363 | 1622 vo_osd_text = (unsigned char *)osd_text; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1623 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1624 // Look if we have a msg |
33363 | 1625 if ((msg = get_osd_msg())) { |
1626 if (strcmp(osd_text, msg->msg)) { | |
1627 strncpy((char *)osd_text, msg->msg, 127); | |
1628 if (mpctx->sh_video) | |
1629 vo_osd_changed(OSDTYPE_OSD); | |
1630 else if (term_osd) | |
1631 mp_msg(MSGT_CPLAYER, MSGL_STATUS, "%s%s\n", term_osd_esc, msg->msg); | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1632 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1633 return; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1634 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1635 |
33363 | 1636 if (mpctx->sh_video) { |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1637 // fallback on the timer |
33363 | 1638 if (osd_level >= 2) { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1639 int len = demuxer_get_time_length(mpctx->demuxer); |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1640 int percentage = -1; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1641 char percentage_text[10]; |
32793 | 1642 char fractions_text[4]; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1643 int pts = demuxer_get_current_time(mpctx->demuxer); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1644 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1645 if (mpctx->osd_show_percentage) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1646 percentage = demuxer_get_percent_pos(mpctx->demuxer); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1647 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1648 if (percentage >= 0) |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1649 snprintf(percentage_text, 9, " (%d%%)", percentage); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1650 else |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1651 percentage_text[0] = 0; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1652 |
33363 | 1653 if (osd_fractions == 1) { |
32793 | 1654 //print fractions as sub-second timestamp |
1655 snprintf(fractions_text, sizeof(fractions_text), ".%02d", | |
33363 | 1656 (int)((mpctx->sh_video->pts - pts) * 100 + 0.5) |
32793 | 1657 % 100); |
33363 | 1658 } else if (osd_fractions == 2) { |
32793 | 1659 //print fractions by estimating the frame count within the |
1660 //second | |
1661 | |
1662 //rounding or cutting off numbers after the decimal point | |
1663 //causes problems because of float's precision and movies, | |
1664 //whose first frame is not exactly at timestamp 0. Therefore, | |
1665 //we add 0.2 and cut off at the decimal point, which proved | |
1666 //as good heuristic | |
1667 snprintf(fractions_text, sizeof(fractions_text), ".%02d", | |
33363 | 1668 (int)((mpctx->sh_video->pts - pts) * |
1669 mpctx->sh_video->fps + 0.2)); | |
32793 | 1670 } else { |
1671 //do not print fractions | |
1672 fractions_text[0] = 0; | |
1673 } | |
1674 | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1675 if (osd_level == 3) |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1676 snprintf(osd_text_timer, 63, |
32793 | 1677 "%c %02d:%02d:%02d%s / %02d:%02d:%02d%s", |
33363 | 1678 mpctx->osd_function, pts / 3600, (pts / 60) % 60, pts % 60, |
1679 fractions_text, len / 3600, (len / 60) % 60, len % 60, | |
32793 | 1680 percentage_text); |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1681 else |
32793 | 1682 snprintf(osd_text_timer, 63, "%c %02d:%02d:%02d%s%s", |
33363 | 1683 mpctx->osd_function, pts / 3600, (pts / 60) % 60, |
1684 pts % 60, fractions_text, percentage_text); | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1685 } else |
33363 | 1686 osd_text_timer[0] = 0; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1687 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1688 // always decrement the percentage timer |
33363 | 1689 if (mpctx->osd_show_percentage) |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1690 mpctx->osd_show_percentage--; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1691 |
33363 | 1692 if (strcmp(osd_text, osd_text_timer)) { |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1693 strncpy(osd_text, osd_text_timer, 63); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1694 vo_osd_changed(OSDTYPE_OSD); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1695 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1696 return; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1697 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1698 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1699 // Clear the term osd line |
33363 | 1700 if (term_osd && osd_text[0]) { |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1701 osd_text[0] = 0; |
33363 | 1702 printf("%s\n", term_osd_esc); |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1703 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1704 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1705 |
33363 | 1706 void reinit_audio_chain(void) |
1707 { | |
29801
7ac1f37f8aa5
Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents:
29800
diff
changeset
|
1708 if (!mpctx->sh_audio) |
7ac1f37f8aa5
Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents:
29800
diff
changeset
|
1709 return; |
31671
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
1710 if (!(initialized_flags & INITIALIZED_ACODEC)) { |
33363 | 1711 current_module = "init_audio_codec"; |
1712 mp_msg(MSGT_CPLAYER, MSGL_INFO, "==========================================================================\n"); | |
1713 if (!init_best_audio_codec(mpctx->sh_audio, audio_codec_list, audio_fm_list)) { | |
31673 | 1714 goto init_error; |
1715 } | |
33363 | 1716 initialized_flags |= INITIALIZED_ACODEC; |
1717 mp_msg(MSGT_CPLAYER, MSGL_INFO, "==========================================================================\n"); | |
31671
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
1718 } |
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
1719 |
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
1720 if (!(initialized_flags & INITIALIZED_AO)) { |
33363 | 1721 current_module = "af_preinit"; |
1722 ao_data.samplerate = force_srate; | |
1723 ao_data.channels = 0; | |
1724 ao_data.format = audio_output_format; | |
31673 | 1725 // first init to detect best values |
33363 | 1726 if (!init_audio_filters(mpctx->sh_audio, // preliminary init |
1727 // input: | |
1728 mpctx->sh_audio->samplerate, | |
1729 // output: | |
1730 &ao_data.samplerate, &ao_data.channels, &ao_data.format)) { | |
1731 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_AudioFilterChainPreinitError); | |
31673 | 1732 exit_player(EXIT_ERROR); |
1733 } | |
33363 | 1734 current_module = "ao2_init"; |
31673 | 1735 mpctx->audio_out = init_best_audio_out(audio_driver_list, |
1736 0, // plugin flag | |
1737 ao_data.samplerate, | |
1738 ao_data.channels, | |
1739 ao_data.format, 0); | |
33363 | 1740 if (!mpctx->audio_out) { |
1741 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CannotInitAO); | |
31673 | 1742 goto init_error; |
1743 } | |
33363 | 1744 initialized_flags |= INITIALIZED_AO; |
1745 mp_msg(MSGT_CPLAYER, MSGL_INFO, "AO: [%s] %dHz %dch %s (%d bytes per sample)\n", | |
31673 | 1746 mpctx->audio_out->info->short_name, |
1747 ao_data.samplerate, ao_data.channels, | |
1748 af_fmt2str_short(ao_data.format), | |
33363 | 1749 af_fmt2bits(ao_data.format) / 8); |
1750 mp_msg(MSGT_CPLAYER, MSGL_V, "AO: Description: %s\nAO: Author: %s\n", | |
31673 | 1751 mpctx->audio_out->info->name, mpctx->audio_out->info->author); |
33363 | 1752 if (strlen(mpctx->audio_out->info->comment) > 0) |
1753 mp_msg(MSGT_CPLAYER, MSGL_V, "AO: Comment: %s\n", mpctx->audio_out->info->comment); | |
31671
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
1754 } |
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
1755 |
18679
e52e101e9e59
moved audio codec/filters/out to a separate function that is called both at init() and to switch audio stream
nicodvb
parents:
18406
diff
changeset
|
1756 // init audio filters: |
33363 | 1757 current_module = "af_init"; |
1758 if (!build_afilter_chain(mpctx->sh_audio, &ao_data)) { | |
1759 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_NoMatchingFilter); | |
29801
7ac1f37f8aa5
Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents:
29800
diff
changeset
|
1760 goto init_error; |
18679
e52e101e9e59
moved audio codec/filters/out to a separate function that is called both at init() and to switch audio stream
nicodvb
parents:
18406
diff
changeset
|
1761 } |
29801
7ac1f37f8aa5
Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents:
29800
diff
changeset
|
1762 mpctx->mixer.audio_out = mpctx->audio_out; |
33363 | 1763 mpctx->mixer.volstep = volstep; |
29801
7ac1f37f8aa5
Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents:
29800
diff
changeset
|
1764 return; |
29794
df1826dcdb2d
Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents:
29785
diff
changeset
|
1765 |
df1826dcdb2d
Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents:
29785
diff
changeset
|
1766 init_error: |
33363 | 1767 uninit_player(INITIALIZED_ACODEC | INITIALIZED_AO); // close codec and possibly AO |
1768 mpctx->sh_audio = mpctx->d_audio->sh = NULL; // -> nosound | |
29794
df1826dcdb2d
Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents:
29785
diff
changeset
|
1769 mpctx->d_audio->id = -2; |
18679
e52e101e9e59
moved audio codec/filters/out to a separate function that is called both at init() and to switch audio stream
nicodvb
parents:
18406
diff
changeset
|
1770 } |
e52e101e9e59
moved audio codec/filters/out to a separate function that is called both at init() and to switch audio stream
nicodvb
parents:
18406
diff
changeset
|
1771 |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1772 // Return pts value corresponding to the end point of audio written to the |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1773 // ao so far. |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1774 static double written_audio_pts(sh_audio_t *sh_audio, demux_stream_t *d_audio) |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1775 { |
24913 | 1776 double buffered_output; |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1777 // first calculate the end pts of audio that has been output by decoder |
32863
674117ab7ce7
Move MPlayer's audio pts calculation code into mp_common.c and reuse it in
reimar
parents:
32814
diff
changeset
|
1778 double a_pts = calc_a_pts(sh_audio, d_audio); |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1779 // Now a_pts hopefully holds the pts for end of audio from decoder. |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1780 // Substract data in buffers between decoder and audio out. |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1781 |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1782 // Decoded but not filtered |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1783 a_pts -= sh_audio->a_buffer_len / (double)sh_audio->o_bps; |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1784 |
24900 | 1785 // Data buffered in audio filters, measured in bytes of "missing" output |
24913 | 1786 buffered_output = af_calc_delay(sh_audio->afilter); |
24900 | 1787 |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1788 // Data that was ready for ao but was buffered because ao didn't fully |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1789 // accept everything to internal buffers yet |
24900 | 1790 buffered_output += sh_audio->a_out_buffer_len; |
1791 | |
1792 // Filters divide audio length by playback_speed, so multiply by it | |
1793 // to get the length in original units without speedup or slowdown | |
1794 a_pts -= buffered_output * playback_speed / ao_data.bps; | |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1795 |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1796 return a_pts; |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1797 } |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1798 |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1799 // Return pts value corresponding to currently playing audio. |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1800 double playing_audio_pts(sh_audio_t *sh_audio, demux_stream_t *d_audio, |
33363 | 1801 const ao_functions_t *audio_out) |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1802 { |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1803 return written_audio_pts(sh_audio, d_audio) - playback_speed * |
33363 | 1804 audio_out->get_delay(); |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1805 } |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1806 |
33363 | 1807 static int check_framedrop(double frame_time) |
1808 { | |
1809 // check for frame-drop: | |
1810 current_module = "check_framedrop"; | |
1811 if (mpctx->sh_audio && !mpctx->d_audio->eof) { | |
1812 static int dropped_frames; | |
1813 float delay = playback_speed * mpctx->audio_out->get_delay(); | |
1814 float d = delay - mpctx->delay; | |
1815 ++total_frame_cnt; | |
1816 // we should avoid dropping too many frames in sequence unless we | |
1817 // are too late. and we allow 100ms A-V delay here: | |
1818 if (d < -dropped_frames * frame_time - 0.100 && | |
1819 mpctx->osd_function != OSD_PAUSE) { | |
1820 ++drop_frame_cnt; | |
1821 ++dropped_frames; | |
1822 return frame_dropping; | |
1823 } else | |
1824 dropped_frames = 0; | |
1825 } | |
1826 return 0; | |
26228
089dc00275b6
Experimental support for -framedrop with -correct-pts.
reimar
parents:
26159
diff
changeset
|
1827 } |
089dc00275b6
Experimental support for -framedrop with -correct-pts.
reimar
parents:
26159
diff
changeset
|
1828 |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1829 static int generate_video_frame(sh_video_t *sh_video, demux_stream_t *d_video) |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1830 { |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1831 unsigned char *start; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1832 int in_size; |
33363 | 1833 int hit_eof = 0; |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1834 double pts; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1835 |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1836 while (1) { |
33363 | 1837 int drop_frame = check_framedrop(sh_video->frametime); |
1838 void *decoded_frame; | |
1839 current_module = "decode video"; | |
1840 // XXX Time used in this call is not counted in any performance | |
1841 // timer now, OSD is not updated correctly for filter-added frames | |
1842 if (vf_output_queued_frame(sh_video->vfilter)) | |
1843 break; | |
1844 current_module = "video_read_frame"; | |
1845 in_size = ds_get_packet_pts(d_video, &start, &pts); | |
1846 if (in_size < 0) { | |
1847 // try to extract last frames in case of decoder lag | |
1848 in_size = 0; | |
1849 pts = MP_NOPTS_VALUE; | |
1850 hit_eof = 1; | |
1851 } | |
1852 if (in_size > max_framesize) | |
1853 max_framesize = in_size; | |
1854 current_module = "decode video"; | |
1855 decoded_frame = decode_video(sh_video, start, in_size, drop_frame, pts, NULL); | |
1856 if (decoded_frame) { | |
1857 update_subtitles(sh_video, sh_video->pts, mpctx->d_sub, 0); | |
1858 update_teletext(sh_video, mpctx->demuxer, 0); | |
1859 update_osd_msg(); | |
1860 current_module = "filter video"; | |
1861 if (filter_video(sh_video, decoded_frame, sh_video->pts)) | |
1862 break; | |
1863 } else if (drop_frame) | |
1864 return -1; | |
1865 if (hit_eof) | |
1866 return 0; | |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1867 } |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1868 return 1; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1869 } |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1870 |
20887 | 1871 #ifdef HAVE_RTC |
33363 | 1872 int rtc_fd = -1; |
20887 | 1873 #endif |
1874 | |
1875 static float timing_sleep(float time_frame) | |
1876 { | |
1877 #ifdef HAVE_RTC | |
33363 | 1878 if (rtc_fd >= 0) { |
1879 // -------- RTC ----------- | |
1880 current_module = "sleep_rtc"; | |
20887 | 1881 while (time_frame > 0.000) { |
33363 | 1882 unsigned long rtc_ts; |
1883 if (read(rtc_fd, &rtc_ts, sizeof(rtc_ts)) <= 0) | |
1884 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_LinuxRTCReadError, strerror(errno)); | |
1885 time_frame -= GetRelativeTime(); | |
1886 } | |
20887 | 1887 } else |
1888 #endif | |
1889 { | |
33363 | 1890 // assume kernel HZ=100 for softsleep, works with larger HZ but with |
1891 // unnecessarily high CPU usage | |
1892 float margin = softsleep ? 0.011 : 0; | |
1893 current_module = "sleep_timer"; | |
1894 while (time_frame > margin) { | |
1895 usec_sleep(1000000 * (time_frame - margin)); | |
1896 time_frame -= GetRelativeTime(); | |
1897 } | |
1898 if (softsleep) { | |
1899 current_module = "sleep_soft"; | |
1900 if (time_frame < 0) | |
1901 mp_msg(MSGT_AVSYNC, MSGL_WARN, MSGTR_SoftsleepUnderflow); | |
1902 while (time_frame > 0) | |
1903 time_frame -= GetRelativeTime(); // burn the CPU | |
1904 } | |
20887 | 1905 } |
1906 return time_frame; | |
1907 } | |
1908 | |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31607
diff
changeset
|
1909 static int select_subtitle(MPContext *mpctx) |
31201
203789464176
misc cosmetics: K&R style nits, #include placement, indentation
diego
parents:
31148
diff
changeset
|
1910 { |
33363 | 1911 // find the best sub to use |
1912 int id; | |
1913 int found = 0; | |
1914 mpctx->global_sub_pos = -1; // no subs by default | |
1915 if (vobsub_id >= 0) { | |
1916 // if user asks for a vobsub id, use that first. | |
1917 id = vobsub_id; | |
1918 found = mp_property_do("sub_vob", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK; | |
1919 } | |
1920 | |
1921 if (!found && dvdsub_id >= 0) { | |
1922 // if user asks for a dvd sub id, use that next. | |
1923 id = dvdsub_id; | |
1924 found = mp_property_do("sub_demux", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK; | |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31607
diff
changeset
|
1925 } |
33363 | 1926 |
1927 if (!found) { | |
1928 // if there are text subs to use, use those. (autosubs come last here) | |
1929 id = 0; | |
1930 found = mp_property_do("sub_file", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK; | |
1931 } | |
1932 | |
1933 if (!found && dvdsub_id == -1) { | |
1934 // finally select subs by language and container hints | |
1935 if (dvdsub_id == -1 && dvdsub_lang) | |
1936 dvdsub_id = demuxer_sub_track_by_lang(mpctx->demuxer, dvdsub_lang); | |
1937 if (dvdsub_id == -1) | |
1938 dvdsub_id = demuxer_default_sub_track(mpctx->demuxer); | |
1939 if (dvdsub_id >= 0) { | |
1940 id = dvdsub_id; | |
1941 found = mp_property_do("sub_demux", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK; | |
1942 } | |
1943 } | |
1944 return found; | |
29854
00ebdb6cb87f
Factor out code that decides which subtitle to play.
reimar
parents:
29804
diff
changeset
|
1945 } |
00ebdb6cb87f
Factor out code that decides which subtitle to play.
reimar
parents:
29804
diff
changeset
|
1946 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1947 #ifdef CONFIG_DVDNAV |
25824 | 1948 #ifndef FF_B_TYPE |
1949 #define FF_B_TYPE 3 | |
1950 #endif | |
33287 | 1951 /** |
1952 * @brief Store decoded video image. | |
1953 */ | |
33363 | 1954 static mp_image_t *mp_dvdnav_copy_mpi(mp_image_t *to_mpi, |
1955 mp_image_t *from_mpi) | |
1956 { | |
25824 | 1957 mp_image_t *mpi; |
1958 | |
33287 | 1959 // do not store B-frames |
25824 | 1960 if (from_mpi->pict_type == FF_B_TYPE) |
1961 return to_mpi; | |
1962 | |
1963 if (to_mpi && | |
1964 to_mpi->w == from_mpi->w && | |
1965 to_mpi->h == from_mpi->h && | |
1966 to_mpi->imgfmt == from_mpi->imgfmt) | |
1967 mpi = to_mpi; | |
1968 else { | |
1969 if (to_mpi) | |
1970 free_mp_image(to_mpi); | |
1971 if (from_mpi->w == 0 || from_mpi->h == 0) | |
1972 return NULL; | |
33363 | 1973 mpi = alloc_mpi(from_mpi->w, from_mpi->h, from_mpi->imgfmt); |
25824 | 1974 } |
1975 | |
33363 | 1976 copy_mpi(mpi, from_mpi); |
25824 | 1977 return mpi; |
1978 } | |
1979 | |
33363 | 1980 static void mp_dvdnav_reset_stream(MPContext *ctx) |
1981 { | |
25824 | 1982 if (ctx->sh_video) { |
33287 | 1983 // clear video pts |
33363 | 1984 ctx->d_video->pts = 0.0f; |
1985 ctx->sh_video->pts = 0.0f; | |
1986 ctx->sh_video->i_pts = 0.0f; | |
25824 | 1987 ctx->sh_video->last_pts = 0.0f; |
33363 | 1988 ctx->sh_video->num_buffered_pts = 0; |
1989 ctx->sh_video->num_frames = 0; | |
25824 | 1990 ctx->sh_video->num_frames_decoded = 0; |
1991 ctx->sh_video->timer = 0.0f; | |
1992 ctx->sh_video->stream_delay = 0.0f; | |
33363 | 1993 ctx->sh_video->timer = 0; |
25824 | 1994 ctx->demuxer->stream_pts = MP_NOPTS_VALUE; |
1995 } | |
1996 | |
1997 if (ctx->sh_audio) { | |
33287 | 1998 // free audio packets and reset |
25824 | 1999 ds_free_packs(ctx->d_audio); |
2000 audio_delay -= ctx->sh_audio->stream_delay; | |
33363 | 2001 ctx->delay = -audio_delay; |
25824 | 2002 ctx->audio_out->reset(); |
2003 resync_audio_stream(ctx->sh_audio); | |
2004 } | |
2005 | |
2006 audio_delay = 0.0f; | |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31607
diff
changeset
|
2007 mpctx->sub_counts[SUB_SOURCE_DEMUX] = mp_dvdnav_number_of_subs(mpctx->stream); |
29855
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
2008 if (dvdsub_lang && dvdsub_id == dvdsub_lang_id) { |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
2009 dvdsub_lang_id = mp_dvdnav_sid_from_lang(ctx->stream, dvdsub_lang); |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
2010 if (dvdsub_lang_id != dvdsub_id) { |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
2011 dvdsub_id = dvdsub_lang_id; |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
2012 select_subtitle(ctx); |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
2013 } |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
2014 } |
25824 | 2015 |
33287 | 2016 // clear all EOF related flags |
25824 | 2017 ctx->d_video->eof = ctx->d_audio->eof = ctx->stream->eof = 0; |
2018 } | |
2019 | |
33287 | 2020 /** |
2021 * @brief Restore last decoded DVDNAV (still frame). | |
2022 */ | |
25824 | 2023 static mp_image_t *mp_dvdnav_restore_smpi(int *in_size, |
2024 unsigned char **start, | |
2025 mp_image_t *decoded_frame) | |
2026 { | |
2027 if (mpctx->stream->type != STREAMTYPE_DVDNAV) | |
2028 return decoded_frame; | |
2029 | |
33287 | 2030 // a change occured in dvdnav stream |
33363 | 2031 if (mp_dvdnav_cell_has_changed(mpctx->stream, 0)) { |
25824 | 2032 mp_dvdnav_read_wait(mpctx->stream, 1, 1); |
2033 mp_dvdnav_context_free(mpctx); | |
2034 mp_dvdnav_reset_stream(mpctx); | |
2035 mp_dvdnav_read_wait(mpctx->stream, 0, 1); | |
33363 | 2036 mp_dvdnav_cell_has_changed(mpctx->stream, 1); |
25824 | 2037 } |
2038 | |
2039 if (*in_size < 0) { | |
2040 float len; | |
2041 | |
33287 | 2042 // display still frame, if any |
25824 | 2043 if (mpctx->nav_smpi && !mpctx->nav_buffer) |
2044 decoded_frame = mpctx->nav_smpi; | |
2045 | |
33287 | 2046 // increment video frame: continue playing after still frame |
25824 | 2047 len = demuxer_get_time_length(mpctx->demuxer); |
2048 if (mpctx->sh_video->pts >= len && | |
2049 mpctx->sh_video->pts > 0.0 && len > 0.0) { | |
2050 mp_dvdnav_skip_still(mpctx->stream); | |
2051 mp_dvdnav_skip_wait(mpctx->stream); | |
2052 } | |
2053 mpctx->sh_video->pts += 1 / mpctx->sh_video->fps; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
2054 |
25824 | 2055 if (mpctx->nav_buffer) { |
33363 | 2056 *start = mpctx->nav_start; |
25824 | 2057 *in_size = mpctx->nav_in_size; |
2058 if (mpctx->nav_start) | |
33363 | 2059 memcpy(*start, mpctx->nav_buffer, mpctx->nav_in_size); |
25824 | 2060 } |
2061 } | |
2062 | |
2063 return decoded_frame; | |
2064 } | |
2065 | |
33287 | 2066 /** |
2067 * @brief Save last decoded DVDNAV (still frame). | |
2068 */ | |
25824 | 2069 static void mp_dvdnav_save_smpi(int in_size, |
2070 unsigned char *start, | |
2071 mp_image_t *decoded_frame) | |
2072 { | |
2073 if (mpctx->stream->type != STREAMTYPE_DVDNAV) | |
2074 return; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
2075 |
32511
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32467
diff
changeset
|
2076 free(mpctx->nav_buffer); |
25824 | 2077 |
33363 | 2078 mpctx->nav_buffer = malloc(in_size); |
2079 mpctx->nav_start = start; | |
25824 | 2080 mpctx->nav_in_size = mpctx->nav_buffer ? in_size : -1; |
2081 if (mpctx->nav_buffer) | |
33363 | 2082 memcpy(mpctx->nav_buffer, start, in_size); |
25824 | 2083 |
2084 if (decoded_frame && mpctx->nav_smpi != decoded_frame) | |
33363 | 2085 mpctx->nav_smpi = mp_dvdnav_copy_mpi(mpctx->nav_smpi, decoded_frame); |
25824 | 2086 } |
33363 | 2087 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2088 #endif /* CONFIG_DVDNAV */ |
25824 | 2089 |
20887 | 2090 static void adjust_sync_and_print_status(int between_frames, float timing_error) |
2091 { | |
33363 | 2092 current_module = "av_sync"; |
2093 | |
2094 if (mpctx->sh_audio) { | |
2095 double a_pts, v_pts; | |
2096 | |
2097 if (autosync) | |
2098 /* | |
2099 * If autosync is enabled, the value for delay must be calculated | |
2100 * a bit differently. It is set only to the difference between | |
2101 * the audio and video timers. Any attempt to include the real | |
2102 * or corrected delay causes the pts_correction code below to | |
2103 * try to correct for the changes in delay which autosync is | |
2104 * trying to measure. This keeps the two from competing, but still | |
2105 * allows the code to correct for PTS drift *only*. (Using a delay | |
2106 * value here, even a "corrected" one, would be incompatible with | |
2107 * autosync mode.) | |
2108 */ | |
2109 a_pts = written_audio_pts(mpctx->sh_audio, mpctx->d_audio) - mpctx->delay; | |
2110 else | |
2111 a_pts = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out); | |
2112 | |
2113 v_pts = mpctx->sh_video->pts; | |
2114 | |
2115 { | |
2116 static int drop_message; | |
2117 double AV_delay = a_pts - audio_delay - v_pts; | |
2118 double x; | |
2119 // not a good idea to do A-V correction with with bogus values | |
2120 if (a_pts == MP_NOPTS_VALUE || v_pts == MP_NOPTS_VALUE) | |
2121 AV_delay = 0; | |
2122 if (AV_delay > 0.5 && drop_frame_cnt > 50 && drop_message == 0) { | |
2123 ++drop_message; | |
2124 mp_msg(MSGT_AVSYNC, MSGL_WARN, MSGTR_SystemTooSlow); | |
2125 } | |
2126 if (autosync) | |
2127 x = AV_delay * 0.1f; | |
2128 else | |
2129 /* Do not correct target time for the next frame if this frame | |
2130 * was late not because of wrong target time but because the | |
2131 * target time could not be met */ | |
2132 x = (AV_delay + timing_error * playback_speed) * 0.1f; | |
2133 if (x < -max_pts_correction) | |
2134 x = -max_pts_correction; | |
2135 else if (x > max_pts_correction) | |
2136 x = max_pts_correction; | |
2137 if (default_max_pts_correction >= 0) | |
2138 max_pts_correction = default_max_pts_correction; | |
2139 else | |
2140 max_pts_correction = mpctx->sh_video->frametime * 0.10; // +-10% of time | |
2141 if (!between_frames) { | |
2142 mpctx->delay += x; | |
2143 c_total += x; | |
2144 } | |
2145 if (!quiet) | |
2146 print_status(a_pts - audio_delay, AV_delay, c_total); | |
2147 } | |
20887 | 2148 } else { |
33363 | 2149 // No audio: |
2150 | |
2151 if (!quiet) | |
2152 print_status(0, 0, 0); | |
20887 | 2153 } |
2154 } | |
2155 | |
20986 | 2156 static int fill_audio_out_buffers(void) |
20889
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2157 { |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2158 unsigned int t; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2159 double tt; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2160 int playsize; |
33363 | 2161 int playflags = 0; |
2162 int audio_eof = 0; | |
20890
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
2163 int bytes_to_write; |
31671
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
2164 int format_change = 0; |
33363 | 2165 sh_audio_t *const sh_audio = mpctx->sh_audio; |
2166 | |
2167 current_module = "play_audio"; | |
20889
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2168 |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2169 while (1) { |
33363 | 2170 int sleep_time; |
2171 // all the current uses of ao_data.pts seem to be in aos that handle | |
2172 // sync completely wrong; there should be no need to use ao_data.pts | |
2173 // in get_space() | |
2174 ao_data.pts = ((mpctx->sh_video ? mpctx->sh_video->timer : 0) + mpctx->delay) * 90000.0; | |
2175 bytes_to_write = mpctx->audio_out->get_space(); | |
2176 if (mpctx->sh_video || bytes_to_write >= ao_data.outburst) | |
2177 break; | |
2178 | |
2179 // handle audio-only case: | |
2180 // this is where mplayer sleeps during audio-only playback | |
2181 // to avoid 100% CPU use | |
2182 sleep_time = (ao_data.outburst - bytes_to_write) * 1000 / ao_data.bps; | |
2183 if (sleep_time < 10) | |
2184 sleep_time = 10; // limit to 100 wakeups per second | |
2185 usec_sleep(sleep_time * 1000); | |
20890
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
2186 } |
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
2187 |
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
2188 while (bytes_to_write) { |
33363 | 2189 int res; |
2190 playsize = bytes_to_write; | |
2191 if (playsize > MAX_OUTBURST) | |
2192 playsize = MAX_OUTBURST; | |
2193 bytes_to_write -= playsize; | |
2194 | |
2195 // Fill buffer if needed: | |
2196 current_module = "decode_audio"; | |
2197 t = GetTimer(); | |
2198 if (!format_change) { | |
2199 res = mp_decode_audio(sh_audio, playsize); | |
2200 format_change = res == -2; | |
2201 } | |
2202 if (!format_change && res < 0) // EOF or error | |
2203 if (mpctx->d_audio->eof) { | |
2204 audio_eof = 1; | |
2205 if (sh_audio->a_out_buffer_len == 0) | |
2206 return 0; | |
2207 } | |
2208 t = GetTimer() - t; | |
2209 tt = t * 0.000001f; | |
2210 audio_time_usage += tt; | |
2211 if (playsize > sh_audio->a_out_buffer_len) { | |
2212 playsize = sh_audio->a_out_buffer_len; | |
2213 if (audio_eof || format_change) | |
2214 playflags |= AOPLAY_FINAL_CHUNK; | |
2215 } | |
2216 if (!playsize) | |
2217 break; | |
2218 | |
2219 // play audio: | |
2220 current_module = "play_audio"; | |
2221 | |
2222 // Is this pts value actually useful for the aos that access it? | |
2223 // They're obviously badly broken in the way they handle av sync; | |
2224 // would not having access to this make them more broken? | |
2225 ao_data.pts = ((mpctx->sh_video ? mpctx->sh_video->timer : 0) + mpctx->delay) * 90000.0; | |
2226 playsize = mpctx->audio_out->play(sh_audio->a_out_buffer, playsize, playflags); | |
2227 | |
2228 if (playsize > 0) { | |
2229 sh_audio->a_out_buffer_len -= playsize; | |
2230 memmove(sh_audio->a_out_buffer, &sh_audio->a_out_buffer[playsize], | |
2231 sh_audio->a_out_buffer_len); | |
2232 mpctx->delay += playback_speed * playsize / (double)ao_data.bps; | |
2233 } else if ((format_change || audio_eof) && mpctx->audio_out->get_delay() < .04) { | |
2234 // Sanity check to avoid hanging in case current ao doesn't output | |
2235 // partial chunks and doesn't check for AOPLAY_FINAL_CHUNK | |
2236 mp_msg(MSGT_CPLAYER, MSGL_WARN, "Audio output truncated at end.\n"); | |
2237 sh_audio->a_out_buffer_len = 0; | |
2238 } | |
20889
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2239 } |
31671
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
2240 if (format_change) { |
33363 | 2241 uninit_player(INITIALIZED_AO); |
2242 reinit_audio_chain(); | |
31671
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
2243 } |
20889
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2244 return 1; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2245 } |
20887 | 2246 |
33155
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2247 static void handle_udp_master(double time) |
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2248 { |
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2249 #ifdef CONFIG_NETWORKING |
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2250 if (udp_master) { |
33363 | 2251 char current_time[256]; |
2252 snprintf(current_time, sizeof(current_time), "%f", time); | |
2253 send_udp(udp_ip, udp_port, current_time); | |
33155
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2254 } |
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2255 #endif /* CONFIG_NETWORKING */ |
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2256 } |
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2257 |
20986 | 2258 static int sleep_until_update(float *time_frame, float *aq_sleep_time) |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2259 { |
20904 | 2260 int frame_time_remaining = 0; |
33363 | 2261 current_module = "calc_sleep_time"; |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2262 |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2263 #ifdef CONFIG_NETWORKING |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2264 if (udp_slave) { |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2265 int udp_master_exited = udp_slave_sync(mpctx); |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2266 if (udp_master_exited) { |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2267 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_MasterQuit); |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2268 exit_player(EXIT_QUIT); |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2269 } |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2270 return 0; |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2271 } |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2272 #endif /* CONFIG_NETWORKING */ |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2273 |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2274 *time_frame -= GetRelativeTime(); // reset timer |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2275 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2276 if (mpctx->sh_audio && !mpctx->d_audio->eof) { |
33363 | 2277 float delay = mpctx->audio_out->get_delay(); |
2278 mp_dbg(MSGT_AVSYNC, MSGL_DBG2, "delay=%f\n", delay); | |
2279 | |
2280 if (autosync) { | |
2281 /* | |
2282 * Adjust this raw delay value by calculating the expected | |
2283 * delay for this frame and generating a new value which is | |
2284 * weighted between the two. The higher autosync is, the | |
2285 * closer to the delay value gets to that which "-nosound" | |
2286 * would have used, and the longer it will take for A/V | |
2287 * sync to settle at the right value (but it eventually will.) | |
2288 * This settling time is very short for values below 100. | |
2289 */ | |
2290 float predicted = mpctx->delay / playback_speed + *time_frame; | |
2291 float difference = delay - predicted; | |
2292 delay = predicted + difference / (float)autosync; | |
2293 } | |
2294 | |
2295 *time_frame = delay - mpctx->delay / playback_speed; | |
2296 | |
2297 // delay = amount of audio buffered in soundcard/driver | |
2298 if (delay > 0.25) | |
2299 delay = 0.25; | |
2300 else if (delay < 0.10) | |
2301 delay = 0.10; | |
2302 if (*time_frame > delay * 0.6) { | |
2303 // sleep time too big - may cause audio drops (buffer underrun) | |
2304 frame_time_remaining = 1; | |
2305 *time_frame = delay * 0.5; | |
2306 } | |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2307 } else { |
33363 | 2308 // If we're lagging more than 200 ms behind the right playback rate, |
2309 // don't try to "catch up". | |
2310 // If benchmark is set always output frames as fast as possible | |
2311 // without sleeping. | |
2312 if (*time_frame < -0.2 || benchmark) | |
2313 *time_frame = 0; | |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2314 } |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2315 |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2316 *aq_sleep_time += *time_frame; |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2317 |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2318 //============================== SLEEP: =================================== |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2319 |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2320 // flag 256 means: libvo driver does its timing (dvb card) |
33363 | 2321 if (*time_frame > 0.001 && !(vo_flags & 256)) |
2322 *time_frame = timing_sleep(*time_frame); | |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2323 |
33155
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2324 handle_udp_master(mpctx->sh_video->pts); |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2325 |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2326 return frame_time_remaining; |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2327 } |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2328 |
33363 | 2329 int reinit_video_chain(void) |
2330 { | |
2331 sh_video_t *const sh_video = mpctx->sh_video; | |
2332 double ar = -1.0; | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2333 //================== Init VIDEO (codec & libvo) ========================== |
33363 | 2334 if (!fixed_vo || !(initialized_flags & INITIALIZED_VO)) { |
2335 current_module = "preinit_libvo"; | |
2336 | |
2337 //shouldn't we set dvideo->id=-2 when we fail? | |
2338 vo_config_count = 0; | |
2339 //if((mpctx->video_out->preinit(vo_subdevice))!=0){ | |
2340 if (!(mpctx->video_out = init_best_video_out(video_driver_list))) { | |
2341 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_ErrorInitializingVODevice); | |
2342 goto err_out; | |
2343 } | |
2344 initialized_flags |= INITIALIZED_VO; | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2345 } |
33363 | 2346 |
2347 if (stream_control(mpctx->demuxer->stream, STREAM_CTRL_GET_ASPECT_RATIO, &ar) != STREAM_UNSUPPORTED) | |
2348 mpctx->sh_video->stream_aspect = ar; | |
2349 current_module = "init_video_filters"; | |
2350 { | |
2351 char *vf_arg[] = { "_oldargs_", (char *)mpctx->video_out, NULL }; | |
2352 sh_video->vfilter = vf_open_filter(NULL, "vo", vf_arg); | |
2353 } | |
27345
b597fd2924b4
Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents:
27343
diff
changeset
|
2354 #ifdef CONFIG_MENU |
33363 | 2355 if (use_menu) { |
2356 char *vf_arg[] = { "_oldargs_", menu_root, NULL }; | |
2357 vf_menu = vf_open_plugin(libmenu_vfs, sh_video->vfilter, "menu", vf_arg); | |
2358 if (!vf_menu) { | |
2359 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantOpenLibmenuFilterWithThisRootMenu, menu_root); | |
2360 use_menu = 0; | |
2361 } | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2362 } |
33363 | 2363 if (vf_menu) |
2364 sh_video->vfilter = vf_menu; | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2365 #endif |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2366 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2367 #ifdef CONFIG_ASS |
33363 | 2368 if (ass_enabled) { |
2369 int i; | |
2370 int insert = 1; | |
2371 if (vf_settings) | |
2372 for (i = 0; vf_settings[i].name; ++i) | |
2373 if (strcmp(vf_settings[i].name, "ass") == 0) { | |
2374 insert = 0; | |
2375 break; | |
2376 } | |
2377 if (insert) { | |
2378 char *vf_arg[] = { "auto", "1", NULL }; | |
2379 vf_instance_t *vf_ass = vf_open_filter(sh_video->vfilter, "ass", vf_arg); | |
2380 if (vf_ass) | |
2381 sh_video->vfilter = vf_ass; | |
2382 else | |
2383 mp_msg(MSGT_CPLAYER, MSGL_ERR, "ASS: cannot add video filter\n"); | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2384 } |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2385 } |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2386 #endif |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2387 |
33363 | 2388 sh_video->vfilter = append_filters(sh_video->vfilter); |
2389 eosd_init(sh_video->vfilter); | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2390 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2391 #ifdef CONFIG_ASS |
33363 | 2392 if (ass_enabled) |
2393 eosd_ass_init(ass_library); | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2394 #endif |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2395 |
33363 | 2396 current_module = "init_video_codec"; |
2397 | |
2398 mp_msg(MSGT_CPLAYER, MSGL_INFO, "==========================================================================\n"); | |
2399 init_best_video_codec(sh_video, video_codec_list, video_fm_list); | |
2400 mp_msg(MSGT_CPLAYER, MSGL_INFO, "==========================================================================\n"); | |
2401 | |
2402 if (!sh_video->initialized) { | |
2403 if (!fixed_vo) | |
2404 uninit_player(INITIALIZED_VO); | |
2405 goto err_out; | |
2406 } | |
2407 | |
2408 initialized_flags |= INITIALIZED_VCODEC; | |
2409 | |
2410 if (sh_video->codec) | |
2411 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_CODEC=%s\n", sh_video->codec->name); | |
2412 | |
2413 sh_video->last_pts = MP_NOPTS_VALUE; | |
2414 sh_video->num_buffered_pts = 0; | |
2415 sh_video->next_frame_time = 0; | |
2416 | |
2417 if (auto_quality > 0) { | |
2418 // Auto quality option enabled | |
2419 output_quality = get_video_quality_max(sh_video); | |
2420 if (auto_quality > output_quality) | |
2421 auto_quality = output_quality; | |
2422 else | |
2423 output_quality = auto_quality; | |
2424 mp_msg(MSGT_CPLAYER, MSGL_V, "AutoQ: setting quality to %d.\n", output_quality); | |
2425 set_video_quality(sh_video, output_quality); | |
2426 } | |
2427 | |
2428 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============ | |
2429 | |
2430 current_module = "init_vo"; | |
2431 | |
2432 return 1; | |
21031
e45bb0ee5558
Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents:
21030
diff
changeset
|
2433 |
e45bb0ee5558
Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents:
21030
diff
changeset
|
2434 err_out: |
33363 | 2435 mpctx->sh_video = mpctx->d_video->sh = NULL; |
2436 return 0; | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2437 } |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2438 |
21077 | 2439 static double update_video(int *blit_frame) |
2440 { | |
33363 | 2441 sh_video_t *const sh_video = mpctx->sh_video; |
21077 | 2442 //-------------------- Decode a frame: ----------------------- |
2443 double frame_time; | |
2444 *blit_frame = 0; // Don't blit if we hit EOF | |
2445 if (!correct_pts) { | |
33363 | 2446 unsigned char *start = NULL; |
2447 void *decoded_frame = NULL; | |
2448 int drop_frame = 0; | |
2449 int in_size; | |
2450 int full_frame; | |
2451 | |
2452 do { | |
2453 current_module = "video_read_frame"; | |
2454 frame_time = sh_video->next_frame_time; | |
2455 in_size = video_read_frame(sh_video, &sh_video->next_frame_time, | |
2456 &start, force_fps); | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2457 #ifdef CONFIG_DVDNAV |
33363 | 2458 // wait, still frame or EOF |
2459 if (mpctx->stream->type == STREAMTYPE_DVDNAV && in_size < 0) { | |
2460 if (mp_dvdnav_is_eof(mpctx->stream)) | |
2461 return -1; | |
2462 if (mpctx->d_video) | |
2463 mpctx->d_video->eof = 0; | |
2464 if (mpctx->d_audio) | |
2465 mpctx->d_audio->eof = 0; | |
2466 mpctx->stream->eof = 0; | |
2467 } else | |
2468 #endif | |
2469 if (in_size < 0) | |
31201
203789464176
misc cosmetics: K&R style nits, #include placement, indentation
diego
parents:
31148
diff
changeset
|
2470 return -1; |
33363 | 2471 if (in_size > max_framesize) |
2472 max_framesize = in_size; // stats | |
2473 drop_frame = check_framedrop(frame_time); | |
2474 current_module = "decode_video"; | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2475 #ifdef CONFIG_DVDNAV |
33363 | 2476 full_frame = 1; |
2477 decoded_frame = mp_dvdnav_restore_smpi(&in_size, &start, decoded_frame); | |
2478 // still frame has been reached, no need to decode | |
2479 if (in_size > 0 && !decoded_frame) | |
25824 | 2480 #endif |
33363 | 2481 decoded_frame = decode_video(sh_video, start, in_size, drop_frame, |
2482 sh_video->pts, &full_frame); | |
2483 | |
2484 if (full_frame) { | |
2485 sh_video->timer += frame_time; | |
2486 | |
2487 // Time-based PTS recalculation. | |
2488 // The key to maintaining A-V sync is to not touch PTS until the proper frame is reached | |
2489 if (sh_video->pts != MP_NOPTS_VALUE) { | |
2490 if (sh_video->last_pts != MP_NOPTS_VALUE) { | |
2491 double pts = sh_video->last_pts + frame_time; | |
2492 double ptsdiff = fabs(pts - sh_video->pts); | |
2493 | |
2494 // Allow starting PTS recalculation at the appropriate frame only | |
2495 mpctx->framestep_found |= (ptsdiff <= frame_time * 1.5); | |
2496 | |
2497 // replace PTS only if we're not too close and not too far | |
2498 // and a correctly timed frame has been found, otherwise | |
2499 // keep pts to eliminate rounding errors or catch up with stream | |
2500 if (ptsdiff > frame_time * 20) | |
2501 mpctx->framestep_found = 0; | |
2502 if (ptsdiff * 10 > frame_time && mpctx->framestep_found) | |
2503 sh_video->pts = pts; | |
2504 else | |
2505 mp_dbg(MSGT_AVSYNC, MSGL_DBG2, "Keeping PTS at %6.2f\n", sh_video->pts); | |
2506 } | |
2507 sh_video->last_pts = sh_video->pts; | |
2508 } | |
2509 if (mpctx->sh_audio) | |
2510 mpctx->delay -= frame_time; | |
2511 // video_read_frame can change fps (e.g. for ASF video) | |
2512 vo_fps = sh_video->fps; | |
2513 update_subtitles(sh_video, sh_video->pts, mpctx->d_sub, 0); | |
2514 update_teletext(sh_video, mpctx->demuxer, 0); | |
2515 update_osd_msg(); | |
2516 } | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2517 #ifdef CONFIG_DVDNAV |
33363 | 2518 // save back last still frame for future display |
2519 mp_dvdnav_save_smpi(in_size, start, decoded_frame); | |
25824 | 2520 #endif |
33363 | 2521 } while (!full_frame); |
2522 | |
2523 current_module = "filter_video"; | |
2524 *blit_frame = (decoded_frame && filter_video(sh_video, decoded_frame, | |
2525 sh_video->pts)); | |
2526 } else { | |
2527 int res = generate_video_frame(sh_video, mpctx->d_video); | |
2528 if (!res) | |
2529 return -1; | |
2530 ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, | |
2531 VFCTRL_GET_PTS, &sh_video->pts); | |
2532 if (sh_video->pts == MP_NOPTS_VALUE) { | |
2533 mp_msg(MSGT_CPLAYER, MSGL_ERR, "pts after filters MISSING\n"); | |
2534 sh_video->pts = sh_video->last_pts; | |
2535 } | |
2536 if (sh_video->last_pts == MP_NOPTS_VALUE) | |
2537 sh_video->last_pts = sh_video->pts; | |
2538 else if (sh_video->last_pts > sh_video->pts) { | |
2539 // make a guess whether this is some kind of discontinuity | |
2540 // we should jump along with or some wron timestamps we | |
2541 // should replace instead | |
31245
a3adde0a5b83
If an invalid pts value is detected, try to to make up some if it seems
reimar
parents:
31243
diff
changeset
|
2542 if (sh_video->pts < sh_video->last_pts - 20 * sh_video->frametime) |
33363 | 2543 sh_video->last_pts = sh_video->pts; |
2544 else | |
2545 sh_video->pts = sh_video->last_pts + sh_video->frametime; | |
2546 mp_msg(MSGT_CPLAYER, MSGL_V, "pts value < previous\n"); | |
2547 } | |
2548 frame_time = sh_video->pts - sh_video->last_pts; | |
2549 if (!frame_time) | |
2550 frame_time = sh_video->frametime; | |
2551 sh_video->last_pts = sh_video->pts; | |
2552 sh_video->timer += frame_time; | |
2553 if (mpctx->sh_audio) | |
2554 mpctx->delay -= frame_time; | |
2555 *blit_frame = res > 0; | |
21077 | 2556 } |
2557 return frame_time; | |
2558 } | |
2559 | |
25606 | 2560 static void pause_loop(void) |
21082 | 2561 { |
33363 | 2562 mp_cmd_t *cmd; |
32732
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2563 #ifdef CONFIG_STREAM_CACHE |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2564 int old_cache_fill = stream_cache_size > 0 ? cache_fill_status(mpctx->stream) : 0; |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2565 #endif |
21082 | 2566 if (!quiet) { |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2567 if (term_osd && !mpctx->sh_video) { |
32730
736b22f11e00
Change MSGTR_Paused definition to allow simplifying some code.
reimar
parents:
32724
diff
changeset
|
2568 set_osd_msg(OSD_MSG_PAUSE, 1, 0, MSGTR_Paused); |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2569 update_osd_msg(); |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2570 } else |
33363 | 2571 mp_msg(MSGT_CPLAYER, MSGL_STATUS, "\n"MSGTR_Paused "\r"); |
21082 | 2572 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_PAUSED\n"); |
2573 } | |
27343 | 2574 #ifdef CONFIG_GUI |
21082 | 2575 if (use_gui) |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2576 guiGetEvent(guiCEvent, (char *)guiSetPause); |
21082 | 2577 #endif |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2578 if (mpctx->video_out && mpctx->sh_video && vo_config_count) |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2579 mpctx->video_out->control(VOCTRL_PAUSE, NULL); |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2580 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2581 if (mpctx->audio_out && mpctx->sh_audio) |
33363 | 2582 mpctx->audio_out->pause(); // pause audio, keep data if possible |
2583 | |
2584 while ((cmd = mp_input_get_cmd(20, 1, 1)) == NULL || cmd->pausing == 4) { | |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2585 if (cmd) { |
33363 | 2586 cmd = mp_input_get_cmd(0, 1, 0); |
2587 run_command(mpctx, cmd); | |
2588 mp_cmd_free(cmd); | |
2589 continue; | |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2590 } |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2591 if (mpctx->sh_video && mpctx->video_out && vo_config_count) |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2592 mpctx->video_out->check_events(); |
27343 | 2593 #ifdef CONFIG_GUI |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2594 if (use_gui) { |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2595 guiEventHandling(); |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2596 guiGetEvent(guiReDraw, NULL); |
33363 | 2597 if (guiIntfStruct.Playing != 2 || (rel_seek_secs || abs_seek_pos)) |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2598 break; |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2599 } |
21082 | 2600 #endif |
27345
b597fd2924b4
Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents:
27343
diff
changeset
|
2601 #ifdef CONFIG_MENU |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2602 if (vf_menu) |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2603 vf_menu_pause_update(vf_menu); |
21082 | 2604 #endif |
32732
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2605 #ifdef CONFIG_STREAM_CACHE |
32735
c8b9c17890cb
Cosmetics: move if and following { onto same line.
reimar
parents:
32732
diff
changeset
|
2606 if (!quiet && stream_cache_size > 0) { |
32732
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2607 int new_cache_fill = cache_fill_status(mpctx->stream); |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2608 if (new_cache_fill != old_cache_fill) { |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2609 if (term_osd && !mpctx->sh_video) { |
33363 | 2610 set_osd_msg(OSD_MSG_PAUSE, 1, 0, MSGTR_Paused " %d%%", |
32732
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2611 new_cache_fill); |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2612 update_osd_msg(); |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2613 } else |
33363 | 2614 mp_msg(MSGT_CPLAYER, MSGL_STATUS, MSGTR_Paused " %d%%\r", |
32732
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2615 new_cache_fill); |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2616 old_cache_fill = new_cache_fill; |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2617 } |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2618 } |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2619 #endif |
33181 | 2620 if (mpctx->sh_video) |
2621 handle_udp_master(mpctx->sh_video->pts); | |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2622 usec_sleep(20000); |
21082 | 2623 } |
2624 if (cmd && cmd->id == MP_CMD_PAUSE) { | |
33363 | 2625 cmd = mp_input_get_cmd(0, 1, 0); |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2626 mp_cmd_free(cmd); |
21082 | 2627 } |
33363 | 2628 mpctx->osd_function = OSD_PLAY; |
29937 | 2629 if (mpctx->audio_out && mpctx->sh_audio) { |
29856
3a6ae46759de
Do not call resume on unpausing if we have already reached eof while
reimar
parents:
29855
diff
changeset
|
2630 if (mpctx->eof) // do not play remaining audio if we e.g. switch to the next file |
33363 | 2631 mpctx->audio_out->reset(); |
29856
3a6ae46759de
Do not call resume on unpausing if we have already reached eof while
reimar
parents:
29855
diff
changeset
|
2632 else |
33363 | 2633 mpctx->audio_out->resume(); // resume audio |
29937 | 2634 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2635 if (mpctx->video_out && mpctx->sh_video && vo_config_count) |
33363 | 2636 mpctx->video_out->control(VOCTRL_RESUME, NULL); // resume video |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2637 (void)GetRelativeTime(); // ignore time that passed during pause |
27343 | 2638 #ifdef CONFIG_GUI |
21082 | 2639 if (use_gui) { |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2640 if (guiIntfStruct.Playing == guiSetStop) |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2641 mpctx->eof = 1; |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2642 else |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2643 guiGetEvent(guiCEvent, (char *)guiSetPlay); |
21082 | 2644 } |
2645 #endif | |
2646 } | |
2647 | |
31956
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2648 static void edl_loadfile(void) |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2649 { |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2650 if (edl_filename) { |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2651 if (edl_records) { |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2652 free_edl(edl_records); |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2653 edl_needs_reset = 1; |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2654 } |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2655 next_edl_record = edl_records = edl_parse_file(); |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2656 } |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2657 } |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2658 |
22298 | 2659 // Execute EDL command for the current position if one exists |
2660 static void edl_update(MPContext *mpctx) | |
2661 { | |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2662 if (!edl_records) { |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2663 return; |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2664 } |
22298 | 2665 |
2666 if (!mpctx->sh_video) { | |
33363 | 2667 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlNOsh_video); |
2668 free_edl(edl_records); | |
2669 next_edl_record = NULL; | |
2670 edl_records = NULL; | |
2671 return; | |
22298 | 2672 } |
2673 | |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2674 // This indicates that we need to reset next EDL record according |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2675 // to new PTS due to seek or other condition |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2676 if (edl_needs_reset) { |
33363 | 2677 edl_needs_reset = 0; |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2678 mpctx->edl_muted = 0; |
33363 | 2679 next_edl_record = edl_records; |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2680 |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2681 // Find next record, also skip immediately if we are already |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2682 // inside any record |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2683 while (next_edl_record) { |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2684 if (next_edl_record->start_sec > mpctx->sh_video->pts) |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2685 break; |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2686 if (next_edl_record->stop_sec >= mpctx->sh_video->pts) { |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2687 if (edl_backward) { |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2688 mpctx->osd_function = OSD_REW; |
33363 | 2689 edl_decision = 1; |
2690 abs_seek_pos = 0; | |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2691 rel_seek_secs = -(mpctx->sh_video->pts - |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2692 next_edl_record->start_sec + |
31580
b6c2b541e1a6
Implement edl-backward-delay to avoid jumping right over an
reynaldo
parents:
31515
diff
changeset
|
2693 edl_backward_delay); |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2694 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: pts [%f], " |
33363 | 2695 "offset [%f], start [%f], stop [%f], length [%f]\n", |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2696 mpctx->sh_video->pts, rel_seek_secs, |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2697 next_edl_record->start_sec, next_edl_record->stop_sec, |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2698 next_edl_record->length_sec); |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2699 return; |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2700 } |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2701 break; |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2702 } |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2703 |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2704 if (next_edl_record->action == EDL_MUTE) |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2705 mpctx->edl_muted = !mpctx->edl_muted; |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2706 |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2707 next_edl_record = next_edl_record->next; |
33363 | 2708 } |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2709 if ((mpctx->user_muted | mpctx->edl_muted) != mpctx->mixer.muted) |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2710 mixer_mute(&mpctx->mixer); |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2711 } |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2712 |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2713 if (next_edl_record && |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2714 mpctx->sh_video->pts >= next_edl_record->start_sec) { |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2715 if (next_edl_record->action == EDL_SKIP) { |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2716 mpctx->osd_function = OSD_FFW; |
33363 | 2717 edl_decision = 1; |
2718 abs_seek_pos = 0; | |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2719 rel_seek_secs = next_edl_record->stop_sec - mpctx->sh_video->pts; |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2720 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: pts [%f], offset [%f], " |
33363 | 2721 "start [%f], stop [%f], length [%f]\n", |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2722 mpctx->sh_video->pts, rel_seek_secs, |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2723 next_edl_record->start_sec, next_edl_record->stop_sec, |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2724 next_edl_record->length_sec); |
33363 | 2725 } else if (next_edl_record->action == EDL_MUTE) { |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2726 mpctx->edl_muted = !mpctx->edl_muted; |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2727 if ((mpctx->user_muted | mpctx->edl_muted) != mpctx->mixer.muted) |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2728 mixer_mute(&mpctx->mixer); |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2729 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_MUTE: [%f]\n", |
33363 | 2730 next_edl_record->start_sec); |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2731 } |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2732 next_edl_record = next_edl_record->next; |
22298 | 2733 } |
2734 } | |
2735 | |
25883
baf32110d3fc
Use defines to give names to the different seek flags.
reimar
parents:
25852
diff
changeset
|
2736 // style & SEEK_ABSOLUTE == 0 means seek relative to current position, == 1 means absolute |
baf32110d3fc
Use defines to give names to the different seek flags.
reimar
parents:
25852
diff
changeset
|
2737 // style & SEEK_FACTOR == 0 means amount in seconds, == 2 means fraction of file length |
22300 | 2738 // return -1 if seek failed (non-seekable stream?), 0 otherwise |
2739 static int seek(MPContext *mpctx, double amount, int style) | |
2740 { | |
2741 current_module = "seek"; | |
2742 if (demux_seek(mpctx->demuxer, amount, audio_delay, style) == 0) | |
33363 | 2743 return -1; |
22300 | 2744 |
30176
6fb92182aff3
At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents:
30175
diff
changeset
|
2745 mpctx->startup_decode_retry = DEFAULT_STARTUP_DECODE_RETRY; |
22300 | 2746 if (mpctx->sh_video) { |
33363 | 2747 current_module = "seek_video_reset"; |
2748 if (vo_config_count) | |
2749 mpctx->video_out->control(VOCTRL_RESET, NULL); | |
2750 mpctx->num_buffered_frames = 0; | |
2751 mpctx->delay = 0; | |
2752 mpctx->time_frame = 0; | |
2753 mpctx->framestep_found = 0; | |
2754 // Not all demuxers set d_video->pts during seek, so this value | |
2755 // (which is used by at least vobsub and edl code below) may | |
2756 // be completely wrong (probably 0). | |
2757 mpctx->sh_video->pts = mpctx->d_video->pts; | |
2758 update_subtitles(mpctx->sh_video, mpctx->sh_video->pts, mpctx->d_sub, 1); | |
2759 update_teletext(mpctx->sh_video, mpctx->demuxer, 1); | |
22300 | 2760 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
2761 |
22300 | 2762 if (mpctx->sh_audio) { |
33363 | 2763 current_module = "seek_audio_reset"; |
2764 mpctx->audio_out->reset(); // stop audio, throwing away buffered data | |
2765 if (!mpctx->sh_video) | |
2766 update_subtitles(NULL, mpctx->sh_audio->pts, mpctx->d_sub, 1); | |
22300 | 2767 } |
2768 | |
25416 | 2769 if (vo_vobsub && mpctx->sh_video) { |
33363 | 2770 current_module = "seek_vobsub_reset"; |
2771 vobsub_seek(vo_vobsub, mpctx->sh_video->pts); | |
22300 | 2772 } |
2773 | |
31700 | 2774 #ifdef CONFIG_ASS |
31227
ee7beb1a3a6e
backport ass_flush_events() from upstream libass and make use of it
aurel
parents:
31201
diff
changeset
|
2775 if (ass_enabled && mpctx->d_sub->sh && ((sh_sub_t *)mpctx->d_sub->sh)->ass_track) |
ee7beb1a3a6e
backport ass_flush_events() from upstream libass and make use of it
aurel
parents:
31201
diff
changeset
|
2776 ass_flush_events(((sh_sub_t *)mpctx->d_sub->sh)->ass_track); |
ee7beb1a3a6e
backport ass_flush_events() from upstream libass and make use of it
aurel
parents:
31201
diff
changeset
|
2777 #endif |
ee7beb1a3a6e
backport ass_flush_events() from upstream libass and make use of it
aurel
parents:
31201
diff
changeset
|
2778 |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2779 if (edl_records) { |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2780 edl_needs_reset = 1; |
33363 | 2781 edl_backward = amount < 0; |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2782 } |
22300 | 2783 |
2784 c_total = 0; | |
2785 max_pts_correction = 0.1; | |
33363 | 2786 audio_time_usage = 0; |
2787 video_time_usage = 0; | |
2788 vout_time_usage = 0; | |
2789 drop_frame_cnt = 0; | |
22300 | 2790 |
2791 current_module = NULL; | |
2792 return 0; | |
2793 } | |
2794 | |
26963
8825552ee585
Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents:
26877
diff
changeset
|
2795 /* This preprocessor directive is a hack to generate a mplayer-nomain.o object |
8825552ee585
Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents:
26877
diff
changeset
|
2796 * file for some tools to link against. */ |
8825552ee585
Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents:
26877
diff
changeset
|
2797 #ifndef DISABLE_MAIN |
33363 | 2798 int main(int argc, char *argv[]) |
2799 { | |
21764 | 2800 // movie info: |
2801 | |
2802 /* Flag indicating whether MPlayer should exit without playing anything. */ | |
33363 | 2803 int opt_exit = 0; |
2804 int i; | |
2805 | |
2806 int gui_no_filename = 0; | |
2807 | |
2808 common_preinit(); | |
2809 | |
2810 // Create the config context and register the options | |
2811 mconfig = m_config_new(); | |
2812 m_config_register_options(mconfig, mplayer_opts); | |
2813 m_config_register_options(mconfig, common_opts); | |
2814 mp_input_register_options(mconfig); | |
2815 | |
2816 // Preparse the command line | |
2817 m_config_preparse_command_line(mconfig, argc, argv); | |
21930
6af0d674aa53
print_version() and others get executed before the command line has been parsed so -really-quiet does not silence them even though it should according to the verbosity level set by it, this simple change/hack fixes it
michael
parents:
21888
diff
changeset
|
2818 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2819 #ifdef CONFIG_TV |
33363 | 2820 stream_tv_defaults.immediate = 1; |
7068
6c2d746b17bf
10l, fix compiling without tv. patch by Andreas Hess <jaska@gmx.net>
arpi
parents:
7058
diff
changeset
|
2821 #endif |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5520
diff
changeset
|
2822 |
33363 | 2823 if (argc > 1 && argv[1] && |
2824 (!strcmp(argv[1], "-gui") || !strcmp(argv[1], "-nogui"))) { | |
2825 use_gui = !strcmp(argv[1], "-gui"); | |
2826 } else if (argv[0] && strstr(mp_basename(argv[0]), "gmplayer")) { | |
2827 use_gui = 1; | |
2828 } | |
1639 | 2829 |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
2830 parse_cfgfiles(mconfig); |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
2831 |
27343 | 2832 #ifdef CONFIG_GUI |
33363 | 2833 if (use_gui) { |
2834 initialized_flags |= INITIALIZED_GUI; | |
2835 cfg_read(); | |
33307 | 2836 } |
7019 | 2837 #endif |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
2838 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2839 mpctx->playtree = m_config_parse_mp_command_line(mconfig, argc, argv); |
33363 | 2840 if (mpctx->playtree == NULL) |
2841 opt_exit = 1; | |
16345
feb16d0117c8
allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents:
16323
diff
changeset
|
2842 else { |
33363 | 2843 mpctx->playtree = play_tree_cleanup(mpctx->playtree); |
2844 if (mpctx->playtree) { | |
2845 mpctx->playtree_iter = play_tree_iter_new(mpctx->playtree, mconfig); | |
2846 if (mpctx->playtree_iter) { | |
2847 if (play_tree_iter_step(mpctx->playtree_iter, 0, 0) != PLAY_TREE_ITER_ENTRY) { | |
2848 play_tree_iter_free(mpctx->playtree_iter); | |
2849 mpctx->playtree_iter = NULL; | |
2850 } | |
2851 filename = play_tree_iter_get_file(mpctx->playtree_iter, 1); | |
2852 } | |
2853 } | |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2854 } |
33363 | 2855 |
2856 print_version("MPlayer"); | |
32415
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2857 #if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_GUI) |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2858 void *runningmplayer = FindWindow("MPlayer GUI for Windows", "MPlayer for Windows"); |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2859 if (runningmplayer && filename && use_gui) { |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2860 COPYDATASTRUCT csData; |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2861 char file[MAX_PATH]; |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2862 char *filepart = filename; |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2863 if (GetFullPathName(filename, MAX_PATH, file, &filepart)) { |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2864 csData.dwData = 0; |
33363 | 2865 csData.cbData = strlen(file) * 2; |
32415
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2866 csData.lpData = file; |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2867 SendMessage(runningmplayer, WM_COPYDATA, (WPARAM)runningmplayer, (LPARAM)&csData); |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2868 } |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2869 } |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2870 #endif |
32383
f6e78eef2e1b
Avoid duplicating common init code between MPlayer and mencoder.
reimar
parents:
32382
diff
changeset
|
2871 if (!common_init()) |
f6e78eef2e1b
Avoid duplicating common init code between MPlayer and mencoder.
reimar
parents:
32382
diff
changeset
|
2872 exit_player_with_rc(EXIT_NONE, 0); |
30855 | 2873 |
27343 | 2874 #ifndef CONFIG_GUI |
33363 | 2875 if (use_gui) { |
2876 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_NoGui); | |
2877 use_gui = 0; | |
1709 | 2878 } |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2879 #else |
27727
48c1ae64255b
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents:
27635
diff
changeset
|
2880 #if !defined(__MINGW32__) && !defined(__CYGWIN__) |
33363 | 2881 if (use_gui && !vo_init()) { |
2882 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_GuiNeedsX); | |
2883 use_gui = 0; | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2884 } |
18945
337d4324c766
No point in checking for X for windows gui, in addition the hackish
reimar
parents:
18939
diff
changeset
|
2885 #endif |
33363 | 2886 if (use_gui && mpctx->playtree_iter) { |
2887 char cwd[PATH_MAX + 2]; | |
2888 // Free Playtree and Playtree-Iter as it's not used by the GUI. | |
2889 play_tree_iter_free(mpctx->playtree_iter); | |
2890 mpctx->playtree_iter = NULL; | |
2891 | |
2892 if (getcwd(cwd, PATH_MAX) != (char *)NULL) { | |
2893 strcat(cwd, "/"); | |
2894 // Prefix relative paths with current working directory | |
2895 play_tree_add_bpf(mpctx->playtree, cwd); | |
2896 } | |
2897 // Import initital playtree into GUI. | |
2898 import_initial_playtree_into_gui(mpctx->playtree, mconfig, enqueue); | |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
2899 } |
27343 | 2900 #endif /* CONFIG_GUI */ |
1709 | 2901 |
33363 | 2902 if (video_driver_list && strcmp(video_driver_list[0], "help") == 0) { |
2903 list_video_out(); | |
2904 opt_exit = 1; | |
956
a6cecd9a1bad
'-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents:
955
diff
changeset
|
2905 } |
5072 | 2906 |
33363 | 2907 if (audio_driver_list && strcmp(audio_driver_list[0], "help") == 0) { |
2908 list_audio_out(); | |
2909 opt_exit = 1; | |
956
a6cecd9a1bad
'-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents:
955
diff
changeset
|
2910 } |
1639 | 2911 |
33363 | 2912 if (audio_codec_list && strcmp(audio_codec_list[0], "help") == 0) { |
2913 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioCodecs); | |
2914 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_CODECS\n"); | |
2915 list_codecs(1); | |
2916 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); | |
2917 opt_exit = 1; | |
1983 | 2918 } |
33363 | 2919 if (video_codec_list && strcmp(video_codec_list[0], "help") == 0) { |
2920 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoCodecs); | |
2921 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_CODECS\n"); | |
2922 list_codecs(0); | |
2923 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); | |
2924 opt_exit = 1; | |
1983 | 2925 } |
33363 | 2926 if (video_fm_list && strcmp(video_fm_list[0], "help") == 0) { |
2927 vfm_help(); | |
2928 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); | |
2929 opt_exit = 1; | |
7191
1eadce15446c
-afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents:
7180
diff
changeset
|
2930 } |
33363 | 2931 if (audio_fm_list && strcmp(audio_fm_list[0], "help") == 0) { |
2932 afm_help(); | |
2933 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); | |
2934 opt_exit = 1; | |
7191
1eadce15446c
-afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents:
7180
diff
changeset
|
2935 } |
33363 | 2936 if (af_cfg.list && strcmp(af_cfg.list[0], "help") == 0) { |
2937 af_help(); | |
2938 printf("\n"); | |
2939 opt_exit = 1; | |
13269
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
13228
diff
changeset
|
2940 } |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27370
diff
changeset
|
2941 #ifdef CONFIG_X11 |
33363 | 2942 if (vo_fstype_list && strcmp(vo_fstype_list[0], "help") == 0) { |
2943 fstype_help(); | |
2944 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); | |
2945 opt_exit = 1; | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9315
diff
changeset
|
2946 } |
9336 | 2947 #endif |
33363 | 2948 if ((demuxer_name && strcmp(demuxer_name, "help") == 0) || |
2949 (audio_demuxer_name && strcmp(audio_demuxer_name, "help") == 0) || | |
2950 (sub_demuxer_name && strcmp(sub_demuxer_name, "help") == 0)) { | |
2951 demuxer_help(); | |
2952 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n"); | |
2953 opt_exit = 1; | |
16175 | 2954 } |
33363 | 2955 if (list_properties) { |
2956 property_print_help(); | |
2957 opt_exit = 1; | |
17914
f9cb6fc1608a
Add an option to list the properties: -list-properties
albeu
parents:
17911
diff
changeset
|
2958 } |
1983 | 2959 |
33363 | 2960 if (opt_exit) |
2961 exit_player(EXIT_NONE); | |
16345
feb16d0117c8
allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents:
16323
diff
changeset
|
2962 |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2963 if (player_idle_mode && use_gui) { |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2964 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoIdleAndGui); |
28032
92e770f6e890
Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents:
27953
diff
changeset
|
2965 exit_player_with_rc(EXIT_NONE, 1); |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2966 } |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2967 |
33363 | 2968 if (!filename && !player_idle_mode) { |
2969 if (!use_gui) { | |
2970 // no file/vcd/dvd -> show HELP: | |
2971 mp_msg(MSGT_CPLAYER, MSGL_INFO, help_text); | |
2972 exit_player_with_rc(EXIT_NONE, 0); | |
2973 } else | |
2974 gui_no_filename = 1; | |
1690 | 2975 } |
2976 | |
21342
dc98645820b7
Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents:
21219
diff
changeset
|
2977 /* Display what configure line was used */ |
dc98645820b7
Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents:
21219
diff
changeset
|
2978 mp_msg(MSGT_CPLAYER, MSGL_V, "Configuration: " CONFIGURATION "\n"); |
dc98645820b7
Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents:
21219
diff
changeset
|
2979 |
1690 | 2980 // Many users forget to include command line in bugreports... |
33363 | 2981 if (mp_msg_test(MSGT_CPLAYER, MSGL_V)) { |
2982 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CommandLine); | |
2983 for (i = 1; i < argc; i++) | |
2984 mp_msg(MSGT_CPLAYER, MSGL_INFO, " '%s'", argv[i]); | |
2985 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n"); | |
1690 | 2986 } |
2987 | |
1639 | 2988 //------ load global data first ------ |
955 | 2989 |
3015 | 2990 #ifdef HAVE_RTC |
33363 | 2991 if (!nortc) { |
2992 // seteuid(0); /* Can't hurt to try to get root here */ | |
2993 if ((rtc_fd = open(rtc_device ? rtc_device : "/dev/rtc", O_RDONLY)) < 0) | |
2994 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_RTCDeviceNotOpenable, | |
2995 rtc_device ? rtc_device : "/dev/rtc", strerror(errno)); | |
2996 else { | |
2997 unsigned long irqp = 1024; /* 512 seemed OK. 128 is jerky. */ | |
2998 | |
2999 if (ioctl(rtc_fd, RTC_IRQP_SET, irqp) < 0) { | |
3000 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_LinuxRTCInitErrorIrqpSet, irqp, strerror(errno)); | |
3001 mp_msg(MSGT_CPLAYER, MSGL_HINT, MSGTR_IncreaseRTCMaxUserFreq, irqp); | |
3002 close(rtc_fd); | |
3003 rtc_fd = -1; | |
3004 } else if (ioctl(rtc_fd, RTC_PIE_ON, 0) < 0) { | |
3005 /* variable only by the root */ | |
3006 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_LinuxRTCInitErrorPieOn, strerror(errno)); | |
3007 close(rtc_fd); | |
3008 rtc_fd = -1; | |
3009 } else | |
3010 mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_UsingRTCTiming, irqp); | |
3011 } | |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
3012 } |
27343 | 3013 #ifdef CONFIG_GUI |
3825 | 3014 // breaks DGA and SVGAlib and VESA drivers: --A'rpi |
4176
116abdd0aed1
small gtk bug fix (-display bug, baze gabu, miattad fogok elkarhozni:), and remove gui dependencie in mencoder
pontscho
parents:
4160
diff
changeset
|
3015 // and now ? -- Pontscho |
33363 | 3016 if (use_gui) |
3017 setuid(getuid()); // strongly test, please check this. | |
4176
116abdd0aed1
small gtk bug fix (-display bug, baze gabu, miattad fogok elkarhozni:), and remove gui dependencie in mencoder
pontscho
parents:
4160
diff
changeset
|
3018 #endif |
33363 | 3019 if (rtc_fd < 0) |
16490
f17b3c152fd6
Add comments to a few #endif statements in order to make clear which
diego
parents:
16489
diff
changeset
|
3020 #endif /* HAVE_RTC */ |
33363 | 3021 mp_msg(MSGT_CPLAYER, MSGL_V, "Using %s timing\n", |
3022 softsleep ? "software" : timer_name); | |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
3023 |
27359
d788e177a35e
Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;
diego
parents:
27345
diff
changeset
|
3024 #ifdef HAVE_TERMCAP |
33363 | 3025 if (!use_gui) |
3026 load_termcap(NULL); // load key-codes | |
1639 | 3027 #endif |
3028 | |
1816 | 3029 // ========== Init keyboard FIFO (connection to libvo) ============ |
1694 | 3030 |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3031 // Init input system |
33363 | 3032 current_module = "init_input"; |
3033 mp_input_init(); | |
3034 mp_input_add_key_fd(-1, 0, mplayer_get_key, NULL); | |
3035 if (slave_mode) | |
3036 mp_input_add_cmd_fd(0, USE_SELECT, MP_INPUT_SLAVE_CMD_FUNC, NULL); | |
3037 else if (!noconsolecontrols) | |
3038 mp_input_add_event_fd(0, getch2); | |
26326
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26288
diff
changeset
|
3039 // Set the libstream interrupt callback |
33363 | 3040 stream_set_interrupt_callback(mp_input_check_interrupt); |
9831 | 3041 |
27345
b597fd2924b4
Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents:
27343
diff
changeset
|
3042 #ifdef CONFIG_MENU |
33363 | 3043 if (use_menu) { |
3044 if (menu_cfg && menu_init(mpctx, menu_cfg)) | |
3045 mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_MenuInitialized, menu_cfg); | |
3046 else { | |
3047 menu_cfg = get_path("menu.conf"); | |
3048 if (menu_init(mpctx, menu_cfg)) | |
3049 mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_MenuInitialized, menu_cfg); | |
3050 else { | |
3051 if (menu_init(mpctx, MPLAYER_CONFDIR "/menu.conf")) | |
3052 mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_MenuInitialized, MPLAYER_CONFDIR "/menu.conf"); | |
3053 else { | |
3054 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_MenuInitFailed); | |
3055 use_menu = 0; | |
3056 } | |
3057 } | |
3058 } | |
3059 } | |
8198 | 3060 #endif |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
3061 |
33363 | 3062 initialized_flags |= INITIALIZED_INPUT; |
3063 current_module = NULL; | |
3064 | |
3065 // Catch signals | |
13391 | 3066 #ifndef __MINGW32__ |
33363 | 3067 signal(SIGCHLD, child_sighandler); |
13391 | 3068 #endif |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3069 |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27393
diff
changeset
|
3070 #ifdef CONFIG_CRASH_DEBUG |
33363 | 3071 prog_path = argv[0]; |
13794 | 3072 #endif |
33363 | 3073 //========= Catch terminate signals: ================ |
3074 // terminate requests: | |
3075 signal(SIGTERM, exit_sighandler); // kill | |
3076 signal(SIGHUP, exit_sighandler); // kill -HUP / xterm closed | |
3077 | |
3078 signal(SIGINT, exit_sighandler); // Interrupt from keyboard | |
3079 | |
3080 signal(SIGQUIT, exit_sighandler); // Quit from keyboard | |
3081 signal(SIGPIPE, exit_sighandler); // Some window managers cause this | |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27393
diff
changeset
|
3082 #ifdef CONFIG_SIGHANDLER |
33363 | 3083 // fatal errors: |
3084 signal(SIGBUS, exit_sighandler); // bus error | |
3085 signal(SIGSEGV, exit_sighandler); // segfault | |
3086 signal(SIGILL, exit_sighandler); // illegal instruction | |
3087 signal(SIGFPE, exit_sighandler); // floating point exc. | |
3088 signal(SIGABRT, exit_sighandler); // abort() | |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27393
diff
changeset
|
3089 #ifdef CONFIG_CRASH_DEBUG |
33363 | 3090 if (crash_debug) |
3091 signal(SIGTRAP, exit_sighandler); | |
13794 | 3092 #endif |
5367
658ea5d7316a
Allow to disable crasj sighandler to enable creation of coredump files.
atmos4
parents:
5326
diff
changeset
|
3093 #endif |
1639 | 3094 |
27343 | 3095 #ifdef CONFIG_GUI |
33363 | 3096 if (use_gui) { |
3097 guiInit(); | |
3098 guiGetEvent(guiSetContext, mpctx); | |
3099 guiGetEvent(guiCEvent, (char *)((gui_no_filename) ? 0 : 1)); | |
3100 } | |
4963 | 3101 #endif |
3102 | |
5983 | 3103 // ******************* Now, let's see the per-file stuff ******************** |
3104 | |
1639 | 3105 play_next_file: |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
3106 |
33363 | 3107 // init global sub numbers |
3108 mpctx->global_sub_size = 0; | |
3109 memset(mpctx->sub_counts, 0, sizeof(mpctx->sub_counts)); | |
3110 | |
3111 if (filename) { | |
3112 load_per_protocol_config(mconfig, filename); | |
3113 load_per_extension_config(mconfig, filename); | |
3114 load_per_file_config(mconfig, filename); | |
3115 } | |
3116 | |
3117 if (video_driver_list) | |
3118 load_per_output_config(mconfig, PROFILE_CFG_VO, video_driver_list[0]); | |
3119 if (audio_driver_list) | |
3120 load_per_output_config(mconfig, PROFILE_CFG_AO, audio_driver_list[0]); | |
25641 | 3121 |
4835
1f59d4d73558
Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents:
4834
diff
changeset
|
3122 // We must enable getch2 here to be able to interrupt network connection |
1f59d4d73558
Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents:
4834
diff
changeset
|
3123 // or cache filling |
33363 | 3124 if (!noconsolecontrols && !slave_mode) { |
3125 if (initialized_flags & INITIALIZED_GETCH2) | |
3126 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_Getch2InitializedTwice); | |
3127 else | |
3128 getch2_enable(); // prepare stdin for hotkeys... | |
3129 initialized_flags |= INITIALIZED_GETCH2; | |
3130 mp_msg(MSGT_CPLAYER, MSGL_DBG2, "\n[[[init getch2]]]\n"); | |
3131 } | |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
3132 |
5983 | 3133 // =================== GUI idle loop (STOP state) =========================== |
27343 | 3134 #ifdef CONFIG_GUI |
33363 | 3135 if (use_gui) { |
3136 mpctx->file_format = DEMUXER_TYPE_UNKNOWN; | |
3137 guiGetEvent(guiSetDefaults, 0); | |
3138 while (guiIntfStruct.Playing != 1) { | |
3139 mp_cmd_t *cmd; | |
3140 usec_sleep(20000); | |
3141 guiEventHandling(); | |
3142 guiGetEvent(guiReDraw, NULL); | |
3143 if ((cmd = mp_input_get_cmd(0, 0, 0)) != NULL) { | |
3144 guiGetEvent(guiIEvent, (char *)cmd->id); | |
3145 mp_cmd_free(cmd); | |
3146 } | |
3147 } | |
3148 guiGetEvent(guiSetParameters, NULL); | |
3149 if (guiIntfStruct.StreamType == STREAMTYPE_STREAM) { | |
3150 play_tree_t *entry = play_tree_new(); | |
3151 play_tree_add_file(entry, guiIntfStruct.Filename); | |
3152 if (mpctx->playtree) | |
3153 play_tree_free_list(mpctx->playtree->child, 1); | |
3154 else | |
3155 mpctx->playtree = play_tree_new(); | |
3156 play_tree_set_child(mpctx->playtree, entry); | |
3157 if (mpctx->playtree) { | |
3158 mpctx->playtree_iter = play_tree_iter_new(mpctx->playtree, mconfig); | |
3159 if (mpctx->playtree_iter) { | |
3160 if (play_tree_iter_step(mpctx->playtree_iter, 0, 0) != PLAY_TREE_ITER_ENTRY) { | |
3161 play_tree_iter_free(mpctx->playtree_iter); | |
3162 mpctx->playtree_iter = NULL; | |
3163 } | |
3164 filename = play_tree_iter_get_file(mpctx->playtree_iter, 1); | |
3165 } | |
3166 } | |
3167 } | |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
3168 } |
27343 | 3169 #endif /* CONFIG_GUI */ |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3170 |
33363 | 3171 while (player_idle_mode && !filename) { |
3172 play_tree_t *entry = NULL; | |
3173 mp_cmd_t *cmd; | |
3174 if (mpctx->video_out && vo_config_count) | |
3175 mpctx->video_out->control(VOCTRL_PAUSE, NULL); | |
3176 while (!(cmd = mp_input_get_cmd(0, 1, 0))) { // wait for command | |
3177 if (mpctx->video_out && vo_config_count) | |
3178 mpctx->video_out->check_events(); | |
3179 usec_sleep(20000); | |
3180 } | |
3181 switch (cmd->id) { | |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3182 case MP_CMD_LOADFILE: |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3183 // prepare a tree entry with the new filename |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3184 entry = play_tree_new(); |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3185 play_tree_add_file(entry, cmd->args[0].v.s); |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
3186 // The entry is added to the main playtree after the switch(). |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3187 break; |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3188 case MP_CMD_LOADLIST: |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3189 entry = parse_playlist_file(cmd->args[0].v.s); |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3190 break; |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3191 case MP_CMD_QUIT: |
33363 | 3192 exit_player_with_rc(EXIT_QUIT, (cmd->nargs > 0) ? cmd->args[0].v.i : 0); |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3193 break; |
31670
05a6d70df204
Allow fullscreen switching during -idle. Useful in combination
reimar
parents:
31612
diff
changeset
|
3194 case MP_CMD_VO_FULLSCREEN: |
26264 | 3195 case MP_CMD_GET_PROPERTY: |
3196 case MP_CMD_SET_PROPERTY: | |
3197 case MP_CMD_STEP_PROPERTY: | |
3198 run_command(mpctx, cmd); | |
3199 break; | |
33363 | 3200 } |
3201 | |
3202 mp_cmd_free(cmd); | |
3203 | |
3204 if (entry) { // user entered a command that gave a valid entry | |
3205 if (mpctx->playtree) // the playtree is always a node with one child. let's clear it | |
3206 play_tree_free_list(mpctx->playtree->child, 1); | |
3207 else | |
3208 mpctx->playtree = play_tree_new(); // .. or make a brand new playtree | |
3209 | |
3210 if (!mpctx->playtree) | |
3211 continue; // couldn't make playtree! wait for next command | |
3212 | |
3213 play_tree_set_child(mpctx->playtree, entry); | |
3214 | |
3215 /* Make iterator start at the top the of tree. */ | |
3216 mpctx->playtree_iter = play_tree_iter_new(mpctx->playtree, mconfig); | |
3217 if (!mpctx->playtree_iter) | |
3218 continue; | |
3219 | |
3220 // find the first real item in the tree | |
3221 if (play_tree_iter_step(mpctx->playtree_iter, 0, 0) != PLAY_TREE_ITER_ENTRY) { | |
3222 // no items! | |
3223 play_tree_iter_free(mpctx->playtree_iter); | |
3224 mpctx->playtree_iter = NULL; | |
3225 continue; // wait for next command | |
3226 } | |
3227 filename = play_tree_iter_get_file(mpctx->playtree_iter, 1); | |
3228 } | |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3229 } |
5983 | 3230 //--------------------------------------------------------------------------- |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
3231 |
30618
c061152a5d84
Send VOCTRL_PAUSE/VOCTRL_RESUME events also when pausing for idle mode.
reimar
parents:
30616
diff
changeset
|
3232 if (mpctx->video_out && vo_config_count) |
c061152a5d84
Send VOCTRL_PAUSE/VOCTRL_RESUME events also when pausing for idle mode.
reimar
parents:
30616
diff
changeset
|
3233 mpctx->video_out->control(VOCTRL_RESUME, NULL); |
c061152a5d84
Send VOCTRL_PAUSE/VOCTRL_RESUME events also when pausing for idle mode.
reimar
parents:
30616
diff
changeset
|
3234 |
33363 | 3235 if (filename) { |
3236 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_Playing, | |
3237 filename_recode(filename)); | |
3238 if (use_filename_title && vo_wintitle == NULL) | |
32543
18338ee51c9d
Export mp_basename in a function instead of duplicate macros in various places
cboesch
parents:
32537
diff
changeset
|
3239 vo_wintitle = strdup(mp_basename(filename)); |
29862
fbb1f57a313e
Added -name, -title and -use-filename-title options and implementation in X11 vos
ptt
parents:
29857
diff
changeset
|
3240 } |
1650
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
3241 |
31956
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
3242 edl_loadfile(); |
31963 | 3243 |
3244 if (edl_output_filename) { | |
3245 if (edl_fd) | |
3246 fclose(edl_fd); | |
31970 | 3247 if ((edl_fd = fopen(edl_output_filename, "w")) == NULL) { |
31963 | 3248 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlCantOpenForWrite, |
31970 | 3249 filename_recode(edl_output_filename)); |
31963 | 3250 } |
17109
327be31a101d
Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents:
17106
diff
changeset
|
3251 } |
327be31a101d
Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents:
17106
diff
changeset
|
3252 |
5983 | 3253 //==================== Open VOB-Sub ============================ |
3254 | |
33363 | 3255 current_module = "vobsub"; |
32724
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
3256 load_vob_subtitle(filename, spudec_ifo, &vo_spudec, add_vob_subtitle); |
33363 | 3257 if (vo_vobsub) { |
3258 initialized_flags |= INITIALIZED_VOBSUB; | |
3259 vobsub_set_from_lang(vo_vobsub, dvdsub_lang); | |
3260 mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx); | |
3261 | |
3262 // setup global sub numbering | |
3263 mpctx->sub_counts[SUB_SOURCE_VOBSUB] = vobsub_get_indexes_count(vo_vobsub); | |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
3264 } |
4770
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
3265 |
5151 | 3266 //============ Open & Sync STREAM --- fork cache2 ==================== |
3267 | |
33363 | 3268 mpctx->stream = NULL; |
3269 mpctx->demuxer = NULL; | |
3270 if (mpctx->d_audio) { | |
3271 //free_demuxer_stream(mpctx->d_audio); | |
3272 mpctx->d_audio = NULL; | |
3273 } | |
3274 if (mpctx->d_video) { | |
3275 //free_demuxer_stream(d_video); | |
3276 mpctx->d_video = NULL; | |
3277 } | |
3278 mpctx->sh_audio = NULL; | |
3279 mpctx->sh_video = NULL; | |
3280 | |
3281 current_module = "open_stream"; | |
3282 mpctx->stream = open_stream(filename, 0, &mpctx->file_format); | |
3283 if (!mpctx->stream) { // error... | |
3284 mpctx->eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY); | |
3285 goto goto_next_file; | |
3286 } | |
3287 initialized_flags |= INITIALIZED_STREAM; | |
5151 | 3288 |
27343 | 3289 #ifdef CONFIG_GUI |
33363 | 3290 if (use_gui) |
3291 guiGetEvent(guiSetStream, (char *)mpctx->stream); | |
8423 | 3292 #endif |
3293 | |
33363 | 3294 if (mpctx->file_format == DEMUXER_TYPE_PLAYLIST) { |
3295 play_tree_t *entry; | |
3296 // Handle playlist | |
3297 current_module = "handle_playlist"; | |
3298 mp_msg(MSGT_CPLAYER, MSGL_V, "Parsing playlist %s...\n", | |
3299 filename_recode(filename)); | |
3300 entry = parse_playtree(mpctx->stream, 0); | |
3301 mpctx->eof = playtree_add_playlist(entry); | |
3302 goto goto_next_file; | |
3303 } | |
3304 mpctx->stream->start_pos += seek_to_byte; | |
3305 | |
3306 if (stream_dump_type == 5) { | |
3307 unsigned char buf[4096]; | |
3308 int len; | |
3309 FILE *f; | |
3310 current_module = "dumpstream"; | |
3311 stream_reset(mpctx->stream); | |
3312 stream_seek(mpctx->stream, mpctx->stream->start_pos); | |
3313 f = fopen(stream_dump_name, "wb"); | |
3314 if (!f) { | |
3315 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_CantOpenDumpfile); | |
3316 exit_player(EXIT_ERROR); | |
3317 } | |
3318 if (dvd_chapter > 1) { | |
3319 int chapter = dvd_chapter - 1; | |
3320 stream_control(mpctx->stream, STREAM_CTRL_SEEK_TO_CHAPTER, &chapter); | |
10225
785c945f6796
check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
10223
diff
changeset
|
3321 } |
33390 | 3322 stream_dump_progress_start(); |
33363 | 3323 while (!mpctx->stream->eof && !async_quit_request) { |
3324 len = stream_read(mpctx->stream, buf, 4096); | |
3325 if (len > 0) { | |
3326 if (fwrite(buf, len, 1, f) != 1) { | |
3327 mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_ErrorWritingFile, stream_dump_name); | |
3328 exit_player(EXIT_ERROR); | |
3329 } | |
3330 } | |
33390 | 3331 stream_dump_progress(len, mpctx->stream); |
33363 | 3332 if (dvd_last_chapter > 0) { |
3333 int chapter = -1; | |
3334 if (stream_control(mpctx->stream, STREAM_CTRL_GET_CURRENT_CHAPTER, | |
3335 &chapter) == STREAM_OK && chapter + 1 > dvd_last_chapter) | |
3336 break; | |
3337 } | |
3338 } | |
3339 if (fclose(f)) { | |
3340 mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_ErrorWritingFile, stream_dump_name); | |
3341 exit_player(EXIT_ERROR); | |
3342 } | |
33390 | 3343 stream_dump_progress_end(); |
33363 | 3344 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CoreDumped); |
3345 exit_player_with_rc(EXIT_EOF, 0); | |
3346 } | |
3347 | |
3348 if (mpctx->stream->type == STREAMTYPE_BD) { | |
3349 if (audio_lang && audio_id == -1) | |
3350 audio_id = bd_aid_from_lang(mpctx->stream, audio_lang); | |
3351 if (dvdsub_lang && dvdsub_id == -1) | |
3352 dvdsub_id = bd_sid_from_lang(mpctx->stream, dvdsub_lang); | |
3353 } | |
31877
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31839
diff
changeset
|
3354 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
3355 #ifdef CONFIG_DVDREAD |
33363 | 3356 if (mpctx->stream->type == STREAMTYPE_DVD) { |
3357 current_module = "dvd lang->id"; | |
3358 if (audio_lang && audio_id == -1) | |
3359 audio_id = dvd_aid_from_lang(mpctx->stream, audio_lang); | |
3360 if (dvdsub_lang && dvdsub_id == -1) | |
3361 dvdsub_id = dvd_sid_from_lang(mpctx->stream, dvdsub_lang); | |
3362 // setup global sub numbering | |
3363 mpctx->sub_counts[SUB_SOURCE_DEMUX] = dvd_number_of_subs(mpctx->stream); | |
3364 current_module = NULL; | |
3365 } | |
4274 | 3366 #endif |
3367 | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
3368 #ifdef CONFIG_DVDNAV |
33363 | 3369 if (mpctx->stream->type == STREAMTYPE_DVDNAV) { |
3370 current_module = "dvdnav lang->id"; | |
3371 if (audio_lang && audio_id == -1) | |
3372 audio_id = mp_dvdnav_aid_from_lang(mpctx->stream, audio_lang); | |
3373 dvdsub_lang_id = -3; | |
3374 if (dvdsub_lang && dvdsub_id == -1) | |
3375 dvdsub_lang_id = dvdsub_id = mp_dvdnav_sid_from_lang(mpctx->stream, dvdsub_lang); | |
3376 // setup global sub numbering | |
3377 mpctx->sub_counts[SUB_SOURCE_DEMUX] = mp_dvdnav_number_of_subs(mpctx->stream); | |
3378 current_module = NULL; | |
3379 } | |
21203
235a8e71ed6f
support for -slang and subtitles in dvdnav; patch by Attila Otvos (oattila chello hu) and me. No palette yet
nicodvb
parents:
21200
diff
changeset
|
3380 #endif |
235a8e71ed6f
support for -slang and subtitles in dvdnav; patch by Attila Otvos (oattila chello hu) and me. No palette yet
nicodvb
parents:
21200
diff
changeset
|
3381 |
5151 | 3382 // CACHE2: initial prefill: 20% later: 5% (should be set by -cacheopts) |
11352 | 3383 goto_enable_cache: |
33363 | 3384 if (stream_cache_size > 0) { |
3385 int res; | |
3386 current_module = "enable_cache"; | |
3387 res = stream_enable_cache(mpctx->stream, stream_cache_size * 1024, | |
3388 stream_cache_size * 1024 * (stream_cache_min_percent / 100.0), | |
3389 stream_cache_size * 1024 * (stream_cache_seek_min_percent / 100.0)); | |
3390 if (res == 0) | |
3391 if ((mpctx->eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY))) | |
3392 goto goto_next_file; | |
3393 } | |
1639 | 3394 |
5151 | 3395 //============ Open DEMUXERS --- DETECT file type ======================= |
33363 | 3396 current_module = "demux_open"; |
3397 | |
3398 mpctx->demuxer = demux_open(mpctx->stream, mpctx->file_format, audio_id, video_id, dvdsub_id, filename); | |
8937 | 3399 |
3400 // HACK to get MOV Reference Files working | |
3401 | |
33363 | 3402 if (mpctx->demuxer && mpctx->demuxer->type == DEMUXER_TYPE_PLAYLIST) { |
3403 unsigned char *playlist_entry; | |
3404 play_tree_t *list = NULL, *entry = NULL; | |
3405 | |
3406 current_module = "handle_demux_playlist"; | |
3407 while (ds_get_packet(mpctx->demuxer->video, &playlist_entry) > 0) { | |
3408 char *temp; | |
3409 const char *bname; | |
3410 | |
3411 mp_msg(MSGT_CPLAYER, MSGL_V, "Adding file %s to element entry.\n", | |
3412 filename_recode(playlist_entry)); | |
3413 | |
3414 bname = mp_basename(playlist_entry); | |
3415 if ((strlen(bname) > 10) && !strncmp(bname, "qt", 2) && !strncmp(bname + 3, "gateQT", 6)) | |
3416 continue; | |
3417 | |
3418 if (!strcmp(playlist_entry, filename)) // ignoring self-reference | |
3419 continue; | |
3420 | |
3421 entry = play_tree_new(); | |
3422 | |
3423 if (filename && !strcmp(mp_basename(playlist_entry), playlist_entry)) { // add reference path of current file | |
3424 temp = malloc((strlen(filename) - strlen(mp_basename(filename)) + strlen(playlist_entry) + 1)); | |
3425 if (temp) { | |
3426 strncpy(temp, filename, strlen(filename) - strlen(mp_basename(filename))); | |
3427 temp[strlen(filename) - strlen(mp_basename(filename))] = '\0'; | |
3428 strcat(temp, playlist_entry); | |
3429 if (!strcmp(temp, filename)) { | |
3430 free(temp); | |
3431 continue; | |
3432 } | |
3433 play_tree_add_file(entry, temp); | |
3434 mp_msg(MSGT_CPLAYER, MSGL_V, "Resolving reference to %s.\n", temp); | |
3435 free(temp); | |
3436 } | |
3437 } else | |
3438 play_tree_add_file(entry, playlist_entry); | |
3439 | |
3440 if (!list) | |
3441 list = entry; | |
3442 else | |
3443 play_tree_append_entry(list, entry); | |
3444 } | |
3445 free_demuxer(mpctx->demuxer); | |
3446 mpctx->demuxer = NULL; | |
3447 | |
3448 if (list) { | |
3449 entry = play_tree_new(); | |
3450 play_tree_set_child(entry, list); | |
3451 mpctx->eof = playtree_add_playlist(entry); | |
3452 goto goto_next_file; | |
3453 } | |
8937 | 3454 } |
33363 | 3455 |
3456 if (!mpctx->demuxer) | |
3457 goto goto_next_file; | |
3458 if (dvd_chapter > 1) { | |
3459 float pts; | |
3460 if (demuxer_seek_chapter(mpctx->demuxer, dvd_chapter - 1, 1, &pts, NULL, NULL) >= 0 && pts > -1.0) | |
3461 seek(mpctx, pts, SEEK_ABSOLUTE); | |
3462 } | |
3463 | |
3464 initialized_flags |= INITIALIZED_DEMUXER; | |
7058
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
7055
diff
changeset
|
3465 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
3466 #ifdef CONFIG_ASS |
33363 | 3467 if (ass_enabled && ass_library) { |
3468 for (i = 0; i < mpctx->demuxer->num_attachments; ++i) { | |
3469 demux_attachment_t *att = mpctx->demuxer->attachments + i; | |
3470 if (extract_embedded_fonts && | |
3471 att->name && att->type && att->data && att->data_size && | |
3472 (strcmp(att->type, "application/x-truetype-font") == 0 || | |
3473 strcmp(att->type, "application/x-font") == 0)) | |
3474 ass_add_font(ass_library, att->name, att->data, att->data_size); | |
3475 } | |
3476 } | |
25658
0d0c48ecba90
Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents:
25641
diff
changeset
|
3477 #endif |
0d0c48ecba90
Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents:
25641
diff
changeset
|
3478 |
33363 | 3479 current_module = "demux_open2"; |
3480 | |
3481 mpctx->d_audio = mpctx->demuxer->audio; | |
3482 mpctx->d_video = mpctx->demuxer->video; | |
3483 mpctx->d_sub = mpctx->demuxer->sub; | |
3484 | |
3485 if (ts_prog) { | |
3486 int tmp = ts_prog; | |
3487 mp_property_do("switch_program", M_PROPERTY_SET, &tmp, mpctx); | |
3488 } | |
26090
c585e2ad8ebf
Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents:
26087
diff
changeset
|
3489 // select audio stream |
33363 | 3490 select_audio(mpctx->demuxer, audio_id, audio_lang); |
26090
c585e2ad8ebf
Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents:
26087
diff
changeset
|
3491 |
792 | 3492 // DUMP STREAMS: |
33363 | 3493 if ((stream_dump_type) && (stream_dump_type < 4)) { |
3494 FILE *f; | |
3495 demux_stream_t *ds = NULL; | |
3496 current_module = "dump"; | |
3497 // select stream to dump | |
3498 switch (stream_dump_type) { | |
3499 case 1: ds = mpctx->d_audio; | |
3500 break; | |
3501 case 2: ds = mpctx->d_video; | |
3502 break; | |
3503 case 3: ds = mpctx->d_sub; | |
3504 break; | |
3505 } | |
3506 if (!ds) { | |
3507 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_DumpSelectedStreamMissing); | |
3508 exit_player(EXIT_ERROR); | |
3509 } | |
3510 // disable other streams: | |
3511 if (mpctx->d_audio && mpctx->d_audio != ds) { | |
3512 ds_free_packs(mpctx->d_audio); | |
3513 mpctx->d_audio->id = -2; | |
3514 } | |
3515 if (mpctx->d_video && mpctx->d_video != ds) { | |
3516 ds_free_packs(mpctx->d_video); | |
3517 mpctx->d_video->id = -2; | |
3518 } | |
3519 if (mpctx->d_sub && mpctx->d_sub != ds) { | |
3520 ds_free_packs(mpctx->d_sub); | |
3521 mpctx->d_sub->id = -2; | |
3522 } | |
3523 // let's dump it! | |
3524 f = fopen(stream_dump_name, "wb"); | |
3525 if (!f) { | |
3526 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_CantOpenDumpfile); | |
3527 exit_player(EXIT_ERROR); | |
3528 } | |
33390 | 3529 stream_dump_progress_start(); |
33363 | 3530 while (!ds->eof) { |
3531 unsigned char *start; | |
3532 int in_size = ds_get_packet(ds, &start); | |
3533 if ((mpctx->demuxer->file_format == DEMUXER_TYPE_AVI || mpctx->demuxer->file_format == DEMUXER_TYPE_ASF || mpctx->demuxer->file_format == DEMUXER_TYPE_MOV) | |
3534 && stream_dump_type == 2) | |
3535 fwrite(&in_size, 1, 4, f); | |
33390 | 3536 if (in_size > 0) { |
33363 | 3537 fwrite(start, in_size, 1, f); |
33390 | 3538 stream_dump_progress(in_size, mpctx->stream); |
3539 } | |
33363 | 3540 if (dvd_last_chapter > 0) { |
3541 int cur_chapter = demuxer_get_current_chapter(mpctx->demuxer); | |
3542 if (cur_chapter != -1 && cur_chapter + 1 > dvd_last_chapter) | |
3543 break; | |
3544 } | |
3545 } | |
3546 fclose(f); | |
33390 | 3547 stream_dump_progress_end(); |
33363 | 3548 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CoreDumped); |
3549 exit_player_with_rc(EXIT_EOF, 0); | |
27953
e5918aa8557f
Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents:
27838
diff
changeset
|
3550 } |
33363 | 3551 |
3552 mpctx->sh_audio = mpctx->d_audio->sh; | |
3553 mpctx->sh_video = mpctx->d_video->sh; | |
3554 | |
3555 if (mpctx->sh_video) { | |
3556 current_module = "video_read_properties"; | |
3557 if (!video_read_properties(mpctx->sh_video)) { | |
3558 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CannotReadVideoProperties); | |
3559 mpctx->sh_video = mpctx->d_video->sh = NULL; | |
3560 } else { | |
3561 mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_FilefmtFourccSizeFpsFtime, | |
3562 mpctx->demuxer->file_format, mpctx->sh_video->format, mpctx->sh_video->disp_w, mpctx->sh_video->disp_h, | |
3563 mpctx->sh_video->fps, mpctx->sh_video->frametime | |
3564 ); | |
3565 | |
3566 /* need to set fps here for output encoders to pick it up in their init */ | |
3567 if (force_fps) { | |
3568 mpctx->sh_video->fps = force_fps; | |
3569 mpctx->sh_video->frametime = 1.0f / mpctx->sh_video->fps; | |
3570 } | |
3571 vo_fps = mpctx->sh_video->fps; | |
3572 | |
3573 if (!mpctx->sh_video->fps && !force_fps && !correct_pts) { | |
3574 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_FPSnotspecified); | |
3575 correct_pts = 1; | |
3576 } | |
3577 } | |
4598 | 3578 } |
33363 | 3579 |
3580 if (!mpctx->sh_video && !mpctx->sh_audio) { | |
3581 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoStreamFound); | |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27359
diff
changeset
|
3582 #ifdef CONFIG_DVBIN |
33363 | 3583 if (mpctx->stream->type == STREAMTYPE_DVB) { |
3584 int dir; | |
3585 int v = mpctx->last_dvb_step; | |
3586 if (v > 0) | |
3587 dir = DVB_CHANNEL_HIGHER; | |
3588 else | |
3589 dir = DVB_CHANNEL_LOWER; | |
3590 | |
3591 if (dvb_step_channel(mpctx->stream, dir)) | |
3592 mpctx->eof = mpctx->dvbin_reopen = 1; | |
3593 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
3594 #endif |
33363 | 3595 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
3596 } | |
778
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
3597 |
5151 | 3598 /* display clip info */ |
33363 | 3599 demux_info_print(mpctx->demuxer); |
5151 | 3600 |
3601 //================== Read SUBTITLES (DVD & TEXT) ========================== | |
33363 | 3602 if (vo_spudec == NULL && |
3603 (mpctx->stream->type == STREAMTYPE_DVD || mpctx->stream->type == STREAMTYPE_DVDNAV)) { | |
3604 init_vo_spudec(); | |
3605 } | |
3606 | |
3607 if (1 || mpctx->sh_video) { | |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
3608 // after reading video params we should load subtitles because |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
3609 // we know fps so now we can adjust subtitle time to ~6 seconds AST |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
3610 // check .sub |
33363 | 3611 double fps = mpctx->sh_video ? mpctx->sh_video->fps : 25; |
3612 current_module = "read_subtitles_file"; | |
3613 load_subtitles(filename, fps, add_subtitles); | |
3614 if (mpctx->set_of_sub_size > 0) | |
3615 mpctx->sub_counts[SUB_SOURCE_SUBS] = mpctx->set_of_sub_size; | |
3616 // set even if we have no subs yet, they may be added later | |
3617 initialized_flags |= INITIALIZED_SUBS; | |
17935
d72e7330c548
Subtitles properties: move sub_select, sub_pos, sub_visibilty,
albeu
parents:
17932
diff
changeset
|
3618 } |
33363 | 3619 |
3620 if (select_subtitle(mpctx)) { | |
3621 if (subdata) | |
3622 switch (stream_dump_type) { | |
3623 case 3: list_sub_file(subdata); | |
3624 break; | |
3625 case 4: dump_mpsub(subdata, mpctx->sh_video->fps); | |
3626 break; | |
3627 case 6: dump_srt(subdata, mpctx->sh_video->fps); | |
3628 break; | |
3629 case 7: dump_microdvd(subdata, mpctx->sh_video->fps); | |
3630 break; | |
3631 case 8: dump_jacosub(subdata, mpctx->sh_video->fps); | |
3632 break; | |
3633 case 9: dump_sami(subdata, mpctx->sh_video->fps); | |
3634 break; | |
3635 } | |
3636 } | |
3637 | |
3638 print_file_properties(mpctx, filename); | |
3639 | |
3640 // Adjust EDL positions with start_pts | |
3641 if (edl_start_pts && start_pts) { | |
3642 edl_record_ptr edl = edl_records; | |
3643 while (edl) { | |
3644 edl->start_sec += start_pts; | |
3645 edl->stop_sec += start_pts; | |
3646 edl = edl->next; | |
3647 } | |
3648 } | |
3649 | |
3650 if (mpctx->sh_video) | |
3651 reinit_video_chain(); | |
3652 | |
3653 if (mpctx->sh_video) { | |
3654 if (vo_flags & 0x08 && vo_spudec) | |
3655 spudec_set_hw_spu(vo_spudec, mpctx->video_out); | |
6110 | 3656 |
27393 | 3657 #ifdef CONFIG_FREETYPE |
33363 | 3658 force_load_font = 1; |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
3659 #endif |
33363 | 3660 } else if (!mpctx->sh_audio) |
3661 goto goto_next_file; | |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
3662 |
1 | 3663 //================== MAIN: ========================== |
33363 | 3664 current_module = "main"; |
3665 | |
3666 if (playing_msg) { | |
3667 char *msg = property_expand_string(mpctx, playing_msg); | |
3668 mp_msg(MSGT_CPLAYER, MSGL_INFO, "%s", msg); | |
17911
52f95509cd05
Add the new property API and implement a couple properties.
albeu
parents:
17910
diff
changeset
|
3669 free(msg); |
52f95509cd05
Add the new property API and implement a couple properties.
albeu
parents:
17910
diff
changeset
|
3670 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
3671 |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
3672 // Disable the term OSD in verbose mode |
33363 | 3673 if (verbose) |
3674 term_osd = 0; | |
3675 | |
3676 { | |
3677 mpctx->num_buffered_frames = 0; | |
3678 mpctx->framestep_found = 0; | |
5929
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
3679 |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
3680 // Make sure old OSD does not stay around, |
16402 | 3681 // e.g. with -fixed-vo and same-resolution files |
33363 | 3682 clear_osd_msgs(); |
3683 update_osd_msg(); | |
6028
bd016664dc18
UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents:
6016
diff
changeset
|
3684 |
1 | 3685 //================ SETUP AUDIO ========================== |
3686 | |
33363 | 3687 if (mpctx->sh_audio) { |
3688 reinit_audio_chain(); | |
3689 if (mpctx->sh_audio && mpctx->sh_audio->codec) | |
3690 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_CODEC=%s\n", mpctx->sh_audio->codec->name); | |
3691 } | |
3692 | |
3693 current_module = "av_init"; | |
3694 | |
3695 if (mpctx->sh_video) { | |
3696 mpctx->sh_video->timer = 0; | |
3697 if (!ignore_start) | |
3698 audio_delay += mpctx->sh_video->stream_delay; | |
3699 } | |
3700 if (mpctx->sh_audio) { | |
3701 if (start_volume >= 0) | |
3702 mixer_setvolume(&mpctx->mixer, start_volume, start_volume); | |
3703 if (!ignore_start) | |
3704 audio_delay -= mpctx->sh_audio->stream_delay; | |
3705 mpctx->delay = -audio_delay; | |
3706 } | |
3707 | |
3708 if (!mpctx->sh_audio) { | |
3709 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_NoSound); | |
3710 mp_msg(MSGT_CPLAYER, MSGL_V, "Freeing %d unused audio chunks.\n", mpctx->d_audio->packs); | |
3711 ds_free_packs(mpctx->d_audio); // free buffered chunks | |
3712 //mpctx->d_audio->id=-2; // do not read audio chunks | |
3713 //uninit_player(INITIALIZED_AO); // close device | |
3714 } | |
3715 if (!mpctx->sh_video) { | |
3716 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_Video_NoVideo); | |
3717 mp_msg(MSGT_CPLAYER, MSGL_V, "Freeing %d unused video chunks.\n", mpctx->d_video->packs); | |
3718 ds_free_packs(mpctx->d_video); | |
3719 mpctx->d_video->id = -2; | |
3720 //if(!fixed_vo) uninit_player(INITIALIZED_VO); | |
3721 } | |
3722 | |
3723 if (!mpctx->sh_video && !mpctx->sh_audio) | |
3724 goto goto_next_file; | |
6185
7e769ea2acc7
jump to next file (or exit) if can't decode audio && video
alex
parents:
6183
diff
changeset
|
3725 |
8030
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
3726 //if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf! |
33363 | 3727 if (force_fps && mpctx->sh_video) { |
3728 vo_fps = mpctx->sh_video->fps = force_fps; | |
3729 mpctx->sh_video->frametime = 1.0f / mpctx->sh_video->fps; | |
3730 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_FPSforced, mpctx->sh_video->fps, mpctx->sh_video->frametime); | |
3731 } | |
1 | 3732 |
27343 | 3733 #ifdef CONFIG_GUI |
33363 | 3734 if (use_gui) { |
3735 if (mpctx->sh_audio) | |
3736 guiIntfStruct.AudioType = mpctx->sh_audio->channels; | |
3737 else | |
3738 guiIntfStruct.AudioType = 0; | |
3739 if (!mpctx->sh_video && mpctx->sh_audio) | |
3740 guiGetEvent(guiSetAudioOnly, (char *)1); | |
3741 else | |
3742 guiGetEvent(guiSetAudioOnly, (char *)0); | |
3743 guiGetEvent(guiSetFileFormat, (char *)mpctx->demuxer->file_format); | |
3744 if (guiGetEvent(guiSetValues, (char *)mpctx->sh_video)) | |
3745 goto goto_next_file; | |
3746 guiGetEvent(guiSetDemuxer, (char *)mpctx->demuxer); | |
3747 } | |
19946
ef94dfe93fe8
Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents:
19945
diff
changeset
|
3748 #endif |
ef94dfe93fe8
Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents:
19945
diff
changeset
|
3749 |
33363 | 3750 mp_input_set_section(NULL); |
23477 | 3751 //TODO: add desired (stream-based) sections here |
33363 | 3752 if (mpctx->stream->type == STREAMTYPE_TV) |
3753 mp_input_set_section("tv"); | |
3754 if (mpctx->stream->type == STREAMTYPE_DVDNAV) | |
3755 mp_input_set_section("dvdnav"); | |
23477 | 3756 |
1639 | 3757 //==================== START PLAYING ======================= |
3758 | |
33363 | 3759 if (mpctx->loop_times > 1) |
3760 mpctx->loop_times--; | |
3761 else if (mpctx->loop_times == 1) | |
3762 mpctx->loop_times = -1; | |
3763 | |
3764 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_StartPlaying); | |
3765 | |
3766 total_time_usage_start = GetTimer(); | |
3767 audio_time_usage = 0; | |
3768 video_time_usage = 0; | |
3769 vout_time_usage = 0; | |
3770 total_frame_cnt = 0; | |
3771 drop_frame_cnt = 0; // fix for multifile fps benchmark | |
3772 play_n_frames = play_n_frames_mf; | |
3773 mpctx->startup_decode_retry = DEFAULT_STARTUP_DECODE_RETRY; | |
3774 | |
3775 if (play_n_frames == 0) { | |
3776 mpctx->eof = PT_NEXT_ENTRY; | |
3777 goto goto_next_file; | |
3778 } | |
3779 | |
3780 if (seek_to_sec) { | |
3781 seek(mpctx, seek_to_sec, SEEK_ABSOLUTE); | |
3782 end_at.pos += seek_to_sec; | |
3783 } | |
22338
434cd072b0d3
Seek to -ss position without first starting audio/video from the start.
uau
parents:
22313
diff
changeset
|
3784 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
3785 #ifdef CONFIG_DVDNAV |
33363 | 3786 mp_dvdnav_context_free(mpctx); |
3787 if (mpctx->stream->type == STREAMTYPE_DVDNAV) { | |
3788 mp_dvdnav_read_wait(mpctx->stream, 0, 1); | |
3789 mp_dvdnav_cell_has_changed(mpctx->stream, 1); | |
3790 } | |
25824 | 3791 #endif |
22338
434cd072b0d3
Seek to -ss position without first starting audio/video from the start.
uau
parents:
22313
diff
changeset
|
3792 |
33363 | 3793 while (!mpctx->eof) { |
3794 float aq_sleep_time = 0; | |
3795 | |
3796 if (dvd_last_chapter > 0) { | |
3797 int cur_chapter = demuxer_get_current_chapter(mpctx->demuxer); | |
3798 if (cur_chapter != -1 && cur_chapter + 1 > dvd_last_chapter) | |
3799 goto goto_next_file; | |
3800 } | |
3801 | |
3802 if (!mpctx->sh_audio && mpctx->d_audio->sh) { | |
3803 mpctx->sh_audio = mpctx->d_audio->sh; | |
3804 mpctx->sh_audio->ds = mpctx->d_audio; | |
3805 reinit_audio_chain(); | |
3806 } | |
1 | 3807 |
3808 /*========================== PLAY AUDIO ============================*/ | |
5610 | 3809 |
33363 | 3810 if (mpctx->sh_audio) |
3811 if (!fill_audio_out_buffers()) | |
3812 // at eof, all audio at least written to ao | |
3813 if (!mpctx->sh_video) | |
3814 mpctx->eof = PT_NEXT_ENTRY; | |
3815 | |
3816 if (!mpctx->sh_video) { | |
3817 // handle audio-only case: | |
3818 double a_pos = 0; | |
3819 // sh_audio can be NULL due to video stream switching | |
3820 // TODO: handle this better | |
3821 if ((!quiet || end_at.type == END_AT_TIME) && mpctx->sh_audio) | |
3822 a_pos = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out); | |
3823 | |
3824 if (!quiet) | |
3825 print_status(a_pos, 0, 0); | |
3826 | |
3827 if (end_at.type == END_AT_TIME && end_at.pos < a_pos || | |
3828 end_at.type == END_AT_SIZE && end_at.pos < stream_tell(mpctx->stream)) | |
3829 mpctx->eof = PT_NEXT_ENTRY; | |
3830 update_subtitles(NULL, a_pos, mpctx->d_sub, 0); | |
3831 update_osd_msg(); | |
3832 } else { | |
3833 int frame_time_remaining = 0; | |
3834 int blit_frame = 1; | |
3835 // skip timing after seek | |
3836 int skip_timing = mpctx->startup_decode_retry > 0; | |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
3837 |
1 | 3838 /*========================== PLAY VIDEO ============================*/ |
3839 | |
33363 | 3840 vo_pts = mpctx->sh_video->timer * 90000.0; |
3841 vo_fps = mpctx->sh_video->fps; | |
3842 | |
3843 if (!mpctx->num_buffered_frames) { | |
3844 double frame_time = update_video(&blit_frame); | |
3845 while (!blit_frame && mpctx->startup_decode_retry > 0) { | |
3846 double delay = mpctx->delay; | |
3847 // these initial decode failures are probably due to codec delay, | |
3848 // ignore them and also their probably nonsense durations | |
3849 update_video(&blit_frame); | |
3850 mpctx->delay = delay; | |
3851 mpctx->startup_decode_retry--; | |
3852 } | |
3853 mpctx->startup_decode_retry = 0; | |
3854 mp_dbg(MSGT_AVSYNC, MSGL_DBG2, "*** ftime=%5.3f ***\n", frame_time); | |
3855 if (mpctx->sh_video->vf_initialized < 0) { | |
3856 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NotInitializeVOPorVO); | |
3857 mpctx->eof = 1; | |
3858 goto goto_next_file; | |
3859 } | |
3860 if (frame_time < 0) { | |
3861 // if we have no more video, sleep some arbitrary time | |
3862 frame_time = 1.0 / 20.0; | |
3863 // only stop playing when audio is at end as well | |
3864 if (!mpctx->sh_audio || mpctx->d_audio->eof) | |
3865 mpctx->eof = 1; | |
3866 } else { | |
3867 // might return with !eof && !blit_frame if !correct_pts | |
3868 mpctx->num_buffered_frames += blit_frame; | |
3869 mpctx->time_frame += frame_time / playback_speed; // for nosound | |
3870 } | |
3871 } | |
5929
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
3872 |
5610 | 3873 // ========================================================================== |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
3874 |
5643 | 3875 // current_module="draw_osd"; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3876 // if(vo_config_count) mpctx->video_out->draw_osd(); |
1 | 3877 |
27343 | 3878 #ifdef CONFIG_GUI |
33363 | 3879 if (use_gui) |
3880 guiEventHandling(); | |
5610 | 3881 #endif |
3882 | |
33363 | 3883 current_module = "vo_check_events"; |
3884 if (vo_config_count) | |
3885 mpctx->video_out->check_events(); | |
20894 | 3886 |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27370
diff
changeset
|
3887 #ifdef CONFIG_X11 |
33363 | 3888 if (stop_xscreensaver) { |
3889 current_module = "stop_xscreensaver"; | |
3890 xscreensaver_heartbeat(); | |
3891 } | |
20900
b0f2e9a16bb1
Move xscreensaver_heartbeat call next to vo check_events
uau
parents:
20899
diff
changeset
|
3892 #endif |
33363 | 3893 if (heartbeat_cmd) { |
3894 static unsigned last_heartbeat; | |
3895 unsigned now = GetTimerMS(); | |
3896 if (now - last_heartbeat > 30000) { | |
3897 last_heartbeat = now; | |
3898 system(heartbeat_cmd); | |
3899 } | |
3900 } | |
3901 | |
3902 if (!skip_timing) | |
3903 frame_time_remaining = sleep_until_update(&mpctx->time_frame, &aq_sleep_time); | |
5929
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
3904 |
5610 | 3905 //====================== FLIP PAGE (VIDEO BLT): ========================= |
3906 | |
33363 | 3907 if (!edl_needs_reset) { |
3908 current_module = "flip_page"; | |
3909 if (!frame_time_remaining && blit_frame) { | |
3910 unsigned int t2 = GetTimer(); | |
3911 | |
3912 if (vo_config_count) | |
3913 mpctx->video_out->flip_page(); | |
3914 mpctx->num_buffered_frames--; | |
3915 | |
3916 vout_time_usage += (GetTimer() - t2) * 0.000001; | |
3917 } | |
3918 } | |
5610 | 3919 //====================== A-V TIMESTAMP CORRECTION: ========================= |
3920 | |
33363 | 3921 adjust_sync_and_print_status(frame_time_remaining, mpctx->time_frame); |
5610 | 3922 |
3923 //============================ Auto QUALITY ============================ | |
1 | 3924 |
1439 | 3925 /*Output quality adjustments:*/ |
33363 | 3926 if (auto_quality > 0) { |
3927 current_module = "autoq"; | |
1496 | 3928 // float total=0.000001f * (GetTimer()-aq_total_time); |
1439 | 3929 // if(output_quality<auto_quality && aq_sleep_time>0.05f*total) |
33363 | 3930 if (output_quality < auto_quality && aq_sleep_time > 0) |
3931 ++output_quality; | |
3932 else | |
1439 | 3933 // if(output_quality>0 && aq_sleep_time<-0.05f*total) |
33363 | 3934 if (output_quality > 1 && aq_sleep_time < 0) |
3935 --output_quality; | |
3936 else if (output_quality > 0 && aq_sleep_time < -0.050f) // 50ms | |
3937 output_quality = 0; | |
1439 | 3938 // printf("total: %8.6f sleep: %8.6f q: %d\n",(0.000001f*aq_total_time),aq_sleep_time,output_quality); |
33363 | 3939 set_video_quality(mpctx->sh_video, output_quality); |
3940 } | |
3941 | |
3942 if (play_n_frames >= 0 && !frame_time_remaining && blit_frame) { | |
3943 --play_n_frames; | |
3944 if (play_n_frames <= 0) | |
3945 mpctx->eof = PT_NEXT_ENTRY; | |
3946 } | |
3947 | |
3948 if (!frame_time_remaining && | |
3949 ((end_at.type == END_AT_TIME && mpctx->sh_video->pts >= end_at.pos) || | |
3950 (end_at.type == END_AT_SIZE && stream_tell(mpctx->stream) >= end_at.pos))) | |
3951 mpctx->eof = PT_NEXT_ENTRY; | |
3952 } // end if(mpctx->sh_video) | |
5610 | 3953 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
3954 #ifdef CONFIG_DVDNAV |
33363 | 3955 if (mpctx->stream->type == STREAMTYPE_DVDNAV) { |
3956 nav_highlight_t hl; | |
3957 mp_dvdnav_get_highlight(mpctx->stream, &hl); | |
3958 if (!vo_spudec || !spudec_apply_palette_crop(vo_spudec, hl.palette, hl.sx, hl.sy, hl.ex, hl.ey)) { | |
3959 osd_set_nav_box(hl.sx, hl.sy, hl.ex, hl.ey); | |
3960 vo_osd_changed(OSDTYPE_DVDNAV); | |
3961 } else { | |
3962 osd_set_nav_box(0, 0, 0, 0); | |
3963 vo_osd_changed(OSDTYPE_DVDNAV); | |
3964 vo_osd_changed(OSDTYPE_SPU); | |
3965 } | |
3966 | |
3967 if (mp_dvdnav_stream_has_changed(mpctx->stream)) { | |
3968 double ar = -1.0; | |
3969 if (mpctx->sh_video && | |
3970 stream_control(mpctx->demuxer->stream, | |
3971 STREAM_CTRL_GET_ASPECT_RATIO, &ar) | |
3972 != STREAM_UNSUPPORTED) | |
3973 mpctx->sh_video->stream_aspect = ar; | |
3974 } | |
3975 } | |
21193
a067e7e18b50
support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents:
21161
diff
changeset
|
3976 #endif |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
3977 |
5610 | 3978 //============================ Handle PAUSE =============================== |
3979 | |
33363 | 3980 current_module = "pause"; |
3981 | |
3982 if (mpctx->osd_function == OSD_PAUSE) { | |
3983 mpctx->was_paused = 1; | |
3984 pause_loop(); | |
3985 } | |
371 | 3986 |
5610 | 3987 // handle -sstep |
33363 | 3988 if (step_sec > 0) { |
3989 mpctx->osd_function = OSD_FFW; | |
3990 rel_seek_secs += step_sec; | |
3991 } | |
3992 | |
3993 edl_update(mpctx); | |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
3994 |
1 | 3995 //================= Keyboard events, SEEKing ==================== |
3996 | |
33363 | 3997 current_module = "key_events"; |
3998 | |
3999 { | |
4000 mp_cmd_t *cmd; | |
4001 int brk_cmd = 0; | |
4002 while (!brk_cmd && (cmd = mp_input_get_cmd(0, 0, 0)) != NULL) { | |
4003 brk_cmd = run_command(mpctx, cmd); | |
4004 if (cmd->id == MP_CMD_EDL_LOADFILE) { | |
4005 free(edl_filename); | |
4006 edl_filename = strdup(cmd->args[0].v.s); | |
4007 if (edl_filename) | |
4008 edl_loadfile(); | |
4009 else | |
4010 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlOutOfMemFile, | |
4011 cmd->args[0].v.s); | |
4012 } | |
4013 mp_cmd_free(cmd); | |
4014 if (brk_cmd == 2) | |
4015 goto goto_enable_cache; | |
4016 } | |
4017 } | |
4018 mpctx->was_paused = 0; | |
4019 | |
4020 /* Looping. */ | |
4021 if (mpctx->eof == 1 && mpctx->loop_times >= 0) { | |
4022 mp_msg(MSGT_CPLAYER, MSGL_V, "loop_times = %d, eof = %d\n", mpctx->loop_times, mpctx->eof); | |
4023 | |
4024 if (mpctx->loop_times > 1) | |
4025 mpctx->loop_times--; | |
4026 else if (mpctx->loop_times == 1) | |
4027 mpctx->loop_times = -1; | |
4028 play_n_frames = play_n_frames_mf; | |
4029 mpctx->eof = 0; | |
4030 abs_seek_pos = SEEK_ABSOLUTE; | |
4031 rel_seek_secs = seek_to_sec; | |
4032 loop_seek = 1; | |
4033 } | |
4034 | |
4035 if (rel_seek_secs || abs_seek_pos) { | |
4036 if (seek(mpctx, rel_seek_secs, abs_seek_pos) >= 0) { | |
4037 // Set OSD: | |
4038 if (!loop_seek) { | |
4039 if (!edl_decision) | |
4040 set_osd_bar(0, "Position", 0, 100, demuxer_get_percent_pos(mpctx->demuxer)); | |
4041 } | |
4042 } | |
4043 | |
4044 rel_seek_secs = 0; | |
4045 abs_seek_pos = 0; | |
4046 loop_seek = 0; | |
4047 edl_decision = 0; | |
4048 } | |
1466 | 4049 |
27343 | 4050 #ifdef CONFIG_GUI |
33363 | 4051 if (use_gui) { |
4052 guiEventHandling(); | |
4053 if (mpctx->demuxer->file_format == DEMUXER_TYPE_AVI && mpctx->sh_video && mpctx->sh_video->video.dwLength > 2) { | |
4054 // get pos from frame number / total frames | |
4055 guiIntfStruct.Position = (float)mpctx->d_video->pack_no * 100.0f / mpctx->sh_video->video.dwLength; | |
4056 } else { | |
4057 guiIntfStruct.Position = demuxer_get_percent_pos(mpctx->demuxer); | |
4058 } | |
4059 if (mpctx->sh_video) | |
4060 guiIntfStruct.TimeSec = mpctx->sh_video->pts; | |
4061 else if (mpctx->sh_audio) | |
4062 guiIntfStruct.TimeSec = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out); | |
4063 guiIntfStruct.LengthInSec = demuxer_get_time_length(mpctx->demuxer); | |
4064 guiGetEvent(guiReDraw, NULL); | |
4065 guiGetEvent(guiSetVolume, NULL); | |
4066 if (guiIntfStruct.Playing == 0) | |
4067 break; // STOP | |
4068 if (guiIntfStruct.Playing == 2) | |
4069 mpctx->osd_function = OSD_PAUSE; | |
4070 if (guiIntfStruct.DiskChanged || guiIntfStruct.NewPlay) | |
4071 goto goto_next_file; | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
4072 #ifdef CONFIG_DVDREAD |
33363 | 4073 if (mpctx->stream->type == STREAMTYPE_DVD) { |
4074 dvd_priv_t *dvdp = mpctx->stream->priv; | |
4075 guiIntfStruct.DVD.current_chapter = dvd_chapter_from_cell(dvdp, guiIntfStruct.DVD.current_title - 1, dvdp->cur_cell) + 1; | |
4076 } | |
3054 | 4077 #endif |
33363 | 4078 } |
27343 | 4079 #endif /* CONFIG_GUI */ |
33363 | 4080 } // while(!mpctx->eof) |
4081 | |
4082 mp_msg(MSGT_GLOBAL, MSGL_V, "EOF code: %d \n", mpctx->eof); | |
1 | 4083 |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27359
diff
changeset
|
4084 #ifdef CONFIG_DVBIN |
33363 | 4085 if (mpctx->dvbin_reopen) { |
4086 mpctx->eof = 0; | |
4087 uninit_player(INITIALIZED_ALL - (INITIALIZED_GUI | INITIALIZED_STREAM | INITIALIZED_INPUT | INITIALIZED_GETCH2 | (fixed_vo ? INITIALIZED_VO : 0))); | |
4088 cache_uninit(mpctx->stream); | |
4089 mpctx->dvbin_reopen = 0; | |
4090 goto goto_enable_cache; | |
4091 } | |
18286 | 4092 #endif |
33363 | 4093 } |
1639 | 4094 |
3618 | 4095 goto_next_file: // don't jump here after ao/vo/getch initialization! |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
4096 |
33363 | 4097 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n"); |
4098 | |
4099 if (benchmark) { | |
4100 double tot = video_time_usage + vout_time_usage + audio_time_usage; | |
4101 double total_time_usage; | |
4102 total_time_usage_start = GetTimer() - total_time_usage_start; | |
4103 total_time_usage = (float)total_time_usage_start * 0.000001; | |
4104 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\nBENCHMARKs: VC:%8.3fs VO:%8.3fs A:%8.3fs Sys:%8.3fs = %8.3fs\n", | |
4105 video_time_usage, vout_time_usage, audio_time_usage, | |
4106 total_time_usage - tot, total_time_usage); | |
4107 if (total_time_usage > 0.0) | |
4108 mp_msg(MSGT_CPLAYER, MSGL_INFO, "BENCHMARK%%: VC:%8.4f%% VO:%8.4f%% A:%8.4f%% Sys:%8.4f%% = %8.4f%%\n", | |
4109 100.0 * video_time_usage / total_time_usage, | |
4110 100.0 * vout_time_usage / total_time_usage, | |
4111 100.0 * audio_time_usage / total_time_usage, | |
4112 100.0 * (total_time_usage - tot) / total_time_usage, | |
4113 100.0); | |
4114 if (total_frame_cnt && frame_dropping) | |
4115 mp_msg(MSGT_CPLAYER, MSGL_INFO, "BENCHMARKn: disp: %d (%3.2f fps) drop: %d (%d%%) total: %d (%3.2f fps)\n", | |
4116 total_frame_cnt - drop_frame_cnt, | |
4117 (total_time_usage > 0.5) ? ((total_frame_cnt - drop_frame_cnt) / total_time_usage) : 0, | |
4118 drop_frame_cnt, | |
4119 100 * drop_frame_cnt / total_frame_cnt, | |
4120 total_frame_cnt, | |
4121 (total_time_usage > 0.5) ? (total_frame_cnt / total_time_usage) : 0); | |
4122 } | |
4221 | 4123 |
5983 | 4124 // time to uninit all, except global stuff: |
33363 | 4125 uninit_player(INITIALIZED_ALL - (INITIALIZED_GUI + INITIALIZED_INPUT + (fixed_vo ? INITIALIZED_VO : 0))); |
4126 | |
4127 if (mpctx->eof == PT_NEXT_ENTRY || mpctx->eof == PT_PREV_ENTRY) { | |
4128 mpctx->eof = mpctx->eof == PT_NEXT_ENTRY ? 1 : -1; | |
4129 if (play_tree_iter_step(mpctx->playtree_iter, mpctx->play_tree_step, 0) == PLAY_TREE_ITER_ENTRY) { | |
26159
7862aea6a387
cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents:
26130
diff
changeset
|
4130 mpctx->eof = 1; |
7862aea6a387
cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents:
26130
diff
changeset
|
4131 } else { |
7862aea6a387
cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents:
26130
diff
changeset
|
4132 play_tree_iter_free(mpctx->playtree_iter); |
7862aea6a387
cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents:
26130
diff
changeset
|
4133 mpctx->playtree_iter = NULL; |
7862aea6a387
cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents:
26130
diff
changeset
|
4134 } |
33363 | 4135 mpctx->play_tree_step = 1; |
4136 } else if (mpctx->eof == PT_UP_NEXT || mpctx->eof == PT_UP_PREV) { | |
4137 mpctx->eof = mpctx->eof == PT_UP_NEXT ? 1 : -1; | |
4138 if (mpctx->playtree_iter) { | |
4139 if (play_tree_iter_up_step(mpctx->playtree_iter, mpctx->eof, 0) == PLAY_TREE_ITER_ENTRY) { | |
4140 mpctx->eof = 1; | |
4141 } else { | |
4142 play_tree_iter_free(mpctx->playtree_iter); | |
4143 mpctx->playtree_iter = NULL; | |
4144 } | |
4145 } | |
4146 } else if (mpctx->eof == PT_STOP) { | |
4147 play_tree_iter_free(mpctx->playtree_iter); | |
4148 mpctx->playtree_iter = NULL; | |
4149 } else { // NEXT PREV SRC | |
4150 mpctx->eof = mpctx->eof == PT_PREV_SRC ? -1 : 1; | |
26159
7862aea6a387
cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents:
26130
diff
changeset
|
4151 } |
33363 | 4152 |
4153 if (mpctx->eof == 0) | |
4154 mpctx->eof = 1; | |
4155 | |
4156 while (mpctx->playtree_iter != NULL) { | |
4157 filename = play_tree_iter_get_file(mpctx->playtree_iter, mpctx->eof); | |
4158 if (filename == NULL) { | |
4159 if (play_tree_iter_step(mpctx->playtree_iter, mpctx->eof, 0) != PLAY_TREE_ITER_ENTRY) { | |
4160 play_tree_iter_free(mpctx->playtree_iter); | |
4161 mpctx->playtree_iter = NULL; | |
4162 } | |
4163 } else | |
4164 break; | |
4165 } | |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4166 |
27343 | 4167 #ifdef CONFIG_GUI |
33363 | 4168 if (use_gui && !mpctx->playtree_iter) { |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
4169 #ifdef CONFIG_DVDREAD |
33363 | 4170 if (!guiIntfStruct.DiskChanged) |
5910
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
4171 #endif |
26159
7862aea6a387
cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents:
26130
diff
changeset
|
4172 mplEnd(); |
33363 | 4173 } |
5910
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
4174 #endif |
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
4175 |
33363 | 4176 if (use_gui || mpctx->playtree_iter != NULL || player_idle_mode) { |
4177 if (!mpctx->playtree_iter) | |
4178 filename = NULL; | |
4179 mpctx->eof = 0; | |
4180 goto play_next_file; | |
4181 } | |
4182 | |
4183 exit_player_with_rc(EXIT_EOF, 0); | |
4184 | |
4185 return 1; | |
1639 | 4186 } |
4187 | |
26963
8825552ee585
Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents:
26877
diff
changeset
|
4188 #endif /* DISABLE_MAIN */ |