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