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