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