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