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