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