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