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