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