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