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