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