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