Mercurial > mplayer.hg
annotate mplayer.c @ 33495:52a393df8df8
Put code checking if at the EOS in a function.
author | cboesch |
---|---|
date | Sat, 11 Jun 2011 15:39:00 +0000 |
parents | fd4a27bd4ed4 |
children | d54614382edc |
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 | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
326 edl_record_ptr edl_records; ///< EDL entries memory area |
33257
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 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
328 short edl_decision; ///< 1 when an EDL operation has been made. |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
329 short edl_needs_reset; ///< 1 if we need to reset EDL next pointer |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
330 short edl_backward; ///< 1 if we need to skip to the beginning of the next EDL record |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
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; |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
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); | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
525 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_BITRATE=%d\n", mpctx->sh_video->i_bps * 8); |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
526 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_WIDTH=%d\n", mpctx->sh_video->disp_w); |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
527 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_HEIGHT=%d\n", mpctx->sh_video->disp_h); |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
528 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_FPS=%5.3f\n", mpctx->sh_video->fps); |
33363 | 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); | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
539 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_RATE=%d\n", mpctx->sh_audio->samplerate); |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
540 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_NCH=%d\n", mpctx->sh_audio->channels); |
33363 | 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; | |
33490 | 795 do { |
796 pid = waitpid(-1, NULL, WNOHANG); | |
797 } while (pid > 0); | |
13391 | 798 } |
33363 | 799 |
13794 | 800 #endif |
33363 | 801 |
802 static void exit_sighandler(int x) | |
803 { | |
804 static int sig_count; | |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27393
diff
changeset
|
805 #ifdef CONFIG_CRASH_DEBUG |
33363 | 806 if (!crash_debug || x != SIGTRAP) |
807 #endif | |
808 ++sig_count; | |
809 if (initialized_flags == 0 && sig_count > 1) | |
810 exit(1); | |
811 if (sig_count == 5) { | |
812 /* We're crashing bad and can't uninit cleanly :( | |
813 * by popular request, we make one last (dirty) | |
814 * effort to restore the user's | |
815 * terminal. */ | |
816 getch2_disable(); | |
817 exit(1); | |
818 } | |
819 if (sig_count == 6) | |
820 exit(1); | |
821 if (sig_count > 6) { | |
822 // can't stop :( | |
823 #ifndef __MINGW32__ | |
824 kill(getpid(), SIGKILL); | |
825 #endif | |
826 } | |
827 mp_msg(MSGT_CPLAYER, MSGL_FATAL, "\n" MSGTR_IntBySignal, x, | |
828 current_module ? current_module : "unknown" | |
829 ); | |
830 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SIGNAL=%d\n", x); | |
831 if (sig_count <= 1) | |
832 switch (x) { | |
833 case SIGINT: | |
834 case SIGPIPE: | |
835 case SIGQUIT: | |
836 case SIGTERM: | |
837 case SIGKILL: | |
838 async_quit_request = 1; | |
839 return; // killed from keyboard (^C) or killed [-9] | |
840 case SIGILL: | |
841 #if CONFIG_RUNTIME_CPUDETECT | |
842 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGILL_RTCpuSel); | |
843 #else | |
844 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGILL); | |
845 #endif | |
846 case SIGFPE: | |
847 case SIGSEGV: | |
848 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGSEGV_SIGFPE); | |
849 default: | |
850 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGCRASH); | |
851 #ifdef CONFIG_CRASH_DEBUG | |
852 if (crash_debug) { | |
853 int gdb_pid; | |
854 mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forking...\n"); | |
855 gdb_pid = fork(); | |
856 mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forked...\n"); | |
857 if (gdb_pid == 0) { // We are the child | |
858 char spid[20]; | |
859 snprintf(spid, sizeof(spid), "%i", getppid()); | |
860 getch2_disable(); // allow terminal to work properly with gdb | |
861 if (execlp("gdb", "gdb", prog_path, spid, "-ex", "bt", NULL) == -1) | |
862 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't start gdb\n"); | |
863 } else if (gdb_pid < 0) | |
864 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't fork\n"); | |
865 else { | |
866 waitpid(gdb_pid, NULL, 0); | |
867 } | |
868 if (x == SIGTRAP) | |
869 return; | |
870 } | |
871 #endif | |
13794 | 872 } |
33363 | 873 getch2_disable(); |
874 exit(1); | |
1156 | 875 } |
876 | |
33363 | 877 static void parse_cfgfiles(m_config_t *conf) |
723 | 878 { |
33363 | 879 char *conffile; |
880 int conffile_fd; | |
881 if (!disable_system_conf && | |
882 m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mplayer.conf") < 0) | |
883 exit_player(EXIT_NONE); | |
884 if ((conffile = get_path("")) == NULL) { | |
885 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_NoHomeDir); | |
886 } else { | |
9831 | 887 #ifdef __MINGW32__ |
33363 | 888 mkdir(conffile); |
9831 | 889 #else |
33363 | 890 mkdir(conffile, 0777); |
9831 | 891 #endif |
33363 | 892 free(conffile); |
893 if ((conffile = get_path("config")) == NULL) { | |
894 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_GetpathProblem); | |
895 } else { | |
896 if ((conffile_fd = open(conffile, O_CREAT | O_EXCL | O_WRONLY, 0666)) != -1) { | |
897 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CreatingCfgFile, conffile); | |
898 write(conffile_fd, default_config, strlen(default_config)); | |
899 close(conffile_fd); | |
900 } | |
901 if (!disable_user_conf && | |
902 m_config_parse_config_file(conf, conffile) < 0) | |
903 exit_player(EXIT_NONE); | |
904 free(conffile); | |
905 } | |
178 | 906 } |
1 | 907 } |
908 | |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
909 #define PROFILE_CFG_PROTOCOL "protocol." |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
910 |
33363 | 911 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
|
912 { |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
913 char *str; |
33363 | 914 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
|
915 m_profile_t *p; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
916 |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
917 /* does filename actually uses a protocol ? */ |
33363 | 918 str = strstr(file, "://"); |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
919 if (!str) |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
920 return; |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
921 |
33363 | 922 sprintf(protocol, "%s%s", PROFILE_CFG_PROTOCOL, file); |
923 protocol[strlen(PROFILE_CFG_PROTOCOL) + strlen(file) - strlen(str)] = '\0'; | |
924 p = m_config_get_profile(conf, protocol); | |
925 if (p) { | |
926 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingProtocolProfile, protocol); | |
927 m_config_set_profile(conf, p); | |
25635
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 } |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
930 |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
931 #define PROFILE_CFG_EXTENSION "extension." |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
932 |
33363 | 933 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
|
934 { |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
935 char *str; |
33363 | 936 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
|
937 m_profile_t *p; |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
938 |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
939 /* does filename actually have an extension ? */ |
33363 | 940 str = strrchr(filename, '.'); |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
941 if (!str) |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
942 return; |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
943 |
33363 | 944 sprintf(extension, PROFILE_CFG_EXTENSION); |
945 strncat(extension, ++str, 7); | |
946 p = m_config_get_profile(conf, extension); | |
947 if (p) { | |
948 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingExtensionProfile, extension); | |
949 m_config_set_profile(conf, p); | |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
950 } |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
951 } |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
952 |
25641 | 953 #define PROFILE_CFG_VO "vo." |
954 #define PROFILE_CFG_AO "ao." | |
955 | |
33363 | 956 static void load_per_output_config(m_config_t *conf, char *cfg, char *out) |
25641 | 957 { |
33363 | 958 char profile[strlen(cfg) + strlen(out) + 1]; |
25641 | 959 m_profile_t *p; |
960 | |
33363 | 961 sprintf(profile, "%s%s", cfg, out); |
962 p = m_config_get_profile(conf, profile); | |
963 if (p) { | |
964 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingExtensionProfile, profile); | |
965 m_config_set_profile(conf, p); | |
25641 | 966 } |
967 } | |
968 | |
29561
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
969 /** |
33287 | 970 * @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
|
971 * @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
|
972 */ |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
973 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
|
974 { |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
975 struct stat st; |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
976 if (stat(file, &st)) |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
977 return 0; |
33363 | 978 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingConfig, file); |
979 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
|
980 return 1; |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
981 } |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
982 |
33363 | 983 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
|
984 { |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
985 char *confpath; |
29594
331320b4557b
Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents:
29592
diff
changeset
|
986 char cfg[PATH_MAX]; |
32588 | 987 const char *name; |
8614
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
988 |
29594
331320b4557b
Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents:
29592
diff
changeset
|
989 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
|
990 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
|
991 return; |
331320b4557b
Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents:
29592
diff
changeset
|
992 } |
33363 | 993 sprintf(cfg, "%s.conf", file); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
994 |
32588 | 995 name = mp_basename(cfg); |
29592
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
996 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
|
997 char dircfg[PATH_MAX]; |
29592
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
998 strcpy(dircfg, cfg); |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
999 strcpy(dircfg + (name - cfg), "mplayer.conf"); |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
1000 try_load_config(conf, dircfg); |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
1001 |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
1002 if (try_load_config(conf, cfg)) |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
1003 return; |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
1004 } |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
1005 |
33363 | 1006 if ((confpath = get_path(name)) != NULL) { |
1007 try_load_config(conf, confpath); | |
1008 | |
1009 free(confpath); | |
8614
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
1010 } |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
1011 } |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
1012 |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1013 /* 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
|
1014 * 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
|
1015 * if it was interrupted by the user. |
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1016 * The function returns a new value for eof. */ |
33363 | 1017 static int libmpdemux_was_interrupted(int eof) |
1018 { | |
1019 mp_cmd_t *cmd; | |
1020 if ((cmd = mp_input_get_cmd(0, 0, 0)) != NULL) { | |
1021 switch (cmd->id) { | |
1022 case MP_CMD_QUIT: | |
1023 run_command(mpctx, cmd); | |
1024 case MP_CMD_PLAY_TREE_STEP: | |
1025 eof = (cmd->args[0].v.i > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY; | |
1026 mpctx->play_tree_step = (cmd->args[0].v.i == 0) ? 1 : cmd->args[0].v.i; | |
1027 break; | |
1028 case MP_CMD_PLAY_TREE_UP_STEP: | |
1029 eof = (cmd->args[0].v.i > 0) ? PT_UP_NEXT : PT_UP_PREV; | |
1030 break; | |
1031 case MP_CMD_PLAY_ALT_SRC_STEP: | |
1032 eof = (cmd->args[0].v.i > 0) ? PT_NEXT_SRC : PT_PREV_SRC; | |
1033 break; | |
1034 } | |
1035 mp_cmd_free(cmd); | |
1036 } | |
1037 return eof; | |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
1038 } |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
1039 |
33363 | 1040 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
|
1041 { |
33363 | 1042 play_tree_add_bpf(entry, filename); |
9301
7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents:
9291
diff
changeset
|
1043 |
27343 | 1044 #ifdef CONFIG_GUI |
33363 | 1045 if (use_gui) { |
1046 if (entry) { | |
1047 import_playtree_playlist_into_gui(entry, mconfig); | |
1048 play_tree_free_list(entry, 1); | |
1049 } | |
1050 } else | |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
1051 #endif |
33363 | 1052 { |
1053 if (!entry) { | |
1054 entry = mpctx->playtree_iter->tree; | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1055 if (play_tree_iter_step(mpctx->playtree_iter, 1, 0) != PLAY_TREE_ITER_ENTRY) |
33363 | 1056 return PT_NEXT_ENTRY; |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1057 // Loop with a single file |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1058 if (mpctx->playtree_iter->tree == entry && |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1059 play_tree_iter_up_step(mpctx->playtree_iter, 1, 0) != PLAY_TREE_ITER_ENTRY) |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1060 return PT_NEXT_ENTRY; |
33363 | 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; | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1067 if (play_tree_iter_step(mpctx->playtree_iter, 1, 0) != PLAY_TREE_ITER_ENTRY) |
33363 | 1068 return PT_NEXT_ENTRY; |
1069 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
|
1070 } |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1071 return PT_NEXT_SRC; |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1072 } |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1073 |
25264
42aa06653705
When auto loading subs, log warning instead of error for load failure.
ulion
parents:
25251
diff
changeset
|
1074 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
|
1075 { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1076 sub_data *subd; |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1077 #ifdef CONFIG_ASS |
31792
55dacfca4a43
Rename libass types to match upstream libass >= 0.9.7
greg
parents:
31762
diff
changeset
|
1078 ASS_Track *asst = 0; |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1079 #endif |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1080 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1081 if (filename == NULL || mpctx->set_of_sub_size >= MAX_SUBTITLE_FILES) |
33363 | 1082 return; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1083 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1084 subd = sub_read_file(filename, fps); |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1085 #ifdef CONFIG_ASS |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1086 if (ass_enabled) |
27393 | 1087 #ifdef CONFIG_ICONV |
30473
7446f58b6899
Add support for loading ASS subtitles through the stream layer and thus e.g.
reimar
parents:
30429
diff
changeset
|
1088 asst = ass_read_stream(ass_library, filename, sub_cp); |
20477 | 1089 #else |
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, 0); |
20477 | 1091 #endif |
19468 | 1092 if (ass_enabled && subd && !asst) |
20477 | 1093 asst = ass_read_subdata(ass_library, subd, fps); |
19401
c0c3a2f8bb32
Add subdata to ass_track conversion for external subtitles.
eugeni
parents:
19380
diff
changeset
|
1094 |
25264
42aa06653705
When auto loading subs, log warning instead of error for load failure.
ulion
parents:
25251
diff
changeset
|
1095 if (!asst && !subd) |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1096 #else |
33363 | 1097 if (!subd) |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1098 #endif |
25264
42aa06653705
When auto loading subs, log warning instead of error for load failure.
ulion
parents:
25251
diff
changeset
|
1099 mp_msg(MSGT_CPLAYER, noerr ? MSGL_WARN : MSGL_ERR, MSGTR_CantLoadSub, |
33363 | 1100 filename_recode(filename)); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1101 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1102 #ifdef CONFIG_ASS |
33363 | 1103 if (!asst && !subd) |
1104 return; | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1105 mpctx->set_of_ass_tracks[mpctx->set_of_sub_size] = asst; |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1106 #else |
33363 | 1107 if (!subd) |
1108 return; | |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1109 #endif |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1110 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
|
1111 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
|
1112 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FILE_SUB_FILENAME=%s\n", |
33363 | 1113 filename_recode(filename)); |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1114 ++mpctx->set_of_sub_size; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1115 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AddedSubtitleFile, mpctx->set_of_sub_size, |
33363 | 1116 filename_recode(filename)); |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1117 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1118 |
33363 | 1119 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
|
1120 { |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1121 if (!vobname) |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1122 return 0; |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1123 |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1124 assert(!vo_vobsub); |
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 vo_vobsub = vobsub_open(vobname, ifo, force, spu); |
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 if (!vo_vobsub && force) |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1129 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantLoadSub, |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1130 filename_recode(vobname)); |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1131 |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1132 return !!vo_vobsub; |
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 |
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
|
1135 // 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
|
1136 void update_set_of_subtitles(void) |
33363 | 1137 { |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1138 // subdata was changed, set_of_sub... have to be updated. |
33363 | 1139 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
|
1140 int i; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1141 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
|
1142 for (i = mpctx->set_of_sub_pos + 1; i < mpctx->set_of_sub_size; ++i) |
33363 | 1143 set_of_subtitles[i - 1] = set_of_subtitles[i]; |
1144 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
|
1145 --mpctx->set_of_sub_size; |
33363 | 1146 if (mpctx->set_of_sub_size > 0) |
1147 subdata = set_of_subtitles[mpctx->set_of_sub_pos = 0]; | |
1148 } 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
|
1149 set_of_subtitles[mpctx->set_of_sub_pos] = subdata; |
33363 | 1150 } else if (mpctx->set_of_sub_size <= 0 && subdata != NULL) { // *subdata was added |
1151 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
|
1152 ++mpctx->set_of_sub_size; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1153 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1154 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1155 |
33363 | 1156 void init_vo_spudec(void) |
1157 { | |
1158 spudec_free(vo_spudec); | |
1159 vo_spudec = NULL; | |
1160 | |
1161 // we currently can't work without video stream | |
1162 if (!mpctx->sh_video) | |
1163 return; | |
1164 | |
1165 if (spudec_ifo) { | |
1166 unsigned int palette[16], width, height; | |
1167 current_module = "spudec_init_vobsub"; | |
1168 if (vobsub_parse_ifo(NULL, spudec_ifo, palette, &width, &height, 1, -1, NULL) >= 0) | |
1169 vo_spudec = spudec_new_scaled(palette, width, height, NULL, 0); | |
1170 } | |
21119
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1171 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1172 #ifdef CONFIG_DVDREAD |
33363 | 1173 if (vo_spudec == NULL && mpctx->stream->type == STREAMTYPE_DVD) { |
1174 current_module = "spudec_init_dvdread"; | |
1175 vo_spudec = spudec_new_scaled(((dvd_priv_t *)(mpctx->stream->priv))->cur_pgc->palette, | |
1176 mpctx->sh_video->disp_w, mpctx->sh_video->disp_h, | |
1177 NULL, 0); | |
1178 } | |
21119
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1179 #endif |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1180 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1181 #ifdef CONFIG_DVDNAV |
33363 | 1182 if (vo_spudec == NULL && mpctx->stream->type == STREAMTYPE_DVDNAV) { |
1183 unsigned int *palette = mp_dvdnav_get_spu_clut(mpctx->stream); | |
1184 current_module = "spudec_init_dvdnav"; | |
1185 vo_spudec = spudec_new_scaled(palette, mpctx->sh_video->disp_w, mpctx->sh_video->disp_h, NULL, 0); | |
1186 } | |
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
|
1187 #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
|
1188 |
33363 | 1189 if (vo_spudec == NULL) { |
1190 sh_sub_t *sh = mpctx->d_sub->sh; | |
1191 current_module = "spudec_init_normal"; | |
1192 vo_spudec = spudec_new_scaled(NULL, mpctx->sh_video->disp_w, mpctx->sh_video->disp_h, sh->extradata, sh->extradata_len); | |
1193 spudec_set_font_factor(vo_spudec, font_factor); | |
1194 } | |
1195 | |
1196 if (vo_spudec != NULL) { | |
1197 mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx); | |
1198 } | |
21119
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1199 } |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1200 |
13710 | 1201 /** |
33287 | 1202 * @brief Append a formatted string. |
1203 * @param buf buffer to print into | |
1204 * @param pos position of terminating 0 in buf | |
1205 * @param len maximum number of characters in buf, not including terminating 0 | |
1206 * @param format printf format string | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1207 */ |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1208 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
|
1209 { |
33363 | 1210 va_list va; |
1211 va_start(va, format); | |
1212 *pos += vsnprintf(&buf[*pos], len - *pos, format, va); | |
1213 va_end(va); | |
1214 if (*pos >= len) { | |
1215 buf[len] = 0; | |
1216 *pos = len; | |
1217 } | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1218 } |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1219 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1220 /** |
33287 | 1221 * @brief Append time in the hh:mm:ss.f format. |
1222 * @param buf buffer to print into | |
1223 * @param pos position of terminating 0 in buf | |
1224 * @param len maximum number of characters in buf, not including terminating 0 | |
1225 * @param time time value to convert/append | |
16654 | 1226 */ |
33363 | 1227 static void sadd_hhmmssf(char *buf, unsigned *pos, int len, float time) |
1228 { | |
1229 int64_t tenths = 10 * time; | |
1230 int f1 = tenths % 10; | |
1231 int ss = (tenths / 10) % 60; | |
1232 int mm = (tenths / 600) % 60; | |
1233 int hh = tenths / 36000; | |
1234 if (time <= 0) { | |
1235 saddf(buf, pos, len, "unknown"); | |
1236 return; | |
1237 } | |
1238 if (hh > 0) | |
1239 saddf(buf, pos, len, "%2d:", hh); | |
1240 if (hh > 0 || mm > 0) | |
1241 saddf(buf, pos, len, "%02d:", mm); | |
1242 saddf(buf, pos, len, "%02d.%1d", ss, f1); | |
16654 | 1243 } |
1244 | |
1245 /** | |
33287 | 1246 * @brief Print the status line. |
1247 * @param a_pos audio position | |
1248 * @param a_v A-V desynchronization | |
1249 * @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
|
1250 */ |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1251 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
|
1252 { |
33363 | 1253 sh_video_t *const sh_video = mpctx->sh_video; |
1254 int width; | |
1255 char *line; | |
1256 unsigned pos = 0; | |
1257 get_screen_size(); | |
1258 if (screen_width > 0) | |
1259 width = screen_width; | |
1260 else | |
1261 width = 80; | |
27727
48c1ae64255b
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents:
27635
diff
changeset
|
1262 #if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__OS2__) |
33363 | 1263 /* Windows command line is broken (MinGW's rxvt works, but we |
1264 * should not depend on that). */ | |
1265 width--; | |
13928 | 1266 #endif |
33363 | 1267 line = malloc(width + 1); // one additional char for the terminating null |
1268 | |
1269 // Audio time | |
1270 if (mpctx->sh_audio) { | |
1271 saddf(line, &pos, width, "A:%6.1f ", a_pos); | |
1272 if (!sh_video) { | |
1273 float len = demuxer_get_time_length(mpctx->demuxer); | |
1274 saddf(line, &pos, width, "("); | |
1275 sadd_hhmmssf(line, &pos, width, a_pos); | |
1276 saddf(line, &pos, width, ") of %.1f (", len); | |
1277 sadd_hhmmssf(line, &pos, width, len); | |
1278 saddf(line, &pos, width, ") "); | |
1279 } | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1280 } |
33363 | 1281 |
1282 // Video time | |
1283 if (sh_video) | |
1284 saddf(line, &pos, width, "V:%6.1f ", sh_video->pts); | |
1285 | |
1286 // A-V sync | |
1287 if (mpctx->sh_audio && sh_video) | |
1288 saddf(line, &pos, width, "A-V:%7.3f ct:%7.3f ", a_v, corr); | |
1289 | |
1290 // Video stats | |
1291 if (sh_video) | |
1292 saddf(line, &pos, width, "%3d/%3d ", | |
1293 (int)sh_video->num_frames, | |
1294 (int)sh_video->num_frames_decoded); | |
1295 | |
1296 // CPU usage | |
1297 if (sh_video) { | |
1298 if (sh_video->timer > 0.5) | |
1299 saddf(line, &pos, width, "%2d%% %2d%% %4.1f%% ", | |
1300 (int)(100.0 * video_time_usage * playback_speed / (double)sh_video->timer), | |
1301 (int)(100.0 * vout_time_usage * playback_speed / (double)sh_video->timer), | |
1302 (100.0 * audio_time_usage * playback_speed / (double)sh_video->timer)); | |
1303 else | |
1304 saddf(line, &pos, width, "??%% ??%% ??,?%% "); | |
1305 } else if (mpctx->sh_audio) { | |
1306 if (mpctx->delay > 0.5) | |
1307 saddf(line, &pos, width, "%4.1f%% ", | |
1308 100.0 * audio_time_usage / (double)mpctx->delay); | |
1309 else | |
1310 saddf(line, &pos, width, "??,?%% "); | |
1311 } | |
1312 | |
1313 // VO stats | |
1314 if (sh_video) | |
1315 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
|
1316 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1317 #ifdef CONFIG_STREAM_CACHE |
33363 | 1318 // cache stats |
1319 if (stream_cache_size > 0) | |
1320 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
|
1321 #endif |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1322 |
33363 | 1323 // other |
1324 if (playback_speed != 1) | |
1325 saddf(line, &pos, width, "%4.2fx ", playback_speed); | |
1326 | |
1327 // end | |
1328 if (erase_to_end_of_line) { | |
1329 line[pos] = 0; | |
1330 mp_msg(MSGT_STATUSLINE, MSGL_STATUS, "%s%s\r", line, erase_to_end_of_line); | |
1331 } else { | |
1332 memset(&line[pos], ' ', width - pos); | |
1333 line[width] = 0; | |
1334 mp_msg(MSGT_STATUSLINE, MSGL_STATUS, "%s\r", line); | |
1335 } | |
1336 free(line); | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1337 } |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1338 |
33390 | 1339 static void stream_dump_progress_start(void) |
1340 { | |
1341 stream_dump_start_time = stream_dump_last_print_time = GetTimerMS(); | |
1342 } | |
1343 | |
1344 static void stream_dump_progress(uint64_t len, stream_t *stream) | |
1345 { | |
1346 unsigned t = GetTimerMS(); | |
1347 uint64_t start = stream->start_pos; | |
1348 uint64_t end = stream->end_pos; | |
1349 uint64_t pos = stream->pos; | |
1350 | |
1351 stream_dump_count += len; | |
1352 if (t - stream_dump_last_print_time - 1000 > UINT_MAX / 2) | |
1353 return; | |
1354 stream_dump_last_print_time = t; | |
1355 /* TODO: pretty print sizes; ETA */ | |
1356 if (end > start && pos >= start && pos <= end) { | |
1357 mp_msg(MSGT_STATUSLINE, MSGL_STATUS, MSGTR_DumpBytesWrittenPercent, | |
1358 stream_dump_count, 100.0 * (pos - start) / (end - start)); | |
1359 } else { | |
1360 mp_msg(MSGT_STATUSLINE, MSGL_STATUS, MSGTR_DumpBytesWritten, | |
1361 stream_dump_count); | |
1362 } | |
1363 } | |
1364 | |
1365 static void stream_dump_progress_end(void) | |
1366 { | |
1367 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_DumpBytesWrittenTo, | |
1368 stream_dump_count, stream_dump_name); | |
1369 } | |
1370 | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1371 /** |
33287 | 1372 * @brief Build a chain of audio filters that converts the input format. |
13710 | 1373 * to the ao's format, taking into account the current playback_speed. |
33287 | 1374 * @param sh_audio describes the requested input format of the chain. |
1375 * @param ao_data describes the requested output format of the chain. | |
13710 | 1376 */ |
32561
17bb5a38ae2e
build_afilter_chain is not safe to use directly, thus make it
reimar
parents:
32543
diff
changeset
|
1377 static int build_afilter_chain(sh_audio_t *sh_audio, ao_data_t *ao_data) |
13710 | 1378 { |
33363 | 1379 int new_srate; |
1380 int result; | |
1381 if (!sh_audio) { | |
27343 | 1382 #ifdef CONFIG_GUI |
33363 | 1383 if (use_gui) |
1384 guiGetEvent(guiSetAfilter, (char *)NULL); | |
14254 | 1385 #endif |
33363 | 1386 mpctx->mixer.afilter = NULL; |
1387 return 0; | |
24896 | 1388 } |
33363 | 1389 if (af_control_any_rev(sh_audio->afilter, |
1390 AF_CONTROL_PLAYBACK_SPEED | AF_CONTROL_SET, | |
1391 &playback_speed)) { | |
1392 new_srate = sh_audio->samplerate; | |
1393 } else { | |
1394 new_srate = sh_audio->samplerate * playback_speed; | |
1395 if (new_srate != ao_data->samplerate) { | |
1396 // limits are taken from libaf/af_resample.c | |
1397 if (new_srate < 8000) | |
1398 new_srate = 8000; | |
1399 if (new_srate > 192000) | |
1400 new_srate = 192000; | |
1401 playback_speed = (float)new_srate / (float)sh_audio->samplerate; | |
1402 } | |
1403 } | |
1404 result = init_audio_filters(sh_audio, new_srate, | |
1405 &ao_data->samplerate, &ao_data->channels, &ao_data->format); | |
1406 mpctx->mixer.afilter = sh_audio->afilter; | |
27343 | 1407 #ifdef CONFIG_GUI |
33363 | 1408 if (use_gui) |
1409 guiGetEvent(guiSetAfilter, (char *)sh_audio->afilter); | |
14254 | 1410 #endif |
33363 | 1411 return result; |
13710 | 1412 } |
8800 | 1413 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1414 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
|
1415 struct mp_osd_msg { |
33363 | 1416 mp_osd_msg_t *prev; ///< Previous message on the stack |
33287 | 1417 char msg[128]; ///< Message text |
33363 | 1418 int id, level, started; |
1419 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
|
1420 }; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1421 |
33363 | 1422 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
|
1423 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1424 /** |
33287 | 1425 * @brief Add a message on the OSD message stack. |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1426 * |
33287 | 1427 * If a message with the same id is already present in the stack |
1428 * 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
|
1429 */ |
33363 | 1430 void set_osd_msg(int id, int level, int time, const char *fmt, ...) |
1431 { | |
1432 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
|
1433 va_list va; |
17929
6fe95ee39422
Fix osd_show_msg alignment and make sure msg strings
albeu
parents:
17928
diff
changeset
|
1434 int r; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1435 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1436 // look if the id is already in the stack |
33363 | 1437 for (msg = osd_msg_stack; msg && msg->id != id; |
1438 last = msg, msg = msg->prev) ; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1439 // not found: alloc it |
33363 | 1440 if (!msg) { |
1441 msg = calloc(1, sizeof(mp_osd_msg_t)); | |
1442 msg->prev = osd_msg_stack; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1443 osd_msg_stack = msg; |
33363 | 1444 } else if (last) { // found, but it's not on top of the stack |
1445 last->prev = msg->prev; | |
1446 msg->prev = osd_msg_stack; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1447 osd_msg_stack = msg; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1448 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1449 // write the msg |
33363 | 1450 va_start(va, fmt); |
28378 | 1451 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
|
1452 va_end(va); |
33363 | 1453 if (r >= 128) |
1454 msg->msg[127] = 0; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1455 // set id and time |
33363 | 1456 msg->id = id; |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1457 msg->level = level; |
33363 | 1458 msg->time = time; |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1459 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1460 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1461 /** |
33287 | 1462 * @brief Remove a message from the OSD stack. |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1463 * |
33287 | 1464 * 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
|
1465 */ |
33363 | 1466 void rm_osd_msg(int id) |
1467 { | |
1468 mp_osd_msg_t *msg, *last = NULL; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1469 |
17057
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1470 // Search for the msg |
33363 | 1471 for (msg = osd_msg_stack; msg && msg->id != id; |
1472 last = msg, msg = msg->prev) ; | |
1473 if (!msg) | |
1474 return; | |
17057
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1475 |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1476 // Detach it from the stack and free it |
33363 | 1477 if (last) |
17057
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1478 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
|
1479 else |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1480 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
|
1481 free(msg); |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1482 } |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1483 |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1484 /** |
33287 | 1485 * @brief Remove all messages from the OSD stack. |
17938 | 1486 */ |
33363 | 1487 static void clear_osd_msgs(void) |
1488 { | |
1489 mp_osd_msg_t *msg = osd_msg_stack, *prev = NULL; | |
1490 while (msg) { | |
17938 | 1491 prev = msg->prev; |
1492 free(msg); | |
1493 msg = prev; | |
1494 } | |
1495 osd_msg_stack = NULL; | |
1496 } | |
1497 | |
1498 /** | |
33287 | 1499 * @brief Get the current message from the OSD stack. |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1500 * |
33287 | 1501 * This function decrements the message timer and destroys the old ones. |
1502 * 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
|
1503 */ |
33363 | 1504 static mp_osd_msg_t *get_osd_msg(void) |
1505 { | |
1506 mp_osd_msg_t *msg, *prev, *last = NULL; | |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
1507 static unsigned last_update; |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1508 unsigned now = GetTimerMS(); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1509 unsigned diff; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1510 char hidden_dec_done = 0; |
24091 | 1511 |
1512 if (osd_visible) { | |
33363 | 1513 // 36000000 means max timed visibility is 1 hour into the future, if |
1514 // the difference is greater assume it's wrapped around from below 0 | |
1515 if (osd_visible - now > 36000000) { | |
1516 osd_visible = 0; | |
1517 vo_osd_progbar_type = -1; // disable | |
1518 vo_osd_changed(OSDTYPE_PROGBAR); | |
1519 if (mpctx->osd_function != OSD_PAUSE) | |
1520 mpctx->osd_function = OSD_PLAY; | |
1521 } | |
24091 | 1522 } |
1523 | |
33363 | 1524 if (!last_update) |
1525 last_update = now; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1526 diff = now >= last_update ? now - last_update : 0; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1527 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1528 last_update = now; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1529 |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1530 // Look for the first message in the stack with high enough level. |
33363 | 1531 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
|
1532 prev = msg->prev; |
33363 | 1533 if (msg->level > osd_level && hidden_dec_done) |
1534 continue; | |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1535 // 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
|
1536 // in both cases we decrement the timer or kill it. |
33363 | 1537 if (!msg->started || msg->time > diff) { |
1538 if (msg->started) | |
1539 msg->time -= diff; | |
1540 else | |
1541 msg->started = 1; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1542 // display it |
33363 | 1543 if (msg->level <= osd_level) |
1544 return msg; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1545 hidden_dec_done = 1; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1546 continue; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1547 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1548 // kill the message |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1549 free(msg); |
33363 | 1550 if (last) { |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1551 last->prev = prev; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1552 msg = last; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1553 } else { |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1554 osd_msg_stack = prev; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1555 msg = NULL; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1556 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1557 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1558 // Nothing found |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1559 return NULL; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1560 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1561 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1562 /** |
33287 | 1563 * @brief Display the OSD bar. |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1564 * |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1565 * 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
|
1566 */ |
33363 | 1567 void set_osd_bar(int type, const char *name, double min, double max, double val) |
1568 { | |
1569 if (osd_level < 1) | |
1570 return; | |
1571 | |
1572 if (mpctx->sh_video) { | |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18286
diff
changeset
|
1573 osd_visible = (GetTimerMS() + 1000) | 1; |
33363 | 1574 vo_osd_progbar_type = type; |
1575 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
|
1576 vo_osd_changed(OSDTYPE_PROGBAR); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1577 return; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1578 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1579 |
33363 | 1580 set_osd_msg(OSD_MSG_BAR, 1, osd_duration, "%s: %d %%", |
1581 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
|
1582 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1583 |
29670
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1584 /** |
33287 | 1585 * @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
|
1586 */ |
33363 | 1587 void set_osd_subtitle(subtitle *subs) |
1588 { | |
29670
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1589 int i; |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1590 vo_sub = subs; |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1591 vo_osd_changed(OSDTYPE_SUBTITLE); |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1592 if (!mpctx->sh_video) { |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1593 // 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
|
1594 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
|
1595 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
|
1596 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
|
1597 else { |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1598 // 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
|
1599 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
|
1600 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
|
1601 } |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1602 } |
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 } |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1605 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1606 /** |
33287 | 1607 * @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
|
1608 * |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1609 * 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
|
1610 * 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
|
1611 * 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
|
1612 */ |
33363 | 1613 static void update_osd_msg(void) |
1614 { | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1615 mp_osd_msg_t *msg; |
28378 | 1616 static char osd_text[128] = ""; |
1617 static char osd_text_timer[128]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1618 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1619 // we need some mem for vo_osd_text |
33363 | 1620 vo_osd_text = (unsigned char *)osd_text; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1621 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1622 // Look if we have a msg |
33363 | 1623 if ((msg = get_osd_msg())) { |
1624 if (strcmp(osd_text, msg->msg)) { | |
1625 strncpy((char *)osd_text, msg->msg, 127); | |
1626 if (mpctx->sh_video) | |
1627 vo_osd_changed(OSDTYPE_OSD); | |
1628 else if (term_osd) | |
1629 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
|
1630 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1631 return; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1632 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1633 |
33363 | 1634 if (mpctx->sh_video) { |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1635 // fallback on the timer |
33363 | 1636 if (osd_level >= 2) { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1637 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
|
1638 int percentage = -1; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1639 char percentage_text[10]; |
32793 | 1640 char fractions_text[4]; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1641 int pts = demuxer_get_current_time(mpctx->demuxer); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1642 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1643 if (mpctx->osd_show_percentage) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1644 percentage = demuxer_get_percent_pos(mpctx->demuxer); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1645 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1646 if (percentage >= 0) |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1647 snprintf(percentage_text, 9, " (%d%%)", percentage); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1648 else |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1649 percentage_text[0] = 0; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1650 |
33363 | 1651 if (osd_fractions == 1) { |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1652 // print fractions as sub-second timestamp |
32793 | 1653 snprintf(fractions_text, sizeof(fractions_text), ".%02d", |
33363 | 1654 (int)((mpctx->sh_video->pts - pts) * 100 + 0.5) |
32793 | 1655 % 100); |
33363 | 1656 } else if (osd_fractions == 2) { |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1657 // print fractions by estimating the frame count within the |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1658 // second |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1659 |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1660 // rounding or cutting off numbers after the decimal point |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1661 // causes problems because of float's precision and movies, |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1662 // whose first frame is not exactly at timestamp 0. Therefore, |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1663 // we add 0.2 and cut off at the decimal point, which proved |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1664 // as good heuristic |
32793 | 1665 snprintf(fractions_text, sizeof(fractions_text), ".%02d", |
33363 | 1666 (int)((mpctx->sh_video->pts - pts) * |
1667 mpctx->sh_video->fps + 0.2)); | |
32793 | 1668 } else { |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1669 // do not print fractions |
32793 | 1670 fractions_text[0] = 0; |
1671 } | |
1672 | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1673 if (osd_level == 3) |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1674 snprintf(osd_text_timer, 63, |
32793 | 1675 "%c %02d:%02d:%02d%s / %02d:%02d:%02d%s", |
33363 | 1676 mpctx->osd_function, pts / 3600, (pts / 60) % 60, pts % 60, |
1677 fractions_text, len / 3600, (len / 60) % 60, len % 60, | |
32793 | 1678 percentage_text); |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1679 else |
32793 | 1680 snprintf(osd_text_timer, 63, "%c %02d:%02d:%02d%s%s", |
33363 | 1681 mpctx->osd_function, pts / 3600, (pts / 60) % 60, |
1682 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
|
1683 } else |
33363 | 1684 osd_text_timer[0] = 0; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1685 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1686 // always decrement the percentage timer |
33363 | 1687 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
|
1688 mpctx->osd_show_percentage--; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1689 |
33363 | 1690 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
|
1691 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
|
1692 vo_osd_changed(OSDTYPE_OSD); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1693 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1694 return; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1695 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1696 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1697 // Clear the term osd line |
33363 | 1698 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
|
1699 osd_text[0] = 0; |
33363 | 1700 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
|
1701 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1702 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1703 |
33363 | 1704 void reinit_audio_chain(void) |
1705 { | |
29801
7ac1f37f8aa5
Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents:
29800
diff
changeset
|
1706 if (!mpctx->sh_audio) |
7ac1f37f8aa5
Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents:
29800
diff
changeset
|
1707 return; |
31671
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
1708 if (!(initialized_flags & INITIALIZED_ACODEC)) { |
33363 | 1709 current_module = "init_audio_codec"; |
1710 mp_msg(MSGT_CPLAYER, MSGL_INFO, "==========================================================================\n"); | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1711 if (!init_best_audio_codec(mpctx->sh_audio, audio_codec_list, audio_fm_list)) |
31673 | 1712 goto init_error; |
33363 | 1713 initialized_flags |= INITIALIZED_ACODEC; |
1714 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
|
1715 } |
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
1716 |
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
1717 if (!(initialized_flags & INITIALIZED_AO)) { |
33363 | 1718 current_module = "af_preinit"; |
1719 ao_data.samplerate = force_srate; | |
1720 ao_data.channels = 0; | |
1721 ao_data.format = audio_output_format; | |
31673 | 1722 // first init to detect best values |
33363 | 1723 if (!init_audio_filters(mpctx->sh_audio, // preliminary init |
1724 // input: | |
1725 mpctx->sh_audio->samplerate, | |
1726 // output: | |
1727 &ao_data.samplerate, &ao_data.channels, &ao_data.format)) { | |
1728 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_AudioFilterChainPreinitError); | |
31673 | 1729 exit_player(EXIT_ERROR); |
1730 } | |
33363 | 1731 current_module = "ao2_init"; |
31673 | 1732 mpctx->audio_out = init_best_audio_out(audio_driver_list, |
1733 0, // plugin flag | |
1734 ao_data.samplerate, | |
1735 ao_data.channels, | |
1736 ao_data.format, 0); | |
33363 | 1737 if (!mpctx->audio_out) { |
1738 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CannotInitAO); | |
31673 | 1739 goto init_error; |
1740 } | |
33363 | 1741 initialized_flags |= INITIALIZED_AO; |
1742 mp_msg(MSGT_CPLAYER, MSGL_INFO, "AO: [%s] %dHz %dch %s (%d bytes per sample)\n", | |
31673 | 1743 mpctx->audio_out->info->short_name, |
1744 ao_data.samplerate, ao_data.channels, | |
1745 af_fmt2str_short(ao_data.format), | |
33363 | 1746 af_fmt2bits(ao_data.format) / 8); |
1747 mp_msg(MSGT_CPLAYER, MSGL_V, "AO: Description: %s\nAO: Author: %s\n", | |
31673 | 1748 mpctx->audio_out->info->name, mpctx->audio_out->info->author); |
33363 | 1749 if (strlen(mpctx->audio_out->info->comment) > 0) |
1750 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
|
1751 } |
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
1752 |
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
|
1753 // init audio filters: |
33363 | 1754 current_module = "af_init"; |
1755 if (!build_afilter_chain(mpctx->sh_audio, &ao_data)) { | |
1756 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_NoMatchingFilter); | |
29801
7ac1f37f8aa5
Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents:
29800
diff
changeset
|
1757 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
|
1758 } |
29801
7ac1f37f8aa5
Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents:
29800
diff
changeset
|
1759 mpctx->mixer.audio_out = mpctx->audio_out; |
33363 | 1760 mpctx->mixer.volstep = volstep; |
29801
7ac1f37f8aa5
Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents:
29800
diff
changeset
|
1761 return; |
29794
df1826dcdb2d
Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents:
29785
diff
changeset
|
1762 |
df1826dcdb2d
Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents:
29785
diff
changeset
|
1763 init_error: |
33363 | 1764 uninit_player(INITIALIZED_ACODEC | INITIALIZED_AO); // close codec and possibly AO |
1765 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
|
1766 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
|
1767 } |
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
|
1768 |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1769 // 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
|
1770 // ao so far. |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1771 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
|
1772 { |
24913 | 1773 double buffered_output; |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1774 // 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
|
1775 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
|
1776 // 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
|
1777 // 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
|
1778 |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1779 // Decoded but not filtered |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1780 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
|
1781 |
24900 | 1782 // Data buffered in audio filters, measured in bytes of "missing" output |
24913 | 1783 buffered_output = af_calc_delay(sh_audio->afilter); |
24900 | 1784 |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1785 // 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
|
1786 // accept everything to internal buffers yet |
24900 | 1787 buffered_output += sh_audio->a_out_buffer_len; |
1788 | |
1789 // Filters divide audio length by playback_speed, so multiply by it | |
1790 // to get the length in original units without speedup or slowdown | |
1791 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
|
1792 |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1793 return a_pts; |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1794 } |
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 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
|
1797 double playing_audio_pts(sh_audio_t *sh_audio, demux_stream_t *d_audio, |
33363 | 1798 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
|
1799 { |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1800 return written_audio_pts(sh_audio, d_audio) - playback_speed * |
33363 | 1801 audio_out->get_delay(); |
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 |
33495 | 1804 static int is_at_end(MPContext *mpctx, m_time_size_t *end_at, double pts) |
1805 { | |
1806 switch (end_at->type) { | |
1807 case END_AT_TIME: return end_at->pos <= pts; | |
1808 case END_AT_SIZE: return end_at->pos <= stream_tell(mpctx->stream); | |
1809 } | |
1810 return 0; | |
1811 } | |
1812 | |
33363 | 1813 static int check_framedrop(double frame_time) |
1814 { | |
1815 // check for frame-drop: | |
1816 current_module = "check_framedrop"; | |
1817 if (mpctx->sh_audio && !mpctx->d_audio->eof) { | |
1818 static int dropped_frames; | |
1819 float delay = playback_speed * mpctx->audio_out->get_delay(); | |
1820 float d = delay - mpctx->delay; | |
1821 ++total_frame_cnt; | |
1822 // we should avoid dropping too many frames in sequence unless we | |
1823 // are too late. and we allow 100ms A-V delay here: | |
1824 if (d < -dropped_frames * frame_time - 0.100 && | |
1825 mpctx->osd_function != OSD_PAUSE) { | |
1826 ++drop_frame_cnt; | |
1827 ++dropped_frames; | |
1828 return frame_dropping; | |
1829 } else | |
1830 dropped_frames = 0; | |
1831 } | |
1832 return 0; | |
26228
089dc00275b6
Experimental support for -framedrop with -correct-pts.
reimar
parents:
26159
diff
changeset
|
1833 } |
089dc00275b6
Experimental support for -framedrop with -correct-pts.
reimar
parents:
26159
diff
changeset
|
1834 |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1835 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
|
1836 { |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1837 unsigned char *start; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1838 int in_size; |
33363 | 1839 int hit_eof = 0; |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1840 double pts; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1841 |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1842 while (1) { |
33363 | 1843 int drop_frame = check_framedrop(sh_video->frametime); |
1844 void *decoded_frame; | |
1845 current_module = "decode video"; | |
1846 // XXX Time used in this call is not counted in any performance | |
1847 // timer now, OSD is not updated correctly for filter-added frames | |
1848 if (vf_output_queued_frame(sh_video->vfilter)) | |
1849 break; | |
1850 current_module = "video_read_frame"; | |
1851 in_size = ds_get_packet_pts(d_video, &start, &pts); | |
1852 if (in_size < 0) { | |
1853 // try to extract last frames in case of decoder lag | |
1854 in_size = 0; | |
1855 pts = MP_NOPTS_VALUE; | |
1856 hit_eof = 1; | |
1857 } | |
1858 if (in_size > max_framesize) | |
1859 max_framesize = in_size; | |
1860 current_module = "decode video"; | |
1861 decoded_frame = decode_video(sh_video, start, in_size, drop_frame, pts, NULL); | |
1862 if (decoded_frame) { | |
1863 update_subtitles(sh_video, sh_video->pts, mpctx->d_sub, 0); | |
1864 update_teletext(sh_video, mpctx->demuxer, 0); | |
1865 update_osd_msg(); | |
1866 current_module = "filter video"; | |
1867 if (filter_video(sh_video, decoded_frame, sh_video->pts)) | |
1868 break; | |
1869 } else if (drop_frame) | |
1870 return -1; | |
1871 if (hit_eof) | |
1872 return 0; | |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1873 } |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1874 return 1; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1875 } |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1876 |
20887 | 1877 #ifdef HAVE_RTC |
33363 | 1878 int rtc_fd = -1; |
20887 | 1879 #endif |
1880 | |
1881 static float timing_sleep(float time_frame) | |
1882 { | |
1883 #ifdef HAVE_RTC | |
33363 | 1884 if (rtc_fd >= 0) { |
1885 // -------- RTC ----------- | |
1886 current_module = "sleep_rtc"; | |
20887 | 1887 while (time_frame > 0.000) { |
33363 | 1888 unsigned long rtc_ts; |
1889 if (read(rtc_fd, &rtc_ts, sizeof(rtc_ts)) <= 0) | |
1890 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_LinuxRTCReadError, strerror(errno)); | |
1891 time_frame -= GetRelativeTime(); | |
1892 } | |
20887 | 1893 } else |
1894 #endif | |
1895 { | |
33363 | 1896 // assume kernel HZ=100 for softsleep, works with larger HZ but with |
1897 // unnecessarily high CPU usage | |
1898 float margin = softsleep ? 0.011 : 0; | |
1899 current_module = "sleep_timer"; | |
1900 while (time_frame > margin) { | |
1901 usec_sleep(1000000 * (time_frame - margin)); | |
1902 time_frame -= GetRelativeTime(); | |
1903 } | |
1904 if (softsleep) { | |
1905 current_module = "sleep_soft"; | |
1906 if (time_frame < 0) | |
1907 mp_msg(MSGT_AVSYNC, MSGL_WARN, MSGTR_SoftsleepUnderflow); | |
1908 while (time_frame > 0) | |
1909 time_frame -= GetRelativeTime(); // burn the CPU | |
1910 } | |
20887 | 1911 } |
1912 return time_frame; | |
1913 } | |
1914 | |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31607
diff
changeset
|
1915 static int select_subtitle(MPContext *mpctx) |
31201
203789464176
misc cosmetics: K&R style nits, #include placement, indentation
diego
parents:
31148
diff
changeset
|
1916 { |
33363 | 1917 // find the best sub to use |
1918 int id; | |
1919 int found = 0; | |
1920 mpctx->global_sub_pos = -1; // no subs by default | |
1921 if (vobsub_id >= 0) { | |
1922 // if user asks for a vobsub id, use that first. | |
1923 id = vobsub_id; | |
1924 found = mp_property_do("sub_vob", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK; | |
1925 } | |
1926 | |
1927 if (!found && dvdsub_id >= 0) { | |
1928 // if user asks for a dvd sub id, use that next. | |
1929 id = dvdsub_id; | |
1930 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
|
1931 } |
33363 | 1932 |
1933 if (!found) { | |
1934 // if there are text subs to use, use those. (autosubs come last here) | |
1935 id = 0; | |
1936 found = mp_property_do("sub_file", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK; | |
1937 } | |
1938 | |
1939 if (!found && dvdsub_id == -1) { | |
1940 // finally select subs by language and container hints | |
1941 if (dvdsub_id == -1 && dvdsub_lang) | |
1942 dvdsub_id = demuxer_sub_track_by_lang(mpctx->demuxer, dvdsub_lang); | |
1943 if (dvdsub_id == -1) | |
1944 dvdsub_id = demuxer_default_sub_track(mpctx->demuxer); | |
1945 if (dvdsub_id >= 0) { | |
1946 id = dvdsub_id; | |
1947 found = mp_property_do("sub_demux", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK; | |
1948 } | |
1949 } | |
1950 return found; | |
29854
00ebdb6cb87f
Factor out code that decides which subtitle to play.
reimar
parents:
29804
diff
changeset
|
1951 } |
00ebdb6cb87f
Factor out code that decides which subtitle to play.
reimar
parents:
29804
diff
changeset
|
1952 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1953 #ifdef CONFIG_DVDNAV |
25824 | 1954 #ifndef FF_B_TYPE |
1955 #define FF_B_TYPE 3 | |
1956 #endif | |
33287 | 1957 /** |
1958 * @brief Store decoded video image. | |
1959 */ | |
33363 | 1960 static mp_image_t *mp_dvdnav_copy_mpi(mp_image_t *to_mpi, |
1961 mp_image_t *from_mpi) | |
1962 { | |
25824 | 1963 mp_image_t *mpi; |
1964 | |
33287 | 1965 // do not store B-frames |
25824 | 1966 if (from_mpi->pict_type == FF_B_TYPE) |
1967 return to_mpi; | |
1968 | |
1969 if (to_mpi && | |
1970 to_mpi->w == from_mpi->w && | |
1971 to_mpi->h == from_mpi->h && | |
1972 to_mpi->imgfmt == from_mpi->imgfmt) | |
1973 mpi = to_mpi; | |
1974 else { | |
1975 if (to_mpi) | |
1976 free_mp_image(to_mpi); | |
1977 if (from_mpi->w == 0 || from_mpi->h == 0) | |
1978 return NULL; | |
33363 | 1979 mpi = alloc_mpi(from_mpi->w, from_mpi->h, from_mpi->imgfmt); |
25824 | 1980 } |
1981 | |
33363 | 1982 copy_mpi(mpi, from_mpi); |
25824 | 1983 return mpi; |
1984 } | |
1985 | |
33363 | 1986 static void mp_dvdnav_reset_stream(MPContext *ctx) |
1987 { | |
25824 | 1988 if (ctx->sh_video) { |
33287 | 1989 // clear video pts |
33363 | 1990 ctx->d_video->pts = 0.0f; |
1991 ctx->sh_video->pts = 0.0f; | |
1992 ctx->sh_video->i_pts = 0.0f; | |
25824 | 1993 ctx->sh_video->last_pts = 0.0f; |
33363 | 1994 ctx->sh_video->num_buffered_pts = 0; |
1995 ctx->sh_video->num_frames = 0; | |
25824 | 1996 ctx->sh_video->num_frames_decoded = 0; |
1997 ctx->sh_video->timer = 0.0f; | |
1998 ctx->sh_video->stream_delay = 0.0f; | |
33363 | 1999 ctx->sh_video->timer = 0; |
25824 | 2000 ctx->demuxer->stream_pts = MP_NOPTS_VALUE; |
2001 } | |
2002 | |
2003 if (ctx->sh_audio) { | |
33287 | 2004 // free audio packets and reset |
25824 | 2005 ds_free_packs(ctx->d_audio); |
2006 audio_delay -= ctx->sh_audio->stream_delay; | |
33363 | 2007 ctx->delay = -audio_delay; |
25824 | 2008 ctx->audio_out->reset(); |
2009 resync_audio_stream(ctx->sh_audio); | |
2010 } | |
2011 | |
2012 audio_delay = 0.0f; | |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31607
diff
changeset
|
2013 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
|
2014 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
|
2015 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
|
2016 if (dvdsub_lang_id != dvdsub_id) { |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
2017 dvdsub_id = dvdsub_lang_id; |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
2018 select_subtitle(ctx); |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
2019 } |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
2020 } |
25824 | 2021 |
33287 | 2022 // clear all EOF related flags |
25824 | 2023 ctx->d_video->eof = ctx->d_audio->eof = ctx->stream->eof = 0; |
2024 } | |
2025 | |
33287 | 2026 /** |
2027 * @brief Restore last decoded DVDNAV (still frame). | |
2028 */ | |
25824 | 2029 static mp_image_t *mp_dvdnav_restore_smpi(int *in_size, |
2030 unsigned char **start, | |
2031 mp_image_t *decoded_frame) | |
2032 { | |
2033 if (mpctx->stream->type != STREAMTYPE_DVDNAV) | |
2034 return decoded_frame; | |
2035 | |
33287 | 2036 // a change occured in dvdnav stream |
33363 | 2037 if (mp_dvdnav_cell_has_changed(mpctx->stream, 0)) { |
25824 | 2038 mp_dvdnav_read_wait(mpctx->stream, 1, 1); |
2039 mp_dvdnav_context_free(mpctx); | |
2040 mp_dvdnav_reset_stream(mpctx); | |
2041 mp_dvdnav_read_wait(mpctx->stream, 0, 1); | |
33363 | 2042 mp_dvdnav_cell_has_changed(mpctx->stream, 1); |
25824 | 2043 } |
2044 | |
2045 if (*in_size < 0) { | |
2046 float len; | |
2047 | |
33287 | 2048 // display still frame, if any |
25824 | 2049 if (mpctx->nav_smpi && !mpctx->nav_buffer) |
2050 decoded_frame = mpctx->nav_smpi; | |
2051 | |
33287 | 2052 // increment video frame: continue playing after still frame |
25824 | 2053 len = demuxer_get_time_length(mpctx->demuxer); |
2054 if (mpctx->sh_video->pts >= len && | |
2055 mpctx->sh_video->pts > 0.0 && len > 0.0) { | |
2056 mp_dvdnav_skip_still(mpctx->stream); | |
2057 mp_dvdnav_skip_wait(mpctx->stream); | |
2058 } | |
2059 mpctx->sh_video->pts += 1 / mpctx->sh_video->fps; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
2060 |
25824 | 2061 if (mpctx->nav_buffer) { |
33363 | 2062 *start = mpctx->nav_start; |
25824 | 2063 *in_size = mpctx->nav_in_size; |
2064 if (mpctx->nav_start) | |
33363 | 2065 memcpy(*start, mpctx->nav_buffer, mpctx->nav_in_size); |
25824 | 2066 } |
2067 } | |
2068 | |
2069 return decoded_frame; | |
2070 } | |
2071 | |
33287 | 2072 /** |
2073 * @brief Save last decoded DVDNAV (still frame). | |
2074 */ | |
25824 | 2075 static void mp_dvdnav_save_smpi(int in_size, |
2076 unsigned char *start, | |
2077 mp_image_t *decoded_frame) | |
2078 { | |
2079 if (mpctx->stream->type != STREAMTYPE_DVDNAV) | |
2080 return; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
2081 |
32511
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32467
diff
changeset
|
2082 free(mpctx->nav_buffer); |
25824 | 2083 |
33363 | 2084 mpctx->nav_buffer = malloc(in_size); |
2085 mpctx->nav_start = start; | |
25824 | 2086 mpctx->nav_in_size = mpctx->nav_buffer ? in_size : -1; |
2087 if (mpctx->nav_buffer) | |
33363 | 2088 memcpy(mpctx->nav_buffer, start, in_size); |
25824 | 2089 |
2090 if (decoded_frame && mpctx->nav_smpi != decoded_frame) | |
33363 | 2091 mpctx->nav_smpi = mp_dvdnav_copy_mpi(mpctx->nav_smpi, decoded_frame); |
25824 | 2092 } |
33363 | 2093 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2094 #endif /* CONFIG_DVDNAV */ |
25824 | 2095 |
20887 | 2096 static void adjust_sync_and_print_status(int between_frames, float timing_error) |
2097 { | |
33363 | 2098 current_module = "av_sync"; |
2099 | |
2100 if (mpctx->sh_audio) { | |
2101 double a_pts, v_pts; | |
2102 | |
2103 if (autosync) | |
2104 /* | |
2105 * If autosync is enabled, the value for delay must be calculated | |
2106 * a bit differently. It is set only to the difference between | |
2107 * the audio and video timers. Any attempt to include the real | |
2108 * or corrected delay causes the pts_correction code below to | |
2109 * try to correct for the changes in delay which autosync is | |
2110 * trying to measure. This keeps the two from competing, but still | |
2111 * allows the code to correct for PTS drift *only*. (Using a delay | |
2112 * value here, even a "corrected" one, would be incompatible with | |
2113 * autosync mode.) | |
2114 */ | |
2115 a_pts = written_audio_pts(mpctx->sh_audio, mpctx->d_audio) - mpctx->delay; | |
2116 else | |
2117 a_pts = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out); | |
2118 | |
2119 v_pts = mpctx->sh_video->pts; | |
2120 | |
2121 { | |
2122 static int drop_message; | |
2123 double AV_delay = a_pts - audio_delay - v_pts; | |
2124 double x; | |
2125 // not a good idea to do A-V correction with with bogus values | |
2126 if (a_pts == MP_NOPTS_VALUE || v_pts == MP_NOPTS_VALUE) | |
2127 AV_delay = 0; | |
2128 if (AV_delay > 0.5 && drop_frame_cnt > 50 && drop_message == 0) { | |
2129 ++drop_message; | |
2130 mp_msg(MSGT_AVSYNC, MSGL_WARN, MSGTR_SystemTooSlow); | |
2131 } | |
2132 if (autosync) | |
2133 x = AV_delay * 0.1f; | |
2134 else | |
2135 /* Do not correct target time for the next frame if this frame | |
2136 * was late not because of wrong target time but because the | |
2137 * target time could not be met */ | |
2138 x = (AV_delay + timing_error * playback_speed) * 0.1f; | |
2139 if (x < -max_pts_correction) | |
2140 x = -max_pts_correction; | |
2141 else if (x > max_pts_correction) | |
2142 x = max_pts_correction; | |
2143 if (default_max_pts_correction >= 0) | |
2144 max_pts_correction = default_max_pts_correction; | |
2145 else | |
2146 max_pts_correction = mpctx->sh_video->frametime * 0.10; // +-10% of time | |
2147 if (!between_frames) { | |
2148 mpctx->delay += x; | |
2149 c_total += x; | |
2150 } | |
2151 if (!quiet) | |
2152 print_status(a_pts - audio_delay, AV_delay, c_total); | |
2153 } | |
20887 | 2154 } else { |
33363 | 2155 // No audio: |
2156 | |
2157 if (!quiet) | |
2158 print_status(0, 0, 0); | |
20887 | 2159 } |
2160 } | |
2161 | |
20986 | 2162 static int fill_audio_out_buffers(void) |
20889
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2163 { |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2164 unsigned int t; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2165 double tt; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2166 int playsize; |
33363 | 2167 int playflags = 0; |
2168 int audio_eof = 0; | |
20890
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
2169 int bytes_to_write; |
31671
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
2170 int format_change = 0; |
33363 | 2171 sh_audio_t *const sh_audio = mpctx->sh_audio; |
2172 | |
2173 current_module = "play_audio"; | |
20889
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2174 |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2175 while (1) { |
33363 | 2176 int sleep_time; |
2177 // all the current uses of ao_data.pts seem to be in aos that handle | |
2178 // sync completely wrong; there should be no need to use ao_data.pts | |
2179 // in get_space() | |
2180 ao_data.pts = ((mpctx->sh_video ? mpctx->sh_video->timer : 0) + mpctx->delay) * 90000.0; | |
2181 bytes_to_write = mpctx->audio_out->get_space(); | |
2182 if (mpctx->sh_video || bytes_to_write >= ao_data.outburst) | |
2183 break; | |
2184 | |
2185 // handle audio-only case: | |
2186 // this is where mplayer sleeps during audio-only playback | |
2187 // to avoid 100% CPU use | |
2188 sleep_time = (ao_data.outburst - bytes_to_write) * 1000 / ao_data.bps; | |
2189 if (sleep_time < 10) | |
2190 sleep_time = 10; // limit to 100 wakeups per second | |
2191 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
|
2192 } |
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
2193 |
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
2194 while (bytes_to_write) { |
33363 | 2195 int res; |
2196 playsize = bytes_to_write; | |
2197 if (playsize > MAX_OUTBURST) | |
2198 playsize = MAX_OUTBURST; | |
2199 bytes_to_write -= playsize; | |
2200 | |
2201 // Fill buffer if needed: | |
2202 current_module = "decode_audio"; | |
2203 t = GetTimer(); | |
2204 if (!format_change) { | |
2205 res = mp_decode_audio(sh_audio, playsize); | |
2206 format_change = res == -2; | |
2207 } | |
2208 if (!format_change && res < 0) // EOF or error | |
2209 if (mpctx->d_audio->eof) { | |
2210 audio_eof = 1; | |
2211 if (sh_audio->a_out_buffer_len == 0) | |
2212 return 0; | |
2213 } | |
2214 t = GetTimer() - t; | |
2215 tt = t * 0.000001f; | |
2216 audio_time_usage += tt; | |
2217 if (playsize > sh_audio->a_out_buffer_len) { | |
2218 playsize = sh_audio->a_out_buffer_len; | |
2219 if (audio_eof || format_change) | |
2220 playflags |= AOPLAY_FINAL_CHUNK; | |
2221 } | |
2222 if (!playsize) | |
2223 break; | |
2224 | |
2225 // play audio: | |
2226 current_module = "play_audio"; | |
2227 | |
2228 // Is this pts value actually useful for the aos that access it? | |
2229 // They're obviously badly broken in the way they handle av sync; | |
2230 // would not having access to this make them more broken? | |
2231 ao_data.pts = ((mpctx->sh_video ? mpctx->sh_video->timer : 0) + mpctx->delay) * 90000.0; | |
2232 playsize = mpctx->audio_out->play(sh_audio->a_out_buffer, playsize, playflags); | |
2233 | |
2234 if (playsize > 0) { | |
2235 sh_audio->a_out_buffer_len -= playsize; | |
2236 memmove(sh_audio->a_out_buffer, &sh_audio->a_out_buffer[playsize], | |
2237 sh_audio->a_out_buffer_len); | |
2238 mpctx->delay += playback_speed * playsize / (double)ao_data.bps; | |
2239 } else if ((format_change || audio_eof) && mpctx->audio_out->get_delay() < .04) { | |
2240 // Sanity check to avoid hanging in case current ao doesn't output | |
2241 // partial chunks and doesn't check for AOPLAY_FINAL_CHUNK | |
2242 mp_msg(MSGT_CPLAYER, MSGL_WARN, "Audio output truncated at end.\n"); | |
2243 sh_audio->a_out_buffer_len = 0; | |
2244 } | |
20889
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2245 } |
31671
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
2246 if (format_change) { |
33363 | 2247 uninit_player(INITIALIZED_AO); |
2248 reinit_audio_chain(); | |
31671
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
2249 } |
20889
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2250 return 1; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2251 } |
20887 | 2252 |
33155
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2253 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
|
2254 { |
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2255 #ifdef CONFIG_NETWORKING |
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2256 if (udp_master) { |
33363 | 2257 char current_time[256]; |
2258 snprintf(current_time, sizeof(current_time), "%f", time); | |
2259 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
|
2260 } |
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2261 #endif /* CONFIG_NETWORKING */ |
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2262 } |
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2263 |
20986 | 2264 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
|
2265 { |
20904 | 2266 int frame_time_remaining = 0; |
33363 | 2267 current_module = "calc_sleep_time"; |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2268 |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2269 #ifdef CONFIG_NETWORKING |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2270 if (udp_slave) { |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2271 int udp_master_exited = udp_slave_sync(mpctx); |
33486
e46989c7f47e
Change -udp-slave code to temporarily fall back to normal
reimar
parents:
33481
diff
changeset
|
2272 if (udp_master_exited > 0) { |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2273 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_MasterQuit); |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2274 exit_player(EXIT_QUIT); |
33486
e46989c7f47e
Change -udp-slave code to temporarily fall back to normal
reimar
parents:
33481
diff
changeset
|
2275 } else if (udp_master_exited == 0) |
e46989c7f47e
Change -udp-slave code to temporarily fall back to normal
reimar
parents:
33481
diff
changeset
|
2276 return 0; |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2277 } |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2278 #endif /* CONFIG_NETWORKING */ |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2279 |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2280 *time_frame -= GetRelativeTime(); // reset timer |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2281 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2282 if (mpctx->sh_audio && !mpctx->d_audio->eof) { |
33363 | 2283 float delay = mpctx->audio_out->get_delay(); |
2284 mp_dbg(MSGT_AVSYNC, MSGL_DBG2, "delay=%f\n", delay); | |
2285 | |
2286 if (autosync) { | |
2287 /* | |
2288 * Adjust this raw delay value by calculating the expected | |
2289 * delay for this frame and generating a new value which is | |
2290 * weighted between the two. The higher autosync is, the | |
2291 * closer to the delay value gets to that which "-nosound" | |
2292 * would have used, and the longer it will take for A/V | |
2293 * sync to settle at the right value (but it eventually will.) | |
2294 * This settling time is very short for values below 100. | |
2295 */ | |
2296 float predicted = mpctx->delay / playback_speed + *time_frame; | |
2297 float difference = delay - predicted; | |
2298 delay = predicted + difference / (float)autosync; | |
2299 } | |
2300 | |
2301 *time_frame = delay - mpctx->delay / playback_speed; | |
2302 | |
2303 // delay = amount of audio buffered in soundcard/driver | |
2304 if (delay > 0.25) | |
2305 delay = 0.25; | |
2306 else if (delay < 0.10) | |
2307 delay = 0.10; | |
2308 if (*time_frame > delay * 0.6) { | |
2309 // sleep time too big - may cause audio drops (buffer underrun) | |
2310 frame_time_remaining = 1; | |
2311 *time_frame = delay * 0.5; | |
2312 } | |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2313 } else { |
33363 | 2314 // If we're lagging more than 200 ms behind the right playback rate, |
2315 // don't try to "catch up". | |
2316 // If benchmark is set always output frames as fast as possible | |
2317 // without sleeping. | |
2318 if (*time_frame < -0.2 || benchmark) | |
2319 *time_frame = 0; | |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2320 } |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2321 |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2322 *aq_sleep_time += *time_frame; |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2323 |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2324 //============================== SLEEP: =================================== |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2325 |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2326 // flag 256 means: libvo driver does its timing (dvb card) |
33363 | 2327 if (*time_frame > 0.001 && !(vo_flags & 256)) |
2328 *time_frame = timing_sleep(*time_frame); | |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2329 |
33155
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2330 handle_udp_master(mpctx->sh_video->pts); |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2331 |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2332 return frame_time_remaining; |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2333 } |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2334 |
33363 | 2335 int reinit_video_chain(void) |
2336 { | |
2337 sh_video_t *const sh_video = mpctx->sh_video; | |
2338 double ar = -1.0; | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2339 //================== Init VIDEO (codec & libvo) ========================== |
33363 | 2340 if (!fixed_vo || !(initialized_flags & INITIALIZED_VO)) { |
2341 current_module = "preinit_libvo"; | |
2342 | |
2343 //shouldn't we set dvideo->id=-2 when we fail? | |
2344 vo_config_count = 0; | |
2345 //if((mpctx->video_out->preinit(vo_subdevice))!=0){ | |
2346 if (!(mpctx->video_out = init_best_video_out(video_driver_list))) { | |
2347 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_ErrorInitializingVODevice); | |
2348 goto err_out; | |
2349 } | |
2350 initialized_flags |= INITIALIZED_VO; | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2351 } |
33363 | 2352 |
2353 if (stream_control(mpctx->demuxer->stream, STREAM_CTRL_GET_ASPECT_RATIO, &ar) != STREAM_UNSUPPORTED) | |
2354 mpctx->sh_video->stream_aspect = ar; | |
2355 current_module = "init_video_filters"; | |
2356 { | |
2357 char *vf_arg[] = { "_oldargs_", (char *)mpctx->video_out, NULL }; | |
2358 sh_video->vfilter = vf_open_filter(NULL, "vo", vf_arg); | |
2359 } | |
27345
b597fd2924b4
Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents:
27343
diff
changeset
|
2360 #ifdef CONFIG_MENU |
33363 | 2361 if (use_menu) { |
2362 char *vf_arg[] = { "_oldargs_", menu_root, NULL }; | |
2363 vf_menu = vf_open_plugin(libmenu_vfs, sh_video->vfilter, "menu", vf_arg); | |
2364 if (!vf_menu) { | |
2365 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantOpenLibmenuFilterWithThisRootMenu, menu_root); | |
2366 use_menu = 0; | |
2367 } | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2368 } |
33363 | 2369 if (vf_menu) |
2370 sh_video->vfilter = vf_menu; | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2371 #endif |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2372 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2373 #ifdef CONFIG_ASS |
33363 | 2374 if (ass_enabled) { |
2375 int i; | |
2376 int insert = 1; | |
2377 if (vf_settings) | |
2378 for (i = 0; vf_settings[i].name; ++i) | |
2379 if (strcmp(vf_settings[i].name, "ass") == 0) { | |
2380 insert = 0; | |
2381 break; | |
2382 } | |
2383 if (insert) { | |
2384 char *vf_arg[] = { "auto", "1", NULL }; | |
2385 vf_instance_t *vf_ass = vf_open_filter(sh_video->vfilter, "ass", vf_arg); | |
2386 if (vf_ass) | |
2387 sh_video->vfilter = vf_ass; | |
2388 else | |
2389 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
|
2390 } |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2391 } |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2392 #endif |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2393 |
33363 | 2394 sh_video->vfilter = append_filters(sh_video->vfilter); |
2395 eosd_init(sh_video->vfilter); | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2396 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2397 #ifdef CONFIG_ASS |
33363 | 2398 if (ass_enabled) |
2399 eosd_ass_init(ass_library); | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2400 #endif |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2401 |
33363 | 2402 current_module = "init_video_codec"; |
2403 | |
2404 mp_msg(MSGT_CPLAYER, MSGL_INFO, "==========================================================================\n"); | |
2405 init_best_video_codec(sh_video, video_codec_list, video_fm_list); | |
2406 mp_msg(MSGT_CPLAYER, MSGL_INFO, "==========================================================================\n"); | |
2407 | |
2408 if (!sh_video->initialized) { | |
2409 if (!fixed_vo) | |
2410 uninit_player(INITIALIZED_VO); | |
2411 goto err_out; | |
2412 } | |
2413 | |
2414 initialized_flags |= INITIALIZED_VCODEC; | |
2415 | |
2416 if (sh_video->codec) | |
2417 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_CODEC=%s\n", sh_video->codec->name); | |
2418 | |
2419 sh_video->last_pts = MP_NOPTS_VALUE; | |
2420 sh_video->num_buffered_pts = 0; | |
2421 sh_video->next_frame_time = 0; | |
2422 | |
2423 if (auto_quality > 0) { | |
2424 // Auto quality option enabled | |
2425 output_quality = get_video_quality_max(sh_video); | |
2426 if (auto_quality > output_quality) | |
2427 auto_quality = output_quality; | |
2428 else | |
2429 output_quality = auto_quality; | |
2430 mp_msg(MSGT_CPLAYER, MSGL_V, "AutoQ: setting quality to %d.\n", output_quality); | |
2431 set_video_quality(sh_video, output_quality); | |
2432 } | |
2433 | |
2434 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============ | |
2435 | |
2436 current_module = "init_vo"; | |
2437 | |
2438 return 1; | |
21031
e45bb0ee5558
Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents:
21030
diff
changeset
|
2439 |
e45bb0ee5558
Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents:
21030
diff
changeset
|
2440 err_out: |
33363 | 2441 mpctx->sh_video = mpctx->d_video->sh = NULL; |
2442 return 0; | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2443 } |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2444 |
21077 | 2445 static double update_video(int *blit_frame) |
2446 { | |
33363 | 2447 sh_video_t *const sh_video = mpctx->sh_video; |
21077 | 2448 //-------------------- Decode a frame: ----------------------- |
2449 double frame_time; | |
2450 *blit_frame = 0; // Don't blit if we hit EOF | |
2451 if (!correct_pts) { | |
33363 | 2452 unsigned char *start = NULL; |
2453 void *decoded_frame = NULL; | |
2454 int drop_frame = 0; | |
2455 int in_size; | |
2456 int full_frame; | |
2457 | |
2458 do { | |
2459 current_module = "video_read_frame"; | |
2460 frame_time = sh_video->next_frame_time; | |
2461 in_size = video_read_frame(sh_video, &sh_video->next_frame_time, | |
2462 &start, force_fps); | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2463 #ifdef CONFIG_DVDNAV |
33363 | 2464 // wait, still frame or EOF |
2465 if (mpctx->stream->type == STREAMTYPE_DVDNAV && in_size < 0) { | |
2466 if (mp_dvdnav_is_eof(mpctx->stream)) | |
2467 return -1; | |
2468 if (mpctx->d_video) | |
2469 mpctx->d_video->eof = 0; | |
2470 if (mpctx->d_audio) | |
2471 mpctx->d_audio->eof = 0; | |
2472 mpctx->stream->eof = 0; | |
2473 } else | |
2474 #endif | |
2475 if (in_size < 0) | |
31201
203789464176
misc cosmetics: K&R style nits, #include placement, indentation
diego
parents:
31148
diff
changeset
|
2476 return -1; |
33363 | 2477 if (in_size > max_framesize) |
2478 max_framesize = in_size; // stats | |
2479 drop_frame = check_framedrop(frame_time); | |
2480 current_module = "decode_video"; | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2481 #ifdef CONFIG_DVDNAV |
33363 | 2482 full_frame = 1; |
2483 decoded_frame = mp_dvdnav_restore_smpi(&in_size, &start, decoded_frame); | |
2484 // still frame has been reached, no need to decode | |
2485 if (in_size > 0 && !decoded_frame) | |
25824 | 2486 #endif |
33363 | 2487 decoded_frame = decode_video(sh_video, start, in_size, drop_frame, |
2488 sh_video->pts, &full_frame); | |
2489 | |
2490 if (full_frame) { | |
2491 sh_video->timer += frame_time; | |
2492 | |
2493 // Time-based PTS recalculation. | |
2494 // The key to maintaining A-V sync is to not touch PTS until the proper frame is reached | |
2495 if (sh_video->pts != MP_NOPTS_VALUE) { | |
2496 if (sh_video->last_pts != MP_NOPTS_VALUE) { | |
2497 double pts = sh_video->last_pts + frame_time; | |
2498 double ptsdiff = fabs(pts - sh_video->pts); | |
2499 | |
2500 // Allow starting PTS recalculation at the appropriate frame only | |
2501 mpctx->framestep_found |= (ptsdiff <= frame_time * 1.5); | |
2502 | |
2503 // replace PTS only if we're not too close and not too far | |
2504 // and a correctly timed frame has been found, otherwise | |
2505 // keep pts to eliminate rounding errors or catch up with stream | |
2506 if (ptsdiff > frame_time * 20) | |
2507 mpctx->framestep_found = 0; | |
2508 if (ptsdiff * 10 > frame_time && mpctx->framestep_found) | |
2509 sh_video->pts = pts; | |
2510 else | |
2511 mp_dbg(MSGT_AVSYNC, MSGL_DBG2, "Keeping PTS at %6.2f\n", sh_video->pts); | |
2512 } | |
2513 sh_video->last_pts = sh_video->pts; | |
2514 } | |
2515 if (mpctx->sh_audio) | |
2516 mpctx->delay -= frame_time; | |
2517 // video_read_frame can change fps (e.g. for ASF video) | |
2518 vo_fps = sh_video->fps; | |
2519 update_subtitles(sh_video, sh_video->pts, mpctx->d_sub, 0); | |
2520 update_teletext(sh_video, mpctx->demuxer, 0); | |
2521 update_osd_msg(); | |
2522 } | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2523 #ifdef CONFIG_DVDNAV |
33363 | 2524 // save back last still frame for future display |
2525 mp_dvdnav_save_smpi(in_size, start, decoded_frame); | |
25824 | 2526 #endif |
33363 | 2527 } while (!full_frame); |
2528 | |
2529 current_module = "filter_video"; | |
2530 *blit_frame = (decoded_frame && filter_video(sh_video, decoded_frame, | |
2531 sh_video->pts)); | |
2532 } else { | |
2533 int res = generate_video_frame(sh_video, mpctx->d_video); | |
2534 if (!res) | |
2535 return -1; | |
2536 ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, | |
2537 VFCTRL_GET_PTS, &sh_video->pts); | |
2538 if (sh_video->pts == MP_NOPTS_VALUE) { | |
2539 mp_msg(MSGT_CPLAYER, MSGL_ERR, "pts after filters MISSING\n"); | |
2540 sh_video->pts = sh_video->last_pts; | |
2541 } | |
2542 if (sh_video->last_pts == MP_NOPTS_VALUE) | |
2543 sh_video->last_pts = sh_video->pts; | |
2544 else if (sh_video->last_pts > sh_video->pts) { | |
2545 // make a guess whether this is some kind of discontinuity | |
2546 // we should jump along with or some wron timestamps we | |
2547 // 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
|
2548 if (sh_video->pts < sh_video->last_pts - 20 * sh_video->frametime) |
33363 | 2549 sh_video->last_pts = sh_video->pts; |
2550 else | |
2551 sh_video->pts = sh_video->last_pts + sh_video->frametime; | |
2552 mp_msg(MSGT_CPLAYER, MSGL_V, "pts value < previous\n"); | |
2553 } | |
2554 frame_time = sh_video->pts - sh_video->last_pts; | |
2555 if (!frame_time) | |
2556 frame_time = sh_video->frametime; | |
2557 sh_video->last_pts = sh_video->pts; | |
2558 sh_video->timer += frame_time; | |
2559 if (mpctx->sh_audio) | |
2560 mpctx->delay -= frame_time; | |
2561 *blit_frame = res > 0; | |
21077 | 2562 } |
2563 return frame_time; | |
2564 } | |
2565 | |
25606 | 2566 static void pause_loop(void) |
21082 | 2567 { |
33363 | 2568 mp_cmd_t *cmd; |
32732
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2569 #ifdef CONFIG_STREAM_CACHE |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2570 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
|
2571 #endif |
21082 | 2572 if (!quiet) { |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2573 if (term_osd && !mpctx->sh_video) { |
32730
736b22f11e00
Change MSGTR_Paused definition to allow simplifying some code.
reimar
parents:
32724
diff
changeset
|
2574 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
|
2575 update_osd_msg(); |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2576 } else |
33363 | 2577 mp_msg(MSGT_CPLAYER, MSGL_STATUS, "\n"MSGTR_Paused "\r"); |
21082 | 2578 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_PAUSED\n"); |
2579 } | |
27343 | 2580 #ifdef CONFIG_GUI |
21082 | 2581 if (use_gui) |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2582 guiGetEvent(guiCEvent, (char *)guiSetPause); |
21082 | 2583 #endif |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2584 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
|
2585 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
|
2586 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2587 if (mpctx->audio_out && mpctx->sh_audio) |
33363 | 2588 mpctx->audio_out->pause(); // pause audio, keep data if possible |
2589 | |
2590 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
|
2591 if (cmd) { |
33363 | 2592 cmd = mp_input_get_cmd(0, 1, 0); |
2593 run_command(mpctx, cmd); | |
2594 mp_cmd_free(cmd); | |
2595 continue; | |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2596 } |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2597 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
|
2598 mpctx->video_out->check_events(); |
27343 | 2599 #ifdef CONFIG_GUI |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2600 if (use_gui) { |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2601 guiEventHandling(); |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2602 guiGetEvent(guiReDraw, NULL); |
33363 | 2603 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
|
2604 break; |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2605 } |
21082 | 2606 #endif |
27345
b597fd2924b4
Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents:
27343
diff
changeset
|
2607 #ifdef CONFIG_MENU |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2608 if (vf_menu) |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2609 vf_menu_pause_update(vf_menu); |
21082 | 2610 #endif |
32732
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2611 #ifdef CONFIG_STREAM_CACHE |
32735
c8b9c17890cb
Cosmetics: move if and following { onto same line.
reimar
parents:
32732
diff
changeset
|
2612 if (!quiet && stream_cache_size > 0) { |
32732
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2613 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
|
2614 if (new_cache_fill != old_cache_fill) { |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2615 if (term_osd && !mpctx->sh_video) { |
33363 | 2616 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
|
2617 new_cache_fill); |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2618 update_osd_msg(); |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2619 } else |
33363 | 2620 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
|
2621 new_cache_fill); |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2622 old_cache_fill = new_cache_fill; |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2623 } |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2624 } |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2625 #endif |
33181 | 2626 if (mpctx->sh_video) |
2627 handle_udp_master(mpctx->sh_video->pts); | |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2628 usec_sleep(20000); |
21082 | 2629 } |
2630 if (cmd && cmd->id == MP_CMD_PAUSE) { | |
33363 | 2631 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
|
2632 mp_cmd_free(cmd); |
21082 | 2633 } |
33363 | 2634 mpctx->osd_function = OSD_PLAY; |
29937 | 2635 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
|
2636 if (mpctx->eof) // do not play remaining audio if we e.g. switch to the next file |
33363 | 2637 mpctx->audio_out->reset(); |
29856
3a6ae46759de
Do not call resume on unpausing if we have already reached eof while
reimar
parents:
29855
diff
changeset
|
2638 else |
33363 | 2639 mpctx->audio_out->resume(); // resume audio |
29937 | 2640 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2641 if (mpctx->video_out && mpctx->sh_video && vo_config_count) |
33363 | 2642 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
|
2643 (void)GetRelativeTime(); // ignore time that passed during pause |
27343 | 2644 #ifdef CONFIG_GUI |
21082 | 2645 if (use_gui) { |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2646 if (guiIntfStruct.Playing == guiSetStop) |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2647 mpctx->eof = 1; |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2648 else |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2649 guiGetEvent(guiCEvent, (char *)guiSetPlay); |
21082 | 2650 } |
2651 #endif | |
2652 } | |
2653 | |
31956
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2654 static void edl_loadfile(void) |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2655 { |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2656 if (edl_filename) { |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2657 if (edl_records) { |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2658 free_edl(edl_records); |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2659 edl_needs_reset = 1; |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2660 } |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2661 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
|
2662 } |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2663 } |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2664 |
22298 | 2665 // Execute EDL command for the current position if one exists |
2666 static void edl_update(MPContext *mpctx) | |
2667 { | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
2668 if (!edl_records) |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2669 return; |
22298 | 2670 |
2671 if (!mpctx->sh_video) { | |
33363 | 2672 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlNOsh_video); |
2673 free_edl(edl_records); | |
2674 next_edl_record = NULL; | |
2675 edl_records = NULL; | |
2676 return; | |
22298 | 2677 } |
2678 | |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2679 // 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
|
2680 // 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
|
2681 if (edl_needs_reset) { |
33363 | 2682 edl_needs_reset = 0; |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2683 mpctx->edl_muted = 0; |
33363 | 2684 next_edl_record = edl_records; |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2685 |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2686 // 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
|
2687 // inside any record |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2688 while (next_edl_record) { |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2689 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
|
2690 break; |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2691 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
|
2692 if (edl_backward) { |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2693 mpctx->osd_function = OSD_REW; |
33363 | 2694 edl_decision = 1; |
2695 abs_seek_pos = 0; | |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2696 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
|
2697 next_edl_record->start_sec + |
31580
b6c2b541e1a6
Implement edl-backward-delay to avoid jumping right over an
reynaldo
parents:
31515
diff
changeset
|
2698 edl_backward_delay); |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2699 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: pts [%f], " |
33363 | 2700 "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
|
2701 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
|
2702 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
|
2703 next_edl_record->length_sec); |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2704 return; |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2705 } |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2706 break; |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2707 } |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2708 |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2709 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
|
2710 mpctx->edl_muted = !mpctx->edl_muted; |
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 next_edl_record = next_edl_record->next; |
33363 | 2713 } |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2714 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
|
2715 mixer_mute(&mpctx->mixer); |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2716 } |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2717 |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2718 if (next_edl_record && |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2719 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
|
2720 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
|
2721 mpctx->osd_function = OSD_FFW; |
33363 | 2722 edl_decision = 1; |
2723 abs_seek_pos = 0; | |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2724 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
|
2725 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: pts [%f], offset [%f], " |
33363 | 2726 "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
|
2727 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
|
2728 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
|
2729 next_edl_record->length_sec); |
33363 | 2730 } 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
|
2731 mpctx->edl_muted = !mpctx->edl_muted; |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2732 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
|
2733 mixer_mute(&mpctx->mixer); |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2734 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_MUTE: [%f]\n", |
33363 | 2735 next_edl_record->start_sec); |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2736 } |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2737 next_edl_record = next_edl_record->next; |
22298 | 2738 } |
2739 } | |
2740 | |
25883
baf32110d3fc
Use defines to give names to the different seek flags.
reimar
parents:
25852
diff
changeset
|
2741 // style & SEEK_ABSOLUTE == 0 means seek relative to current position, == 1 means absolute |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
2742 // style & SEEK_FACTOR == 0 means amount in seconds, == 2 means fraction of file length |
22300 | 2743 // return -1 if seek failed (non-seekable stream?), 0 otherwise |
2744 static int seek(MPContext *mpctx, double amount, int style) | |
2745 { | |
2746 current_module = "seek"; | |
2747 if (demux_seek(mpctx->demuxer, amount, audio_delay, style) == 0) | |
33363 | 2748 return -1; |
22300 | 2749 |
30176
6fb92182aff3
At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents:
30175
diff
changeset
|
2750 mpctx->startup_decode_retry = DEFAULT_STARTUP_DECODE_RETRY; |
22300 | 2751 if (mpctx->sh_video) { |
33363 | 2752 current_module = "seek_video_reset"; |
2753 if (vo_config_count) | |
2754 mpctx->video_out->control(VOCTRL_RESET, NULL); | |
2755 mpctx->num_buffered_frames = 0; | |
2756 mpctx->delay = 0; | |
2757 mpctx->time_frame = 0; | |
2758 mpctx->framestep_found = 0; | |
2759 // Not all demuxers set d_video->pts during seek, so this value | |
2760 // (which is used by at least vobsub and edl code below) may | |
2761 // be completely wrong (probably 0). | |
2762 mpctx->sh_video->pts = mpctx->d_video->pts; | |
2763 update_subtitles(mpctx->sh_video, mpctx->sh_video->pts, mpctx->d_sub, 1); | |
2764 update_teletext(mpctx->sh_video, mpctx->demuxer, 1); | |
22300 | 2765 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
2766 |
22300 | 2767 if (mpctx->sh_audio) { |
33363 | 2768 current_module = "seek_audio_reset"; |
2769 mpctx->audio_out->reset(); // stop audio, throwing away buffered data | |
2770 if (!mpctx->sh_video) | |
2771 update_subtitles(NULL, mpctx->sh_audio->pts, mpctx->d_sub, 1); | |
22300 | 2772 } |
2773 | |
25416 | 2774 if (vo_vobsub && mpctx->sh_video) { |
33363 | 2775 current_module = "seek_vobsub_reset"; |
2776 vobsub_seek(vo_vobsub, mpctx->sh_video->pts); | |
22300 | 2777 } |
2778 | |
31700 | 2779 #ifdef CONFIG_ASS |
31227
ee7beb1a3a6e
backport ass_flush_events() from upstream libass and make use of it
aurel
parents:
31201
diff
changeset
|
2780 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
|
2781 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
|
2782 #endif |
ee7beb1a3a6e
backport ass_flush_events() from upstream libass and make use of it
aurel
parents:
31201
diff
changeset
|
2783 |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2784 if (edl_records) { |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2785 edl_needs_reset = 1; |
33363 | 2786 edl_backward = amount < 0; |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2787 } |
22300 | 2788 |
2789 c_total = 0; | |
2790 max_pts_correction = 0.1; | |
33363 | 2791 audio_time_usage = 0; |
2792 video_time_usage = 0; | |
2793 vout_time_usage = 0; | |
2794 drop_frame_cnt = 0; | |
22300 | 2795 |
2796 current_module = NULL; | |
2797 return 0; | |
2798 } | |
2799 | |
26963
8825552ee585
Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents:
26877
diff
changeset
|
2800 /* 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
|
2801 * file for some tools to link against. */ |
8825552ee585
Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents:
26877
diff
changeset
|
2802 #ifndef DISABLE_MAIN |
33363 | 2803 int main(int argc, char *argv[]) |
2804 { | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
2805 int opt_exit = 0; // Flag indicating whether MPlayer should exit without playing anything. |
33363 | 2806 int i; |
2807 | |
2808 int gui_no_filename = 0; | |
2809 | |
2810 common_preinit(); | |
2811 | |
2812 // Create the config context and register the options | |
2813 mconfig = m_config_new(); | |
2814 m_config_register_options(mconfig, mplayer_opts); | |
2815 m_config_register_options(mconfig, common_opts); | |
2816 mp_input_register_options(mconfig); | |
2817 | |
2818 // Preparse the command line | |
2819 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
|
2820 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2821 #ifdef CONFIG_TV |
33363 | 2822 stream_tv_defaults.immediate = 1; |
7068
6c2d746b17bf
10l, fix compiling without tv. patch by Andreas Hess <jaska@gmx.net>
arpi
parents:
7058
diff
changeset
|
2823 #endif |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5520
diff
changeset
|
2824 |
33363 | 2825 if (argc > 1 && argv[1] && |
2826 (!strcmp(argv[1], "-gui") || !strcmp(argv[1], "-nogui"))) { | |
2827 use_gui = !strcmp(argv[1], "-gui"); | |
33466 | 2828 } else if (argv[0] && strstr(mp_basename(argv[0]), GMPlayer)) { |
33363 | 2829 use_gui = 1; |
2830 } | |
1639 | 2831 |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
2832 parse_cfgfiles(mconfig); |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
2833 |
27343 | 2834 #ifdef CONFIG_GUI |
33363 | 2835 if (use_gui) { |
2836 initialized_flags |= INITIALIZED_GUI; | |
2837 cfg_read(); | |
33307 | 2838 } |
7019 | 2839 #endif |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
2840 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2841 mpctx->playtree = m_config_parse_mp_command_line(mconfig, argc, argv); |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
2842 if (mpctx->playtree == NULL) { |
33363 | 2843 opt_exit = 1; |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
2844 } else { |
33363 | 2845 mpctx->playtree = play_tree_cleanup(mpctx->playtree); |
2846 if (mpctx->playtree) { | |
2847 mpctx->playtree_iter = play_tree_iter_new(mpctx->playtree, mconfig); | |
2848 if (mpctx->playtree_iter) { | |
2849 if (play_tree_iter_step(mpctx->playtree_iter, 0, 0) != PLAY_TREE_ITER_ENTRY) { | |
2850 play_tree_iter_free(mpctx->playtree_iter); | |
2851 mpctx->playtree_iter = NULL; | |
2852 } | |
2853 filename = play_tree_iter_get_file(mpctx->playtree_iter, 1); | |
2854 } | |
2855 } | |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2856 } |
33363 | 2857 |
2858 print_version("MPlayer"); | |
32415
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2859 #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
|
2860 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
|
2861 if (runningmplayer && filename && use_gui) { |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2862 COPYDATASTRUCT csData; |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2863 char file[MAX_PATH]; |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2864 char *filepart = filename; |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2865 if (GetFullPathName(filename, MAX_PATH, file, &filepart)) { |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2866 csData.dwData = 0; |
33363 | 2867 csData.cbData = strlen(file) * 2; |
32415
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2868 csData.lpData = file; |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2869 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
|
2870 } |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2871 } |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2872 #endif |
32383
f6e78eef2e1b
Avoid duplicating common init code between MPlayer and mencoder.
reimar
parents:
32382
diff
changeset
|
2873 if (!common_init()) |
f6e78eef2e1b
Avoid duplicating common init code between MPlayer and mencoder.
reimar
parents:
32382
diff
changeset
|
2874 exit_player_with_rc(EXIT_NONE, 0); |
30855 | 2875 |
27343 | 2876 #ifndef CONFIG_GUI |
33363 | 2877 if (use_gui) { |
2878 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_NoGui); | |
2879 use_gui = 0; | |
1709 | 2880 } |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2881 #else |
27727
48c1ae64255b
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents:
27635
diff
changeset
|
2882 #if !defined(__MINGW32__) && !defined(__CYGWIN__) |
33363 | 2883 if (use_gui && !vo_init()) { |
2884 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_GuiNeedsX); | |
2885 use_gui = 0; | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2886 } |
18945
337d4324c766
No point in checking for X for windows gui, in addition the hackish
reimar
parents:
18939
diff
changeset
|
2887 #endif |
33363 | 2888 if (use_gui && mpctx->playtree_iter) { |
2889 char cwd[PATH_MAX + 2]; | |
2890 // Free Playtree and Playtree-Iter as it's not used by the GUI. | |
2891 play_tree_iter_free(mpctx->playtree_iter); | |
2892 mpctx->playtree_iter = NULL; | |
2893 | |
2894 if (getcwd(cwd, PATH_MAX) != (char *)NULL) { | |
2895 strcat(cwd, "/"); | |
2896 // Prefix relative paths with current working directory | |
2897 play_tree_add_bpf(mpctx->playtree, cwd); | |
2898 } | |
2899 // Import initital playtree into GUI. | |
2900 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
|
2901 } |
27343 | 2902 #endif /* CONFIG_GUI */ |
1709 | 2903 |
33363 | 2904 if (video_driver_list && strcmp(video_driver_list[0], "help") == 0) { |
2905 list_video_out(); | |
2906 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
|
2907 } |
5072 | 2908 |
33363 | 2909 if (audio_driver_list && strcmp(audio_driver_list[0], "help") == 0) { |
2910 list_audio_out(); | |
2911 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
|
2912 } |
1639 | 2913 |
33363 | 2914 if (audio_codec_list && strcmp(audio_codec_list[0], "help") == 0) { |
2915 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioCodecs); | |
2916 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_CODECS\n"); | |
2917 list_codecs(1); | |
2918 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); | |
2919 opt_exit = 1; | |
1983 | 2920 } |
33363 | 2921 if (video_codec_list && strcmp(video_codec_list[0], "help") == 0) { |
2922 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoCodecs); | |
2923 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_CODECS\n"); | |
2924 list_codecs(0); | |
2925 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); | |
2926 opt_exit = 1; | |
1983 | 2927 } |
33363 | 2928 if (video_fm_list && strcmp(video_fm_list[0], "help") == 0) { |
2929 vfm_help(); | |
2930 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); | |
2931 opt_exit = 1; | |
7191
1eadce15446c
-afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents:
7180
diff
changeset
|
2932 } |
33363 | 2933 if (audio_fm_list && strcmp(audio_fm_list[0], "help") == 0) { |
2934 afm_help(); | |
2935 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); | |
2936 opt_exit = 1; | |
7191
1eadce15446c
-afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents:
7180
diff
changeset
|
2937 } |
33363 | 2938 if (af_cfg.list && strcmp(af_cfg.list[0], "help") == 0) { |
2939 af_help(); | |
2940 printf("\n"); | |
2941 opt_exit = 1; | |
13269
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
13228
diff
changeset
|
2942 } |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27370
diff
changeset
|
2943 #ifdef CONFIG_X11 |
33363 | 2944 if (vo_fstype_list && strcmp(vo_fstype_list[0], "help") == 0) { |
2945 fstype_help(); | |
2946 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); | |
2947 opt_exit = 1; | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9315
diff
changeset
|
2948 } |
9336 | 2949 #endif |
33363 | 2950 if ((demuxer_name && strcmp(demuxer_name, "help") == 0) || |
2951 (audio_demuxer_name && strcmp(audio_demuxer_name, "help") == 0) || | |
2952 (sub_demuxer_name && strcmp(sub_demuxer_name, "help") == 0)) { | |
2953 demuxer_help(); | |
2954 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n"); | |
2955 opt_exit = 1; | |
16175 | 2956 } |
33363 | 2957 if (list_properties) { |
2958 property_print_help(); | |
2959 opt_exit = 1; | |
17914
f9cb6fc1608a
Add an option to list the properties: -list-properties
albeu
parents:
17911
diff
changeset
|
2960 } |
1983 | 2961 |
33363 | 2962 if (opt_exit) |
2963 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
|
2964 |
33476 | 2965 if (!filename) { |
2966 if (use_gui) | |
2967 gui_no_filename = 1; | |
2968 else if (!player_idle_mode) { | |
33363 | 2969 // no file/vcd/dvd -> show HELP: |
2970 mp_msg(MSGT_CPLAYER, MSGL_INFO, help_text); | |
2971 exit_player_with_rc(EXIT_NONE, 0); | |
33476 | 2972 } |
1690 | 2973 } |
2974 | |
21342
dc98645820b7
Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents:
21219
diff
changeset
|
2975 /* Display what configure line was used */ |
dc98645820b7
Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents:
21219
diff
changeset
|
2976 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
|
2977 |
1690 | 2978 // Many users forget to include command line in bugreports... |
33363 | 2979 if (mp_msg_test(MSGT_CPLAYER, MSGL_V)) { |
2980 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CommandLine); | |
2981 for (i = 1; i < argc; i++) | |
2982 mp_msg(MSGT_CPLAYER, MSGL_INFO, " '%s'", argv[i]); | |
2983 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n"); | |
1690 | 2984 } |
2985 | |
1639 | 2986 //------ load global data first ------ |
955 | 2987 |
3015 | 2988 #ifdef HAVE_RTC |
33363 | 2989 if (!nortc) { |
2990 // seteuid(0); /* Can't hurt to try to get root here */ | |
2991 if ((rtc_fd = open(rtc_device ? rtc_device : "/dev/rtc", O_RDONLY)) < 0) | |
2992 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_RTCDeviceNotOpenable, | |
2993 rtc_device ? rtc_device : "/dev/rtc", strerror(errno)); | |
2994 else { | |
2995 unsigned long irqp = 1024; /* 512 seemed OK. 128 is jerky. */ | |
2996 | |
2997 if (ioctl(rtc_fd, RTC_IRQP_SET, irqp) < 0) { | |
2998 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_LinuxRTCInitErrorIrqpSet, irqp, strerror(errno)); | |
2999 mp_msg(MSGT_CPLAYER, MSGL_HINT, MSGTR_IncreaseRTCMaxUserFreq, irqp); | |
3000 close(rtc_fd); | |
3001 rtc_fd = -1; | |
3002 } else if (ioctl(rtc_fd, RTC_PIE_ON, 0) < 0) { | |
3003 /* variable only by the root */ | |
3004 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_LinuxRTCInitErrorPieOn, strerror(errno)); | |
3005 close(rtc_fd); | |
3006 rtc_fd = -1; | |
3007 } else | |
3008 mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_UsingRTCTiming, irqp); | |
3009 } | |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
3010 } |
27343 | 3011 #ifdef CONFIG_GUI |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3012 // breaks DGA and SVGAlib and VESA drivers: --A'rpi |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3013 // and now ? -- Pontscho |
33363 | 3014 if (use_gui) |
3015 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
|
3016 #endif |
33363 | 3017 if (rtc_fd < 0) |
16490
f17b3c152fd6
Add comments to a few #endif statements in order to make clear which
diego
parents:
16489
diff
changeset
|
3018 #endif /* HAVE_RTC */ |
33363 | 3019 mp_msg(MSGT_CPLAYER, MSGL_V, "Using %s timing\n", |
3020 softsleep ? "software" : timer_name); | |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
3021 |
27359
d788e177a35e
Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;
diego
parents:
27345
diff
changeset
|
3022 #ifdef HAVE_TERMCAP |
33363 | 3023 if (!use_gui) |
3024 load_termcap(NULL); // load key-codes | |
1639 | 3025 #endif |
3026 | |
1816 | 3027 // ========== Init keyboard FIFO (connection to libvo) ============ |
1694 | 3028 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3029 // Init input system |
33363 | 3030 current_module = "init_input"; |
3031 mp_input_init(); | |
3032 mp_input_add_key_fd(-1, 0, mplayer_get_key, NULL); | |
3033 if (slave_mode) | |
3034 mp_input_add_cmd_fd(0, USE_SELECT, MP_INPUT_SLAVE_CMD_FUNC, NULL); | |
3035 else if (!noconsolecontrols) | |
3036 mp_input_add_event_fd(0, getch2); | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3037 // Set the libstream interrupt callback |
33363 | 3038 stream_set_interrupt_callback(mp_input_check_interrupt); |
9831 | 3039 |
27345
b597fd2924b4
Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents:
27343
diff
changeset
|
3040 #ifdef CONFIG_MENU |
33363 | 3041 if (use_menu) { |
3042 if (menu_cfg && menu_init(mpctx, menu_cfg)) | |
3043 mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_MenuInitialized, menu_cfg); | |
3044 else { | |
3045 menu_cfg = get_path("menu.conf"); | |
3046 if (menu_init(mpctx, menu_cfg)) | |
3047 mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_MenuInitialized, menu_cfg); | |
3048 else { | |
3049 if (menu_init(mpctx, MPLAYER_CONFDIR "/menu.conf")) | |
3050 mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_MenuInitialized, MPLAYER_CONFDIR "/menu.conf"); | |
3051 else { | |
3052 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_MenuInitFailed); | |
3053 use_menu = 0; | |
3054 } | |
3055 } | |
3056 } | |
3057 } | |
8198 | 3058 #endif |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
3059 |
33363 | 3060 initialized_flags |= INITIALIZED_INPUT; |
3061 current_module = NULL; | |
3062 | |
3063 // Catch signals | |
13391 | 3064 #ifndef __MINGW32__ |
33363 | 3065 signal(SIGCHLD, child_sighandler); |
13391 | 3066 #endif |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3067 |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27393
diff
changeset
|
3068 #ifdef CONFIG_CRASH_DEBUG |
33363 | 3069 prog_path = argv[0]; |
13794 | 3070 #endif |
33363 | 3071 //========= Catch terminate signals: ================ |
3072 // terminate requests: | |
3073 signal(SIGTERM, exit_sighandler); // kill | |
3074 signal(SIGHUP, exit_sighandler); // kill -HUP / xterm closed | |
3075 | |
3076 signal(SIGINT, exit_sighandler); // Interrupt from keyboard | |
3077 | |
3078 signal(SIGQUIT, exit_sighandler); // Quit from keyboard | |
3079 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
|
3080 #ifdef CONFIG_SIGHANDLER |
33363 | 3081 // fatal errors: |
3082 signal(SIGBUS, exit_sighandler); // bus error | |
3083 signal(SIGSEGV, exit_sighandler); // segfault | |
3084 signal(SIGILL, exit_sighandler); // illegal instruction | |
3085 signal(SIGFPE, exit_sighandler); // floating point exc. | |
3086 signal(SIGABRT, exit_sighandler); // abort() | |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27393
diff
changeset
|
3087 #ifdef CONFIG_CRASH_DEBUG |
33363 | 3088 if (crash_debug) |
3089 signal(SIGTRAP, exit_sighandler); | |
13794 | 3090 #endif |
5367
658ea5d7316a
Allow to disable crasj sighandler to enable creation of coredump files.
atmos4
parents:
5326
diff
changeset
|
3091 #endif |
1639 | 3092 |
27343 | 3093 #ifdef CONFIG_GUI |
33363 | 3094 if (use_gui) { |
3095 guiInit(); | |
3096 guiGetEvent(guiSetContext, mpctx); | |
3097 guiGetEvent(guiCEvent, (char *)((gui_no_filename) ? 0 : 1)); | |
3098 } | |
4963 | 3099 #endif |
3100 | |
5983 | 3101 // ******************* Now, let's see the per-file stuff ******************** |
3102 | |
1639 | 3103 play_next_file: |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
3104 |
33363 | 3105 // init global sub numbers |
3106 mpctx->global_sub_size = 0; | |
3107 memset(mpctx->sub_counts, 0, sizeof(mpctx->sub_counts)); | |
3108 | |
3109 if (filename) { | |
3110 load_per_protocol_config(mconfig, filename); | |
3111 load_per_extension_config(mconfig, filename); | |
3112 load_per_file_config(mconfig, filename); | |
3113 } | |
3114 | |
3115 if (video_driver_list) | |
3116 load_per_output_config(mconfig, PROFILE_CFG_VO, video_driver_list[0]); | |
3117 if (audio_driver_list) | |
3118 load_per_output_config(mconfig, PROFILE_CFG_AO, audio_driver_list[0]); | |
25641 | 3119 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3120 // We must enable getch2 here to be able to interrupt network connection |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3121 // or cache filling |
33363 | 3122 if (!noconsolecontrols && !slave_mode) { |
3123 if (initialized_flags & INITIALIZED_GETCH2) | |
3124 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_Getch2InitializedTwice); | |
3125 else | |
3126 getch2_enable(); // prepare stdin for hotkeys... | |
3127 initialized_flags |= INITIALIZED_GETCH2; | |
3128 mp_msg(MSGT_CPLAYER, MSGL_DBG2, "\n[[[init getch2]]]\n"); | |
3129 } | |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
3130 |
5983 | 3131 // =================== GUI idle loop (STOP state) =========================== |
27343 | 3132 #ifdef CONFIG_GUI |
33363 | 3133 if (use_gui) { |
3134 mpctx->file_format = DEMUXER_TYPE_UNKNOWN; | |
3135 guiGetEvent(guiSetDefaults, 0); | |
3136 while (guiIntfStruct.Playing != 1) { | |
3137 mp_cmd_t *cmd; | |
3138 usec_sleep(20000); | |
3139 guiEventHandling(); | |
3140 guiGetEvent(guiReDraw, NULL); | |
3141 if ((cmd = mp_input_get_cmd(0, 0, 0)) != NULL) { | |
3142 guiGetEvent(guiIEvent, (char *)cmd->id); | |
3143 mp_cmd_free(cmd); | |
3144 } | |
3145 } | |
3146 guiGetEvent(guiSetParameters, NULL); | |
3147 if (guiIntfStruct.StreamType == STREAMTYPE_STREAM) { | |
3148 play_tree_t *entry = play_tree_new(); | |
3149 play_tree_add_file(entry, guiIntfStruct.Filename); | |
3150 if (mpctx->playtree) | |
3151 play_tree_free_list(mpctx->playtree->child, 1); | |
3152 else | |
3153 mpctx->playtree = play_tree_new(); | |
3154 play_tree_set_child(mpctx->playtree, entry); | |
3155 if (mpctx->playtree) { | |
3156 mpctx->playtree_iter = play_tree_iter_new(mpctx->playtree, mconfig); | |
3157 if (mpctx->playtree_iter) { | |
3158 if (play_tree_iter_step(mpctx->playtree_iter, 0, 0) != PLAY_TREE_ITER_ENTRY) { | |
3159 play_tree_iter_free(mpctx->playtree_iter); | |
3160 mpctx->playtree_iter = NULL; | |
3161 } | |
3162 filename = play_tree_iter_get_file(mpctx->playtree_iter, 1); | |
3163 } | |
3164 } | |
3165 } | |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
3166 } |
27343 | 3167 #endif /* CONFIG_GUI */ |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3168 |
33363 | 3169 while (player_idle_mode && !filename) { |
3170 play_tree_t *entry = NULL; | |
3171 mp_cmd_t *cmd; | |
3172 if (mpctx->video_out && vo_config_count) | |
3173 mpctx->video_out->control(VOCTRL_PAUSE, NULL); | |
3174 while (!(cmd = mp_input_get_cmd(0, 1, 0))) { // wait for command | |
3175 if (mpctx->video_out && vo_config_count) | |
3176 mpctx->video_out->check_events(); | |
3177 usec_sleep(20000); | |
3178 } | |
3179 switch (cmd->id) { | |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3180 case MP_CMD_LOADFILE: |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3181 // 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
|
3182 entry = play_tree_new(); |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3183 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
|
3184 // 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
|
3185 break; |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3186 case MP_CMD_LOADLIST: |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3187 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
|
3188 break; |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3189 case MP_CMD_QUIT: |
33363 | 3190 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
|
3191 break; |
31670
05a6d70df204
Allow fullscreen switching during -idle. Useful in combination
reimar
parents:
31612
diff
changeset
|
3192 case MP_CMD_VO_FULLSCREEN: |
26264 | 3193 case MP_CMD_GET_PROPERTY: |
3194 case MP_CMD_SET_PROPERTY: | |
3195 case MP_CMD_STEP_PROPERTY: | |
3196 run_command(mpctx, cmd); | |
3197 break; | |
33363 | 3198 } |
3199 | |
3200 mp_cmd_free(cmd); | |
3201 | |
3202 if (entry) { // user entered a command that gave a valid entry | |
3203 if (mpctx->playtree) // the playtree is always a node with one child. let's clear it | |
3204 play_tree_free_list(mpctx->playtree->child, 1); | |
3205 else | |
3206 mpctx->playtree = play_tree_new(); // .. or make a brand new playtree | |
3207 | |
3208 if (!mpctx->playtree) | |
3209 continue; // couldn't make playtree! wait for next command | |
3210 | |
3211 play_tree_set_child(mpctx->playtree, entry); | |
3212 | |
3213 /* Make iterator start at the top the of tree. */ | |
3214 mpctx->playtree_iter = play_tree_iter_new(mpctx->playtree, mconfig); | |
3215 if (!mpctx->playtree_iter) | |
3216 continue; | |
3217 | |
3218 // find the first real item in the tree | |
3219 if (play_tree_iter_step(mpctx->playtree_iter, 0, 0) != PLAY_TREE_ITER_ENTRY) { | |
3220 // no items! | |
3221 play_tree_iter_free(mpctx->playtree_iter); | |
3222 mpctx->playtree_iter = NULL; | |
3223 continue; // wait for next command | |
3224 } | |
3225 filename = play_tree_iter_get_file(mpctx->playtree_iter, 1); | |
3226 } | |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3227 } |
5983 | 3228 //--------------------------------------------------------------------------- |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
3229 |
30618
c061152a5d84
Send VOCTRL_PAUSE/VOCTRL_RESUME events also when pausing for idle mode.
reimar
parents:
30616
diff
changeset
|
3230 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
|
3231 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
|
3232 |
33363 | 3233 if (filename) { |
3234 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_Playing, | |
3235 filename_recode(filename)); | |
3236 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
|
3237 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
|
3238 } |
1650
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
3239 |
31956
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
3240 edl_loadfile(); |
31963 | 3241 |
3242 if (edl_output_filename) { | |
3243 if (edl_fd) | |
3244 fclose(edl_fd); | |
31970 | 3245 if ((edl_fd = fopen(edl_output_filename, "w")) == NULL) { |
31963 | 3246 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlCantOpenForWrite, |
31970 | 3247 filename_recode(edl_output_filename)); |
31963 | 3248 } |
17109
327be31a101d
Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents:
17106
diff
changeset
|
3249 } |
327be31a101d
Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents:
17106
diff
changeset
|
3250 |
5983 | 3251 //==================== Open VOB-Sub ============================ |
3252 | |
33363 | 3253 current_module = "vobsub"; |
32724
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
3254 load_vob_subtitle(filename, spudec_ifo, &vo_spudec, add_vob_subtitle); |
33363 | 3255 if (vo_vobsub) { |
3256 initialized_flags |= INITIALIZED_VOBSUB; | |
3257 vobsub_set_from_lang(vo_vobsub, dvdsub_lang); | |
3258 mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx); | |
3259 | |
3260 // setup global sub numbering | |
3261 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
|
3262 } |
4770
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
3263 |
5151 | 3264 //============ Open & Sync STREAM --- fork cache2 ==================== |
3265 | |
33363 | 3266 mpctx->stream = NULL; |
3267 mpctx->demuxer = NULL; | |
3268 if (mpctx->d_audio) { | |
3269 //free_demuxer_stream(mpctx->d_audio); | |
3270 mpctx->d_audio = NULL; | |
3271 } | |
3272 if (mpctx->d_video) { | |
3273 //free_demuxer_stream(d_video); | |
3274 mpctx->d_video = NULL; | |
3275 } | |
3276 mpctx->sh_audio = NULL; | |
3277 mpctx->sh_video = NULL; | |
3278 | |
3279 current_module = "open_stream"; | |
3280 mpctx->stream = open_stream(filename, 0, &mpctx->file_format); | |
3281 if (!mpctx->stream) { // error... | |
3282 mpctx->eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY); | |
3283 goto goto_next_file; | |
3284 } | |
3285 initialized_flags |= INITIALIZED_STREAM; | |
5151 | 3286 |
27343 | 3287 #ifdef CONFIG_GUI |
33363 | 3288 if (use_gui) |
3289 guiGetEvent(guiSetStream, (char *)mpctx->stream); | |
8423 | 3290 #endif |
3291 | |
33363 | 3292 if (mpctx->file_format == DEMUXER_TYPE_PLAYLIST) { |
3293 play_tree_t *entry; | |
3294 // Handle playlist | |
3295 current_module = "handle_playlist"; | |
3296 mp_msg(MSGT_CPLAYER, MSGL_V, "Parsing playlist %s...\n", | |
3297 filename_recode(filename)); | |
3298 entry = parse_playtree(mpctx->stream, 0); | |
3299 mpctx->eof = playtree_add_playlist(entry); | |
3300 goto goto_next_file; | |
3301 } | |
3302 mpctx->stream->start_pos += seek_to_byte; | |
3303 | |
3304 if (stream_dump_type == 5) { | |
3305 unsigned char buf[4096]; | |
3306 int len; | |
3307 FILE *f; | |
3308 current_module = "dumpstream"; | |
3309 stream_reset(mpctx->stream); | |
3310 stream_seek(mpctx->stream, mpctx->stream->start_pos); | |
3311 f = fopen(stream_dump_name, "wb"); | |
3312 if (!f) { | |
3313 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_CantOpenDumpfile); | |
3314 exit_player(EXIT_ERROR); | |
3315 } | |
3316 if (dvd_chapter > 1) { | |
3317 int chapter = dvd_chapter - 1; | |
3318 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
|
3319 } |
33390 | 3320 stream_dump_progress_start(); |
33363 | 3321 while (!mpctx->stream->eof && !async_quit_request) { |
3322 len = stream_read(mpctx->stream, buf, 4096); | |
3323 if (len > 0) { | |
3324 if (fwrite(buf, len, 1, f) != 1) { | |
3325 mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_ErrorWritingFile, stream_dump_name); | |
3326 exit_player(EXIT_ERROR); | |
3327 } | |
3328 } | |
33390 | 3329 stream_dump_progress(len, mpctx->stream); |
33363 | 3330 if (dvd_last_chapter > 0) { |
3331 int chapter = -1; | |
3332 if (stream_control(mpctx->stream, STREAM_CTRL_GET_CURRENT_CHAPTER, | |
3333 &chapter) == STREAM_OK && chapter + 1 > dvd_last_chapter) | |
3334 break; | |
3335 } | |
3336 } | |
3337 if (fclose(f)) { | |
3338 mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_ErrorWritingFile, stream_dump_name); | |
3339 exit_player(EXIT_ERROR); | |
3340 } | |
33390 | 3341 stream_dump_progress_end(); |
33363 | 3342 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CoreDumped); |
3343 exit_player_with_rc(EXIT_EOF, 0); | |
3344 } | |
3345 | |
3346 if (mpctx->stream->type == STREAMTYPE_BD) { | |
3347 if (audio_lang && audio_id == -1) | |
3348 audio_id = bd_aid_from_lang(mpctx->stream, audio_lang); | |
3349 if (dvdsub_lang && dvdsub_id == -1) | |
3350 dvdsub_id = bd_sid_from_lang(mpctx->stream, dvdsub_lang); | |
3351 } | |
31877
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31839
diff
changeset
|
3352 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
3353 #ifdef CONFIG_DVDREAD |
33363 | 3354 if (mpctx->stream->type == STREAMTYPE_DVD) { |
3355 current_module = "dvd lang->id"; | |
3356 if (audio_lang && audio_id == -1) | |
3357 audio_id = dvd_aid_from_lang(mpctx->stream, audio_lang); | |
3358 if (dvdsub_lang && dvdsub_id == -1) | |
3359 dvdsub_id = dvd_sid_from_lang(mpctx->stream, dvdsub_lang); | |
3360 // setup global sub numbering | |
3361 mpctx->sub_counts[SUB_SOURCE_DEMUX] = dvd_number_of_subs(mpctx->stream); | |
3362 current_module = NULL; | |
3363 } | |
4274 | 3364 #endif |
3365 | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
3366 #ifdef CONFIG_DVDNAV |
33363 | 3367 if (mpctx->stream->type == STREAMTYPE_DVDNAV) { |
3368 current_module = "dvdnav lang->id"; | |
3369 if (audio_lang && audio_id == -1) | |
3370 audio_id = mp_dvdnav_aid_from_lang(mpctx->stream, audio_lang); | |
3371 dvdsub_lang_id = -3; | |
3372 if (dvdsub_lang && dvdsub_id == -1) | |
3373 dvdsub_lang_id = dvdsub_id = mp_dvdnav_sid_from_lang(mpctx->stream, dvdsub_lang); | |
3374 // setup global sub numbering | |
3375 mpctx->sub_counts[SUB_SOURCE_DEMUX] = mp_dvdnav_number_of_subs(mpctx->stream); | |
3376 current_module = NULL; | |
3377 } | |
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
|
3378 #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
|
3379 |
5151 | 3380 // CACHE2: initial prefill: 20% later: 5% (should be set by -cacheopts) |
11352 | 3381 goto_enable_cache: |
33363 | 3382 if (stream_cache_size > 0) { |
3383 int res; | |
3384 current_module = "enable_cache"; | |
3385 res = stream_enable_cache(mpctx->stream, stream_cache_size * 1024, | |
3386 stream_cache_size * 1024 * (stream_cache_min_percent / 100.0), | |
3387 stream_cache_size * 1024 * (stream_cache_seek_min_percent / 100.0)); | |
3388 if (res == 0) | |
3389 if ((mpctx->eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY))) | |
3390 goto goto_next_file; | |
3391 } | |
1639 | 3392 |
5151 | 3393 //============ Open DEMUXERS --- DETECT file type ======================= |
33363 | 3394 current_module = "demux_open"; |
3395 | |
3396 mpctx->demuxer = demux_open(mpctx->stream, mpctx->file_format, audio_id, video_id, dvdsub_id, filename); | |
8937 | 3397 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3398 // HACK to get MOV Reference Files working |
33363 | 3399 if (mpctx->demuxer && mpctx->demuxer->type == DEMUXER_TYPE_PLAYLIST) { |
3400 unsigned char *playlist_entry; | |
3401 play_tree_t *list = NULL, *entry = NULL; | |
3402 | |
3403 current_module = "handle_demux_playlist"; | |
3404 while (ds_get_packet(mpctx->demuxer->video, &playlist_entry) > 0) { | |
3405 char *temp; | |
3406 const char *bname; | |
3407 | |
3408 mp_msg(MSGT_CPLAYER, MSGL_V, "Adding file %s to element entry.\n", | |
3409 filename_recode(playlist_entry)); | |
3410 | |
3411 bname = mp_basename(playlist_entry); | |
3412 if ((strlen(bname) > 10) && !strncmp(bname, "qt", 2) && !strncmp(bname + 3, "gateQT", 6)) | |
3413 continue; | |
3414 | |
3415 if (!strcmp(playlist_entry, filename)) // ignoring self-reference | |
3416 continue; | |
3417 | |
3418 entry = play_tree_new(); | |
3419 | |
3420 if (filename && !strcmp(mp_basename(playlist_entry), playlist_entry)) { // add reference path of current file | |
3421 temp = malloc((strlen(filename) - strlen(mp_basename(filename)) + strlen(playlist_entry) + 1)); | |
3422 if (temp) { | |
3423 strncpy(temp, filename, strlen(filename) - strlen(mp_basename(filename))); | |
3424 temp[strlen(filename) - strlen(mp_basename(filename))] = '\0'; | |
3425 strcat(temp, playlist_entry); | |
3426 if (!strcmp(temp, filename)) { | |
3427 free(temp); | |
3428 continue; | |
3429 } | |
3430 play_tree_add_file(entry, temp); | |
3431 mp_msg(MSGT_CPLAYER, MSGL_V, "Resolving reference to %s.\n", temp); | |
3432 free(temp); | |
3433 } | |
3434 } else | |
3435 play_tree_add_file(entry, playlist_entry); | |
3436 | |
3437 if (!list) | |
3438 list = entry; | |
3439 else | |
3440 play_tree_append_entry(list, entry); | |
3441 } | |
3442 free_demuxer(mpctx->demuxer); | |
3443 mpctx->demuxer = NULL; | |
3444 | |
3445 if (list) { | |
3446 entry = play_tree_new(); | |
3447 play_tree_set_child(entry, list); | |
3448 mpctx->eof = playtree_add_playlist(entry); | |
3449 goto goto_next_file; | |
3450 } | |
8937 | 3451 } |
33363 | 3452 |
3453 if (!mpctx->demuxer) | |
3454 goto goto_next_file; | |
3455 if (dvd_chapter > 1) { | |
3456 float pts; | |
3457 if (demuxer_seek_chapter(mpctx->demuxer, dvd_chapter - 1, 1, &pts, NULL, NULL) >= 0 && pts > -1.0) | |
3458 seek(mpctx, pts, SEEK_ABSOLUTE); | |
3459 } | |
3460 | |
3461 initialized_flags |= INITIALIZED_DEMUXER; | |
7058
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
7055
diff
changeset
|
3462 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
3463 #ifdef CONFIG_ASS |
33363 | 3464 if (ass_enabled && ass_library) { |
3465 for (i = 0; i < mpctx->demuxer->num_attachments; ++i) { | |
3466 demux_attachment_t *att = mpctx->demuxer->attachments + i; | |
3467 if (extract_embedded_fonts && | |
3468 att->name && att->type && att->data && att->data_size && | |
3469 (strcmp(att->type, "application/x-truetype-font") == 0 || | |
3470 strcmp(att->type, "application/x-font") == 0)) | |
3471 ass_add_font(ass_library, att->name, att->data, att->data_size); | |
3472 } | |
3473 } | |
25658
0d0c48ecba90
Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents:
25641
diff
changeset
|
3474 #endif |
0d0c48ecba90
Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents:
25641
diff
changeset
|
3475 |
33363 | 3476 current_module = "demux_open2"; |
3477 | |
3478 mpctx->d_audio = mpctx->demuxer->audio; | |
3479 mpctx->d_video = mpctx->demuxer->video; | |
3480 mpctx->d_sub = mpctx->demuxer->sub; | |
3481 | |
3482 if (ts_prog) { | |
3483 int tmp = ts_prog; | |
3484 mp_property_do("switch_program", M_PROPERTY_SET, &tmp, mpctx); | |
3485 } | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3486 // select audio stream |
33363 | 3487 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
|
3488 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3489 // DUMP STREAMS: |
33363 | 3490 if ((stream_dump_type) && (stream_dump_type < 4)) { |
3491 FILE *f; | |
3492 demux_stream_t *ds = NULL; | |
3493 current_module = "dump"; | |
3494 // select stream to dump | |
3495 switch (stream_dump_type) { | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3496 case 1: ds = mpctx->d_audio; break; |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3497 case 2: ds = mpctx->d_video; break; |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3498 case 3: ds = mpctx->d_sub; break; |
33363 | 3499 } |
3500 if (!ds) { | |
3501 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_DumpSelectedStreamMissing); | |
3502 exit_player(EXIT_ERROR); | |
3503 } | |
3504 // disable other streams: | |
3505 if (mpctx->d_audio && mpctx->d_audio != ds) { | |
3506 ds_free_packs(mpctx->d_audio); | |
3507 mpctx->d_audio->id = -2; | |
3508 } | |
3509 if (mpctx->d_video && mpctx->d_video != ds) { | |
3510 ds_free_packs(mpctx->d_video); | |
3511 mpctx->d_video->id = -2; | |
3512 } | |
3513 if (mpctx->d_sub && mpctx->d_sub != ds) { | |
3514 ds_free_packs(mpctx->d_sub); | |
3515 mpctx->d_sub->id = -2; | |
3516 } | |
3517 // let's dump it! | |
3518 f = fopen(stream_dump_name, "wb"); | |
3519 if (!f) { | |
3520 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_CantOpenDumpfile); | |
3521 exit_player(EXIT_ERROR); | |
3522 } | |
33390 | 3523 stream_dump_progress_start(); |
33363 | 3524 while (!ds->eof) { |
3525 unsigned char *start; | |
3526 int in_size = ds_get_packet(ds, &start); | |
3527 if ((mpctx->demuxer->file_format == DEMUXER_TYPE_AVI || mpctx->demuxer->file_format == DEMUXER_TYPE_ASF || mpctx->demuxer->file_format == DEMUXER_TYPE_MOV) | |
3528 && stream_dump_type == 2) | |
3529 fwrite(&in_size, 1, 4, f); | |
33390 | 3530 if (in_size > 0) { |
33363 | 3531 fwrite(start, in_size, 1, f); |
33390 | 3532 stream_dump_progress(in_size, mpctx->stream); |
3533 } | |
33363 | 3534 if (dvd_last_chapter > 0) { |
3535 int cur_chapter = demuxer_get_current_chapter(mpctx->demuxer); | |
3536 if (cur_chapter != -1 && cur_chapter + 1 > dvd_last_chapter) | |
3537 break; | |
3538 } | |
3539 } | |
3540 fclose(f); | |
33390 | 3541 stream_dump_progress_end(); |
33363 | 3542 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CoreDumped); |
3543 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
|
3544 } |
33363 | 3545 |
3546 mpctx->sh_audio = mpctx->d_audio->sh; | |
3547 mpctx->sh_video = mpctx->d_video->sh; | |
3548 | |
3549 if (mpctx->sh_video) { | |
3550 current_module = "video_read_properties"; | |
3551 if (!video_read_properties(mpctx->sh_video)) { | |
3552 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CannotReadVideoProperties); | |
3553 mpctx->sh_video = mpctx->d_video->sh = NULL; | |
3554 } else { | |
3555 mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_FilefmtFourccSizeFpsFtime, | |
3556 mpctx->demuxer->file_format, mpctx->sh_video->format, mpctx->sh_video->disp_w, mpctx->sh_video->disp_h, | |
3557 mpctx->sh_video->fps, mpctx->sh_video->frametime | |
3558 ); | |
3559 | |
3560 /* need to set fps here for output encoders to pick it up in their init */ | |
3561 if (force_fps) { | |
3562 mpctx->sh_video->fps = force_fps; | |
3563 mpctx->sh_video->frametime = 1.0f / mpctx->sh_video->fps; | |
3564 } | |
3565 vo_fps = mpctx->sh_video->fps; | |
3566 | |
3567 if (!mpctx->sh_video->fps && !force_fps && !correct_pts) { | |
3568 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_FPSnotspecified); | |
3569 correct_pts = 1; | |
3570 } | |
3571 } | |
4598 | 3572 } |
33363 | 3573 |
3574 if (!mpctx->sh_video && !mpctx->sh_audio) { | |
3575 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
|
3576 #ifdef CONFIG_DVBIN |
33363 | 3577 if (mpctx->stream->type == STREAMTYPE_DVB) { |
3578 int dir; | |
3579 int v = mpctx->last_dvb_step; | |
3580 if (v > 0) | |
3581 dir = DVB_CHANNEL_HIGHER; | |
3582 else | |
3583 dir = DVB_CHANNEL_LOWER; | |
3584 | |
3585 if (dvb_step_channel(mpctx->stream, dir)) | |
3586 mpctx->eof = mpctx->dvbin_reopen = 1; | |
3587 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
3588 #endif |
33363 | 3589 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
3590 } | |
778
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
3591 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3592 /* display clip info */ |
33363 | 3593 demux_info_print(mpctx->demuxer); |
5151 | 3594 |
3595 //================== Read SUBTITLES (DVD & TEXT) ========================== | |
33363 | 3596 if (vo_spudec == NULL && |
3597 (mpctx->stream->type == STREAMTYPE_DVD || mpctx->stream->type == STREAMTYPE_DVDNAV)) { | |
3598 init_vo_spudec(); | |
3599 } | |
3600 | |
3601 if (1 || mpctx->sh_video) { | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3602 // after reading video params we should load subtitles because |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3603 // we know fps so now we can adjust subtitle time to ~6 seconds AST |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3604 // check .sub |
33363 | 3605 double fps = mpctx->sh_video ? mpctx->sh_video->fps : 25; |
3606 current_module = "read_subtitles_file"; | |
3607 load_subtitles(filename, fps, add_subtitles); | |
3608 if (mpctx->set_of_sub_size > 0) | |
3609 mpctx->sub_counts[SUB_SOURCE_SUBS] = mpctx->set_of_sub_size; | |
3610 // set even if we have no subs yet, they may be added later | |
3611 initialized_flags |= INITIALIZED_SUBS; | |
17935
d72e7330c548
Subtitles properties: move sub_select, sub_pos, sub_visibilty,
albeu
parents:
17932
diff
changeset
|
3612 } |
33363 | 3613 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3614 if (select_subtitle(mpctx) && subdata) { |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3615 switch (stream_dump_type) { |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3616 case 3: list_sub_file(subdata); break; |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3617 case 4: dump_mpsub(subdata, mpctx->sh_video->fps); break; |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3618 case 6: dump_srt(subdata, mpctx->sh_video->fps); break; |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3619 case 7: dump_microdvd(subdata, mpctx->sh_video->fps); break; |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3620 case 8: dump_jacosub(subdata, mpctx->sh_video->fps); break; |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3621 case 9: dump_sami(subdata, mpctx->sh_video->fps); break; |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3622 } |
33363 | 3623 } |
3624 | |
3625 print_file_properties(mpctx, filename); | |
3626 | |
3627 // Adjust EDL positions with start_pts | |
3628 if (edl_start_pts && start_pts) { | |
3629 edl_record_ptr edl = edl_records; | |
3630 while (edl) { | |
3631 edl->start_sec += start_pts; | |
3632 edl->stop_sec += start_pts; | |
3633 edl = edl->next; | |
3634 } | |
3635 } | |
3636 | |
3637 if (mpctx->sh_video) | |
3638 reinit_video_chain(); | |
3639 | |
3640 if (mpctx->sh_video) { | |
3641 if (vo_flags & 0x08 && vo_spudec) | |
3642 spudec_set_hw_spu(vo_spudec, mpctx->video_out); | |
6110 | 3643 |
27393 | 3644 #ifdef CONFIG_FREETYPE |
33363 | 3645 force_load_font = 1; |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
3646 #endif |
33363 | 3647 } else if (!mpctx->sh_audio) |
3648 goto goto_next_file; | |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
3649 |
1 | 3650 //================== MAIN: ========================== |
33363 | 3651 current_module = "main"; |
3652 | |
3653 if (playing_msg) { | |
3654 char *msg = property_expand_string(mpctx, playing_msg); | |
3655 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
|
3656 free(msg); |
52f95509cd05
Add the new property API and implement a couple properties.
albeu
parents:
17910
diff
changeset
|
3657 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
3658 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3659 // Disable the term OSD in verbose mode |
33363 | 3660 if (verbose) |
3661 term_osd = 0; | |
3662 | |
3663 { | |
3664 mpctx->num_buffered_frames = 0; | |
3665 mpctx->framestep_found = 0; | |
5929
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
3666 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3667 // Make sure old OSD does not stay around, |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3668 // e.g. with -fixed-vo and same-resolution files |
33363 | 3669 clear_osd_msgs(); |
3670 update_osd_msg(); | |
6028
bd016664dc18
UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents:
6016
diff
changeset
|
3671 |
1 | 3672 //================ SETUP AUDIO ========================== |
3673 | |
33363 | 3674 if (mpctx->sh_audio) { |
3675 reinit_audio_chain(); | |
3676 if (mpctx->sh_audio && mpctx->sh_audio->codec) | |
3677 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_CODEC=%s\n", mpctx->sh_audio->codec->name); | |
3678 } | |
3679 | |
3680 current_module = "av_init"; | |
3681 | |
3682 if (mpctx->sh_video) { | |
3683 mpctx->sh_video->timer = 0; | |
3684 if (!ignore_start) | |
3685 audio_delay += mpctx->sh_video->stream_delay; | |
3686 } | |
3687 if (mpctx->sh_audio) { | |
3688 if (start_volume >= 0) | |
3689 mixer_setvolume(&mpctx->mixer, start_volume, start_volume); | |
3690 if (!ignore_start) | |
3691 audio_delay -= mpctx->sh_audio->stream_delay; | |
3692 mpctx->delay = -audio_delay; | |
3693 } | |
3694 | |
3695 if (!mpctx->sh_audio) { | |
3696 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_NoSound); | |
3697 mp_msg(MSGT_CPLAYER, MSGL_V, "Freeing %d unused audio chunks.\n", mpctx->d_audio->packs); | |
3698 ds_free_packs(mpctx->d_audio); // free buffered chunks | |
3699 //mpctx->d_audio->id=-2; // do not read audio chunks | |
3700 //uninit_player(INITIALIZED_AO); // close device | |
3701 } | |
3702 if (!mpctx->sh_video) { | |
3703 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_Video_NoVideo); | |
3704 mp_msg(MSGT_CPLAYER, MSGL_V, "Freeing %d unused video chunks.\n", mpctx->d_video->packs); | |
3705 ds_free_packs(mpctx->d_video); | |
3706 mpctx->d_video->id = -2; | |
3707 //if(!fixed_vo) uninit_player(INITIALIZED_VO); | |
3708 } | |
3709 | |
3710 if (!mpctx->sh_video && !mpctx->sh_audio) | |
3711 goto goto_next_file; | |
6185
7e769ea2acc7
jump to next file (or exit) if can't decode audio && video
alex
parents:
6183
diff
changeset
|
3712 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3713 //if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf! |
33363 | 3714 if (force_fps && mpctx->sh_video) { |
3715 vo_fps = mpctx->sh_video->fps = force_fps; | |
3716 mpctx->sh_video->frametime = 1.0f / mpctx->sh_video->fps; | |
3717 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_FPSforced, mpctx->sh_video->fps, mpctx->sh_video->frametime); | |
3718 } | |
1 | 3719 |
27343 | 3720 #ifdef CONFIG_GUI |
33363 | 3721 if (use_gui) { |
3722 if (mpctx->sh_audio) | |
3723 guiIntfStruct.AudioType = mpctx->sh_audio->channels; | |
3724 else | |
3725 guiIntfStruct.AudioType = 0; | |
3726 if (!mpctx->sh_video && mpctx->sh_audio) | |
3727 guiGetEvent(guiSetAudioOnly, (char *)1); | |
3728 else | |
3729 guiGetEvent(guiSetAudioOnly, (char *)0); | |
3730 guiGetEvent(guiSetFileFormat, (char *)mpctx->demuxer->file_format); | |
3731 if (guiGetEvent(guiSetValues, (char *)mpctx->sh_video)) | |
3732 goto goto_next_file; | |
3733 guiGetEvent(guiSetDemuxer, (char *)mpctx->demuxer); | |
3734 } | |
19946
ef94dfe93fe8
Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents:
19945
diff
changeset
|
3735 #endif |
ef94dfe93fe8
Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents:
19945
diff
changeset
|
3736 |
33363 | 3737 mp_input_set_section(NULL); |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3738 //TODO: add desired (stream-based) sections here |
33363 | 3739 if (mpctx->stream->type == STREAMTYPE_TV) |
3740 mp_input_set_section("tv"); | |
3741 if (mpctx->stream->type == STREAMTYPE_DVDNAV) | |
3742 mp_input_set_section("dvdnav"); | |
23477 | 3743 |
1639 | 3744 //==================== START PLAYING ======================= |
3745 | |
33363 | 3746 if (mpctx->loop_times > 1) |
3747 mpctx->loop_times--; | |
3748 else if (mpctx->loop_times == 1) | |
3749 mpctx->loop_times = -1; | |
3750 | |
3751 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_StartPlaying); | |
3752 | |
3753 total_time_usage_start = GetTimer(); | |
3754 audio_time_usage = 0; | |
3755 video_time_usage = 0; | |
3756 vout_time_usage = 0; | |
3757 total_frame_cnt = 0; | |
3758 drop_frame_cnt = 0; // fix for multifile fps benchmark | |
3759 play_n_frames = play_n_frames_mf; | |
3760 mpctx->startup_decode_retry = DEFAULT_STARTUP_DECODE_RETRY; | |
3761 | |
3762 if (play_n_frames == 0) { | |
3763 mpctx->eof = PT_NEXT_ENTRY; | |
3764 goto goto_next_file; | |
3765 } | |
3766 | |
3767 if (seek_to_sec) { | |
3768 seek(mpctx, seek_to_sec, SEEK_ABSOLUTE); | |
3769 end_at.pos += seek_to_sec; | |
3770 } | |
22338
434cd072b0d3
Seek to -ss position without first starting audio/video from the start.
uau
parents:
22313
diff
changeset
|
3771 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
3772 #ifdef CONFIG_DVDNAV |
33363 | 3773 mp_dvdnav_context_free(mpctx); |
3774 if (mpctx->stream->type == STREAMTYPE_DVDNAV) { | |
3775 mp_dvdnav_read_wait(mpctx->stream, 0, 1); | |
3776 mp_dvdnav_cell_has_changed(mpctx->stream, 1); | |
3777 } | |
25824 | 3778 #endif |
22338
434cd072b0d3
Seek to -ss position without first starting audio/video from the start.
uau
parents:
22313
diff
changeset
|
3779 |
33363 | 3780 while (!mpctx->eof) { |
3781 float aq_sleep_time = 0; | |
3782 | |
3783 if (dvd_last_chapter > 0) { | |
3784 int cur_chapter = demuxer_get_current_chapter(mpctx->demuxer); | |
3785 if (cur_chapter != -1 && cur_chapter + 1 > dvd_last_chapter) | |
3786 goto goto_next_file; | |
3787 } | |
3788 | |
3789 if (!mpctx->sh_audio && mpctx->d_audio->sh) { | |
3790 mpctx->sh_audio = mpctx->d_audio->sh; | |
3791 mpctx->sh_audio->ds = mpctx->d_audio; | |
3792 reinit_audio_chain(); | |
3793 } | |
1 | 3794 |
3795 /*========================== PLAY AUDIO ============================*/ | |
5610 | 3796 |
33363 | 3797 if (mpctx->sh_audio) |
3798 if (!fill_audio_out_buffers()) | |
3799 // at eof, all audio at least written to ao | |
3800 if (!mpctx->sh_video) | |
3801 mpctx->eof = PT_NEXT_ENTRY; | |
3802 | |
3803 if (!mpctx->sh_video) { | |
3804 // handle audio-only case: | |
3805 double a_pos = 0; | |
3806 // sh_audio can be NULL due to video stream switching | |
3807 // TODO: handle this better | |
33493
fd4a27bd4ed4
a_pos is also used by update_subtitles, so initialize it always.
reimar
parents:
33491
diff
changeset
|
3808 if (mpctx->sh_audio) |
33363 | 3809 a_pos = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out); |
3810 | |
3811 if (!quiet) | |
3812 print_status(a_pos, 0, 0); | |
3813 | |
33495 | 3814 if (is_at_end(mpctx, &end_at, a_pos)) |
33363 | 3815 mpctx->eof = PT_NEXT_ENTRY; |
3816 update_subtitles(NULL, a_pos, mpctx->d_sub, 0); | |
3817 update_osd_msg(); | |
3818 } else { | |
3819 int frame_time_remaining = 0; | |
3820 int blit_frame = 1; | |
3821 // skip timing after seek | |
3822 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
|
3823 |
1 | 3824 /*========================== PLAY VIDEO ============================*/ |
3825 | |
33363 | 3826 vo_pts = mpctx->sh_video->timer * 90000.0; |
3827 vo_fps = mpctx->sh_video->fps; | |
3828 | |
3829 if (!mpctx->num_buffered_frames) { | |
3830 double frame_time = update_video(&blit_frame); | |
3831 while (!blit_frame && mpctx->startup_decode_retry > 0) { | |
3832 double delay = mpctx->delay; | |
3833 // these initial decode failures are probably due to codec delay, | |
3834 // ignore them and also their probably nonsense durations | |
3835 update_video(&blit_frame); | |
3836 mpctx->delay = delay; | |
3837 mpctx->startup_decode_retry--; | |
3838 } | |
3839 mpctx->startup_decode_retry = 0; | |
3840 mp_dbg(MSGT_AVSYNC, MSGL_DBG2, "*** ftime=%5.3f ***\n", frame_time); | |
3841 if (mpctx->sh_video->vf_initialized < 0) { | |
3842 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NotInitializeVOPorVO); | |
3843 mpctx->eof = 1; | |
3844 goto goto_next_file; | |
3845 } | |
3846 if (frame_time < 0) { | |
3847 // if we have no more video, sleep some arbitrary time | |
3848 frame_time = 1.0 / 20.0; | |
3849 // only stop playing when audio is at end as well | |
3850 if (!mpctx->sh_audio || mpctx->d_audio->eof) | |
3851 mpctx->eof = 1; | |
3852 } else { | |
3853 // might return with !eof && !blit_frame if !correct_pts | |
3854 mpctx->num_buffered_frames += blit_frame; | |
3855 mpctx->time_frame += frame_time / playback_speed; // for nosound | |
3856 } | |
3857 } | |
5929
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
3858 |
5610 | 3859 // ========================================================================== |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
3860 |
5643 | 3861 // current_module="draw_osd"; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3862 // if(vo_config_count) mpctx->video_out->draw_osd(); |
1 | 3863 |
27343 | 3864 #ifdef CONFIG_GUI |
33363 | 3865 if (use_gui) |
3866 guiEventHandling(); | |
5610 | 3867 #endif |
3868 | |
33363 | 3869 current_module = "vo_check_events"; |
3870 if (vo_config_count) | |
3871 mpctx->video_out->check_events(); | |
20894 | 3872 |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27370
diff
changeset
|
3873 #ifdef CONFIG_X11 |
33363 | 3874 if (stop_xscreensaver) { |
3875 current_module = "stop_xscreensaver"; | |
3876 xscreensaver_heartbeat(); | |
3877 } | |
20900
b0f2e9a16bb1
Move xscreensaver_heartbeat call next to vo check_events
uau
parents:
20899
diff
changeset
|
3878 #endif |
33363 | 3879 if (heartbeat_cmd) { |
3880 static unsigned last_heartbeat; | |
3881 unsigned now = GetTimerMS(); | |
3882 if (now - last_heartbeat > 30000) { | |
3883 last_heartbeat = now; | |
3884 system(heartbeat_cmd); | |
3885 } | |
3886 } | |
3887 | |
3888 if (!skip_timing) | |
3889 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
|
3890 |
5610 | 3891 //====================== FLIP PAGE (VIDEO BLT): ========================= |
3892 | |
33363 | 3893 if (!edl_needs_reset) { |
3894 current_module = "flip_page"; | |
3895 if (!frame_time_remaining && blit_frame) { | |
3896 unsigned int t2 = GetTimer(); | |
3897 | |
3898 if (vo_config_count) | |
3899 mpctx->video_out->flip_page(); | |
3900 mpctx->num_buffered_frames--; | |
3901 | |
3902 vout_time_usage += (GetTimer() - t2) * 0.000001; | |
3903 } | |
3904 } | |
5610 | 3905 //====================== A-V TIMESTAMP CORRECTION: ========================= |
3906 | |
33363 | 3907 adjust_sync_and_print_status(frame_time_remaining, mpctx->time_frame); |
5610 | 3908 |
3909 //============================ Auto QUALITY ============================ | |
1 | 3910 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3911 /*Output quality adjustments:*/ |
33363 | 3912 if (auto_quality > 0) { |
3913 current_module = "autoq"; | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3914 //float total=0.000001f * (GetTimer()-aq_total_time); |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3915 //if(output_quality<auto_quality && aq_sleep_time>0.05f*total) |
33363 | 3916 if (output_quality < auto_quality && aq_sleep_time > 0) |
3917 ++output_quality; | |
3918 else | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3919 //if(output_quality>0 && aq_sleep_time<-0.05f*total) |
33363 | 3920 if (output_quality > 1 && aq_sleep_time < 0) |
3921 --output_quality; | |
3922 else if (output_quality > 0 && aq_sleep_time < -0.050f) // 50ms | |
3923 output_quality = 0; | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3924 //printf("total: %8.6f sleep: %8.6f q: %d\n",(0.000001f*aq_total_time),aq_sleep_time,output_quality); |
33363 | 3925 set_video_quality(mpctx->sh_video, output_quality); |
3926 } | |
3927 | |
3928 if (play_n_frames >= 0 && !frame_time_remaining && blit_frame) { | |
3929 --play_n_frames; | |
3930 if (play_n_frames <= 0) | |
3931 mpctx->eof = PT_NEXT_ENTRY; | |
3932 } | |
3933 | |
33495 | 3934 if (!frame_time_remaining && is_at_end(mpctx, &end_at, |
3935 mpctx->sh_video->pts)) | |
33363 | 3936 mpctx->eof = PT_NEXT_ENTRY; |
3937 } // end if(mpctx->sh_video) | |
5610 | 3938 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
3939 #ifdef CONFIG_DVDNAV |
33363 | 3940 if (mpctx->stream->type == STREAMTYPE_DVDNAV) { |
3941 nav_highlight_t hl; | |
3942 mp_dvdnav_get_highlight(mpctx->stream, &hl); | |
3943 if (!vo_spudec || !spudec_apply_palette_crop(vo_spudec, hl.palette, hl.sx, hl.sy, hl.ex, hl.ey)) { | |
3944 osd_set_nav_box(hl.sx, hl.sy, hl.ex, hl.ey); | |
3945 vo_osd_changed(OSDTYPE_DVDNAV); | |
3946 } else { | |
3947 osd_set_nav_box(0, 0, 0, 0); | |
3948 vo_osd_changed(OSDTYPE_DVDNAV); | |
3949 vo_osd_changed(OSDTYPE_SPU); | |
3950 } | |
3951 | |
3952 if (mp_dvdnav_stream_has_changed(mpctx->stream)) { | |
3953 double ar = -1.0; | |
3954 if (mpctx->sh_video && | |
3955 stream_control(mpctx->demuxer->stream, | |
3956 STREAM_CTRL_GET_ASPECT_RATIO, &ar) | |
3957 != STREAM_UNSUPPORTED) | |
3958 mpctx->sh_video->stream_aspect = ar; | |
3959 } | |
3960 } | |
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
|
3961 #endif |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
3962 |
5610 | 3963 //============================ Handle PAUSE =============================== |
3964 | |
33363 | 3965 current_module = "pause"; |
3966 | |
3967 if (mpctx->osd_function == OSD_PAUSE) { | |
3968 mpctx->was_paused = 1; | |
3969 pause_loop(); | |
3970 } | |
371 | 3971 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3972 // handle -sstep |
33363 | 3973 if (step_sec > 0) { |
3974 mpctx->osd_function = OSD_FFW; | |
3975 rel_seek_secs += step_sec; | |
3976 } | |
3977 | |
3978 edl_update(mpctx); | |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
3979 |
1 | 3980 //================= Keyboard events, SEEKing ==================== |
3981 | |
33363 | 3982 current_module = "key_events"; |
3983 | |
3984 { | |
3985 mp_cmd_t *cmd; | |
3986 int brk_cmd = 0; | |
3987 while (!brk_cmd && (cmd = mp_input_get_cmd(0, 0, 0)) != NULL) { | |
3988 brk_cmd = run_command(mpctx, cmd); | |
3989 if (cmd->id == MP_CMD_EDL_LOADFILE) { | |
3990 free(edl_filename); | |
3991 edl_filename = strdup(cmd->args[0].v.s); | |
3992 if (edl_filename) | |
3993 edl_loadfile(); | |
3994 else | |
3995 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlOutOfMemFile, | |
3996 cmd->args[0].v.s); | |
3997 } | |
3998 mp_cmd_free(cmd); | |
3999 if (brk_cmd == 2) | |
4000 goto goto_enable_cache; | |
4001 } | |
4002 } | |
4003 mpctx->was_paused = 0; | |
4004 | |
4005 /* Looping. */ | |
4006 if (mpctx->eof == 1 && mpctx->loop_times >= 0) { | |
4007 mp_msg(MSGT_CPLAYER, MSGL_V, "loop_times = %d, eof = %d\n", mpctx->loop_times, mpctx->eof); | |
4008 | |
4009 if (mpctx->loop_times > 1) | |
4010 mpctx->loop_times--; | |
4011 else if (mpctx->loop_times == 1) | |
4012 mpctx->loop_times = -1; | |
4013 play_n_frames = play_n_frames_mf; | |
4014 mpctx->eof = 0; | |
4015 abs_seek_pos = SEEK_ABSOLUTE; | |
4016 rel_seek_secs = seek_to_sec; | |
4017 loop_seek = 1; | |
4018 } | |
4019 | |
4020 if (rel_seek_secs || abs_seek_pos) { | |
4021 if (seek(mpctx, rel_seek_secs, abs_seek_pos) >= 0) { | |
4022 // Set OSD: | |
4023 if (!loop_seek) { | |
4024 if (!edl_decision) | |
4025 set_osd_bar(0, "Position", 0, 100, demuxer_get_percent_pos(mpctx->demuxer)); | |
4026 } | |
4027 } | |
4028 | |
4029 rel_seek_secs = 0; | |
4030 abs_seek_pos = 0; | |
4031 loop_seek = 0; | |
4032 edl_decision = 0; | |
4033 } | |
1466 | 4034 |
27343 | 4035 #ifdef CONFIG_GUI |
33363 | 4036 if (use_gui) { |
4037 guiEventHandling(); | |
4038 if (mpctx->demuxer->file_format == DEMUXER_TYPE_AVI && mpctx->sh_video && mpctx->sh_video->video.dwLength > 2) { | |
4039 // get pos from frame number / total frames | |
4040 guiIntfStruct.Position = (float)mpctx->d_video->pack_no * 100.0f / mpctx->sh_video->video.dwLength; | |
4041 } else { | |
4042 guiIntfStruct.Position = demuxer_get_percent_pos(mpctx->demuxer); | |
4043 } | |
4044 if (mpctx->sh_video) | |
4045 guiIntfStruct.TimeSec = mpctx->sh_video->pts; | |
4046 else if (mpctx->sh_audio) | |
4047 guiIntfStruct.TimeSec = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out); | |
4048 guiIntfStruct.LengthInSec = demuxer_get_time_length(mpctx->demuxer); | |
4049 guiGetEvent(guiReDraw, NULL); | |
4050 guiGetEvent(guiSetVolume, NULL); | |
4051 if (guiIntfStruct.Playing == 0) | |
4052 break; // STOP | |
4053 if (guiIntfStruct.Playing == 2) | |
4054 mpctx->osd_function = OSD_PAUSE; | |
4055 if (guiIntfStruct.DiskChanged || guiIntfStruct.NewPlay) | |
4056 goto goto_next_file; | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
4057 #ifdef CONFIG_DVDREAD |
33363 | 4058 if (mpctx->stream->type == STREAMTYPE_DVD) { |
4059 dvd_priv_t *dvdp = mpctx->stream->priv; | |
4060 guiIntfStruct.DVD.current_chapter = dvd_chapter_from_cell(dvdp, guiIntfStruct.DVD.current_title - 1, dvdp->cur_cell) + 1; | |
4061 } | |
3054 | 4062 #endif |
33363 | 4063 } |
27343 | 4064 #endif /* CONFIG_GUI */ |
33363 | 4065 } // while(!mpctx->eof) |
4066 | |
4067 mp_msg(MSGT_GLOBAL, MSGL_V, "EOF code: %d \n", mpctx->eof); | |
1 | 4068 |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27359
diff
changeset
|
4069 #ifdef CONFIG_DVBIN |
33363 | 4070 if (mpctx->dvbin_reopen) { |
4071 mpctx->eof = 0; | |
4072 uninit_player(INITIALIZED_ALL - (INITIALIZED_GUI | INITIALIZED_STREAM | INITIALIZED_INPUT | INITIALIZED_GETCH2 | (fixed_vo ? INITIALIZED_VO : 0))); | |
4073 cache_uninit(mpctx->stream); | |
4074 mpctx->dvbin_reopen = 0; | |
4075 goto goto_enable_cache; | |
4076 } | |
18286 | 4077 #endif |
33363 | 4078 } |
1639 | 4079 |
3618 | 4080 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
|
4081 |
33363 | 4082 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n"); |
4083 | |
4084 if (benchmark) { | |
4085 double tot = video_time_usage + vout_time_usage + audio_time_usage; | |
4086 double total_time_usage; | |
4087 total_time_usage_start = GetTimer() - total_time_usage_start; | |
4088 total_time_usage = (float)total_time_usage_start * 0.000001; | |
4089 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\nBENCHMARKs: VC:%8.3fs VO:%8.3fs A:%8.3fs Sys:%8.3fs = %8.3fs\n", | |
4090 video_time_usage, vout_time_usage, audio_time_usage, | |
4091 total_time_usage - tot, total_time_usage); | |
4092 if (total_time_usage > 0.0) | |
4093 mp_msg(MSGT_CPLAYER, MSGL_INFO, "BENCHMARK%%: VC:%8.4f%% VO:%8.4f%% A:%8.4f%% Sys:%8.4f%% = %8.4f%%\n", | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
4094 100.0 * video_time_usage / total_time_usage, |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
4095 100.0 * vout_time_usage / total_time_usage, |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
4096 100.0 * audio_time_usage / total_time_usage, |
33363 | 4097 100.0 * (total_time_usage - tot) / total_time_usage, |
4098 100.0); | |
4099 if (total_frame_cnt && frame_dropping) | |
4100 mp_msg(MSGT_CPLAYER, MSGL_INFO, "BENCHMARKn: disp: %d (%3.2f fps) drop: %d (%d%%) total: %d (%3.2f fps)\n", | |
4101 total_frame_cnt - drop_frame_cnt, | |
4102 (total_time_usage > 0.5) ? ((total_frame_cnt - drop_frame_cnt) / total_time_usage) : 0, | |
4103 drop_frame_cnt, | |
4104 100 * drop_frame_cnt / total_frame_cnt, | |
4105 total_frame_cnt, | |
4106 (total_time_usage > 0.5) ? (total_frame_cnt / total_time_usage) : 0); | |
4107 } | |
4221 | 4108 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
4109 // time to uninit all, except global stuff: |
33363 | 4110 uninit_player(INITIALIZED_ALL - (INITIALIZED_GUI + INITIALIZED_INPUT + (fixed_vo ? INITIALIZED_VO : 0))); |
4111 | |
4112 if (mpctx->eof == PT_NEXT_ENTRY || mpctx->eof == PT_PREV_ENTRY) { | |
4113 mpctx->eof = mpctx->eof == PT_NEXT_ENTRY ? 1 : -1; | |
4114 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
|
4115 mpctx->eof = 1; |
7862aea6a387
cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents:
26130
diff
changeset
|
4116 } else { |
7862aea6a387
cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents:
26130
diff
changeset
|
4117 play_tree_iter_free(mpctx->playtree_iter); |
7862aea6a387
cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents:
26130
diff
changeset
|
4118 mpctx->playtree_iter = NULL; |
7862aea6a387
cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents:
26130
diff
changeset
|
4119 } |
33363 | 4120 mpctx->play_tree_step = 1; |
4121 } else if (mpctx->eof == PT_UP_NEXT || mpctx->eof == PT_UP_PREV) { | |
4122 mpctx->eof = mpctx->eof == PT_UP_NEXT ? 1 : -1; | |
4123 if (mpctx->playtree_iter) { | |
4124 if (play_tree_iter_up_step(mpctx->playtree_iter, mpctx->eof, 0) == PLAY_TREE_ITER_ENTRY) { | |
4125 mpctx->eof = 1; | |
4126 } else { | |
4127 play_tree_iter_free(mpctx->playtree_iter); | |
4128 mpctx->playtree_iter = NULL; | |
4129 } | |
4130 } | |
4131 } else if (mpctx->eof == PT_STOP) { | |
4132 play_tree_iter_free(mpctx->playtree_iter); | |
4133 mpctx->playtree_iter = NULL; | |
4134 } else { // NEXT PREV SRC | |
4135 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
|
4136 } |
33363 | 4137 |
4138 if (mpctx->eof == 0) | |
4139 mpctx->eof = 1; | |
4140 | |
4141 while (mpctx->playtree_iter != NULL) { | |
4142 filename = play_tree_iter_get_file(mpctx->playtree_iter, mpctx->eof); | |
4143 if (filename == NULL) { | |
4144 if (play_tree_iter_step(mpctx->playtree_iter, mpctx->eof, 0) != PLAY_TREE_ITER_ENTRY) { | |
4145 play_tree_iter_free(mpctx->playtree_iter); | |
4146 mpctx->playtree_iter = NULL; | |
4147 } | |
4148 } else | |
4149 break; | |
4150 } | |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4151 |
27343 | 4152 #ifdef CONFIG_GUI |
33363 | 4153 if (use_gui && !mpctx->playtree_iter) { |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
4154 #ifdef CONFIG_DVDREAD |
33363 | 4155 if (!guiIntfStruct.DiskChanged) |
5910
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
4156 #endif |
26159
7862aea6a387
cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents:
26130
diff
changeset
|
4157 mplEnd(); |
33363 | 4158 } |
5910
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
4159 #endif |
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
4160 |
33481 | 4161 if ( |
4162 #ifdef CONFIG_GUI | |
4163 (use_gui && guiIntfStruct.Playing) || | |
4164 #endif | |
4165 mpctx->playtree_iter != NULL || player_idle_mode) { | |
33363 | 4166 if (!mpctx->playtree_iter) |
4167 filename = NULL; | |
4168 mpctx->eof = 0; | |
4169 goto play_next_file; | |
4170 } | |
4171 | |
4172 exit_player_with_rc(EXIT_EOF, 0); | |
4173 return 1; | |
1639 | 4174 } |
4175 | |
26963
8825552ee585
Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents:
26877
diff
changeset
|
4176 #endif /* DISABLE_MAIN */ |