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