Mercurial > mplayer.hg
annotate mplayer.c @ 4134:ca999c616c17
Typo
author | nick |
---|---|
date | Sun, 13 Jan 2002 10:47:11 +0000 |
parents | 07d831705ec6 |
children | da00e9f57949 |
rev | line source |
---|---|
1237 | 1 // AVI & MPEG Player v0.18 (C) 2000-2001. by A'rpi/ESP-team |
1 | 2 |
1430 | 3 #include <stdio.h> |
4 #include <stdlib.h> | |
5 #include <string.h> | |
6 #include <unistd.h> | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
7 |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
8 #include <sys/ioctl.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
9 #include <sys/mman.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
10 #include <sys/types.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
11 #include <sys/wait.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
12 #include <sys/time.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
13 #include <sys/stat.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
14 |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
15 #include <signal.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
16 #include <time.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
17 #include <fcntl.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
18 |
1430 | 19 #include "version.h" |
20 #include "config.h" | |
1584 | 21 |
1564 | 22 #include "mp_msg.h" |
1 | 23 |
1584 | 24 #define HELP_MP_DEFINE_STATIC |
25 #include "help_mp.h" | |
26 | |
147 | 27 #include "cfgparser.h" |
151 | 28 #include "cfg-mplayer-def.h" |
147 | 29 |
1422 | 30 #ifdef USE_SUB |
258 | 31 #include "subreader.h" |
1422 | 32 #endif |
258 | 33 |
1422 | 34 #ifdef USE_LIBVO2 |
35 #include "libvo2/libvo2.h" | |
36 #else | |
36 | 37 #include "libvo/video_out.h" |
2550 | 38 extern void* mDisplay; // Display* mDisplay; |
1422 | 39 #endif |
40 | |
2897 | 41 #ifdef USE_LIBVO2 |
42 #include "libvo2/sub.h" | |
43 #else | |
220 | 44 #include "libvo/sub.h" |
2897 | 45 #endif |
36 | 46 |
955 | 47 #include "libao2/audio_out.h" |
3194
1648d11fc36c
commandline configuration of audio plugins now through struct, format conversion plugin added
anders
parents:
3180
diff
changeset
|
48 #include "libao2/audio_plugin.h" |
955 | 49 |
1 | 50 #include "libmpeg2/mpeg2.h" |
51 #include "libmpeg2/mpeg2_internal.h" | |
52 | |
303 | 53 #include "codec-cfg.h" |
175 | 54 |
492 | 55 #include "dvdauth.h" |
3180
d53f70e3c794
spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents:
3166
diff
changeset
|
56 #ifdef USE_DVDREAD |
560
28ae99036574
Separated dvdsub code to be able to work with it easier
lgb
parents:
557
diff
changeset
|
57 #include "spudec.h" |
3180
d53f70e3c794
spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents:
3166
diff
changeset
|
58 #endif |
4079 | 59 #include "vobsub.h" |
492 | 60 |
1 | 61 #include "linux/getch2.h" |
62 #include "linux/keycodes.h" | |
63 #include "linux/timer.h" | |
64 #include "linux/shmem.h" | |
65 | |
2272 | 66 #include "cpudetect.h" |
67 | |
1 | 68 #ifdef HAVE_LIRC |
69 #include "lirc_mp.h" | |
70 #endif | |
71 | |
2036 | 72 #ifdef HAVE_NEW_GUI |
73 #include "Gui/mplayer/play.h" | |
74 #endif | |
75 | |
3322
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
76 int slave_mode=0; |
362 | 77 int verbose=0; |
1448 | 78 int quiet=0; |
1 | 79 |
398 | 80 #define ABS(x) (((x)>=0)?(x):(-(x))) |
81 | |
3015 | 82 #ifdef HAVE_RTC |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
83 #include <linux/rtc.h> |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
84 #endif |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
85 |
2941
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
86 #ifdef USE_TV |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
87 #include "libmpdemux/tv.h" |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
88 |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
89 extern int tv_param_on; |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
90 extern tvi_handle_t *tv_handler; |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
91 #endif |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
92 |
258 | 93 //**************************************************************************// |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
94 // Playtree |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
95 //**************************************************************************// |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
96 #include "playtree.h" |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
97 |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
98 play_tree_t* playtree; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
99 |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
100 //**************************************************************************// |
258 | 101 // Config file |
102 //**************************************************************************// | |
103 | |
2557 | 104 static int cfg_inc_verbose(struct config *conf){ ++verbose; return 0;} |
153 | 105 |
162 | 106 static int cfg_include(struct config *conf, char *filename){ |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
107 return parse_config_file(conf, filename); |
162 | 108 } |
109 | |
2557 | 110 #include "get_path.c" |
178 | 111 |
1 | 112 //**************************************************************************// |
442 | 113 //**************************************************************************// |
114 // Input media streaming & demultiplexer: | |
115 //**************************************************************************// | |
116 | |
1289 | 117 static int max_framesize=0; |
118 | |
578 | 119 #include "stream.h" |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
578
diff
changeset
|
120 #include "demuxer.h" |
442 | 121 #include "stheader.h" |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
122 #include "parse_es.h" |
1 | 123 |
2563 | 124 #include "dec_audio.h" |
125 #include "dec_video.h" | |
126 | |
2567 | 127 #if 0 |
1015 | 128 extern picture_t *picture; // exported from libmpeg2/decode.c |
442 | 129 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
130 int frameratecode2framerate[16] = { |
780 | 131 0, |
132 // Official mpeg1/2 framerates: | |
133 24000*10000/1001, 24*10000,25*10000, 30000*10000/1001, 30*10000,50*10000,60000*10000/1001, 60*10000, | |
134 // libmpeg3's "Unofficial economy rates": | |
135 1*10000,5*10000,10*10000,12*10000,15*10000,0,0 | |
112 | 136 }; |
2567 | 137 #endif |
112 | 138 |
111 | 139 //**************************************************************************// |
1 | 140 //**************************************************************************// |
141 | |
112 | 142 // Common FIFO functions, and keyboard/event FIFO code |
143 #include "fifo.c" | |
144 | |
1 | 145 //**************************************************************************// |
146 | |
1422 | 147 #ifdef USE_LIBVO2 |
148 static vo2_handle_t *video_out=NULL; | |
149 #else | |
1 | 150 static vo_functions_t *video_out=NULL; |
1422 | 151 #endif |
1289 | 152 static ao_functions_t *audio_out=NULL; |
1 | 153 |
2557 | 154 // benchmark: |
1291 | 155 double video_time_usage=0; |
156 double vout_time_usage=0; | |
1289 | 157 static double audio_time_usage=0; |
158 static int total_time_usage_start=0; | |
159 static int benchmark=0; | |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
160 |
2557 | 161 // static int play_in_bg=0; |
606 | 162 |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
163 // options: |
1496 | 164 static int auto_quality=0; |
165 static int output_quality=0; | |
1439 | 166 |
1709 | 167 int use_gui=0; |
168 | |
1439 | 169 int osd_level=2; |
2557 | 170 |
171 // seek: | |
937 | 172 char *seek_to_sec=NULL; |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
173 off_t seek_to_byte=0; |
2436 | 174 off_t step_sec=0; |
2557 | 175 int loop_times=-1; |
176 float rel_seek_secs=0; | |
177 int abs_seek_pos=0; | |
178 | |
179 // codecs: | |
442 | 180 int has_audio=1; |
1286
543a94b241a2
Replaced LGBs video codec forcing change with mine for audio and video codecs, which is IMHO more convenient cause codecs are selected by name instead of number, one unclearity is left to me, that's why audio_format is used once before codecs selection for MPEG_PS files, that's why I left -afm in for that one.
atmos4
parents:
1285
diff
changeset
|
181 char *audio_codec=NULL; // override audio codec |
543a94b241a2
Replaced LGBs video codec forcing change with mine for audio and video codecs, which is IMHO more convenient cause codecs are selected by name instead of number, one unclearity is left to me, that's why audio_format is used once before codecs selection for MPEG_PS files, that's why I left -afm in for that one.
atmos4
parents:
1285
diff
changeset
|
182 char *video_codec=NULL; // override video codec |
1299
fa50e6bc6091
As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents:
1296
diff
changeset
|
183 int audio_family=-1; // override audio codec family |
fa50e6bc6091
As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents:
1296
diff
changeset
|
184 int video_family=-1; // 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
|
185 |
1299
fa50e6bc6091
As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents:
1296
diff
changeset
|
186 // IMHO this stuff is no longer of use, or is there a special |
fa50e6bc6091
As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents:
1296
diff
changeset
|
187 // reason why dshow should be completely disabled? - atmos :: |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1302
diff
changeset
|
188 // yes, people without working c++ compiler can disable it - A'rpi |
626 | 189 #ifdef USE_DIRECTSHOW |
190 int allow_dshow=1; | |
191 #else | |
192 int allow_dshow=0; | |
193 #endif | |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
194 |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
195 // streaming: |
3532 | 196 int audio_id=-1; |
197 int video_id=-1; | |
3618 | 198 int dvdsub_id=-1; |
4079 | 199 int vobsub_id=-1; |
3754
174e473f582d
-alang/-slang options (audio/sub selection by language code)
arpi
parents:
3748
diff
changeset
|
200 char* audio_lang=NULL; |
174e473f582d
-alang/-slang options (audio/sub selection by language code)
arpi
parents:
3748
diff
changeset
|
201 char* dvdsub_lang=NULL; |
1496 | 202 static int vcd_track=0; |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
203 |
2353 | 204 // cache2: |
2557 | 205 static int stream_cache_size=0; |
2353 | 206 #ifdef USE_STREAM_CACHE |
207 extern int cache_fill_status; | |
208 #else | |
209 #define cache_fill_status 0 | |
210 #endif | |
211 | |
2557 | 212 // dump: |
3257 | 213 static char *stream_dump_name="stream.dump"; |
2557 | 214 static int stream_dump_type=0; |
215 | |
216 // A-V sync: | |
1498 | 217 static float default_max_pts_correction=-1;//0.01f; |
218 static float max_pts_correction=0;//default_max_pts_correction; | |
2557 | 219 static float c_total=0; |
220 static float audio_delay=0; | |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
221 |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
222 static int dapsync=0; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
223 static int softsleep=0; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
224 |
2557 | 225 static float force_fps=0; |
226 static int force_srate=0; | |
227 static int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode | |
228 static int play_n_frames=-1; | |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
229 |
1 | 230 // screen info: |
231 char* video_driver=NULL; //"mga"; // default | |
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
|
232 char* audio_driver=NULL; |
1496 | 233 static int fullscreen=0; |
234 static int vidmode=0; | |
235 static int softzoom=0; | |
236 static int flip=-1; | |
237 static int screen_size_x=0;//SCREEN_SIZE_X; | |
238 static int screen_size_y=0;//SCREEN_SIZE_Y; | |
239 static int screen_size_xy=0; | |
3139 | 240 static float movie_aspect=-1.0; |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
241 |
2647
679d3b21bedb
-playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents:
2567
diff
changeset
|
242 char* playlist_file; |
679d3b21bedb
-playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents:
2567
diff
changeset
|
243 |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
244 // sub: |
212 | 245 char *font_name=NULL; |
215 | 246 float font_factor=0.75; |
258 | 247 char *sub_name=NULL; |
248 float sub_delay=0; | |
249 float sub_fps=0; | |
510 | 250 int sub_auto = 1; |
4079 | 251 char *vobsub_name=NULL; |
1255
94f2853ec6f4
-dsp option removed, displaying help text (-ao oss:dsp_path)
alex
parents:
1250
diff
changeset
|
252 /*DSP!!char *dsp=NULL;*/ |
723 | 253 |
1183 | 254 extern char *vo_subdevice; |
255 extern char *ao_subdevice; | |
1156 | 256 |
2321 | 257 static stream_t* stream=NULL; |
258 | |
1856 | 259 static char* current_module=NULL; // for debugging |
260 | |
261 static unsigned int inited_flags=0; | |
262 #define INITED_VO 1 | |
263 #define INITED_AO 2 | |
264 #define INITED_GUI 4 | |
265 #define INITED_GETCH2 8 | |
266 #define INITED_LIRC 16 | |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
267 #define INITED_SPUDEC 32 |
2321 | 268 #define INITED_STREAM 64 |
1856 | 269 #define INITED_ALL 0xFFFF |
270 | |
271 void uninit_player(unsigned int mask){ | |
272 mask=inited_flags&mask; | |
3180
d53f70e3c794
spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents:
3166
diff
changeset
|
273 #ifdef USE_DVDREAD |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
274 if (mask&INITED_SPUDEC){ |
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
275 inited_flags&=~INITED_SPUDEC; |
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
276 current_module="uninit_spudec"; |
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
277 spudec_free(vo_spudec); |
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
278 } |
3180
d53f70e3c794
spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents:
3166
diff
changeset
|
279 #endif |
1856 | 280 if(mask&INITED_VO){ |
281 inited_flags&=~INITED_VO; | |
282 current_module="uninit_vo"; | |
283 #ifdef USE_LIBVO2 | |
284 vo2_close(video_out); | |
285 #else | |
286 video_out->uninit(); | |
287 #endif | |
288 } | |
289 | |
290 if(mask&INITED_AO){ | |
291 inited_flags&=~INITED_AO; | |
292 current_module="uninit_ao"; | |
293 audio_out->uninit(); | |
294 } | |
295 | |
296 if(mask&INITED_GETCH2){ | |
297 inited_flags&=~INITED_GETCH2; | |
298 current_module="uninit_getch2"; | |
299 // restore terminal: | |
300 getch2_disable(); | |
301 } | |
302 | |
303 #ifdef HAVE_NEW_GUI | |
304 if(mask&INITED_GUI){ | |
305 inited_flags&=~INITED_GUI; | |
306 current_module="uninit_gui"; | |
307 mplDone(); | |
308 } | |
309 #endif | |
310 | |
2321 | 311 if(mask&INITED_STREAM){ |
312 inited_flags&=~INITED_STREAM; | |
313 current_module="uninit_stream"; | |
314 if(stream) free_stream(stream); | |
315 stream=NULL; | |
316 } | |
317 | |
1856 | 318 #ifdef HAVE_LIRC |
319 if(mask&INITED_LIRC){ | |
320 inited_flags&=~INITED_LIRC; | |
321 current_module="uninit_lirc"; | |
322 lirc_mp_cleanup(); | |
323 } | |
324 #endif | |
325 | |
1863 | 326 current_module=NULL; |
327 | |
1856 | 328 } |
329 | |
1156 | 330 void exit_player(char* how){ |
331 total_time_usage_start=GetTimer()-total_time_usage_start; | |
332 | |
1856 | 333 uninit_player(INITED_ALL); |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
334 |
1856 | 335 current_module="exit_player"; |
1156 | 336 |
1583 | 337 if(how) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Exiting,how); |
1567 | 338 mp_msg(MSGT_CPLAYER,MSGL_V,"max framesize was %d bytes\n",max_framesize); |
1156 | 339 if(benchmark){ |
340 double tot=video_time_usage+vout_time_usage+audio_time_usage; | |
341 double total_time_usage=(float)total_time_usage_start*0.000001; | |
1567 | 342 mp_msg(MSGT_CPLAYER,MSGL_INFO,"BENCHMARKs: V:%8.3fs VO:%8.3fs A:%8.3fs Sys:%8.3fs = %8.3fs\n", |
1156 | 343 video_time_usage,vout_time_usage,audio_time_usage, |
344 total_time_usage-tot,total_time_usage); | |
345 if(total_time_usage>0.0) | |
1567 | 346 mp_msg(MSGT_CPLAYER,MSGL_INFO,"BENCHMARK%%: V:%8.4f%% VO:%8.4f%% A:%8.4f%% Sys:%8.4f%% = %8.4f%%\n", |
1156 | 347 100.0*video_time_usage/total_time_usage, |
348 100.0*vout_time_usage/total_time_usage, | |
349 100.0*audio_time_usage/total_time_usage, | |
350 100.0*(total_time_usage-tot)/total_time_usage, | |
351 100.0); | |
352 } | |
1639 | 353 |
1156 | 354 exit(1); |
355 } | |
356 | |
357 void exit_sighandler(int x){ | |
358 static int sig_count=0; | |
359 ++sig_count; | |
360 if(sig_count==2) exit(1); | |
361 if(sig_count>2){ | |
362 // can't stop :( | |
363 kill(getpid(),SIGKILL); | |
364 } | |
1583 | 365 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_IntBySignal,x, |
1156 | 366 current_module?current_module:"unknown" |
367 ); | |
368 exit_player(NULL); | |
369 } | |
370 | |
2557 | 371 //extern void write_avi_header_1(FILE *f,int fcc,float fps,int width,int height); |
1439 | 372 |
459 | 373 #include "mixer.h" |
147 | 374 #include "cfg-mplayer.h" |
1 | 375 |
723 | 376 void parse_cfgfiles( void ) |
377 { | |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
378 char *conffile; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
379 int conffile_fd; |
147 | 380 if (parse_config_file(conf, "/etc/mplayer.conf") < 0) |
381 exit(1); | |
178 | 382 if ((conffile = get_path("")) == NULL) { |
1583 | 383 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoHomeDir); |
147 | 384 } else { |
178 | 385 mkdir(conffile, 0777); |
386 free(conffile); | |
387 if ((conffile = get_path("config")) == NULL) { | |
1583 | 388 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem); |
178 | 389 } else { |
390 if ((conffile_fd = open(conffile, O_CREAT | O_EXCL | O_WRONLY, 0666)) != -1) { | |
1582 | 391 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CreatingCfgFile, conffile); |
178 | 392 write(conffile_fd, default_config, strlen(default_config)); |
393 close(conffile_fd); | |
394 } | |
395 if (parse_config_file(conf, conffile) < 0) | |
396 exit(1); | |
397 free(conffile); | |
151 | 398 } |
1 | 399 } |
400 } | |
401 | |
1983 | 402 int main(int argc,char* argv[], char *envp[]){ |
723 | 403 |
1422 | 404 #ifdef USE_SUB |
1289 | 405 static subtitle* subtitles=NULL; |
3274
ac7ded58b6df
mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3257
diff
changeset
|
406 float sub_last_pts = -303; |
1422 | 407 #endif |
1289 | 408 |
409 static demuxer_t *demuxer=NULL; | |
410 | |
411 static demux_stream_t *d_audio=NULL; | |
412 static demux_stream_t *d_video=NULL; | |
413 static demux_stream_t *d_dvdsub=NULL; | |
414 | |
415 static sh_audio_t *sh_audio=NULL; | |
416 static sh_video_t *sh_video=NULL; | |
417 | |
1629 | 418 // for multifile support: |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
419 play_tree_iter_t* playtree_iter = NULL; |
1629 | 420 char **filenames=NULL; |
421 int num_filenames=0; | |
422 int curr_filename=0; | |
423 | |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
424 char* filename=NULL; //"MI2-Trailer.avi"; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
425 int file_format=DEMUXER_TYPE_UNKNOWN; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
426 // |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
427 int delay_corrected=1; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
428 char* title="MPlayer"; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
429 |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
430 // movie info: |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
431 int out_fmt=0; |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
432 int eof=0; |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
433 |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
434 int osd_visible=100; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
435 int osd_function=OSD_PLAY; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
436 int osd_last_pts=-303; |
3783 | 437 int osd_show_av_delay = 0; |
3234
d1e891c1e548
dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3201
diff
changeset
|
438 int osd_show_sub_delay = 0; |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
439 |
1429 | 440 int v_bright=50; |
441 int v_cont=50; | |
442 int v_hue=50; | |
443 int v_saturation=50; | |
444 | |
2705 | 445 int vo_flags=0; |
446 | |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
447 int rtc_fd=-1; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
448 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
449 //float a_frame=0; // Audio |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
450 |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
451 int i; |
1467 | 452 int use_stdin=0; //int f; // filedes |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
453 |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
454 int gui_no_filename=0; |
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
455 |
1567 | 456 mp_msg_init(MSGL_STATUS); |
457 | |
458 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s",banner_text); | |
723 | 459 |
2272 | 460 /* Test for cpu capabilities (and corresponding OS support) for optimizing */ |
461 #ifdef ARCH_X86 | |
462 GetCpuCaps(&gCpuCaps); | |
463 mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: Type: %d MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n", | |
464 gCpuCaps.cpuType,gCpuCaps.hasMMX,gCpuCaps.hasMMX2, | |
465 gCpuCaps.has3DNow, gCpuCaps.has3DNowExt, | |
466 gCpuCaps.hasSSE, gCpuCaps.hasSSE2); | |
3742 | 467 #ifdef RUNTIME_CPUDETECT |
468 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Compiled with RUNTIME CPU Detection - warning, it's untested!\n"); | |
469 #else | |
470 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Compiled for x86 CPU with features:"); | |
471 #ifdef HAVE_MMX | |
472 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX"); | |
473 #endif | |
474 #ifdef HAVE_MMX2 | |
475 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX2"); | |
476 #endif | |
477 #ifdef HAVE_3DNOW | |
478 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNow"); | |
479 #endif | |
480 #ifdef HAVE_3DNOWEX | |
481 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNowEx"); | |
482 #endif | |
483 #ifdef HAVE_SSE | |
484 mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE"); | |
485 #endif | |
486 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n"); | |
487 #endif | |
488 | |
2272 | 489 #endif |
490 | |
1709 | 491 if ( argv[0] ) |
492 if(!strcmp(argv[0],"gmplayer") || | |
493 (strrchr(argv[0],'/') && !strcmp(strrchr(argv[0],'/'),"/gmplayer") ) ) | |
494 use_gui=1; | |
1639 | 495 |
751 | 496 parse_cfgfiles(); |
1639 | 497 num_filenames=parse_command_line(conf, argc, argv, envp, &filenames); |
498 if(num_filenames<0) exit(1); // error parsing cmdline | |
723 | 499 |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
500 playtree = play_tree_new(); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
501 { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
502 play_tree_t* list = NULL; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
503 int i; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
504 play_tree_t *entry = NULL, *tree = play_tree_new(); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
505 for(i= 0; i < num_filenames ; i++) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
506 entry = entry != NULL ? play_tree_new() : tree; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
507 play_tree_add_file(entry,filenames[i]); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
508 play_tree_append_entry(tree,entry); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
509 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
510 |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
511 entry = play_tree_new(); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
512 play_tree_set_child(entry,tree); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
513 list = entry; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
514 if(playlist_file!=NULL) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
515 entry = parse_playlist_file(playlist_file); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
516 if(entry != NULL){ |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
517 if(list) play_tree_append_entry(list,entry); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
518 else list = entry; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
519 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
520 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
521 if(list) play_tree_set_child(playtree,list); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
522 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
523 playtree = play_tree_cleanup(playtree); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
524 if(playtree) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
525 playtree_iter = play_tree_iter_new(playtree); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
526 if(playtree_iter) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
527 if(play_tree_iter_step(playtree_iter,0,0) != PLAY_TREE_ITER_ENTRY) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
528 play_tree_iter_free(playtree_iter); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
529 playtree_iter = NULL; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
530 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
531 filename = play_tree_iter_get_file(playtree_iter,1); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
532 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
533 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
534 |
1709 | 535 #ifndef HAVE_NEW_GUI |
536 if(use_gui){ | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1962
diff
changeset
|
537 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoGui); |
1709 | 538 use_gui=0; |
539 } | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
540 #else |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
541 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
|
542 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
|
543 use_gui=0; |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
544 } |
1709 | 545 #endif |
546 | |
1422 | 547 #ifndef USE_LIBVO2 |
723 | 548 if(video_driver && strcmp(video_driver,"help")==0){ |
549 printf("Available video output drivers:\n"); | |
550 i=0; | |
551 while (video_out_drivers[i]) { | |
552 const vo_info_t *info = video_out_drivers[i++]->get_info (); | |
553 printf("\t%s\t%s\n", info->short_name, info->name); | |
554 } | |
555 printf("\n"); | |
556 exit(0); | |
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
|
557 } |
1422 | 558 #endif |
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
|
559 if(audio_driver && strcmp(audio_driver,"help")==0){ |
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
|
560 printf("Available audio output drivers:\n"); |
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
|
561 i=0; |
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
|
562 while (audio_out_drivers[i]) { |
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
|
563 const ao_info_t *info = audio_out_drivers[i++]->info; |
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
|
564 printf("\t%s\t%s\n", info->short_name, info->name); |
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
|
565 } |
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
|
566 printf("\n"); |
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
|
567 exit(0); |
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
|
568 } |
1639 | 569 |
1983 | 570 // check codec.conf |
571 if(!parse_codec_cfg(get_path("codecs.conf"))){ | |
3748 | 572 if(!parse_codec_cfg(CONFDIR"/codecs.conf")){ |
1983 | 573 mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf); |
2116 | 574 // printf("Exit.\n"); |
3934
e8e7ca8995a1
codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents:
3843
diff
changeset
|
575 exit(0); // From unknown reason a hangup occurs here :(((((( |
e8e7ca8995a1
codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents:
3843
diff
changeset
|
576 // kill(getpid(),SIGTERM); |
e8e7ca8995a1
codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents:
3843
diff
changeset
|
577 // usleep(20000); |
e8e7ca8995a1
codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents:
3843
diff
changeset
|
578 // kill(getpid(),SIGKILL); |
1983 | 579 } |
580 } | |
581 | |
582 if(audio_codec && strcmp(audio_codec,"help")==0){ | |
583 printf("Available audio codecs:\n"); | |
584 list_codecs(1); | |
585 printf("\n"); | |
586 exit(0); | |
587 } | |
588 if(video_codec && strcmp(video_codec,"help")==0){ | |
589 printf("Available video codecs:\n"); | |
590 list_codecs(0); | |
591 printf("\n"); | |
592 exit(0); | |
593 } | |
594 | |
595 | |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
596 if(!filename && !vcd_track && !dvd_title && !tv_param_on){ |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
597 if(!use_gui){ |
1690 | 598 // no file/vcd/dvd -> show HELP: |
599 printf("%s",help_text); | |
600 exit(0); | |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
601 } else gui_no_filename=1; |
1690 | 602 } |
603 | |
604 // Many users forget to include command line in bugreports... | |
605 if(verbose){ | |
606 printf("CommandLine:"); | |
607 for(i=1;i<argc;i++)printf(" '%s'",argv[i]); | |
608 printf("\n"); | |
609 printf("num_filenames: %d\n",num_filenames); | |
610 } | |
611 | |
1183 | 612 |
1639 | 613 //------ load global data first ------ |
955 | 614 |
442 | 615 |
212 | 616 // check font |
1422 | 617 #ifdef USE_OSD |
212 | 618 if(font_name){ |
337 | 619 vo_font=read_font_desc(font_name,font_factor,verbose>1); |
1582 | 620 if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name); |
220 | 621 } else { |
622 // try default: | |
337 | 623 vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1); |
1353 | 624 if(!vo_font) |
625 vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1); | |
212 | 626 } |
1422 | 627 #endif |
212 | 628 |
1709 | 629 // It's time to init the GUI code: (and fork() the GTK process) |
630 #ifdef HAVE_NEW_GUI | |
631 if(use_gui){ | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
632 appInit( argc,argv,envp,(void*)mDisplay ); |
1856 | 633 inited_flags|=INITED_GUI; |
1803 | 634 mplShMem->Playing= (gui_no_filename) ? 0 : 1; |
1709 | 635 } |
636 #endif | |
1639 | 637 |
638 #ifdef HAVE_LIRC | |
639 lirc_mp_setup(); | |
1856 | 640 inited_flags|=INITED_LIRC; |
1639 | 641 #endif |
642 | |
3015 | 643 #ifdef HAVE_RTC |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
644 if ((rtc_fd = open("/dev/rtc", O_RDONLY)) < 0) |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
645 perror ("Linux RTC init: open"); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
646 else { |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
647 unsigned long irqp; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
648 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
649 /* if (ioctl(rtc_fd, RTC_IRQP_SET, _) < 0) { */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
650 if (ioctl(rtc_fd, RTC_IRQP_READ, &irqp) < 0) { |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
651 perror ("Linux RTC init: ioctl (rtc_irqp_read)"); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
652 close (rtc_fd); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
653 rtc_fd = -1; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
654 } 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
|
655 /* variable only by the root */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
656 perror ("Linux RTC init: ioctl (rtc_pie_on)"); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
657 close (rtc_fd); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
658 rtc_fd = -1; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
659 } else |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
660 printf("Using Linux's hardware RTC timing (%ldHz)\n", irqp); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
661 } |
3825 | 662 // breaks DGA and SVGAlib and VESA drivers: --A'rpi |
663 // setuid( getuid() ); // strongly test, please check this. | |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
664 if(rtc_fd<0) |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
665 #endif |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
666 printf("Using %s timing\n",softsleep?"software":"usleep()"); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
667 |
1639 | 668 #ifdef USE_TERMCAP |
3618 | 669 if ( !use_gui ) load_termcap(NULL); // load key-codes |
1639 | 670 #endif |
671 | |
1816 | 672 // ========== Init keyboard FIFO (connection to libvo) ============ |
673 make_pipe(&keyb_fifo_get,&keyb_fifo_put); | |
1694 | 674 |
1639 | 675 //========= Catch terminate signals: ================ |
676 // terminate requests: | |
677 signal(SIGTERM,exit_sighandler); // kill | |
678 signal(SIGHUP,exit_sighandler); // kill -HUP / xterm closed | |
679 | |
1729 | 680 signal(SIGINT,exit_sighandler); // Interrupt from keyboard |
1639 | 681 |
682 signal(SIGQUIT,exit_sighandler); // Quit from keyboard | |
683 // fatal errors: | |
684 signal(SIGBUS,exit_sighandler); // bus error | |
685 signal(SIGSEGV,exit_sighandler); // segfault | |
686 signal(SIGILL,exit_sighandler); // illegal instruction | |
687 signal(SIGFPE,exit_sighandler); // floating point exc. | |
688 signal(SIGABRT,exit_sighandler); // abort() | |
689 | |
690 // ******************* Now, let's see the per-file stuff ******************** | |
691 | |
692 play_next_file: | |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
693 |
1745 | 694 #ifdef HAVE_NEW_GUI |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
695 if ( use_gui ) { |
3618 | 696 |
697 #ifdef USE_DVDREAD | |
698 if ( mplShMem->DVDChanged ) | |
699 { | |
700 mplShMem->DVDChanged=0; | |
701 mplShMem->Playing=1; | |
702 filename="/dev/dvd"; | |
703 goto play_dvd; | |
704 } | |
705 #endif | |
706 | |
1817
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
707 if(filename && !mplShMem->FilenameChanged) strcpy( mplShMem->Filename,filename ); |
1803 | 708 // mplShMem->Playing= (gui_no_filename) ? 0 : 1; |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
709 while(mplShMem->Playing!=1){ |
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
710 usleep(20000); |
1802 | 711 EventHandling(); |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
712 } |
3560 | 713 |
3618 | 714 play_dvd: |
715 | |
3499 | 716 #ifdef USE_SUB |
3543 | 717 if ( mplShMem->SubtitleChanged || !mplShMem->FilenameChanged ) |
3560 | 718 { |
719 if ( mplShMem->Subtitlename[0] != 0 ) sub_name=mplShMem->Subtitlename; | |
720 mplShMem->SubtitleChanged=0; | |
721 } | |
3499 | 722 #endif |
3543 | 723 |
724 if ( mplShMem->FilenameChanged || !filename ) | |
725 { | |
726 filename=mplShMem->Filename; | |
727 mplShMem->FilenameChanged=0; | |
728 } | |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
729 } |
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
730 #endif |
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
731 |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1962
diff
changeset
|
732 if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing, filename); |
1650
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
733 |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
734 #ifdef USE_SUB_OLD |
1650
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
735 // check .sub |
3499 | 736 if(sub_name){ |
3580 | 737 #if 0 |
3499 | 738 int l=strlen(sub_name); |
739 if ((l>4) && ((0==strcmp(&sub_name[l-4],".utf")) | |
740 ||(0==strcmp(&sub_name[l-4],".UTF")))) | |
741 sub_utf8=1; | |
3580 | 742 #endif |
3499 | 743 subtitles=sub_read_file(sub_name); |
744 if(!subtitles || sub_num == 0) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name); | |
745 } | |
1651 | 746 if(!sub_name){ |
1650
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
747 if(sub_auto && filename) { // auto load sub file ... |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
748 subtitles=sub_read_file( sub_filename( get_path("sub/"), filename ) ); |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
749 } |
3580 | 750 #if 0 |
1650
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
751 if(!subtitles) subtitles=sub_read_file(get_path("default.sub")); // try default |
3580 | 752 #endif |
1650
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
753 } |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
754 |
1762 | 755 if(subtitles && stream_dump_type==3) list_sub_file(subtitles); |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
756 if(subtitles && stream_dump_type==4) dump_mpsub(subtitles, fps); |
3736 | 757 #endif |
1762 | 758 |
4079 | 759 current_module="vobsub"; |
760 if (vobsub_name){ | |
761 vo_vobsub=vobsub_open(vobsub_name); | |
762 if(vo_vobsub==NULL) | |
763 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,vobsub_name); | |
764 } | |
765 | |
1654 | 766 stream=NULL; |
767 demuxer=NULL; | |
768 d_audio=NULL; | |
769 d_video=NULL; | |
770 sh_audio=NULL; | |
771 sh_video=NULL; | |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
772 |
1639 | 773 #ifdef USE_LIBVO2 |
774 current_module="vo2_new"; | |
775 video_out=vo2_new(video_driver); | |
776 current_module=NULL; | |
777 #else | |
778 // check video_out driver name: | |
779 if (video_driver) | |
780 if ((i = strcspn(video_driver, ":")) > 0) | |
781 { | |
782 size_t i2 = strlen(video_driver); | |
783 | |
784 if (video_driver[i] == ':') | |
785 { | |
786 vo_subdevice = malloc(i2-i); | |
787 if (vo_subdevice != NULL) | |
788 strncpy(vo_subdevice, (char *)(video_driver+i+1), i2-i); | |
789 video_driver[i] = '\0'; | |
790 } | |
791 // printf("video_driver: %s, subdevice: %s\n", video_driver, vo_subdevice); | |
792 } | |
793 if(!video_driver) | |
794 video_out=video_out_drivers[0]; | |
795 else | |
796 for (i=0; video_out_drivers[i] != NULL; i++){ | |
797 const vo_info_t *info = video_out_drivers[i]->get_info (); | |
798 if(strcmp(info->short_name,video_driver) == 0){ | |
799 video_out = video_out_drivers[i];break; | |
800 } | |
801 } | |
802 #endif | |
803 if(!video_out){ | |
804 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidVOdriver,video_driver?video_driver:"?"); | |
805 exit_player(MSGTR_Exit_error); | |
806 } | |
807 | |
808 // check audio_out driver name: | |
809 if (audio_driver) | |
810 if ((i = strcspn(audio_driver, ":")) > 0) | |
811 { | |
812 size_t i2 = strlen(audio_driver); | |
813 | |
814 if (audio_driver[i] == ':') | |
815 { | |
816 ao_subdevice = malloc(i2-i); | |
817 if (ao_subdevice != NULL) | |
818 strncpy(ao_subdevice, (char *)(audio_driver+i+1), i2-i); | |
819 audio_driver[i] = '\0'; | |
820 } | |
821 // printf("audio_driver: %s, subdevice: %s\n", audio_driver, ao_subdevice); | |
822 } | |
823 if(!audio_driver) | |
824 audio_out=audio_out_drivers[0]; | |
825 else | |
826 for (i=0; audio_out_drivers[i] != NULL; i++){ | |
827 const ao_info_t *info = audio_out_drivers[i]->info; | |
828 if(strcmp(info->short_name,audio_driver) == 0){ | |
829 audio_out = audio_out_drivers[i];break; | |
830 } | |
831 } | |
832 if (!audio_out){ | |
833 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidAOdriver,audio_driver); | |
834 exit_player(MSGTR_Exit_error); | |
835 } | |
3107 | 836 /* Initailize audio plugin interface if used */ |
3194
1648d11fc36c
commandline configuration of audio plugins now through struct, format conversion plugin added
anders
parents:
3180
diff
changeset
|
837 if(ao_plugin_cfg.plugin_list){ |
3107 | 838 for (i=0; audio_out_drivers[i] != NULL; i++){ |
839 const ao_info_t *info = audio_out_drivers[i]->info; | |
840 if(strcmp(info->short_name,"plugin") == 0){ | |
841 audio_out_drivers[i]->control(AOCONTROL_SET_PLUGIN_DRIVER,(int)audio_out); | |
842 audio_out = audio_out_drivers[i]; | |
843 break; | |
844 } | |
845 } | |
846 } | |
847 | |
1639 | 848 current_module="open_stream"; |
1467 | 849 stream=open_stream(filename,vcd_track,&file_format); |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
850 if(!stream) { // error... |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
851 uninit_player(inited_flags-(INITED_GUI+INITED_LIRC)); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
852 goto goto_next_file_src; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
853 } |
2321 | 854 inited_flags|=INITED_STREAM; |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
855 if(stream->type == STREAMTYPE_PLAYLIST) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
856 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
|
857 // Handle playlist |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
858 mp_msg(MSGT_CPLAYER,MSGL_V,"Parsing playlist %s...\n",filename); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
859 entry = parse_playtree(stream); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
860 if(!entry) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
861 entry = playtree_iter->tree; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
862 if(play_tree_iter_step(playtree_iter,1,0) != PLAY_TREE_ITER_ENTRY) |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
863 goto goto_next_file; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
864 if(playtree_iter->tree == entry) { // Loop with a single file |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
865 if(play_tree_iter_up_step(playtree_iter,1,0) != PLAY_TREE_ITER_ENTRY) |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
866 goto goto_next_file; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
867 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
868 play_tree_remove(entry,1,1); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
869 uninit_player(inited_flags-(INITED_GUI+INITED_LIRC)); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
870 goto goto_next_file_src; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
871 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
872 play_tree_insert_entry(playtree_iter->tree,entry); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
873 entry = playtree_iter->tree; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
874 if(play_tree_iter_step(playtree_iter,1,0) != PLAY_TREE_ITER_ENTRY) |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
875 goto goto_next_file; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
876 play_tree_remove(entry,1,1); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
877 uninit_player(inited_flags-(INITED_GUI+INITED_LIRC)); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
878 goto goto_next_file_src; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
879 } |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
880 stream->start_pos+=seek_to_byte; |
598 | 881 |
3257 | 882 if(stream_dump_type==5){ |
883 unsigned char buf[4096]; | |
884 int len; | |
885 FILE *f; | |
886 current_module="dump"; | |
887 stream_reset(stream); | |
888 stream_seek(stream,stream->start_pos); | |
889 f=fopen(stream_dump_name,"wb"); | |
890 if(!f){ | |
891 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile); | |
892 exit_player(MSGTR_Exit_error); | |
893 } | |
894 while(!stream->eof){ | |
895 len=stream_read(stream,buf,4096); | |
896 if(len>0) fwrite(buf,len,1,f); | |
897 } | |
898 fclose(f); | |
899 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped); | |
900 exit_player(MSGTR_Exit_eof); | |
901 } | |
902 | |
3563 | 903 // initial prefill: 20% later: 5% (should be set by -cacheopts) |
904 if(stream_cache_size) stream_enable_cache(stream,stream_cache_size*1024,stream_cache_size*1024/5,stream_cache_size*1024/20); | |
2321 | 905 |
1639 | 906 use_stdin=filename && (!strcmp(filename,"-")); |
907 | |
492 | 908 #ifdef HAVE_LIBCSS |
1639 | 909 current_module="libcss"; |
546 | 910 if (dvdimportkey) { |
911 if (dvd_import_key(dvdimportkey)) { | |
1582 | 912 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorDVDkey); |
1639 | 913 exit_player(MSGTR_Exit_error); |
546 | 914 } |
1582 | 915 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CmdlineDVDkey); |
546 | 916 } |
1018
e5fc7ec51fa3
-dvd is renamed to -dvdauth, variable dvd_device is renamed to dvd_auth_device. These changes are needed for future DVD playback developmenting
lgb
parents:
1015
diff
changeset
|
917 if (dvd_auth_device) { |
1042
b333271f4e7c
Solaris 8 DVD support and other fixes by Juergen Keil <jk@tools.de>
arpi_esp
parents:
1039
diff
changeset
|
918 // if (dvd_auth(dvd_auth_device,f)) { |
b333271f4e7c
Solaris 8 DVD support and other fixes by Juergen Keil <jk@tools.de>
arpi_esp
parents:
1039
diff
changeset
|
919 if (dvd_auth(dvd_auth_device,filename)) { |
1809 | 920 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Error in DVD auth...\n"); |
1639 | 921 exit_player(MSGTR_Exit_error); |
723 | 922 } |
1582 | 923 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_DVDauthOk); |
492 | 924 } |
925 #endif | |
1 | 926 |
927 //============ Open & Sync stream and detect file format =============== | |
928 | |
3257 | 929 |
442 | 930 if(!has_audio) audio_id=-2; // do NOT read audio packets... |
1 | 931 |
1639 | 932 current_module="demux_open"; |
933 | |
1496 | 934 demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id); |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
935 if(!demuxer) goto goto_next_file; // exit_player(MSGTR_Exit_error); // ERROR |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
936 |
1660 | 937 //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
|
938 |
1 | 939 d_audio=demuxer->audio; |
940 d_video=demuxer->video; | |
554 | 941 d_dvdsub=demuxer->sub; |
1 | 942 |
792 | 943 // DUMP STREAMS: |
944 if(stream_dump_type){ | |
945 FILE *f; | |
946 demux_stream_t *ds=NULL; | |
1639 | 947 current_module="dump"; |
792 | 948 // select stream to dump |
949 switch(stream_dump_type){ | |
950 case 1: ds=d_audio;break; | |
951 case 2: ds=d_video;break; | |
2178 | 952 case 3: |
953 case 4: ds=d_dvdsub;break; | |
792 | 954 } |
955 if(!ds){ | |
1582 | 956 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpSelectedSteramMissing); |
1639 | 957 exit_player(MSGTR_Exit_error); |
792 | 958 } |
959 // disable other streams: | |
960 if(d_audio && d_audio!=ds) {ds_free_packs(d_audio); d_audio->id=-2; } | |
961 if(d_video && d_video!=ds) {ds_free_packs(d_video); d_video->id=-2; } | |
962 if(d_dvdsub && d_dvdsub!=ds) {ds_free_packs(d_dvdsub); d_dvdsub->id=-2; } | |
963 // let's dump it! | |
3257 | 964 f=fopen(stream_dump_name,"wb"); |
1639 | 965 if(!f){ |
966 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile); | |
967 exit_player(MSGTR_Exit_error); | |
968 } | |
792 | 969 while(!ds->eof){ |
970 unsigned char* start; | |
971 int in_size=ds_get_packet(ds,&start); | |
2102 | 972 if( (demuxer->file_format==DEMUXER_TYPE_AVI || demuxer->file_format==DEMUXER_TYPE_ASF || 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
|
973 && stream_dump_type==2) fwrite(&in_size,1,4,f); |
792 | 974 if(in_size>0) fwrite(start,in_size,1,f); |
975 } | |
976 fclose(f); | |
1582 | 977 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped); |
1639 | 978 exit_player(MSGTR_Exit_eof); |
792 | 979 } |
980 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
981 sh_audio=d_audio->sh; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
982 sh_video=d_video->sh; |
792 | 983 |
3054 | 984 #ifdef HAVE_NEW_GUI |
985 #ifdef USE_DVDREAD | |
986 if ( use_gui && stream->type == STREAMTYPE_DVD ) | |
987 { | |
988 dvd_priv_t * dvdp = stream->priv; | |
989 mplShMem->DVD.titles=dvdp->vmg_file->tt_srpt->nr_of_srpts; | |
990 mplShMem->DVD.chapters=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_ptts; | |
991 mplShMem->DVD.angles=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_angles; | |
992 mplShMem->DVD.nr_of_audio_channels=dvdp->nr_of_channels; | |
993 memcpy( mplShMem->DVD.audio_streams,dvdp->audio_streams,sizeof( dvdp->audio_streams ) ); | |
994 mplShMem->DVD.nr_of_subtitles=dvdp->nr_of_subtitles; | |
995 memcpy( mplShMem->DVD.subtitles,dvdp->subtitles,sizeof( dvdp->subtitles ) ); | |
996 mplShMem->DVD.current_title=dvd_title + 1; | |
997 mplShMem->DVD.current_chapter=dvd_chapter + 1; | |
3597 | 998 mplShMem->DVD.current_angle=dvd_angle + 1; |
3054 | 999 mplShMem->Track=dvd_title + 1; |
1000 } | |
1001 #endif | |
1002 #endif | |
1003 | |
1639 | 1004 current_module="video_read_properties"; |
1005 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
1006 if(sh_video){ |
1 | 1007 |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1008 if(!video_read_properties(sh_video)) goto goto_next_file; // exit_player(MSGTR_Exit_error); // couldn't read header? |
1 | 1009 |
1567 | 1010 mp_msg(MSGT_CPLAYER,MSGL_INFO,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n", |
1660 | 1011 demuxer->file_format,sh_video->format, sh_video->disp_w,sh_video->disp_h, |
398 | 1012 sh_video->fps,sh_video->frametime |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
1013 ); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
1014 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
1015 if(!sh_video->fps && !force_fps){ |
1582 | 1016 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_FPSnotspecified); |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1017 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
1018 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
1019 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
1020 } |
398 | 1021 |
1 | 1022 fflush(stdout); |
1023 | |
778
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1024 if(!sh_video){ |
1582 | 1025 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_NoVideoStream); |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1026 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
|
1027 } |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1028 |
4087 | 1029 #ifdef USE_DVDREAD |
1030 current_module="dvd lang->id"; | |
1031 if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang); | |
1032 if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang); | |
1033 | |
1034 current_module="spudec"; | |
1035 vo_spudec=spudec_new_scaled(stream->priv?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL, | |
1036 sh_video->disp_w, sh_video->disp_h); | |
1037 if (vo_spudec!=NULL) | |
1038 inited_flags|=INITED_SPUDEC; | |
1039 #endif | |
1040 current_module=NULL; | |
4052
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4045
diff
changeset
|
1041 |
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4045
diff
changeset
|
1042 #ifdef USE_SUB |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1043 // after reading video params we should load subtitles because |
4052
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4045
diff
changeset
|
1044 // we know fps so now we can adjust subtitles 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
|
1045 // check .sub |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1046 current_module="read_subtitles_file"; |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1047 if(sub_name){ |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1048 #if 0 |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1049 int l=strlen(sub_name); |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1050 if ((l>4) && ((0==strcmp(&sub_name[l-4],".utf")) |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1051 ||(0==strcmp(&sub_name[l-4],".UTF")))) |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1052 sub_utf8=1; |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1053 #endif |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1054 subtitles=sub_read_file(sub_name, sh_video->fps); |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1055 if(!subtitles || sub_num == 0) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name); |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1056 } |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1057 if(!sub_name){ |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1058 if(sub_auto && filename) { // auto load sub file ... |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1059 subtitles=sub_read_file( sub_filename( get_path("sub/"), filename ), |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1060 sh_video->fps ); |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1061 } |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1062 #if 0 |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1063 if(!subtitles) subtitles=sub_read_file(get_path("default.sub"), |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1064 sh_video->fps); // try default |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1065 #endif |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1066 } |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1067 |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1068 if(subtitles && stream_dump_type==3) list_sub_file(subtitles); |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1069 if(subtitles && stream_dump_type==4) dump_mpsub(subtitles, sh_video->fps); |
4052
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4045
diff
changeset
|
1070 #endif |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1071 |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1072 /* display clip info */ |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1073 demux_info_print(demuxer); |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1074 |
303 | 1075 //================== Init AUDIO (codec) ========================== |
1639 | 1076 |
1077 current_module="init_audio_codec"; | |
1078 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1079 if(sh_audio){ |
303 | 1080 // Go through the codec.conf and find the best codec... |
626 | 1081 sh_audio->codec=NULL; |
1582 | 1082 if(audio_family!=-1) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceAudioFmt,audio_family); |
626 | 1083 while(1){ |
1084 sh_audio->codec=find_codec(sh_audio->format,NULL,sh_audio->codec,1); | |
1085 if(!sh_audio->codec){ | |
1299
fa50e6bc6091
As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents:
1296
diff
changeset
|
1086 if(audio_family!=-1) { |
fa50e6bc6091
As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents:
1296
diff
changeset
|
1087 sh_audio->codec=NULL; /* re-search */ |
1582 | 1088 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantFindAfmtFallback); |
1299
fa50e6bc6091
As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents:
1296
diff
changeset
|
1089 audio_family=-1; |
fa50e6bc6091
As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents:
1296
diff
changeset
|
1090 continue; |
fa50e6bc6091
As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents:
1296
diff
changeset
|
1091 } |
1582 | 1092 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantFindAudioCodec,sh_audio->format); |
1093 mp_msg(MSGT_CPLAYER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf")); | |
1792 | 1094 sh_audio=d_audio->sh=NULL; |
626 | 1095 break; |
1096 } | |
1286
543a94b241a2
Replaced LGBs video codec forcing change with mine for audio and video codecs, which is IMHO more convenient cause codecs are selected by name instead of number, one unclearity is left to me, that's why audio_format is used once before codecs selection for MPEG_PS files, that's why I left -afm in for that one.
atmos4
parents:
1285
diff
changeset
|
1097 if(audio_codec && strcmp(sh_audio->codec->name,audio_codec)) continue; |
1299
fa50e6bc6091
As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents:
1296
diff
changeset
|
1098 else if(audio_family!=-1 && sh_audio->codec->driver!=audio_family) continue; |
1567 | 1099 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s audio codec: [%s] drv:%d (%s)\n",audio_codec?"Forcing":"Detected",sh_audio->codec->name,sh_audio->codec->driver,sh_audio->codec->info); |
626 | 1100 break; |
303 | 1101 } |
1 | 1102 } |
1103 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1104 if(sh_audio){ |
1567 | 1105 mp_msg(MSGT_CPLAYER,MSGL_V,"Initializing audio codec...\n"); |
442 | 1106 if(!init_audio(sh_audio)){ |
1582 | 1107 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CouldntInitAudioCodec); |
1792 | 1108 sh_audio=d_audio->sh=NULL; |
1889 | 1109 #ifdef HAVE_NEW_GUI |
1110 if ( use_gui ) mplShMem->AudioType=0; | |
1111 #endif | |
303 | 1112 } else { |
1567 | 1113 mp_msg(MSGT_CPLAYER,MSGL_INFO,"AUDIO: srate=%d chans=%d bps=%d sfmt=0x%X ratio: %d->%d\n",sh_audio->samplerate,sh_audio->channels,sh_audio->samplesize, |
758 | 1114 sh_audio->sample_format,sh_audio->i_bps,sh_audio->o_bps); |
1889 | 1115 #ifdef HAVE_NEW_GUI |
1116 if ( use_gui ) mplShMem->AudioType=sh_audio->channels; | |
1117 #endif | |
303 | 1118 } |
175 | 1119 } |
1120 | |
303 | 1121 //================== Init VIDEO (codec & libvo) ========================== |
1122 | |
1639 | 1123 current_module="init_video_codec"; |
1124 | |
303 | 1125 // Go through the codec.conf and find the best codec... |
626 | 1126 sh_video->codec=NULL; |
1582 | 1127 if(video_family!=-1) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceVideoFmt,video_family); |
3712 | 1128 { /* local vars */ |
1129 short bestprio=-1; | |
1130 struct codecs_st *bestcodec=NULL; | |
626 | 1131 while(1){ |
1132 sh_video->codec=find_codec(sh_video->format, | |
1133 sh_video->bih?((unsigned int*) &sh_video->bih->biCompression):NULL,sh_video->codec,0); | |
3712 | 1134 if(!sh_video->codec/* && bestprio==-1*/){ |
1299
fa50e6bc6091
As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents:
1296
diff
changeset
|
1135 if(video_family!=-1) { |
3712 | 1136 //sh_video->codec=NULL; /* re-search */ |
1582 | 1137 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_CantFindVfmtFallback); |
1299
fa50e6bc6091
As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents:
1296
diff
changeset
|
1138 video_family=-1; |
fa50e6bc6091
As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents:
1296
diff
changeset
|
1139 continue; |
fa50e6bc6091
As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents:
1296
diff
changeset
|
1140 } |
3712 | 1141 if(bestprio==-1 || !video_codec) { |
1582 | 1142 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantFindVideoCodec,sh_video->format); |
1143 mp_msg(MSGT_CPLAYER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf")); | |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1144 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
3712 | 1145 } |
1146 } else { | |
1147 // is next line needed anymore? - atmos :: | |
1148 if(!allow_dshow && sh_video->codec->driver==VFM_DSHOW) continue; // skip DShow | |
1149 else if(video_codec && strcmp(sh_video->codec->name,video_codec)) continue; | |
1150 else if(video_family!=-1 && sh_video->codec->driver!=video_family) continue; | |
1151 else if(video_family==-1 && !video_codec && sh_video->codec->priority) { | |
1152 if(sh_video->codec->priority > bestprio) { | |
1153 //printf("\n\n!!! setting bestprio from %d to %d for %s!!!\n\n", bestprio, sh_video->codec->priority, sh_video->codec->name); | |
1154 bestprio=sh_video->codec->priority; | |
1155 bestcodec=sh_video->codec; | |
1156 } | |
1157 continue; | |
1158 } | |
1159 } /* sh_video->codec */ | |
626 | 1160 break; |
303 | 1161 } |
3712 | 1162 if(bestprio!=-1) { |
1163 //printf("chose codec %s by priority.\n", bestcodec->name); | |
1164 sh_video->codec=bestcodec; | |
1165 } | |
303 | 1166 |
3712 | 1167 } /* end local vars */ |
1168 | |
1169 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s video codec: [%s] drv:%d prio:%d (%s)\n",video_codec?"Forcing":"Detected",sh_video->codec->name,sh_video->codec->driver,sh_video->codec->priority!=-1?sh_video->codec->priority:0,sh_video->codec->info); | |
303 | 1170 |
1171 for(i=0;i<CODECS_MAX_OUTFMT;i++){ | |
2705 | 1172 // int ret; |
303 | 1173 out_fmt=sh_video->codec->outfmt[i]; |
534
2a45d5adcc88
do not query vo drivers for format 0xFFFFFFFF (thanx to szabi)
arpi_esp
parents:
510
diff
changeset
|
1174 if(out_fmt==0xFFFFFFFF) continue; |
1422 | 1175 #ifdef USE_LIBVO2 |
2705 | 1176 vo_flags=vo2_query_format(video_out); |
1422 | 1177 #else |
2705 | 1178 vo_flags=video_out->query_format(out_fmt); |
1422 | 1179 #endif |
2705 | 1180 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: query(%s) returned 0x%X\n",vo_format_name(out_fmt),vo_flags); |
1181 if(vo_flags) break; | |
303 | 1182 } |
1183 if(i>=CODECS_MAX_OUTFMT){ | |
1582 | 1184 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_VOincompCodec); |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1185 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
303 | 1186 } |
1187 sh_video->outfmtidx=i; | |
1188 | |
778
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1189 if(flip==-1){ |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1190 // autodetect flipping |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1191 flip=0; |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1192 if(sh_video->codec->outflags[i]&CODECS_FLAG_FLIP) |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1193 if(!(sh_video->codec->outflags[i]&CODECS_FLAG_NOFLIP)) |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1194 flip=1; |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1195 } |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1196 |
1567 | 1197 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug1: out_fmt=%s\n",vo_format_name(out_fmt)); |
487 | 1198 |
1291 | 1199 if(!init_video(sh_video)){ |
1582 | 1200 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CouldntInitVideoCodec); |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1201 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
1 | 1202 } |
1203 | |
1439 | 1204 if(auto_quality>0){ |
1205 // Auto quality option enabled | |
1206 output_quality=get_video_quality_max(sh_video); | |
1207 if(auto_quality>output_quality) auto_quality=output_quality; | |
1208 else output_quality=auto_quality; | |
1567 | 1209 mp_msg(MSGT_CPLAYER,MSGL_V,"AutoQ: setting quality to %d\n",output_quality); |
1439 | 1210 set_video_quality(sh_video,output_quality); |
1211 } | |
1212 | |
398 | 1213 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============ |
1 | 1214 |
1639 | 1215 current_module="init_libvo"; |
1216 | |
2034
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1217 #if 0 /* was X11_FULLSCREEN hack -> moved to libvo/vo_xv.c where it belongs ::atmos */ |
1 | 1218 if(fullscreen){ |
1219 if(vo_init()){ | |
1220 //if(verbose) printf("X11 running at %dx%d depth: %d\n",vo_screenwidth,vo_screenheight,vo_depthonscreen); | |
1221 } | |
1222 if(!screen_size_xy) screen_size_xy=vo_screenwidth; // scale with asp.ratio | |
1223 } | |
1224 #endif | |
2034
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1225 // Set default VGA 1:1 aspect as fallback ::atmos |
3139 | 1226 if(movie_aspect>-1.0) sh_video->aspect = movie_aspect; // cmdline overrides autodetect |
2042 | 1227 // if(!sh_video->aspect) sh_video->aspect=1.0; |
1 | 1228 |
2034
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1229 if(screen_size_xy||screen_size_x||screen_size_y){ |
1 | 1230 if(screen_size_xy>0){ |
1231 if(screen_size_xy<=8){ | |
398 | 1232 screen_size_x=screen_size_xy*sh_video->disp_w; |
1233 screen_size_y=screen_size_xy*sh_video->disp_h; | |
1 | 1234 } else { |
1235 screen_size_x=screen_size_xy; | |
398 | 1236 screen_size_y=screen_size_xy*sh_video->disp_h/sh_video->disp_w; |
1 | 1237 } |
337 | 1238 } else if(!vidmode){ |
1239 if(!screen_size_x) screen_size_x=SCREEN_SIZE_X; | |
1240 if(!screen_size_y) screen_size_y=SCREEN_SIZE_Y; | |
398 | 1241 if(screen_size_x<=8) screen_size_x*=sh_video->disp_w; |
1242 if(screen_size_y<=8) screen_size_y*=sh_video->disp_h; | |
1 | 1243 } |
2034
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1244 } else { |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1245 // check source format aspect, calculate prescale ::atmos |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1246 screen_size_x=sh_video->disp_w; |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1247 screen_size_y=sh_video->disp_h; |
2042 | 1248 if(sh_video->aspect>0.01){ |
2034
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1249 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Movie-Aspect is %.2f:1 - prescaling to correct movie aspect.\n", |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1250 sh_video->aspect); |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1251 screen_size_x=(int)((float)sh_video->disp_h*sh_video->aspect); |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1252 screen_size_x+=screen_size_x%2; // round |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1253 if(screen_size_x<sh_video->disp_w){ |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1254 screen_size_x=sh_video->disp_w; |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1255 screen_size_y=(int)((float)sh_video->disp_w*(1.0/sh_video->aspect)); |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1256 screen_size_y+=screen_size_y%2; // round |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1257 } |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1258 } else { |
2042 | 1259 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Movie-Aspect is undefined - no prescaling applied.\n"); |
2034
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1260 } |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1261 } |
208
ae0f909ccc7c
Adds code to deal with vidmode selection. -- mgraffam
mgraffam
parents:
190
diff
changeset
|
1262 |
1422 | 1263 #ifndef USE_LIBVO2 |
340 | 1264 { const vo_info_t *info = video_out->get_info(); |
1567 | 1265 mp_msg(MSGT_CPLAYER,MSGL_INFO,"VO: [%s] %dx%d => %dx%d %s %s%s%s%s\n",info->short_name, |
398 | 1266 sh_video->disp_w,sh_video->disp_h, |
340 | 1267 screen_size_x,screen_size_y, |
1183 | 1268 vo_format_name(out_fmt), |
340 | 1269 fullscreen?"fs ":"", |
1270 vidmode?"vm ":"", | |
766 | 1271 softzoom?"zoom ":"", |
778
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1272 (flip==1)?"flip ":"" |
766 | 1273 // fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3) |
340 | 1274 ); |
1567 | 1275 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Description: %s\n",info->name); |
1276 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Author: %s\n", info->author); | |
1237 | 1277 if(strlen(info->comment) > 0) |
1567 | 1278 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Comment: %s\n", info->comment); |
340 | 1279 } |
1422 | 1280 #endif |
340 | 1281 |
1753 | 1282 #ifdef HAVE_NEW_GUI |
1283 if ( use_gui ) | |
1284 { | |
1952 | 1285 mplResizeToMovieSize( sh_video->disp_w,sh_video->disp_h ); |
3558 | 1286 moviewidth=sh_video->disp_w; |
1287 movieheight=sh_video->disp_h; | |
2447 | 1288 mplShMem->StreamType=stream->type; |
2854 | 1289 mplSetFileName( filename ); |
1753 | 1290 } |
1291 #endif | |
1292 | |
1567 | 1293 mp_msg(MSGT_CPLAYER,MSGL_V,"video_out->init(%dx%d->%dx%d,flags=%d,'%s',0x%X)\n", |
398 | 1294 sh_video->disp_w,sh_video->disp_h, |
1 | 1295 screen_size_x,screen_size_y, |
766 | 1296 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3), |
337 | 1297 title,out_fmt); |
1 | 1298 |
1422 | 1299 #ifdef USE_LIBVO2 |
1300 if(!vo2_start(video_out, | |
1301 sh_video->disp_w,sh_video->disp_h,out_fmt,0, | |
1302 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3) )){ | |
1303 #else | |
398 | 1304 if(video_out->init(sh_video->disp_w,sh_video->disp_h, |
1 | 1305 screen_size_x,screen_size_y, |
766 | 1306 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3), |
337 | 1307 title,out_fmt)){ |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1308 #endif |
1582 | 1309 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CannotInitVO); |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1310 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
1 | 1311 } |
1856 | 1312 inited_flags|=INITED_VO; |
1567 | 1313 mp_msg(MSGT_CPLAYER,MSGL_V,"INFO: Video OUT driver init OK!\n"); |
1 | 1314 |
1315 fflush(stdout); | |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1316 |
1 | 1317 //================== MAIN: ========================== |
1318 { | |
746 | 1319 |
1420 | 1320 //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
|
1321 //float v_frame=0; // Video |
1 | 1322 float time_frame=0; // Timer |
1323 int force_redraw=0; | |
1400 | 1324 //float num_frames=0; // number of frames played |
1382 | 1325 int grab_frames=0; |
212 | 1326 char osd_text_buffer[64]; |
715 | 1327 int drop_frame=0; |
1328 int drop_frame_cnt=0; | |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1329 int too_slow_frame_cnt=0; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1330 int too_fast_frame_cnt=0; |
1439 | 1331 // for auto-quality: |
1478
6f9167f0fcca
'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents:
1467
diff
changeset
|
1332 float AV_delay=0; // average of A-V timestamp differences |
1439 | 1333 double cvideo_base_vtime; |
1334 double cvideo_base_vframe; | |
1335 double vdecode_time; | |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1336 unsigned int lastframeout_ts; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1337 float time_frame_corr_avg=0; |
1 | 1338 |
1339 //================ SETUP AUDIO ========================== | |
1340 current_module="setup_audio"; | |
1341 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1342 if(sh_audio){ |
1237 | 1343 |
1344 const ao_info_t *info=audio_out->info; | |
1567 | 1345 mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %iHz %s %s\n", |
1237 | 1346 info->short_name, |
1347 force_srate?force_srate:sh_audio->samplerate, | |
1348 sh_audio->channels>1?"Stereo":"Mono", | |
1456
8c57a5a3c645
printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents:
1449
diff
changeset
|
1349 audio_out_format_name(sh_audio->sample_format) |
8c57a5a3c645
printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents:
1449
diff
changeset
|
1350 ); |
1567 | 1351 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Description: %s\nAO: Author: %s\n", |
1237 | 1352 info->name, |
1353 info->author | |
1354 ); | |
1456
8c57a5a3c645
printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents:
1449
diff
changeset
|
1355 if(strlen(info->comment) > 0) |
1567 | 1356 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Comment: %s\n", info->comment); |
969 | 1357 if(!audio_out->init(force_srate?force_srate:sh_audio->samplerate, |
1358 sh_audio->channels,sh_audio->sample_format,0)){ | |
1582 | 1359 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO); |
1792 | 1360 sh_audio=d_audio->sh=NULL; |
1856 | 1361 } else { |
1362 inited_flags|=INITED_AO; | |
1 | 1363 } |
1364 | |
955 | 1365 // printf("Audio buffer size: %d bytes, delay: %5.3fs\n",audio_buffer_size,audio_buffer_delay); |
746 | 1366 |
758 | 1367 // fixup audio buffer size: |
782 | 1368 // if(outburst<MAX_OUTBURST){ |
1369 // sh_audio->a_buffer_size=sh_audio->audio_out_minsize+outburst; | |
1370 // printf("Audio out buffer size reduced to %d bytes\n",sh_audio->a_buffer_size); | |
1371 // } | |
758 | 1372 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1373 // sh_audio->timer=-(audio_buffer_delay); |
1 | 1374 } |
1375 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1376 sh_video->timer=0; |
2000 | 1377 if(sh_audio) sh_audio->timer=-audio_delay; |
1 | 1378 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1379 if(!sh_audio){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1962
diff
changeset
|
1380 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_NoSound); |
1567 | 1381 if(verbose) mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused audio chunks\n",d_audio->packs); |
1 | 1382 ds_free_packs(d_audio); // free buffered chunks |
1383 d_audio->id=-2; // do not read audio chunks | |
1856 | 1384 if(audio_out) uninit_player(INITED_AO); // close device |
1 | 1385 } |
1386 | |
1387 current_module=NULL; | |
1388 | |
1660 | 1389 if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf! |
398 | 1390 if(force_fps){ |
1391 sh_video->fps=force_fps; | |
1392 sh_video->frametime=1.0f/sh_video->fps; | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1962
diff
changeset
|
1393 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FPSforced,sh_video->fps,sh_video->frametime); |
398 | 1394 } |
1 | 1395 |
1639 | 1396 //==================== START PLAYING ======================= |
1397 | |
1582 | 1398 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_StartPlaying);fflush(stdout); |
1 | 1399 |
3322
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1400 if(!use_stdin && !slave_mode){ |
1856 | 1401 getch2_enable(); // prepare stdin for hotkeys... |
1402 inited_flags|=INITED_GETCH2; | |
1403 } | |
1639 | 1404 |
1 | 1405 InitTimer(); |
1406 | |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
1407 total_time_usage_start=GetTimer(); |
3934
e8e7ca8995a1
codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents:
3843
diff
changeset
|
1408 audio_time_usage=0; video_time_usage=0; vout_time_usage=0; |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
1409 |
1 | 1410 while(!eof){ |
2567 | 1411 // unsigned int aq_total_time=GetTimer(); |
1439 | 1412 float aq_sleep_time=0; |
1 | 1413 |
1125 | 1414 if(play_n_frames>=0){ |
1415 --play_n_frames; | |
1582 | 1416 if(play_n_frames<0) exit_player(MSGTR_Exit_frames); |
1125 | 1417 } |
1418 | |
2705 | 1419 vo_pts=sh_video->timer*90000.0; |
3201 | 1420 vo_fps=sh_video->fps; |
2705 | 1421 |
1 | 1422 /*========================== PLAY AUDIO ============================*/ |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1423 while(sh_audio){ |
746 | 1424 unsigned int t; |
2705 | 1425 int playsize; |
1426 | |
3097 | 1427 ao_data.pts=sh_audio->timer*90000.0; |
2705 | 1428 playsize=audio_out->get_space(); |
746 | 1429 |
955 | 1430 if(!playsize) break; // buffer is full, do not block here!!! |
746 | 1431 |
1432 if(playsize>MAX_OUTBURST) playsize=MAX_OUTBURST; // we shouldn't exceed it! | |
1433 //if(playsize>outburst) playsize=outburst; | |
291 | 1434 |
1435 // Update buffer if needed | |
1639 | 1436 current_module="decode_audio"; // Enter AUDIO decoder module |
746 | 1437 t=GetTimer(); |
1438 while(sh_audio->a_buffer_len<playsize && !d_audio->eof){ | |
1439 int ret=decode_audio(sh_audio,&sh_audio->a_buffer[sh_audio->a_buffer_len], | |
1440 playsize-sh_audio->a_buffer_len,sh_audio->a_buffer_size-sh_audio->a_buffer_len); | |
296 | 1441 if(ret>0) sh_audio->a_buffer_len+=ret; else break; |
1 | 1442 } |
1443 current_module=NULL; // Leave AUDIO decoder module | |
291 | 1444 t=GetTimer()-t;audio_time_usage+=t*0.000001; |
746 | 1445 |
1446 if(playsize>sh_audio->a_buffer_len) playsize=sh_audio->a_buffer_len; | |
1447 | |
955 | 1448 playsize=audio_out->play(sh_audio->a_buffer,playsize,0); |
1 | 1449 |
955 | 1450 if(playsize>0){ |
746 | 1451 sh_audio->a_buffer_len-=playsize; |
1452 memcpy(sh_audio->a_buffer,&sh_audio->a_buffer[playsize],sh_audio->a_buffer_len); | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1453 sh_audio->timer+=playsize/(float)(sh_audio->o_bps); |
1 | 1454 } |
1455 | |
1456 break; | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1457 } // if(sh_audio) |
1 | 1458 |
1459 /*========================== UPDATE TIMERS ============================*/ | |
746 | 1460 #if 0 |
1 | 1461 if(alsa){ |
1462 // Use system timer for sync, not audio card/driver | |
1463 time_frame-=GetRelativeTime(); | |
1464 if(time_frame<-0.1 || time_frame>0.1){ | |
1465 time_frame=0; | |
1466 } else { | |
398 | 1467 while(time_frame>0.022){ |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1468 usec_sleep(time_frame-0.022); |
398 | 1469 time_frame-=GetRelativeTime(); |
1470 } | |
103 | 1471 while(time_frame>0.007){ |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1472 usec_sleep(1000); // sleeps 1 clock tick (10ms)! |
103 | 1473 time_frame-=GetRelativeTime(); |
1474 } | |
398 | 1475 } |
1 | 1476 } |
746 | 1477 #endif |
1 | 1478 |
1479 /*========================== PLAY VIDEO ============================*/ | |
1480 | |
1439 | 1481 cvideo_base_vframe=sh_video->timer; |
1482 cvideo_base_vtime=video_time_usage; | |
1483 | |
1 | 1484 if(1) |
746 | 1485 while(1){ |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1486 |
2567 | 1487 float frame_time=0; |
1291 | 1488 int blit_frame=0; |
715 | 1489 |
2567 | 1490 //-------------------- Decode a frame: ----------------------- |
1491 vdecode_time=video_time_usage; | |
1492 { unsigned char* start=NULL; | |
1493 int in_size; | |
1494 // get it! | |
1495 current_module="video_read_frame"; | |
1496 in_size=video_read_frame(sh_video,&frame_time,&start,force_fps); | |
1497 if(in_size<0){ eof=1; break; } | |
1498 if(in_size>max_framesize) max_framesize=in_size; // stats | |
1499 // decode: | |
1500 current_module="decode_video"; | |
1501 // printf("Decode! %p %d \n",start,in_size); | |
1502 blit_frame=decode_video(video_out,sh_video,start,in_size,drop_frame); | |
1291 | 1503 } |
2567 | 1504 vdecode_time=video_time_usage-vdecode_time; |
1505 //------------------------ frame decoded. -------------------- | |
1506 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1507 //------------------------ add OSD to frame contents --------- |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1508 #ifndef USE_LIBVO2 |
1768 | 1509 current_module="draw_osd"; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1510 video_out->draw_osd(); |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1511 #endif |
1 | 1512 |
1768 | 1513 current_module="av_sync"; |
1514 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1515 sh_video->timer+=frame_time; |
746 | 1516 time_frame+=frame_time; // for nosound |
1517 | |
1567 | 1518 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"*** ftime=%5.3f ***\n",frame_time); |
780 | 1519 |
798 | 1520 if(drop_frame){ |
746 | 1521 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1522 if(sh_audio && !d_audio->eof){ |
3097 | 1523 float delay=audio_out->get_delay(); |
1524 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"delay=%f\n",delay); | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1525 time_frame=sh_video->timer; |
3097 | 1526 time_frame-=sh_audio->timer-delay; |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1527 if(time_frame>-2*frame_time) { |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1528 drop_frame=0; // stop dropping frames |
1567 | 1529 mp_msg(MSGT_AVSYNC,MSGL_DBG2,"\nstop frame drop %.2f\n", time_frame); |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1530 }else{ |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1531 ++drop_frame_cnt; |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1532 if (verbose > 0 && drop_frame_cnt%10 == 0) |
1567 | 1533 mp_msg(MSGT_AVSYNC,MSGL_DBG2,"\nstill dropping, %.2f\n", time_frame); |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1534 } |
798 | 1535 } |
1709 | 1536 #ifdef HAVE_NEW_GUI |
2567 | 1537 if(use_gui) EventHandling(); |
1709 | 1538 #endif |
1729 | 1539 video_out->check_events(); // check events AST |
798 | 1540 } else { |
780 | 1541 // It's time to sleep... |
1542 current_module="sleep"; | |
1543 | |
1544 time_frame-=GetRelativeTime(); // reset timer | |
1545 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1546 if(sh_audio && !d_audio->eof){ |
3097 | 1547 float delay=audio_out->get_delay(); |
1548 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"delay=%f\n",delay); | |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1549 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1550 if(!dapsync){ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1551 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1552 /* Arpi's AV-sync */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1553 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1554 time_frame=sh_video->timer; |
3097 | 1555 time_frame-=sh_audio->timer-delay; |
1556 | |
798 | 1557 // we are out of time... drop next frame! |
940 | 1558 if(time_frame<-2*frame_time){ |
1478
6f9167f0fcca
'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents:
1467
diff
changeset
|
1559 static int drop_message=0; |
798 | 1560 drop_frame=frame_dropping; // tricky! |
1561 ++drop_frame_cnt; | |
1478
6f9167f0fcca
'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents:
1467
diff
changeset
|
1562 if(drop_frame_cnt>50 && AV_delay>0.5 && !drop_message){ |
6f9167f0fcca
'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents:
1467
diff
changeset
|
1563 drop_message=1; |
1582 | 1564 mp_msg(MSGT_AVSYNC,MSGL_WARN,MSGTR_SystemTooSlow); |
1478
6f9167f0fcca
'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents:
1467
diff
changeset
|
1565 } |
1567 | 1566 mp_msg(MSGT_AVSYNC,MSGL_DBG2,"\nframe drop %d, %.2f\n", drop_frame, time_frame); |
798 | 1567 } |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1568 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1569 } else { |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1570 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1571 /* DaP's AV-sync */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1572 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1573 float SH_AV_delay; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1574 /* SH_AV_delay = sh_video->timer - (sh_audio->timer - (float)((float)delay + sh_audio->a_buffer_len) / (float)sh_audio->o_bps); */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1575 SH_AV_delay = sh_video->timer - (sh_audio->timer - (float)((float)delay) / (float)sh_audio->o_bps); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1576 // printf ("audio slp req: %.3f TF: %.3f delta: %.3f (v: %.3f a: %.3f) | ", i, time_frame, |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1577 // i - time_frame, sh_video->timer, sh_audio->timer - (float)((float)delay / (float)sh_audio->o_bps)); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1578 if(SH_AV_delay<-2*frame_time){ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1579 static int drop_message=0; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1580 drop_frame=frame_dropping; // tricky! |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1581 ++drop_frame_cnt; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1582 if(drop_frame_cnt>50 && AV_delay>0.5 && !drop_message){ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1583 drop_message=1; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1584 mp_msg(MSGT_AVSYNC,MSGL_WARN,MSGTR_SystemTooSlow); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1585 } |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1586 printf ("A-V SYNC: FRAMEDROP (SH_AV_delay=%.3f)!\n", SH_AV_delay); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1587 mp_msg(MSGT_AVSYNC,MSGL_DBG2,"\nframe drop %d, %.2f\n", drop_frame, time_frame); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1588 /* go into unlimited-TF cycle */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1589 time_frame = SH_AV_delay; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1590 } else { |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1591 #define SL_CORR_AVG_LEN 125 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1592 /* don't adjust under framedropping */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1593 time_frame_corr_avg = (time_frame_corr_avg * (SL_CORR_AVG_LEN - 1) + |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1594 (SH_AV_delay - time_frame)) / SL_CORR_AVG_LEN; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1595 #define UNEXP_CORR_MAX 0.1 /* limit of unexpected correction between two frames (percentage) */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1596 #define UNEXP_CORR_WARN 1.0 /* warn limit of A-V lag (percentage) */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1597 time_frame += time_frame_corr_avg; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1598 // printf ("{%.3f - %.3f}\n", i - time_frame, frame_time + frame_time_corr_avg); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1599 if (SH_AV_delay - time_frame < (frame_time + time_frame_corr_avg) * UNEXP_CORR_MAX && |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1600 SH_AV_delay - time_frame > (frame_time + time_frame_corr_avg) * -UNEXP_CORR_MAX) |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1601 time_frame = SH_AV_delay; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1602 else { |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1603 if (SH_AV_delay - time_frame > (frame_time + time_frame_corr_avg) * UNEXP_CORR_WARN || |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1604 SH_AV_delay - time_frame < (frame_time + time_frame_corr_avg) * -UNEXP_CORR_WARN) |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1605 printf ("WARNING: A-V SYNC LAG TOO LARGE: %.3f {%.3f - %.3f} (too little UNEXP_CORR_MAX?)\n", |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1606 SH_AV_delay - time_frame, SH_AV_delay, time_frame); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1607 time_frame += (frame_time + time_frame_corr_avg) * ((SH_AV_delay > time_frame) ? |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1608 UNEXP_CORR_MAX : -UNEXP_CORR_MAX); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1609 } |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1610 } /* /start dropframe */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1611 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1612 } |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1613 |
780 | 1614 } else { |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1615 // NOSOUND: |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
1616 if( (time_frame<-3*frame_time || time_frame>3*frame_time) || benchmark) |
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
1617 time_frame=0; |
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
1618 |
780 | 1619 } |
798 | 1620 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1621 // if(verbose>1)printf("sleep: %5.3f a:%6.3f v:%6.3f \n",time_frame,sh_audio->timer,sh_video->timer); |
1439 | 1622 |
1623 aq_sleep_time+=time_frame; | |
1709 | 1624 |
1625 #ifdef HAVE_NEW_GUI | |
1626 if(use_gui){ | |
1802 | 1627 EventHandling(); |
1709 | 1628 } |
1629 #endif | |
2705 | 1630 |
1631 if(!(vo_flags&256)){ // flag 256 means: libvo driver does its timing (dvb card) | |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1632 |
3015 | 1633 #ifdef HAVE_RTC |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1634 if(rtc_fd>=0){ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1635 // -------- RTC ----------- |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1636 while (time_frame > 0.000) { |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1637 unsigned long long rtc_ts; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1638 if (read (rtc_fd, &rtc_ts, sizeof(rtc_ts)) <= 0) |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1639 perror ("read (rtc_fd)"); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1640 time_frame-=GetRelativeTime(); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1641 } |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1642 } else |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1643 #endif |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1644 { |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1645 // -------- USLEEP + SOFTSLEEP ----------- |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1646 float min=softsleep?0.021:0.005; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1647 while(time_frame>min){ |
746 | 1648 if(time_frame<=0.020) |
1439 | 1649 usec_sleep(0); // sleeps 1 clock tick (10ms)! |
746 | 1650 else |
2757 | 1651 usec_sleep(1000000*(time_frame-0.020)); |
746 | 1652 time_frame-=GetRelativeTime(); |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1653 } |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1654 if(softsleep){ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1655 if(time_frame<0) printf("Warning! softsleep underflow!\n"); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1656 while(time_frame>0) time_frame-=GetRelativeTime(); // burn the CPU |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1657 } |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1658 } |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1659 |
2705 | 1660 } |
117 | 1661 |
715 | 1662 current_module="flip_page"; |
1422 | 1663 #ifdef USE_LIBVO2 |
1664 if(blit_frame) vo2_flip(video_out,0); | |
1665 #else | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1666 video_out->check_events(); |
1962 | 1667 if(blit_frame){ |
1668 unsigned int t2=GetTimer(); | |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1669 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1670 float j; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1671 #define FRAME_LAG_WARN 0.2 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1672 j = ((float)t2 - lastframeout_ts) / 1000000; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1673 lastframeout_ts = GetTimer(); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1674 if (j < frame_time + frame_time * -FRAME_LAG_WARN) |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1675 too_fast_frame_cnt++; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1676 /* printf ("PANIC: too fast frame (%.3f)!\n", j); */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1677 else if (j > frame_time + frame_time * FRAME_LAG_WARN) |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1678 too_slow_frame_cnt++; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1679 /* printf ("PANIC: too slow frame (%.3f)!\n", j); */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1680 |
1962 | 1681 video_out->flip_page(); |
1682 t2=GetTimer()-t2;vout_time_usage+=t2*0.000001f; | |
1683 } | |
1422 | 1684 #endif |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1685 // usec_sleep(50000); // test only! |
780 | 1686 |
715 | 1687 } |
780 | 1688 |
1689 current_module=NULL; | |
715 | 1690 |
1 | 1691 if(eof) break; |
220 | 1692 if(force_redraw){ |
1693 --force_redraw; | |
577 | 1694 if(!force_redraw) osd_function=OSD_PLAY; |
746 | 1695 continue; |
220 | 1696 } |
1 | 1697 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1698 // printf("A:%6.1f V:%6.1f A-V:%7.3f frame=%5.2f \r",d_audio->pts,d_video->pts,d_audio->pts-d_video->pts,sh_audio->timer); |
1 | 1699 // fflush(stdout); |
1700 | |
1701 #if 1 | |
1702 /*================ A-V TIMESTAMP CORRECTION: =========================*/ | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1703 if(sh_audio){ |
780 | 1704 float a_pts=0; |
1705 float v_pts=0; | |
1706 | |
746 | 1707 // unplayed bytes in our and soundcard/dma buffer: |
3097 | 1708 float delay=audio_out->get_delay()+(float)sh_audio->a_buffer_len/(float)sh_audio->o_bps; |
746 | 1709 |
780 | 1710 if(pts_from_bps){ |
1498 | 1711 #if 1 |
1712 unsigned int samples=(sh_audio->audio.dwSampleSize)? | |
1713 ((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) : | |
1714 (d_audio->pack_no); // <- used for VBR audio | |
3302 | 1715 samples+=sh_audio->audio.dwStart; // offset |
1498 | 1716 a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate; |
1717 #else | |
1481 | 1718 if(sh_audio->audio.dwSampleSize) |
1719 a_pts=(ds_tell(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->wf->nAvgBytesPerSec; | |
1720 else // VBR: | |
1721 a_pts=d_audio->pack_no*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate; | |
1498 | 1722 #endif |
1723 // v_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; | |
1724 // printf("V_PTS: PTS: %8.3f BPS: %8.3f \n",d_video->pts,v_pts); | |
1725 delay_corrected=1; | |
780 | 1726 } else { |
1727 // PTS = (last timestamp) + (bytes after last timestamp)/(bytes per sec) | |
746 | 1728 a_pts=d_audio->pts; |
1498 | 1729 if(!delay_corrected) if(a_pts) delay_corrected=1; |
1478
6f9167f0fcca
'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents:
1467
diff
changeset
|
1730 //printf("*** %5.3f ***\n",a_pts); |
746 | 1731 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; |
1456
8c57a5a3c645
printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents:
1449
diff
changeset
|
1732 // v_pts=d_video->pts-frame_time; |
1498 | 1733 // v_pts=d_video->pts; |
780 | 1734 } |
1498 | 1735 v_pts=d_video->pts; |
746 | 1736 |
1567 | 1737 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"### A:%8.3f (%8.3f) V:%8.3f A-V:%7.4f \n",a_pts,a_pts-audio_delay-delay,v_pts,(a_pts-delay-audio_delay)-v_pts); |
780 | 1738 |
398 | 1739 if(delay_corrected){ |
1478
6f9167f0fcca
'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents:
1467
diff
changeset
|
1740 float x; |
6f9167f0fcca
'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents:
1467
diff
changeset
|
1741 AV_delay=(a_pts-delay-audio_delay)-v_pts; |
6f9167f0fcca
'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents:
1467
diff
changeset
|
1742 x=AV_delay*0.1f; |
1 | 1743 if(x<-max_pts_correction) x=-max_pts_correction; else |
1744 if(x> max_pts_correction) x= max_pts_correction; | |
780 | 1745 if(default_max_pts_correction>=0) |
1746 max_pts_correction=default_max_pts_correction; | |
1747 else | |
1748 max_pts_correction=sh_video->frametime*0.10; // +-10% of time | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1749 sh_audio->timer+=x; c_total+=x; |
2353 | 1750 if(!quiet) mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A:%6.1f V:%6.1f A-V:%7.3f ct:%7.3f %3d/%3d %2d%% %2d%% %4.1f%% %d %d %d%%\r", |
1498 | 1751 a_pts-audio_delay-delay,v_pts,AV_delay,c_total, |
1546 | 1752 (int)sh_video->num_frames,(int)sh_video->num_frames_decoded, |
1498 | 1753 (sh_video->timer>0.5)?(int)(100.0*video_time_usage/(double)sh_video->timer):0, |
1754 (sh_video->timer>0.5)?(int)(100.0*vout_time_usage/(double)sh_video->timer):0, | |
1755 (sh_video->timer>0.5)?(100.0*audio_time_usage/(double)sh_video->timer):0 | |
1756 ,drop_frame_cnt | |
1757 ,output_quality | |
2353 | 1758 ,cache_fill_status |
1 | 1759 ); |
1760 fflush(stdout); | |
1761 } | |
780 | 1762 |
1 | 1763 } else { |
1764 // No audio: | |
1420 | 1765 |
1448 | 1766 if(!quiet) |
2353 | 1767 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"V:%6.1f %3d %2d%% %2d%% %4.1f%% %d %d %d%%\r",d_video->pts, |
1400 | 1768 (int)sh_video->num_frames, |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1769 (sh_video->timer>0.5)?(int)(100.0*video_time_usage/(double)sh_video->timer):0, |
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1770 (sh_video->timer>0.5)?(int)(100.0*vout_time_usage/(double)sh_video->timer):0, |
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1771 (sh_video->timer>0.5)?(100.0*audio_time_usage/(double)sh_video->timer):0 |
2353 | 1772 ,drop_frame_cnt |
1773 ,output_quality | |
1774 ,cache_fill_status | |
442 | 1775 ); |
1 | 1776 |
1777 fflush(stdout); | |
1420 | 1778 |
1 | 1779 } |
1780 #endif | |
1781 | |
1439 | 1782 /*Output quality adjustments:*/ |
1783 if(auto_quality>0){ | |
1784 #if 0 | |
1785 /*If we took a long time decoding this frame, downgrade the quality.*/ | |
1786 if(output_quality>0&& | |
1787 (video_time_usage-cvideo_base_vtime)*sh_video->timer>= | |
1788 (0.95*sh_video->timer-(vout_time_usage+audio_time_usage))* | |
1789 (sh_video->timer-cvideo_base_vframe-frame_correction)){ | |
1790 output_quality>>=1; | |
1567 | 1791 mp_msg(MSGT_AUTOQ,MSGL_DBG2,"Downgrading quality to %i.\n",output_quality); |
1439 | 1792 set_video_quality(sh_video,output_quality); |
1793 } else | |
1794 /*If we had plenty of extra time, upgrade the quality.*/ | |
1795 if(output_quality<auto_quality&& | |
1796 vdecode_time<0.5*frame_time&& | |
1797 (video_time_usage-cvideo_base_vtime)*sh_video->timer< | |
1798 (0.67*sh_video->timer-(vout_time_usage+audio_time_usage))* | |
1799 (sh_video->timer-cvideo_base_vframe-frame_correction)){ | |
1800 output_quality++; | |
1567 | 1801 mp_msg(MSGT_AUTOQ,MSGL_DBG2,"Upgrading quality to %i.\n",output_quality); |
1439 | 1802 set_video_quality(sh_video,output_quality); |
1803 } | |
1804 #else | |
1496 | 1805 // float total=0.000001f * (GetTimer()-aq_total_time); |
1439 | 1806 // if(output_quality<auto_quality && aq_sleep_time>0.05f*total) |
1807 if(output_quality<auto_quality && aq_sleep_time>0) | |
1808 ++output_quality; | |
1809 else | |
1810 // if(output_quality>0 && aq_sleep_time<-0.05f*total) | |
1811 if(output_quality>1 && aq_sleep_time<0) | |
1812 --output_quality; | |
1813 else | |
1814 if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms | |
1815 output_quality=0; | |
1816 // printf("total: %8.6f sleep: %8.6f q: %d\n",(0.000001f*aq_total_time),aq_sleep_time,output_quality); | |
1817 set_video_quality(sh_video,output_quality); | |
1818 #endif | |
1819 } | |
1820 | |
1422 | 1821 #ifdef USE_OSD |
220 | 1822 if(osd_visible){ |
1504
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
1823 if (!--osd_visible){ vo_osd_progbar_type=-1; // disable |
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
1824 if (osd_function != OSD_PAUSE) |
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
1825 osd_function = OSD_PLAY; |
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
1826 } |
220 | 1827 } |
1422 | 1828 #endif |
371 | 1829 |
1830 if(osd_function==OSD_PAUSE){ | |
1817
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
1831 int gui_pause_flag=0; // gany! |
1567 | 1832 mp_msg(MSGT_CPLAYER,MSGL_STATUS,"\n------ PAUSED -------\r");fflush(stdout); |
1793
ba11d77c587a
gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents:
1792
diff
changeset
|
1833 #ifdef HAVE_NEW_GUI |
ba11d77c587a
gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents:
1792
diff
changeset
|
1834 if(use_gui) mplShMem->Playing=2; |
ba11d77c587a
gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents:
1792
diff
changeset
|
1835 #endif |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1836 if (audio_out && sh_audio) |
1156 | 1837 audio_out->pause(); // pause audio, keep data if possible |
3322
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1838 |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1839 if(slave_mode) { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1840 fd_set set; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1841 struct timeval timeout; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1842 while (1) { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1843 usec_sleep(1000); |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1844 FD_ZERO (&set); |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1845 FD_SET (STDIN_FILENO, &set); |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1846 timeout.tv_sec = 0; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1847 timeout.tv_usec = 1000; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1848 if(1==select(FD_SETSIZE, &set, NULL, NULL, &timeout)) { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1849 break; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1850 } |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1851 } |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1852 } else { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1853 |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1854 while( |
371 | 1855 #ifdef HAVE_LIRC |
723 | 1856 lirc_mp_getinput()<=0 && |
371 | 1857 #endif |
1467 | 1858 (use_stdin || getch2(20)<=0) && mplayer_get_key()<=0){ |
1422 | 1859 #ifndef USE_LIBVO2 |
723 | 1860 video_out->check_events(); |
1422 | 1861 #endif |
1709 | 1862 #ifdef HAVE_NEW_GUI |
1863 if(use_gui){ | |
1802 | 1864 EventHandling(); |
1817
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
1865 if(mplShMem->Playing!=2 || (rel_seek_secs || abs_seek_pos)) |
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
1866 { gui_pause_flag=1; break; } // end of pause or seek |
1709 | 1867 } |
1868 #endif | |
1467 | 1869 if(use_stdin) usec_sleep(1000); // do not eat the CPU |
723 | 1870 } |
3322
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1871 } |
723 | 1872 osd_function=OSD_PLAY; |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1873 if (audio_out && sh_audio) |
1156 | 1874 audio_out->resume(); // resume audio |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1875 (void)GetRelativeTime(); // keep TF around FT in next cycle |
1793
ba11d77c587a
gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents:
1792
diff
changeset
|
1876 #ifdef HAVE_NEW_GUI |
1817
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
1877 if(use_gui && !gui_pause_flag) mplShMem->Playing=1; // play from keyboard |
1793
ba11d77c587a
gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents:
1792
diff
changeset
|
1878 #endif |
371 | 1879 } |
1880 | |
746 | 1881 |
1882 if(!force_redraw) break; | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1883 } // while(sh_video->timer<sh_audio->timer || force_redraw) |
1 | 1884 |
2436 | 1885 // skip some seconds... added by fly |
1886 | |
1887 if(step_sec>0) { | |
1888 osd_function=OSD_FFW; | |
1889 rel_seek_secs+=step_sec; | |
1890 } | |
1 | 1891 |
1892 //================= Keyboard events, SEEKing ==================== | |
1893 | |
3322
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1894 /* slave mode */ |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1895 if(slave_mode) { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1896 char buffer[1024]; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1897 fd_set set; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1898 struct timeval timeout; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1899 int arg; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1900 |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1901 FD_ZERO (&set); |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1902 FD_SET (STDIN_FILENO, &set); |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1903 timeout.tv_sec = 0; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1904 timeout.tv_usec = 1000; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1905 |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1906 if(1 == select (FD_SETSIZE, &set, NULL, NULL, &timeout)) { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1907 fgets(buffer, 1024, stdin); |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1908 if(!strcmp("play\n", buffer)) { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1909 osd_function=OSD_PLAY; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1910 } else if(!strcmp("stop\n", buffer)) { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1911 osd_function=OSD_PAUSE; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1912 } else if(!strncmp("seek ", buffer, 5)) { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1913 sscanf(buffer+5, "%d", &arg); |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1914 rel_seek_secs = arg-d_video->pts; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1915 } else if(!strncmp("skip ", buffer, 5)) { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1916 sscanf(buffer+5, "%d", &arg); |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1917 rel_seek_secs = arg; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1918 } else if(!strcmp("quit\n", buffer)) { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1919 exit_player(MSGTR_Exit_quit); |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1920 } |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1921 } else { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1922 osd_function=OSD_PLAY; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1923 } |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1924 } else |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1925 |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1926 /* interactive mode */ |
723 | 1927 { int c; |
1 | 1928 while( |
1929 #ifdef HAVE_LIRC | |
1930 (c=lirc_mp_getinput())>0 || | |
1931 #endif | |
1467 | 1932 (!use_stdin && (c=getch2(0))>0) || (c=mplayer_get_key())>0) switch(c){ |
1 | 1933 // seek 10 sec |
1934 case KEY_RIGHT: | |
220 | 1935 osd_function=OSD_FFW; |
1 | 1936 rel_seek_secs+=10;break; |
1937 case KEY_LEFT: | |
220 | 1938 osd_function=OSD_REW; |
1 | 1939 rel_seek_secs-=10;break; |
1940 // seek 1 min | |
1941 case KEY_UP: | |
220 | 1942 osd_function=OSD_FFW; |
1 | 1943 rel_seek_secs+=60;break; |
1944 case KEY_DOWN: | |
220 | 1945 osd_function=OSD_REW; |
1 | 1946 rel_seek_secs-=60;break; |
651 | 1947 // seek 10 min |
1948 case KEY_PAGE_UP: | |
1949 rel_seek_secs+=600;break; | |
1950 case KEY_PAGE_DOWN: | |
1951 rel_seek_secs-=600;break; | |
1 | 1952 // delay correction: |
1953 case '+': | |
746 | 1954 audio_delay+=0.1; // increase audio buffer delay |
3783 | 1955 osd_show_av_delay = 9; // show the A-V delay in OSD |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1956 if(sh_audio) sh_audio->timer-=0.1; |
1 | 1957 break; |
1958 case '-': | |
746 | 1959 audio_delay-=0.1; // decrease audio buffer delay |
3783 | 1960 osd_show_av_delay = 9; // show the A-V delay in OSD |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1961 if(sh_audio) sh_audio->timer+=0.1; |
1 | 1962 break; |
1963 // quit | |
1964 case KEY_ESC: // ESC | |
1639 | 1965 case 'q': exit_player(MSGTR_Exit_quit); |
2647
679d3b21bedb
-playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents:
2567
diff
changeset
|
1966 case '>': |
679d3b21bedb
-playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents:
2567
diff
changeset
|
1967 if(curr_filename>=num_filenames-1) |
679d3b21bedb
-playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents:
2567
diff
changeset
|
1968 break; |
1 | 1969 case KEY_ENTER: // ESC |
3540 | 1970 eof=2; // jump to next file |
1639 | 1971 break; |
2647
679d3b21bedb
-playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents:
2567
diff
changeset
|
1972 case '<': |
679d3b21bedb
-playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents:
2567
diff
changeset
|
1973 if(curr_filename < 1) |
679d3b21bedb
-playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents:
2567
diff
changeset
|
1974 break; |
679d3b21bedb
-playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents:
2567
diff
changeset
|
1975 curr_filename-=2; |
3540 | 1976 eof=2; |
2647
679d3b21bedb
-playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents:
2567
diff
changeset
|
1977 break; |
36 | 1978 case 'g': grab_frames=2;break; |
1 | 1979 // pause |
1980 case 'p': | |
1981 case ' ': | |
220 | 1982 osd_function=OSD_PAUSE; |
371 | 1983 break; |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1984 case KEY_HOME: |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1985 { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1986 play_tree_iter_t* i = play_tree_iter_new_copy(playtree_iter); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1987 if(play_tree_iter_step(i,1,0) == PLAY_TREE_ITER_ENTRY) |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1988 eof = 1; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1989 play_tree_iter_free(i); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1990 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1991 break; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1992 case KEY_END: |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1993 { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1994 play_tree_iter_t* i = play_tree_iter_new_copy(playtree_iter); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1995 if(play_tree_iter_step(i,-1,0) == PLAY_TREE_ITER_ENTRY) |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1996 eof = -1; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1997 play_tree_iter_free(i); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1998 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1999 break; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2000 case KEY_INS: |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2001 if(playtree_iter->num_files > 1 && playtree_iter->file < playtree_iter->num_files) |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2002 eof = 2; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2003 break; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2004 case KEY_DEL: |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2005 if(playtree_iter->num_files > 1 && playtree_iter->file > 1) |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2006 eof = -2; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2007 break; |
371 | 2008 case 'o': // toggle OSD |
2009 osd_level=(osd_level+1)%3; | |
1 | 2010 break; |
939 | 2011 case 'z': |
2012 sub_delay -= 0.1; | |
3234
d1e891c1e548
dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3201
diff
changeset
|
2013 osd_show_sub_delay = 9; // show the subdelay in OSD |
939 | 2014 break; |
2015 case 'x': | |
2016 sub_delay += 0.1; | |
3234
d1e891c1e548
dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3201
diff
changeset
|
2017 osd_show_sub_delay = 9; // show the subdelay in OSD |
939 | 2018 break; |
1626 | 2019 case '9': |
2020 case '0': | |
459 | 2021 case '*': |
555 | 2022 case '/': { |
1626 | 2023 if(c=='*' || c=='0'){ |
1881
d75b24bda7ce
Applied fix for mixercontrol w/alsa ossemu by Christian Ohm.
atmos4
parents:
1863
diff
changeset
|
2024 mixer_incvolume(); |
555 | 2025 } else { |
1881
d75b24bda7ce
Applied fix for mixercontrol w/alsa ossemu by Christian Ohm.
atmos4
parents:
1863
diff
changeset
|
2026 mixer_decvolume(); |
555 | 2027 } |
2028 | |
1422 | 2029 #ifdef USE_OSD |
555 | 2030 if(osd_level){ |
2031 osd_visible=sh_video->fps; // 1 sec | |
2032 vo_osd_progbar_type=OSD_VOLUME; | |
1881
d75b24bda7ce
Applied fix for mixercontrol w/alsa ossemu by Christian Ohm.
atmos4
parents:
1863
diff
changeset
|
2033 vo_osd_progbar_value=(mixer_getbothvolume()*256.0)/100.0; |
1852 | 2034 //printf("volume: %d\n",vo_osd_progbar_value); |
555 | 2035 } |
1422 | 2036 #endif |
555 | 2037 } |
2038 break; | |
459 | 2039 case 'm': |
510 | 2040 mixer_usemaster=!mixer_usemaster; |
459 | 2041 break; |
1429 | 2042 |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2043 #if 0 // change to 1 for absolute seeking tests |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2044 case '1': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2045 case '2': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2046 case '3': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2047 case '4': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2048 case '5': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2049 case '6': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2050 case '7': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2051 case '8': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2052 rel_seek_secs=0.99*(float)(c-'1')/7.0; |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2053 abs_seek_pos=3; |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2054 printf("ABS seek to %5.3f \n",rel_seek_secs); |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2055 break; |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2056 #else |
1429 | 2057 // Contrast: |
2058 case '1': | |
2059 case '2': | |
2060 if(c=='2'){ | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
2061 if ( ++v_cont > 100 ) v_cont = 100; |
1429 | 2062 } else { |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
2063 if ( --v_cont < 0 ) v_cont = 0; |
1429 | 2064 } |
2065 if(set_video_colors(sh_video,"Contrast",v_cont)){ | |
2066 #ifdef USE_OSD | |
2067 if(osd_level){ | |
2068 osd_visible=sh_video->fps; // 1 sec | |
2069 vo_osd_progbar_type=OSD_CONTRAST; | |
1726 | 2070 vo_osd_progbar_value=((v_cont)<<8)/100; |
1429 | 2071 } |
2072 #endif | |
2073 } | |
2074 break; | |
2075 | |
2076 // Brightness: | |
2077 case '3': | |
2078 case '4': | |
2079 if(c=='4'){ | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
2080 if ( ++v_bright > 100 ) v_bright = 100; |
1429 | 2081 } else { |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
2082 if ( --v_bright < 0 ) v_bright = 0; |
1429 | 2083 } |
2084 if(set_video_colors(sh_video,"Brightness",v_bright)){ | |
2085 #ifdef USE_OSD | |
2086 if(osd_level){ | |
2087 osd_visible=sh_video->fps; // 1 sec | |
2088 vo_osd_progbar_type=OSD_BRIGHTNESS; | |
1726 | 2089 vo_osd_progbar_value=((v_bright)<<8)/100; |
1429 | 2090 } |
2091 #endif | |
2092 } | |
2093 break; | |
2094 | |
2095 // Hue: | |
2096 case '5': | |
2097 case '6': | |
2098 if(c=='6'){ | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
2099 if ( ++v_hue > 100 ) v_hue = 100; |
1429 | 2100 } else { |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
2101 if ( --v_hue < 0 ) v_hue = 0; |
1429 | 2102 } |
2103 if(set_video_colors(sh_video,"Hue",v_hue)){ | |
2104 #ifdef USE_OSD | |
2105 if(osd_level){ | |
2106 osd_visible=sh_video->fps; // 1 sec | |
2107 vo_osd_progbar_type=OSD_HUE; | |
1726 | 2108 vo_osd_progbar_value=((v_hue)<<8)/100; |
1429 | 2109 } |
2110 #endif | |
2111 } | |
2112 break; | |
2113 | |
2114 // Saturation: | |
2115 case '7': | |
2116 case '8': | |
2117 if(c=='8'){ | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
2118 if ( ++v_saturation > 100 ) v_saturation = 100; |
1429 | 2119 } else { |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
2120 if ( --v_saturation < 0 ) v_saturation = 0; |
1429 | 2121 } |
2122 if(set_video_colors(sh_video,"Saturation",v_saturation)){ | |
2123 #ifdef USE_OSD | |
2124 if(osd_level){ | |
2125 osd_visible=sh_video->fps; // 1 sec | |
2126 vo_osd_progbar_type=OSD_SATURATION; | |
1726 | 2127 vo_osd_progbar_value=((v_saturation)<<8)/100; |
1429 | 2128 } |
2129 #endif | |
2130 } | |
2131 break; | |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2132 #endif |
1429 | 2133 |
715 | 2134 case 'd': |
798 | 2135 frame_dropping=(frame_dropping+1)%3; |
1567 | 2136 mp_msg(MSGT_CPLAYER,MSGL_V,"== drop: %d == \n",frame_dropping); |
715 | 2137 break; |
2941
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2138 |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2139 #ifdef USE_TV |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2140 case 'h': |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2141 if (tv_param_on == 1) |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2142 tv_step_channel(tv_handler, TV_CHANNEL_HIGHER); |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2143 break; |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2144 case 'l': |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2145 if (tv_param_on == 1) |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2146 tv_step_channel(tv_handler, TV_CHANNEL_LOWER); |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2147 break; |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2148 case 'n': |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2149 if (tv_param_on == 1) |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2150 tv_step_norm(tv_handler); |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2151 break; |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2152 case 'b': |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2153 if (tv_param_on == 1) |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2154 tv_step_chanlist(tv_handler); |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2155 break; |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2156 #endif |
1 | 2157 } |
1406 | 2158 } // keyboard event handler |
2159 | |
651 | 2160 if (seek_to_sec) { |
937 | 2161 int a,b; float d; |
2162 | |
2163 if (sscanf(seek_to_sec, "%d:%d:%f", &a,&b,&d)==3) | |
2164 rel_seek_secs += 3600*a +60*b +d ; | |
2165 else if (sscanf(seek_to_sec, "%d:%f", &a, &d)==2) | |
2166 rel_seek_secs += 60*a +d; | |
2167 else if (sscanf(seek_to_sec, "%f", &d)==1) | |
2168 rel_seek_secs += d; | |
2169 | |
2170 seek_to_sec = NULL; | |
651 | 2171 } |
937 | 2172 |
2365 | 2173 /* Looping. */ |
3540 | 2174 if(eof==1 && loop_times>=0) { |
2175 | |
2176 mp_msg(MSGT_CPLAYER,MSGL_V,"loop_times = %d, eof = %d\n", loop_times,eof); | |
2365 | 2177 |
3540 | 2178 if(loop_times>1) loop_times--; else |
2179 if(loop_times==1) loop_times=-1; | |
2180 | |
2365 | 2181 eof=0; |
3540 | 2182 abs_seek_pos=3; rel_seek_secs=0; // seek to start of movie (0%) |
2365 | 2183 |
2184 } | |
2185 | |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2186 if(rel_seek_secs || abs_seek_pos){ |
1466 | 2187 current_module="seek"; |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2188 if(demux_seek(demuxer,rel_seek_secs,abs_seek_pos)){ |
1405 | 2189 // success: |
4079 | 2190 /* FIXME there should be real seeking for vobsub */ |
2191 if (vo_vobsub) | |
2192 vobsub_reset(vo_vobsub); | |
889 | 2193 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
2194 if(sh_audio){ |
1459
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
2195 if(verbose){ |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
2196 float a_pts=d_audio->pts; |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
2197 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; |
1567 | 2198 mp_msg(MSGT_AVSYNC,MSGL_V,"SEEK: A: %5.3f V: %5.3f A-V: %5.3f \n",a_pts,d_video->pts,a_pts-d_video->pts); |
1459
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
2199 } |
1567 | 2200 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A:%6.1f V:%6.1f A-V:%7.3f ct: ? \r",d_audio->pts,d_video->pts,0.0f); |
1459
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
2201 } else { |
1567 | 2202 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A: --- V:%6.1f \r",d_video->pts); |
1459
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
2203 } |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
2204 fflush(stdout); |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
2205 |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
2206 if(sh_audio){ |
1466 | 2207 current_module="seek_audio_reset"; |
1334 | 2208 audio_out->reset(); // stop audio, throwing away buffered data |
1 | 2209 } |
2210 | |
1422 | 2211 #ifdef USE_OSD |
1334 | 2212 // Set OSD: |
2213 if(osd_level){ | |
2214 int len=((demuxer->movi_end-demuxer->movi_start)>>8); | |
1727 | 2215 if (len>0){ |
2216 osd_visible=sh_video->fps; // 1 sec | |
2217 vo_osd_progbar_type=0; | |
2218 vo_osd_progbar_value=(demuxer->filepos-demuxer->movi_start)/len; | |
2219 } | |
1334 | 2220 } |
1422 | 2221 #endif |
1405 | 2222 |
1420 | 2223 c_total=0; |
1 | 2224 max_pts_correction=0.1; |
1504
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
2225 osd_visible=sh_video->fps; // to rewert to PLAY pointer after 1 sec |
3823 | 2226 // audio_time_usage=0; video_time_usage=0; vout_time_usage=0; |
1459
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
2227 drop_frame_cnt=0; |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2228 too_slow_frame_cnt=0; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2229 too_fast_frame_cnt=0; |
3744 | 2230 |
2231 #ifdef USE_DVDREAD | |
2232 if(vo_spudec) spudec_reset(vo_spudec); | |
2233 #endif | |
1 | 2234 } |
1405 | 2235 rel_seek_secs=0; |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2236 abs_seek_pos=0; |
1466 | 2237 current_module=NULL; |
2238 } | |
2239 | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2240 #ifdef HAVE_NEW_GUI |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2241 if(use_gui){ |
1735 | 2242 if(demuxer->file_format==DEMUXER_TYPE_AVI && sh_video->video.dwLength>2){ |
2243 // get pos from frame number / total frames | |
2244 mplShMem->Position=(float)d_video->pack_no*100.0f/sh_video->video.dwLength; | |
2245 } else { | |
2246 // get pos from file position / filesize | |
2247 int len=((demuxer->movi_end-demuxer->movi_start)); | |
2248 int pos=(demuxer->file_format==DEMUXER_TYPE_AVI)?demuxer->filepos:d_video->pos; | |
2249 mplShMem->Position=(len<=0)?0:((float)(pos-demuxer->movi_start) / len * 100.0f); | |
2250 } | |
1729 | 2251 mplShMem->TimeSec=d_video->pts; |
1772 | 2252 if(mplShMem->Playing==0) break; // STOP |
2253 if(mplShMem->Playing==2) osd_function=OSD_PAUSE; | |
1852 | 2254 if ( mplShMem->VolumeChanged ) |
1848 | 2255 { |
1852 | 2256 mixer_setvolume( mplShMem->Volume,mplShMem->Volume ); |
2257 mplShMem->VolumeChanged=0; | |
2258 #ifdef USE_OSD | |
2259 if ( osd_level ) | |
2260 { | |
2261 osd_visible=sh_video->fps; // 1 sec | |
2262 vo_osd_progbar_type=OSD_VOLUME; | |
2263 vo_osd_progbar_value=( ( mplShMem->Volume ) * 256.0 ) / 100.0; | |
2264 } | |
1848 | 2265 #endif |
1852 | 2266 } |
2267 mplShMem->Volume=(float)mixer_getbothvolume(); | |
3054 | 2268 #ifdef USE_DVDREAD |
3618 | 2269 if ( mplShMem->DVDChanged ) goto goto_next_file; |
3054 | 2270 if ( stream->type == STREAMTYPE_DVD ) |
2271 { | |
2272 dvd_priv_t * dvdp = stream->priv; | |
2273 mplShMem->DVD.current_chapter=dvdp->cur_cell + 1; | |
2274 } | |
2275 #endif | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2276 } |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2277 #endif |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2278 |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2279 |
220 | 2280 //================= Update OSD ==================== |
1422 | 2281 #ifdef USE_OSD |
1421 | 2282 if(osd_level>=2){ |
780 | 2283 int pts=d_video->pts; |
595 | 2284 if(pts==osd_last_pts-1) ++pts; else osd_last_pts=pts; |
371 | 2285 vo_osd_text=osd_text_buffer; |
3234
d1e891c1e548
dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3201
diff
changeset
|
2286 if (osd_show_sub_delay) { |
d1e891c1e548
dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3201
diff
changeset
|
2287 sprintf(vo_osd_text, "Sub delay: %d ms",(int)(sub_delay*1000)); |
d1e891c1e548
dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3201
diff
changeset
|
2288 osd_show_sub_delay--; |
d1e891c1e548
dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3201
diff
changeset
|
2289 } else |
3783 | 2290 if (osd_show_av_delay) { |
2291 sprintf(vo_osd_text, "A-V delay: %d ms",(int)(audio_delay*1000)); | |
2292 osd_show_av_delay--; | |
2293 } else | |
3234
d1e891c1e548
dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3201
diff
changeset
|
2294 sprintf(vo_osd_text,"%c %02d:%02d:%02d",osd_function,pts/3600,(pts/60)%60,pts%60); |
371 | 2295 } else { |
2296 vo_osd_text=NULL; | |
2297 } | |
220 | 2298 // for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0; |
371 | 2299 // vo_osd_text=osd_text_buffer; |
1422 | 2300 #endif |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
2301 |
1422 | 2302 #ifdef USE_SUB |
258 | 2303 // find sub |
1204 | 2304 if(subtitles && d_video->pts>0){ |
1762 | 2305 float pts=d_video->pts; |
398 | 2306 if(sub_fps==0) sub_fps=sh_video->fps; |
482 | 2307 current_module="find_sub"; |
3274
ac7ded58b6df
mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3257
diff
changeset
|
2308 if (pts > sub_last_pts || pts < sub_last_pts-1.0 ) { |
ac7ded58b6df
mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3257
diff
changeset
|
2309 find_sub(subtitles,sub_uses_time?(100*(pts+sub_delay)):((pts+sub_delay)*sub_fps)); // FIXME! frame counter... |
ac7ded58b6df
mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3257
diff
changeset
|
2310 sub_last_pts = pts; |
ac7ded58b6df
mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3257
diff
changeset
|
2311 } |
482 | 2312 current_module=NULL; |
258 | 2313 } |
1422 | 2314 #endif |
554 | 2315 |
3180
d53f70e3c794
spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents:
3166
diff
changeset
|
2316 |
4079 | 2317 // VobSub subtitles |
2318 if(vo_vobsub){ | |
2319 current_module="vobsub"; | |
2320 vobsub_process(vo_vobsub,d_video->pts); | |
2321 current_module=NULL; | |
2322 } | |
2323 | |
3180
d53f70e3c794
spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents:
3166
diff
changeset
|
2324 #ifdef USE_DVDREAD |
554 | 2325 // DVD sub: |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
2326 if(vo_spudec){ |
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
2327 unsigned char* packet=NULL; |
3843 | 2328 int len; |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
2329 current_module="spudec"; |
3843 | 2330 while((len=ds_get_packet_sub(d_dvdsub,&packet))>0){ |
2331 mp_msg(MSGT_CPLAYER,MSGL_V,"\rDVD sub: len=%d v_pts=%5.3f s_pts=%5.3f \n",len,d_video->pts,d_dvdsub->pts); | |
3842 | 2332 spudec_assemble(vo_spudec,packet,len,100*d_dvdsub->pts); |
554 | 2333 } |
3842 | 2334 spudec_heartbeat(vo_spudec,100*d_video->pts); |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
2335 current_module=NULL; |
554 | 2336 } |
3180
d53f70e3c794
spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents:
3166
diff
changeset
|
2337 #endif |
554 | 2338 |
1421 | 2339 } // while(!eof) |
1 | 2340 |
1567 | 2341 mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d \n",eof); |
1 | 2342 |
1639 | 2343 } |
2344 | |
3618 | 2345 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
|
2346 |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2347 if(eof == 1 || eof == -1) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2348 if(play_tree_iter_step(playtree_iter,eof,0) == PLAY_TREE_ITER_ENTRY) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2349 uninit_player(INITED_ALL-(INITED_GUI+INITED_LIRC)); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2350 eof = 1; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2351 } else { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2352 play_tree_iter_free(playtree_iter); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2353 playtree_iter = NULL; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2354 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2355 } else { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2356 uninit_player(INITED_ALL-(INITED_GUI+INITED_LIRC)); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2357 eof = eof == -2 ? -1 : 1; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2358 } |
1639 | 2359 |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2360 goto_next_file_src: // When we have multiple src for file |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2361 |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2362 if(eof == 0) eof = 1; |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2363 |
1797 | 2364 #ifdef HAVE_NEW_GUI |
2365 if(use_gui) | |
2366 { | |
3618 | 2367 #ifdef USE_DVDREAD |
2368 if ( !mplShMem->DVDChanged ) | |
2369 #endif | |
2370 mplStop(); | |
1797 | 2371 } |
2372 #endif | |
2373 | |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2374 while(playtree_iter != NULL) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2375 filename = play_tree_iter_get_file(playtree_iter,eof); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2376 if(filename == NULL) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2377 if( play_tree_iter_step(playtree_iter,eof,0) != PLAY_TREE_ITER_ENTRY) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2378 play_tree_iter_free(playtree_iter); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2379 playtree_iter = NULL; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2380 }; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2381 } else |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2382 break; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2383 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2384 |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2385 if(use_gui || playtree_iter != NULL |
3618 | 2386 #if defined( HAVE_NEW_GUI ) && defined( USE_DVDREAD ) |
3723 | 2387 || (mplShMem && mplShMem->DVDChanged) |
3618 | 2388 #endif |
2389 ){ | |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2390 |
1654 | 2391 current_module="uninit_vcodec"; |
2392 if(sh_video) uninit_video(sh_video); | |
2393 | |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2394 current_module="free_demuxer"; |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2395 if(demuxer) free_demuxer(demuxer); |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2396 |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2397 current_module="free_stream"; |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2398 if(stream) free_stream(stream); |
3543 | 2399 |
2400 current_module="sub_free"; | |
2401 if ( subtitles ) | |
2402 { | |
2403 sub_free( subtitles ); | |
2404 sub_name=NULL; | |
2405 vo_sub=NULL; | |
2406 } | |
2407 | |
1639 | 2408 video_out=NULL; |
2409 audio_out=NULL; | |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2410 eof = 0; |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2411 goto play_next_file; |
1639 | 2412 } |
2413 | |
1582 | 2414 exit_player(MSGTR_Exit_eof); |
1639 | 2415 |
109 | 2416 return 1; |
2417 } |