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