Mercurial > mplayer.hg
annotate mplayer.c @ 4152:da00e9f57949
10l to Alban B. - restored removed verbose level setting
author | arpi |
---|---|
date | Mon, 14 Jan 2002 17:39:02 +0000 |
parents | 07d831705ec6 |
children | 22fadd4022b5 |
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 | |
4152
da00e9f57949
10l to Alban B. - restored removed verbose level setting
arpi
parents:
4087
diff
changeset
|
612 mp_msg_init(verbose+MSGL_STATUS); |
1183 | 613 |
1639 | 614 //------ load global data first ------ |
955 | 615 |
442 | 616 |
212 | 617 // check font |
1422 | 618 #ifdef USE_OSD |
212 | 619 if(font_name){ |
337 | 620 vo_font=read_font_desc(font_name,font_factor,verbose>1); |
1582 | 621 if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name); |
220 | 622 } else { |
623 // try default: | |
337 | 624 vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1); |
1353 | 625 if(!vo_font) |
626 vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1); | |
212 | 627 } |
1422 | 628 #endif |
212 | 629 |
1709 | 630 // It's time to init the GUI code: (and fork() the GTK process) |
631 #ifdef HAVE_NEW_GUI | |
632 if(use_gui){ | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
633 appInit( argc,argv,envp,(void*)mDisplay ); |
1856 | 634 inited_flags|=INITED_GUI; |
1803 | 635 mplShMem->Playing= (gui_no_filename) ? 0 : 1; |
1709 | 636 } |
637 #endif | |
1639 | 638 |
639 #ifdef HAVE_LIRC | |
640 lirc_mp_setup(); | |
1856 | 641 inited_flags|=INITED_LIRC; |
1639 | 642 #endif |
643 | |
3015 | 644 #ifdef HAVE_RTC |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
645 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
|
646 perror ("Linux RTC init: open"); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
647 else { |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
648 unsigned long irqp; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
649 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
650 /* if (ioctl(rtc_fd, RTC_IRQP_SET, _) < 0) { */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
651 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
|
652 perror ("Linux RTC init: ioctl (rtc_irqp_read)"); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
653 close (rtc_fd); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
654 rtc_fd = -1; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
655 } 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
|
656 /* variable only by the root */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
657 perror ("Linux RTC init: ioctl (rtc_pie_on)"); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
658 close (rtc_fd); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
659 rtc_fd = -1; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
660 } else |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
661 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
|
662 } |
3825 | 663 // breaks DGA and SVGAlib and VESA drivers: --A'rpi |
664 // setuid( getuid() ); // strongly test, please check this. | |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
665 if(rtc_fd<0) |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
666 #endif |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
667 printf("Using %s timing\n",softsleep?"software":"usleep()"); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
668 |
1639 | 669 #ifdef USE_TERMCAP |
3618 | 670 if ( !use_gui ) load_termcap(NULL); // load key-codes |
1639 | 671 #endif |
672 | |
1816 | 673 // ========== Init keyboard FIFO (connection to libvo) ============ |
674 make_pipe(&keyb_fifo_get,&keyb_fifo_put); | |
1694 | 675 |
1639 | 676 //========= Catch terminate signals: ================ |
677 // terminate requests: | |
678 signal(SIGTERM,exit_sighandler); // kill | |
679 signal(SIGHUP,exit_sighandler); // kill -HUP / xterm closed | |
680 | |
1729 | 681 signal(SIGINT,exit_sighandler); // Interrupt from keyboard |
1639 | 682 |
683 signal(SIGQUIT,exit_sighandler); // Quit from keyboard | |
684 // fatal errors: | |
685 signal(SIGBUS,exit_sighandler); // bus error | |
686 signal(SIGSEGV,exit_sighandler); // segfault | |
687 signal(SIGILL,exit_sighandler); // illegal instruction | |
688 signal(SIGFPE,exit_sighandler); // floating point exc. | |
689 signal(SIGABRT,exit_sighandler); // abort() | |
690 | |
691 // ******************* Now, let's see the per-file stuff ******************** | |
692 | |
693 play_next_file: | |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
694 |
1745 | 695 #ifdef HAVE_NEW_GUI |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
696 if ( use_gui ) { |
3618 | 697 |
698 #ifdef USE_DVDREAD | |
699 if ( mplShMem->DVDChanged ) | |
700 { | |
701 mplShMem->DVDChanged=0; | |
702 mplShMem->Playing=1; | |
703 filename="/dev/dvd"; | |
704 goto play_dvd; | |
705 } | |
706 #endif | |
707 | |
1817
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
708 if(filename && !mplShMem->FilenameChanged) strcpy( mplShMem->Filename,filename ); |
1803 | 709 // mplShMem->Playing= (gui_no_filename) ? 0 : 1; |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
710 while(mplShMem->Playing!=1){ |
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
711 usleep(20000); |
1802 | 712 EventHandling(); |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
713 } |
3560 | 714 |
3618 | 715 play_dvd: |
716 | |
3499 | 717 #ifdef USE_SUB |
3543 | 718 if ( mplShMem->SubtitleChanged || !mplShMem->FilenameChanged ) |
3560 | 719 { |
720 if ( mplShMem->Subtitlename[0] != 0 ) sub_name=mplShMem->Subtitlename; | |
721 mplShMem->SubtitleChanged=0; | |
722 } | |
3499 | 723 #endif |
3543 | 724 |
725 if ( mplShMem->FilenameChanged || !filename ) | |
726 { | |
727 filename=mplShMem->Filename; | |
728 mplShMem->FilenameChanged=0; | |
729 } | |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
730 } |
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
731 #endif |
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
732 |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1962
diff
changeset
|
733 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
|
734 |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
735 #ifdef USE_SUB_OLD |
1650
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
736 // check .sub |
3499 | 737 if(sub_name){ |
3580 | 738 #if 0 |
3499 | 739 int l=strlen(sub_name); |
740 if ((l>4) && ((0==strcmp(&sub_name[l-4],".utf")) | |
741 ||(0==strcmp(&sub_name[l-4],".UTF")))) | |
742 sub_utf8=1; | |
3580 | 743 #endif |
3499 | 744 subtitles=sub_read_file(sub_name); |
745 if(!subtitles || sub_num == 0) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name); | |
746 } | |
1651 | 747 if(!sub_name){ |
1650
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
748 if(sub_auto && filename) { // auto load sub file ... |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
749 subtitles=sub_read_file( sub_filename( get_path("sub/"), filename ) ); |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
750 } |
3580 | 751 #if 0 |
1650
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
752 if(!subtitles) subtitles=sub_read_file(get_path("default.sub")); // try default |
3580 | 753 #endif |
1650
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
754 } |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
755 |
1762 | 756 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
|
757 if(subtitles && stream_dump_type==4) dump_mpsub(subtitles, fps); |
3736 | 758 #endif |
1762 | 759 |
4079 | 760 current_module="vobsub"; |
761 if (vobsub_name){ | |
762 vo_vobsub=vobsub_open(vobsub_name); | |
763 if(vo_vobsub==NULL) | |
764 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,vobsub_name); | |
765 } | |
766 | |
1654 | 767 stream=NULL; |
768 demuxer=NULL; | |
769 d_audio=NULL; | |
770 d_video=NULL; | |
771 sh_audio=NULL; | |
772 sh_video=NULL; | |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
773 |
1639 | 774 #ifdef USE_LIBVO2 |
775 current_module="vo2_new"; | |
776 video_out=vo2_new(video_driver); | |
777 current_module=NULL; | |
778 #else | |
779 // check video_out driver name: | |
780 if (video_driver) | |
781 if ((i = strcspn(video_driver, ":")) > 0) | |
782 { | |
783 size_t i2 = strlen(video_driver); | |
784 | |
785 if (video_driver[i] == ':') | |
786 { | |
787 vo_subdevice = malloc(i2-i); | |
788 if (vo_subdevice != NULL) | |
789 strncpy(vo_subdevice, (char *)(video_driver+i+1), i2-i); | |
790 video_driver[i] = '\0'; | |
791 } | |
792 // printf("video_driver: %s, subdevice: %s\n", video_driver, vo_subdevice); | |
793 } | |
794 if(!video_driver) | |
795 video_out=video_out_drivers[0]; | |
796 else | |
797 for (i=0; video_out_drivers[i] != NULL; i++){ | |
798 const vo_info_t *info = video_out_drivers[i]->get_info (); | |
799 if(strcmp(info->short_name,video_driver) == 0){ | |
800 video_out = video_out_drivers[i];break; | |
801 } | |
802 } | |
803 #endif | |
804 if(!video_out){ | |
805 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidVOdriver,video_driver?video_driver:"?"); | |
806 exit_player(MSGTR_Exit_error); | |
807 } | |
808 | |
809 // check audio_out driver name: | |
810 if (audio_driver) | |
811 if ((i = strcspn(audio_driver, ":")) > 0) | |
812 { | |
813 size_t i2 = strlen(audio_driver); | |
814 | |
815 if (audio_driver[i] == ':') | |
816 { | |
817 ao_subdevice = malloc(i2-i); | |
818 if (ao_subdevice != NULL) | |
819 strncpy(ao_subdevice, (char *)(audio_driver+i+1), i2-i); | |
820 audio_driver[i] = '\0'; | |
821 } | |
822 // printf("audio_driver: %s, subdevice: %s\n", audio_driver, ao_subdevice); | |
823 } | |
824 if(!audio_driver) | |
825 audio_out=audio_out_drivers[0]; | |
826 else | |
827 for (i=0; audio_out_drivers[i] != NULL; i++){ | |
828 const ao_info_t *info = audio_out_drivers[i]->info; | |
829 if(strcmp(info->short_name,audio_driver) == 0){ | |
830 audio_out = audio_out_drivers[i];break; | |
831 } | |
832 } | |
833 if (!audio_out){ | |
834 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidAOdriver,audio_driver); | |
835 exit_player(MSGTR_Exit_error); | |
836 } | |
3107 | 837 /* 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
|
838 if(ao_plugin_cfg.plugin_list){ |
3107 | 839 for (i=0; audio_out_drivers[i] != NULL; i++){ |
840 const ao_info_t *info = audio_out_drivers[i]->info; | |
841 if(strcmp(info->short_name,"plugin") == 0){ | |
842 audio_out_drivers[i]->control(AOCONTROL_SET_PLUGIN_DRIVER,(int)audio_out); | |
843 audio_out = audio_out_drivers[i]; | |
844 break; | |
845 } | |
846 } | |
847 } | |
848 | |
1639 | 849 current_module="open_stream"; |
1467 | 850 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
|
851 if(!stream) { // error... |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
852 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
|
853 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
|
854 } |
2321 | 855 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
|
856 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
|
857 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
|
858 // Handle playlist |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
859 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
|
860 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
|
861 if(!entry) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
862 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
|
863 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
|
864 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
|
865 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
|
866 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
|
867 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
|
868 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
869 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
|
870 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
|
871 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
|
872 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
873 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
|
874 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
|
875 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
|
876 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
|
877 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
|
878 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
|
879 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
|
880 } |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
881 stream->start_pos+=seek_to_byte; |
598 | 882 |
3257 | 883 if(stream_dump_type==5){ |
884 unsigned char buf[4096]; | |
885 int len; | |
886 FILE *f; | |
887 current_module="dump"; | |
888 stream_reset(stream); | |
889 stream_seek(stream,stream->start_pos); | |
890 f=fopen(stream_dump_name,"wb"); | |
891 if(!f){ | |
892 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile); | |
893 exit_player(MSGTR_Exit_error); | |
894 } | |
895 while(!stream->eof){ | |
896 len=stream_read(stream,buf,4096); | |
897 if(len>0) fwrite(buf,len,1,f); | |
898 } | |
899 fclose(f); | |
900 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped); | |
901 exit_player(MSGTR_Exit_eof); | |
902 } | |
903 | |
3563 | 904 // initial prefill: 20% later: 5% (should be set by -cacheopts) |
905 if(stream_cache_size) stream_enable_cache(stream,stream_cache_size*1024,stream_cache_size*1024/5,stream_cache_size*1024/20); | |
2321 | 906 |
1639 | 907 use_stdin=filename && (!strcmp(filename,"-")); |
908 | |
492 | 909 #ifdef HAVE_LIBCSS |
1639 | 910 current_module="libcss"; |
546 | 911 if (dvdimportkey) { |
912 if (dvd_import_key(dvdimportkey)) { | |
1582 | 913 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorDVDkey); |
1639 | 914 exit_player(MSGTR_Exit_error); |
546 | 915 } |
1582 | 916 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CmdlineDVDkey); |
546 | 917 } |
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
|
918 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
|
919 // 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
|
920 if (dvd_auth(dvd_auth_device,filename)) { |
1809 | 921 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Error in DVD auth...\n"); |
1639 | 922 exit_player(MSGTR_Exit_error); |
723 | 923 } |
1582 | 924 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_DVDauthOk); |
492 | 925 } |
926 #endif | |
1 | 927 |
928 //============ Open & Sync stream and detect file format =============== | |
929 | |
3257 | 930 |
442 | 931 if(!has_audio) audio_id=-2; // do NOT read audio packets... |
1 | 932 |
1639 | 933 current_module="demux_open"; |
934 | |
1496 | 935 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
|
936 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
|
937 |
1660 | 938 //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
|
939 |
1 | 940 d_audio=demuxer->audio; |
941 d_video=demuxer->video; | |
554 | 942 d_dvdsub=demuxer->sub; |
1 | 943 |
792 | 944 // DUMP STREAMS: |
945 if(stream_dump_type){ | |
946 FILE *f; | |
947 demux_stream_t *ds=NULL; | |
1639 | 948 current_module="dump"; |
792 | 949 // select stream to dump |
950 switch(stream_dump_type){ | |
951 case 1: ds=d_audio;break; | |
952 case 2: ds=d_video;break; | |
2178 | 953 case 3: |
954 case 4: ds=d_dvdsub;break; | |
792 | 955 } |
956 if(!ds){ | |
1582 | 957 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpSelectedSteramMissing); |
1639 | 958 exit_player(MSGTR_Exit_error); |
792 | 959 } |
960 // disable other streams: | |
961 if(d_audio && d_audio!=ds) {ds_free_packs(d_audio); d_audio->id=-2; } | |
962 if(d_video && d_video!=ds) {ds_free_packs(d_video); d_video->id=-2; } | |
963 if(d_dvdsub && d_dvdsub!=ds) {ds_free_packs(d_dvdsub); d_dvdsub->id=-2; } | |
964 // let's dump it! | |
3257 | 965 f=fopen(stream_dump_name,"wb"); |
1639 | 966 if(!f){ |
967 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile); | |
968 exit_player(MSGTR_Exit_error); | |
969 } | |
792 | 970 while(!ds->eof){ |
971 unsigned char* start; | |
972 int in_size=ds_get_packet(ds,&start); | |
2102 | 973 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
|
974 && stream_dump_type==2) fwrite(&in_size,1,4,f); |
792 | 975 if(in_size>0) fwrite(start,in_size,1,f); |
976 } | |
977 fclose(f); | |
1582 | 978 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped); |
1639 | 979 exit_player(MSGTR_Exit_eof); |
792 | 980 } |
981 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
982 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
|
983 sh_video=d_video->sh; |
792 | 984 |
3054 | 985 #ifdef HAVE_NEW_GUI |
986 #ifdef USE_DVDREAD | |
987 if ( use_gui && stream->type == STREAMTYPE_DVD ) | |
988 { | |
989 dvd_priv_t * dvdp = stream->priv; | |
990 mplShMem->DVD.titles=dvdp->vmg_file->tt_srpt->nr_of_srpts; | |
991 mplShMem->DVD.chapters=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_ptts; | |
992 mplShMem->DVD.angles=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_angles; | |
993 mplShMem->DVD.nr_of_audio_channels=dvdp->nr_of_channels; | |
994 memcpy( mplShMem->DVD.audio_streams,dvdp->audio_streams,sizeof( dvdp->audio_streams ) ); | |
995 mplShMem->DVD.nr_of_subtitles=dvdp->nr_of_subtitles; | |
996 memcpy( mplShMem->DVD.subtitles,dvdp->subtitles,sizeof( dvdp->subtitles ) ); | |
997 mplShMem->DVD.current_title=dvd_title + 1; | |
998 mplShMem->DVD.current_chapter=dvd_chapter + 1; | |
3597 | 999 mplShMem->DVD.current_angle=dvd_angle + 1; |
3054 | 1000 mplShMem->Track=dvd_title + 1; |
1001 } | |
1002 #endif | |
1003 #endif | |
1004 | |
1639 | 1005 current_module="video_read_properties"; |
1006 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
1007 if(sh_video){ |
1 | 1008 |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1009 if(!video_read_properties(sh_video)) goto goto_next_file; // exit_player(MSGTR_Exit_error); // couldn't read header? |
1 | 1010 |
1567 | 1011 mp_msg(MSGT_CPLAYER,MSGL_INFO,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n", |
1660 | 1012 demuxer->file_format,sh_video->format, sh_video->disp_w,sh_video->disp_h, |
398 | 1013 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
|
1014 ); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
1015 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
1016 if(!sh_video->fps && !force_fps){ |
1582 | 1017 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
|
1018 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
|
1019 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
1020 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
1021 } |
398 | 1022 |
1 | 1023 fflush(stdout); |
1024 | |
778
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1025 if(!sh_video){ |
1582 | 1026 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
|
1027 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
|
1028 } |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1029 |
4087 | 1030 #ifdef USE_DVDREAD |
1031 current_module="dvd lang->id"; | |
1032 if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang); | |
1033 if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang); | |
1034 | |
1035 current_module="spudec"; | |
1036 vo_spudec=spudec_new_scaled(stream->priv?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL, | |
1037 sh_video->disp_w, sh_video->disp_h); | |
1038 if (vo_spudec!=NULL) | |
1039 inited_flags|=INITED_SPUDEC; | |
1040 #endif | |
1041 current_module=NULL; | |
4052
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4045
diff
changeset
|
1042 |
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4045
diff
changeset
|
1043 #ifdef USE_SUB |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1044 // 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
|
1045 // 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
|
1046 // check .sub |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1047 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
|
1048 if(sub_name){ |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1049 #if 0 |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1050 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
|
1051 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
|
1052 ||(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
|
1053 sub_utf8=1; |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1054 #endif |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1055 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
|
1056 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
|
1057 } |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1058 if(!sub_name){ |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1059 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
|
1060 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
|
1061 sh_video->fps ); |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1062 } |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1063 #if 0 |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1064 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
|
1065 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
|
1066 #endif |
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 |
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==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
|
1070 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
|
1071 #endif |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1072 |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1073 /* display clip info */ |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1074 demux_info_print(demuxer); |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1075 |
303 | 1076 //================== Init AUDIO (codec) ========================== |
1639 | 1077 |
1078 current_module="init_audio_codec"; | |
1079 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1080 if(sh_audio){ |
303 | 1081 // Go through the codec.conf and find the best codec... |
626 | 1082 sh_audio->codec=NULL; |
1582 | 1083 if(audio_family!=-1) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceAudioFmt,audio_family); |
626 | 1084 while(1){ |
1085 sh_audio->codec=find_codec(sh_audio->format,NULL,sh_audio->codec,1); | |
1086 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
|
1087 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
|
1088 sh_audio->codec=NULL; /* re-search */ |
1582 | 1089 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
|
1090 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
|
1091 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
|
1092 } |
1582 | 1093 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantFindAudioCodec,sh_audio->format); |
1094 mp_msg(MSGT_CPLAYER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf")); | |
1792 | 1095 sh_audio=d_audio->sh=NULL; |
626 | 1096 break; |
1097 } | |
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
|
1098 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
|
1099 else if(audio_family!=-1 && sh_audio->codec->driver!=audio_family) continue; |
1567 | 1100 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 | 1101 break; |
303 | 1102 } |
1 | 1103 } |
1104 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1105 if(sh_audio){ |
1567 | 1106 mp_msg(MSGT_CPLAYER,MSGL_V,"Initializing audio codec...\n"); |
442 | 1107 if(!init_audio(sh_audio)){ |
1582 | 1108 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CouldntInitAudioCodec); |
1792 | 1109 sh_audio=d_audio->sh=NULL; |
1889 | 1110 #ifdef HAVE_NEW_GUI |
1111 if ( use_gui ) mplShMem->AudioType=0; | |
1112 #endif | |
303 | 1113 } else { |
1567 | 1114 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 | 1115 sh_audio->sample_format,sh_audio->i_bps,sh_audio->o_bps); |
1889 | 1116 #ifdef HAVE_NEW_GUI |
1117 if ( use_gui ) mplShMem->AudioType=sh_audio->channels; | |
1118 #endif | |
303 | 1119 } |
175 | 1120 } |
1121 | |
303 | 1122 //================== Init VIDEO (codec & libvo) ========================== |
1123 | |
1639 | 1124 current_module="init_video_codec"; |
1125 | |
303 | 1126 // Go through the codec.conf and find the best codec... |
626 | 1127 sh_video->codec=NULL; |
1582 | 1128 if(video_family!=-1) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceVideoFmt,video_family); |
3712 | 1129 { /* local vars */ |
1130 short bestprio=-1; | |
1131 struct codecs_st *bestcodec=NULL; | |
626 | 1132 while(1){ |
1133 sh_video->codec=find_codec(sh_video->format, | |
1134 sh_video->bih?((unsigned int*) &sh_video->bih->biCompression):NULL,sh_video->codec,0); | |
3712 | 1135 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
|
1136 if(video_family!=-1) { |
3712 | 1137 //sh_video->codec=NULL; /* re-search */ |
1582 | 1138 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
|
1139 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
|
1140 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
|
1141 } |
3712 | 1142 if(bestprio==-1 || !video_codec) { |
1582 | 1143 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantFindVideoCodec,sh_video->format); |
1144 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
|
1145 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
3712 | 1146 } |
1147 } else { | |
1148 // is next line needed anymore? - atmos :: | |
1149 if(!allow_dshow && sh_video->codec->driver==VFM_DSHOW) continue; // skip DShow | |
1150 else if(video_codec && strcmp(sh_video->codec->name,video_codec)) continue; | |
1151 else if(video_family!=-1 && sh_video->codec->driver!=video_family) continue; | |
1152 else if(video_family==-1 && !video_codec && sh_video->codec->priority) { | |
1153 if(sh_video->codec->priority > bestprio) { | |
1154 //printf("\n\n!!! setting bestprio from %d to %d for %s!!!\n\n", bestprio, sh_video->codec->priority, sh_video->codec->name); | |
1155 bestprio=sh_video->codec->priority; | |
1156 bestcodec=sh_video->codec; | |
1157 } | |
1158 continue; | |
1159 } | |
1160 } /* sh_video->codec */ | |
626 | 1161 break; |
303 | 1162 } |
3712 | 1163 if(bestprio!=-1) { |
1164 //printf("chose codec %s by priority.\n", bestcodec->name); | |
1165 sh_video->codec=bestcodec; | |
1166 } | |
303 | 1167 |
3712 | 1168 } /* end local vars */ |
1169 | |
1170 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 | 1171 |
1172 for(i=0;i<CODECS_MAX_OUTFMT;i++){ | |
2705 | 1173 // int ret; |
303 | 1174 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
|
1175 if(out_fmt==0xFFFFFFFF) continue; |
1422 | 1176 #ifdef USE_LIBVO2 |
2705 | 1177 vo_flags=vo2_query_format(video_out); |
1422 | 1178 #else |
2705 | 1179 vo_flags=video_out->query_format(out_fmt); |
1422 | 1180 #endif |
2705 | 1181 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: query(%s) returned 0x%X\n",vo_format_name(out_fmt),vo_flags); |
1182 if(vo_flags) break; | |
303 | 1183 } |
1184 if(i>=CODECS_MAX_OUTFMT){ | |
1582 | 1185 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
|
1186 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
303 | 1187 } |
1188 sh_video->outfmtidx=i; | |
1189 | |
778
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1190 if(flip==-1){ |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1191 // autodetect flipping |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1192 flip=0; |
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_FLIP) |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1194 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
|
1195 flip=1; |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1196 } |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1197 |
1567 | 1198 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug1: out_fmt=%s\n",vo_format_name(out_fmt)); |
487 | 1199 |
1291 | 1200 if(!init_video(sh_video)){ |
1582 | 1201 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
|
1202 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
1 | 1203 } |
1204 | |
1439 | 1205 if(auto_quality>0){ |
1206 // Auto quality option enabled | |
1207 output_quality=get_video_quality_max(sh_video); | |
1208 if(auto_quality>output_quality) auto_quality=output_quality; | |
1209 else output_quality=auto_quality; | |
1567 | 1210 mp_msg(MSGT_CPLAYER,MSGL_V,"AutoQ: setting quality to %d\n",output_quality); |
1439 | 1211 set_video_quality(sh_video,output_quality); |
1212 } | |
1213 | |
398 | 1214 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============ |
1 | 1215 |
1639 | 1216 current_module="init_libvo"; |
1217 | |
2034
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1218 #if 0 /* was X11_FULLSCREEN hack -> moved to libvo/vo_xv.c where it belongs ::atmos */ |
1 | 1219 if(fullscreen){ |
1220 if(vo_init()){ | |
1221 //if(verbose) printf("X11 running at %dx%d depth: %d\n",vo_screenwidth,vo_screenheight,vo_depthonscreen); | |
1222 } | |
1223 if(!screen_size_xy) screen_size_xy=vo_screenwidth; // scale with asp.ratio | |
1224 } | |
1225 #endif | |
2034
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1226 // Set default VGA 1:1 aspect as fallback ::atmos |
3139 | 1227 if(movie_aspect>-1.0) sh_video->aspect = movie_aspect; // cmdline overrides autodetect |
2042 | 1228 // if(!sh_video->aspect) sh_video->aspect=1.0; |
1 | 1229 |
2034
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1230 if(screen_size_xy||screen_size_x||screen_size_y){ |
1 | 1231 if(screen_size_xy>0){ |
1232 if(screen_size_xy<=8){ | |
398 | 1233 screen_size_x=screen_size_xy*sh_video->disp_w; |
1234 screen_size_y=screen_size_xy*sh_video->disp_h; | |
1 | 1235 } else { |
1236 screen_size_x=screen_size_xy; | |
398 | 1237 screen_size_y=screen_size_xy*sh_video->disp_h/sh_video->disp_w; |
1 | 1238 } |
337 | 1239 } else if(!vidmode){ |
1240 if(!screen_size_x) screen_size_x=SCREEN_SIZE_X; | |
1241 if(!screen_size_y) screen_size_y=SCREEN_SIZE_Y; | |
398 | 1242 if(screen_size_x<=8) screen_size_x*=sh_video->disp_w; |
1243 if(screen_size_y<=8) screen_size_y*=sh_video->disp_h; | |
1 | 1244 } |
2034
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1245 } else { |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1246 // 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
|
1247 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
|
1248 screen_size_y=sh_video->disp_h; |
2042 | 1249 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
|
1250 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
|
1251 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=(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
|
1253 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
|
1254 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
|
1255 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
|
1256 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
|
1257 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
|
1258 } |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1259 } else { |
2042 | 1260 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
|
1261 } |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1262 } |
208
ae0f909ccc7c
Adds code to deal with vidmode selection. -- mgraffam
mgraffam
parents:
190
diff
changeset
|
1263 |
1422 | 1264 #ifndef USE_LIBVO2 |
340 | 1265 { const vo_info_t *info = video_out->get_info(); |
1567 | 1266 mp_msg(MSGT_CPLAYER,MSGL_INFO,"VO: [%s] %dx%d => %dx%d %s %s%s%s%s\n",info->short_name, |
398 | 1267 sh_video->disp_w,sh_video->disp_h, |
340 | 1268 screen_size_x,screen_size_y, |
1183 | 1269 vo_format_name(out_fmt), |
340 | 1270 fullscreen?"fs ":"", |
1271 vidmode?"vm ":"", | |
766 | 1272 softzoom?"zoom ":"", |
778
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1273 (flip==1)?"flip ":"" |
766 | 1274 // fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3) |
340 | 1275 ); |
1567 | 1276 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Description: %s\n",info->name); |
1277 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Author: %s\n", info->author); | |
1237 | 1278 if(strlen(info->comment) > 0) |
1567 | 1279 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Comment: %s\n", info->comment); |
340 | 1280 } |
1422 | 1281 #endif |
340 | 1282 |
1753 | 1283 #ifdef HAVE_NEW_GUI |
1284 if ( use_gui ) | |
1285 { | |
1952 | 1286 mplResizeToMovieSize( sh_video->disp_w,sh_video->disp_h ); |
3558 | 1287 moviewidth=sh_video->disp_w; |
1288 movieheight=sh_video->disp_h; | |
2447 | 1289 mplShMem->StreamType=stream->type; |
2854 | 1290 mplSetFileName( filename ); |
1753 | 1291 } |
1292 #endif | |
1293 | |
1567 | 1294 mp_msg(MSGT_CPLAYER,MSGL_V,"video_out->init(%dx%d->%dx%d,flags=%d,'%s',0x%X)\n", |
398 | 1295 sh_video->disp_w,sh_video->disp_h, |
1 | 1296 screen_size_x,screen_size_y, |
766 | 1297 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3), |
337 | 1298 title,out_fmt); |
1 | 1299 |
1422 | 1300 #ifdef USE_LIBVO2 |
1301 if(!vo2_start(video_out, | |
1302 sh_video->disp_w,sh_video->disp_h,out_fmt,0, | |
1303 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3) )){ | |
1304 #else | |
398 | 1305 if(video_out->init(sh_video->disp_w,sh_video->disp_h, |
1 | 1306 screen_size_x,screen_size_y, |
766 | 1307 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3), |
337 | 1308 title,out_fmt)){ |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1309 #endif |
1582 | 1310 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
|
1311 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
1 | 1312 } |
1856 | 1313 inited_flags|=INITED_VO; |
1567 | 1314 mp_msg(MSGT_CPLAYER,MSGL_V,"INFO: Video OUT driver init OK!\n"); |
1 | 1315 |
1316 fflush(stdout); | |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1317 |
1 | 1318 //================== MAIN: ========================== |
1319 { | |
746 | 1320 |
1420 | 1321 //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
|
1322 //float v_frame=0; // Video |
1 | 1323 float time_frame=0; // Timer |
1324 int force_redraw=0; | |
1400 | 1325 //float num_frames=0; // number of frames played |
1382 | 1326 int grab_frames=0; |
212 | 1327 char osd_text_buffer[64]; |
715 | 1328 int drop_frame=0; |
1329 int drop_frame_cnt=0; | |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1330 int too_slow_frame_cnt=0; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1331 int too_fast_frame_cnt=0; |
1439 | 1332 // 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
|
1333 float AV_delay=0; // average of A-V timestamp differences |
1439 | 1334 double cvideo_base_vtime; |
1335 double cvideo_base_vframe; | |
1336 double vdecode_time; | |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1337 unsigned int lastframeout_ts; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1338 float time_frame_corr_avg=0; |
1 | 1339 |
1340 //================ SETUP AUDIO ========================== | |
1341 current_module="setup_audio"; | |
1342 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1343 if(sh_audio){ |
1237 | 1344 |
1345 const ao_info_t *info=audio_out->info; | |
1567 | 1346 mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %iHz %s %s\n", |
1237 | 1347 info->short_name, |
1348 force_srate?force_srate:sh_audio->samplerate, | |
1349 sh_audio->channels>1?"Stereo":"Mono", | |
1456
8c57a5a3c645
printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents:
1449
diff
changeset
|
1350 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
|
1351 ); |
1567 | 1352 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Description: %s\nAO: Author: %s\n", |
1237 | 1353 info->name, |
1354 info->author | |
1355 ); | |
1456
8c57a5a3c645
printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents:
1449
diff
changeset
|
1356 if(strlen(info->comment) > 0) |
1567 | 1357 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Comment: %s\n", info->comment); |
969 | 1358 if(!audio_out->init(force_srate?force_srate:sh_audio->samplerate, |
1359 sh_audio->channels,sh_audio->sample_format,0)){ | |
1582 | 1360 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO); |
1792 | 1361 sh_audio=d_audio->sh=NULL; |
1856 | 1362 } else { |
1363 inited_flags|=INITED_AO; | |
1 | 1364 } |
1365 | |
955 | 1366 // printf("Audio buffer size: %d bytes, delay: %5.3fs\n",audio_buffer_size,audio_buffer_delay); |
746 | 1367 |
758 | 1368 // fixup audio buffer size: |
782 | 1369 // if(outburst<MAX_OUTBURST){ |
1370 // sh_audio->a_buffer_size=sh_audio->audio_out_minsize+outburst; | |
1371 // printf("Audio out buffer size reduced to %d bytes\n",sh_audio->a_buffer_size); | |
1372 // } | |
758 | 1373 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1374 // sh_audio->timer=-(audio_buffer_delay); |
1 | 1375 } |
1376 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1377 sh_video->timer=0; |
2000 | 1378 if(sh_audio) sh_audio->timer=-audio_delay; |
1 | 1379 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1380 if(!sh_audio){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1962
diff
changeset
|
1381 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_NoSound); |
1567 | 1382 if(verbose) mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused audio chunks\n",d_audio->packs); |
1 | 1383 ds_free_packs(d_audio); // free buffered chunks |
1384 d_audio->id=-2; // do not read audio chunks | |
1856 | 1385 if(audio_out) uninit_player(INITED_AO); // close device |
1 | 1386 } |
1387 | |
1388 current_module=NULL; | |
1389 | |
1660 | 1390 if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf! |
398 | 1391 if(force_fps){ |
1392 sh_video->fps=force_fps; | |
1393 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
|
1394 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FPSforced,sh_video->fps,sh_video->frametime); |
398 | 1395 } |
1 | 1396 |
1639 | 1397 //==================== START PLAYING ======================= |
1398 | |
1582 | 1399 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_StartPlaying);fflush(stdout); |
1 | 1400 |
3322
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1401 if(!use_stdin && !slave_mode){ |
1856 | 1402 getch2_enable(); // prepare stdin for hotkeys... |
1403 inited_flags|=INITED_GETCH2; | |
1404 } | |
1639 | 1405 |
1 | 1406 InitTimer(); |
1407 | |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
1408 total_time_usage_start=GetTimer(); |
3934
e8e7ca8995a1
codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents:
3843
diff
changeset
|
1409 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
|
1410 |
1 | 1411 while(!eof){ |
2567 | 1412 // unsigned int aq_total_time=GetTimer(); |
1439 | 1413 float aq_sleep_time=0; |
1 | 1414 |
1125 | 1415 if(play_n_frames>=0){ |
1416 --play_n_frames; | |
1582 | 1417 if(play_n_frames<0) exit_player(MSGTR_Exit_frames); |
1125 | 1418 } |
1419 | |
2705 | 1420 vo_pts=sh_video->timer*90000.0; |
3201 | 1421 vo_fps=sh_video->fps; |
2705 | 1422 |
1 | 1423 /*========================== 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
|
1424 while(sh_audio){ |
746 | 1425 unsigned int t; |
2705 | 1426 int playsize; |
1427 | |
3097 | 1428 ao_data.pts=sh_audio->timer*90000.0; |
2705 | 1429 playsize=audio_out->get_space(); |
746 | 1430 |
955 | 1431 if(!playsize) break; // buffer is full, do not block here!!! |
746 | 1432 |
1433 if(playsize>MAX_OUTBURST) playsize=MAX_OUTBURST; // we shouldn't exceed it! | |
1434 //if(playsize>outburst) playsize=outburst; | |
291 | 1435 |
1436 // Update buffer if needed | |
1639 | 1437 current_module="decode_audio"; // Enter AUDIO decoder module |
746 | 1438 t=GetTimer(); |
1439 while(sh_audio->a_buffer_len<playsize && !d_audio->eof){ | |
1440 int ret=decode_audio(sh_audio,&sh_audio->a_buffer[sh_audio->a_buffer_len], | |
1441 playsize-sh_audio->a_buffer_len,sh_audio->a_buffer_size-sh_audio->a_buffer_len); | |
296 | 1442 if(ret>0) sh_audio->a_buffer_len+=ret; else break; |
1 | 1443 } |
1444 current_module=NULL; // Leave AUDIO decoder module | |
291 | 1445 t=GetTimer()-t;audio_time_usage+=t*0.000001; |
746 | 1446 |
1447 if(playsize>sh_audio->a_buffer_len) playsize=sh_audio->a_buffer_len; | |
1448 | |
955 | 1449 playsize=audio_out->play(sh_audio->a_buffer,playsize,0); |
1 | 1450 |
955 | 1451 if(playsize>0){ |
746 | 1452 sh_audio->a_buffer_len-=playsize; |
1453 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
|
1454 sh_audio->timer+=playsize/(float)(sh_audio->o_bps); |
1 | 1455 } |
1456 | |
1457 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
|
1458 } // if(sh_audio) |
1 | 1459 |
1460 /*========================== UPDATE TIMERS ============================*/ | |
746 | 1461 #if 0 |
1 | 1462 if(alsa){ |
1463 // Use system timer for sync, not audio card/driver | |
1464 time_frame-=GetRelativeTime(); | |
1465 if(time_frame<-0.1 || time_frame>0.1){ | |
1466 time_frame=0; | |
1467 } else { | |
398 | 1468 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
|
1469 usec_sleep(time_frame-0.022); |
398 | 1470 time_frame-=GetRelativeTime(); |
1471 } | |
103 | 1472 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
|
1473 usec_sleep(1000); // sleeps 1 clock tick (10ms)! |
103 | 1474 time_frame-=GetRelativeTime(); |
1475 } | |
398 | 1476 } |
1 | 1477 } |
746 | 1478 #endif |
1 | 1479 |
1480 /*========================== PLAY VIDEO ============================*/ | |
1481 | |
1439 | 1482 cvideo_base_vframe=sh_video->timer; |
1483 cvideo_base_vtime=video_time_usage; | |
1484 | |
1 | 1485 if(1) |
746 | 1486 while(1){ |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1487 |
2567 | 1488 float frame_time=0; |
1291 | 1489 int blit_frame=0; |
715 | 1490 |
2567 | 1491 //-------------------- Decode a frame: ----------------------- |
1492 vdecode_time=video_time_usage; | |
1493 { unsigned char* start=NULL; | |
1494 int in_size; | |
1495 // get it! | |
1496 current_module="video_read_frame"; | |
1497 in_size=video_read_frame(sh_video,&frame_time,&start,force_fps); | |
1498 if(in_size<0){ eof=1; break; } | |
1499 if(in_size>max_framesize) max_framesize=in_size; // stats | |
1500 // decode: | |
1501 current_module="decode_video"; | |
1502 // printf("Decode! %p %d \n",start,in_size); | |
1503 blit_frame=decode_video(video_out,sh_video,start,in_size,drop_frame); | |
1291 | 1504 } |
2567 | 1505 vdecode_time=video_time_usage-vdecode_time; |
1506 //------------------------ frame decoded. -------------------- | |
1507 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1508 //------------------------ add OSD to frame contents --------- |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1509 #ifndef USE_LIBVO2 |
1768 | 1510 current_module="draw_osd"; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1511 video_out->draw_osd(); |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1512 #endif |
1 | 1513 |
1768 | 1514 current_module="av_sync"; |
1515 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1516 sh_video->timer+=frame_time; |
746 | 1517 time_frame+=frame_time; // for nosound |
1518 | |
1567 | 1519 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"*** ftime=%5.3f ***\n",frame_time); |
780 | 1520 |
798 | 1521 if(drop_frame){ |
746 | 1522 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1523 if(sh_audio && !d_audio->eof){ |
3097 | 1524 float delay=audio_out->get_delay(); |
1525 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
|
1526 time_frame=sh_video->timer; |
3097 | 1527 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
|
1528 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
|
1529 drop_frame=0; // stop dropping frames |
1567 | 1530 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
|
1531 }else{ |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1532 ++drop_frame_cnt; |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1533 if (verbose > 0 && drop_frame_cnt%10 == 0) |
1567 | 1534 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
|
1535 } |
798 | 1536 } |
1709 | 1537 #ifdef HAVE_NEW_GUI |
2567 | 1538 if(use_gui) EventHandling(); |
1709 | 1539 #endif |
1729 | 1540 video_out->check_events(); // check events AST |
798 | 1541 } else { |
780 | 1542 // It's time to sleep... |
1543 current_module="sleep"; | |
1544 | |
1545 time_frame-=GetRelativeTime(); // reset timer | |
1546 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1547 if(sh_audio && !d_audio->eof){ |
3097 | 1548 float delay=audio_out->get_delay(); |
1549 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
|
1550 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1551 if(!dapsync){ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1552 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1553 /* Arpi's AV-sync */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1554 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1555 time_frame=sh_video->timer; |
3097 | 1556 time_frame-=sh_audio->timer-delay; |
1557 | |
798 | 1558 // we are out of time... drop next frame! |
940 | 1559 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
|
1560 static int drop_message=0; |
798 | 1561 drop_frame=frame_dropping; // tricky! |
1562 ++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
|
1563 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
|
1564 drop_message=1; |
1582 | 1565 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
|
1566 } |
1567 | 1567 mp_msg(MSGT_AVSYNC,MSGL_DBG2,"\nframe drop %d, %.2f\n", drop_frame, time_frame); |
798 | 1568 } |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1569 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1570 } else { |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1571 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1572 /* DaP's AV-sync */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1573 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1574 float SH_AV_delay; |
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 + 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
|
1576 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
|
1577 // 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
|
1578 // 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
|
1579 if(SH_AV_delay<-2*frame_time){ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1580 static int drop_message=0; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1581 drop_frame=frame_dropping; // tricky! |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1582 ++drop_frame_cnt; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1583 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
|
1584 drop_message=1; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1585 mp_msg(MSGT_AVSYNC,MSGL_WARN,MSGTR_SystemTooSlow); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1586 } |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1587 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
|
1588 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
|
1589 /* go into unlimited-TF cycle */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1590 time_frame = SH_AV_delay; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1591 } else { |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1592 #define SL_CORR_AVG_LEN 125 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1593 /* don't adjust under framedropping */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1594 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
|
1595 (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
|
1596 #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
|
1597 #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
|
1598 time_frame += time_frame_corr_avg; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1599 // 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
|
1600 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
|
1601 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
|
1602 time_frame = SH_AV_delay; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1603 else { |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1604 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
|
1605 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
|
1606 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
|
1607 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
|
1608 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
|
1609 UNEXP_CORR_MAX : -UNEXP_CORR_MAX); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1610 } |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1611 } /* /start dropframe */ |
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 } |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1614 |
780 | 1615 } else { |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1616 // NOSOUND: |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
1617 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
|
1618 time_frame=0; |
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
1619 |
780 | 1620 } |
798 | 1621 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1622 // if(verbose>1)printf("sleep: %5.3f a:%6.3f v:%6.3f \n",time_frame,sh_audio->timer,sh_video->timer); |
1439 | 1623 |
1624 aq_sleep_time+=time_frame; | |
1709 | 1625 |
1626 #ifdef HAVE_NEW_GUI | |
1627 if(use_gui){ | |
1802 | 1628 EventHandling(); |
1709 | 1629 } |
1630 #endif | |
2705 | 1631 |
1632 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
|
1633 |
3015 | 1634 #ifdef HAVE_RTC |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1635 if(rtc_fd>=0){ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1636 // -------- RTC ----------- |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1637 while (time_frame > 0.000) { |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1638 unsigned long long rtc_ts; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1639 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
|
1640 perror ("read (rtc_fd)"); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1641 time_frame-=GetRelativeTime(); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1642 } |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1643 } else |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1644 #endif |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1645 { |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1646 // -------- USLEEP + SOFTSLEEP ----------- |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1647 float min=softsleep?0.021:0.005; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1648 while(time_frame>min){ |
746 | 1649 if(time_frame<=0.020) |
1439 | 1650 usec_sleep(0); // sleeps 1 clock tick (10ms)! |
746 | 1651 else |
2757 | 1652 usec_sleep(1000000*(time_frame-0.020)); |
746 | 1653 time_frame-=GetRelativeTime(); |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1654 } |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1655 if(softsleep){ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1656 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
|
1657 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
|
1658 } |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1659 } |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1660 |
2705 | 1661 } |
117 | 1662 |
715 | 1663 current_module="flip_page"; |
1422 | 1664 #ifdef USE_LIBVO2 |
1665 if(blit_frame) vo2_flip(video_out,0); | |
1666 #else | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1667 video_out->check_events(); |
1962 | 1668 if(blit_frame){ |
1669 unsigned int t2=GetTimer(); | |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1670 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1671 float j; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1672 #define FRAME_LAG_WARN 0.2 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1673 j = ((float)t2 - lastframeout_ts) / 1000000; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1674 lastframeout_ts = GetTimer(); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1675 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
|
1676 too_fast_frame_cnt++; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1677 /* printf ("PANIC: too fast frame (%.3f)!\n", j); */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1678 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
|
1679 too_slow_frame_cnt++; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1680 /* printf ("PANIC: too slow frame (%.3f)!\n", j); */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1681 |
1962 | 1682 video_out->flip_page(); |
1683 t2=GetTimer()-t2;vout_time_usage+=t2*0.000001f; | |
1684 } | |
1422 | 1685 #endif |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1686 // usec_sleep(50000); // test only! |
780 | 1687 |
715 | 1688 } |
780 | 1689 |
1690 current_module=NULL; | |
715 | 1691 |
1 | 1692 if(eof) break; |
220 | 1693 if(force_redraw){ |
1694 --force_redraw; | |
577 | 1695 if(!force_redraw) osd_function=OSD_PLAY; |
746 | 1696 continue; |
220 | 1697 } |
1 | 1698 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1699 // 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 | 1700 // fflush(stdout); |
1701 | |
1702 #if 1 | |
1703 /*================ 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
|
1704 if(sh_audio){ |
780 | 1705 float a_pts=0; |
1706 float v_pts=0; | |
1707 | |
746 | 1708 // unplayed bytes in our and soundcard/dma buffer: |
3097 | 1709 float delay=audio_out->get_delay()+(float)sh_audio->a_buffer_len/(float)sh_audio->o_bps; |
746 | 1710 |
780 | 1711 if(pts_from_bps){ |
1498 | 1712 #if 1 |
1713 unsigned int samples=(sh_audio->audio.dwSampleSize)? | |
1714 ((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) : | |
1715 (d_audio->pack_no); // <- used for VBR audio | |
3302 | 1716 samples+=sh_audio->audio.dwStart; // offset |
1498 | 1717 a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate; |
1718 #else | |
1481 | 1719 if(sh_audio->audio.dwSampleSize) |
1720 a_pts=(ds_tell(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->wf->nAvgBytesPerSec; | |
1721 else // VBR: | |
1722 a_pts=d_audio->pack_no*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate; | |
1498 | 1723 #endif |
1724 // v_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; | |
1725 // printf("V_PTS: PTS: %8.3f BPS: %8.3f \n",d_video->pts,v_pts); | |
1726 delay_corrected=1; | |
780 | 1727 } else { |
1728 // PTS = (last timestamp) + (bytes after last timestamp)/(bytes per sec) | |
746 | 1729 a_pts=d_audio->pts; |
1498 | 1730 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
|
1731 //printf("*** %5.3f ***\n",a_pts); |
746 | 1732 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
|
1733 // v_pts=d_video->pts-frame_time; |
1498 | 1734 // v_pts=d_video->pts; |
780 | 1735 } |
1498 | 1736 v_pts=d_video->pts; |
746 | 1737 |
1567 | 1738 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 | 1739 |
398 | 1740 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
|
1741 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
|
1742 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
|
1743 x=AV_delay*0.1f; |
1 | 1744 if(x<-max_pts_correction) x=-max_pts_correction; else |
1745 if(x> max_pts_correction) x= max_pts_correction; | |
780 | 1746 if(default_max_pts_correction>=0) |
1747 max_pts_correction=default_max_pts_correction; | |
1748 else | |
1749 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
|
1750 sh_audio->timer+=x; c_total+=x; |
2353 | 1751 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 | 1752 a_pts-audio_delay-delay,v_pts,AV_delay,c_total, |
1546 | 1753 (int)sh_video->num_frames,(int)sh_video->num_frames_decoded, |
1498 | 1754 (sh_video->timer>0.5)?(int)(100.0*video_time_usage/(double)sh_video->timer):0, |
1755 (sh_video->timer>0.5)?(int)(100.0*vout_time_usage/(double)sh_video->timer):0, | |
1756 (sh_video->timer>0.5)?(100.0*audio_time_usage/(double)sh_video->timer):0 | |
1757 ,drop_frame_cnt | |
1758 ,output_quality | |
2353 | 1759 ,cache_fill_status |
1 | 1760 ); |
1761 fflush(stdout); | |
1762 } | |
780 | 1763 |
1 | 1764 } else { |
1765 // No audio: | |
1420 | 1766 |
1448 | 1767 if(!quiet) |
2353 | 1768 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"V:%6.1f %3d %2d%% %2d%% %4.1f%% %d %d %d%%\r",d_video->pts, |
1400 | 1769 (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
|
1770 (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
|
1771 (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
|
1772 (sh_video->timer>0.5)?(100.0*audio_time_usage/(double)sh_video->timer):0 |
2353 | 1773 ,drop_frame_cnt |
1774 ,output_quality | |
1775 ,cache_fill_status | |
442 | 1776 ); |
1 | 1777 |
1778 fflush(stdout); | |
1420 | 1779 |
1 | 1780 } |
1781 #endif | |
1782 | |
1439 | 1783 /*Output quality adjustments:*/ |
1784 if(auto_quality>0){ | |
1785 #if 0 | |
1786 /*If we took a long time decoding this frame, downgrade the quality.*/ | |
1787 if(output_quality>0&& | |
1788 (video_time_usage-cvideo_base_vtime)*sh_video->timer>= | |
1789 (0.95*sh_video->timer-(vout_time_usage+audio_time_usage))* | |
1790 (sh_video->timer-cvideo_base_vframe-frame_correction)){ | |
1791 output_quality>>=1; | |
1567 | 1792 mp_msg(MSGT_AUTOQ,MSGL_DBG2,"Downgrading quality to %i.\n",output_quality); |
1439 | 1793 set_video_quality(sh_video,output_quality); |
1794 } else | |
1795 /*If we had plenty of extra time, upgrade the quality.*/ | |
1796 if(output_quality<auto_quality&& | |
1797 vdecode_time<0.5*frame_time&& | |
1798 (video_time_usage-cvideo_base_vtime)*sh_video->timer< | |
1799 (0.67*sh_video->timer-(vout_time_usage+audio_time_usage))* | |
1800 (sh_video->timer-cvideo_base_vframe-frame_correction)){ | |
1801 output_quality++; | |
1567 | 1802 mp_msg(MSGT_AUTOQ,MSGL_DBG2,"Upgrading quality to %i.\n",output_quality); |
1439 | 1803 set_video_quality(sh_video,output_quality); |
1804 } | |
1805 #else | |
1496 | 1806 // float total=0.000001f * (GetTimer()-aq_total_time); |
1439 | 1807 // if(output_quality<auto_quality && aq_sleep_time>0.05f*total) |
1808 if(output_quality<auto_quality && aq_sleep_time>0) | |
1809 ++output_quality; | |
1810 else | |
1811 // if(output_quality>0 && aq_sleep_time<-0.05f*total) | |
1812 if(output_quality>1 && aq_sleep_time<0) | |
1813 --output_quality; | |
1814 else | |
1815 if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms | |
1816 output_quality=0; | |
1817 // printf("total: %8.6f sleep: %8.6f q: %d\n",(0.000001f*aq_total_time),aq_sleep_time,output_quality); | |
1818 set_video_quality(sh_video,output_quality); | |
1819 #endif | |
1820 } | |
1821 | |
1422 | 1822 #ifdef USE_OSD |
220 | 1823 if(osd_visible){ |
1504
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
1824 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
|
1825 if (osd_function != OSD_PAUSE) |
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
1826 osd_function = OSD_PLAY; |
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
1827 } |
220 | 1828 } |
1422 | 1829 #endif |
371 | 1830 |
1831 if(osd_function==OSD_PAUSE){ | |
1817
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
1832 int gui_pause_flag=0; // gany! |
1567 | 1833 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
|
1834 #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
|
1835 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
|
1836 #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
|
1837 if (audio_out && sh_audio) |
1156 | 1838 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
|
1839 |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1840 if(slave_mode) { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1841 fd_set set; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1842 struct timeval timeout; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1843 while (1) { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1844 usec_sleep(1000); |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1845 FD_ZERO (&set); |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1846 FD_SET (STDIN_FILENO, &set); |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1847 timeout.tv_sec = 0; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1848 timeout.tv_usec = 1000; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1849 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
|
1850 break; |
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 } |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1853 } else { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1854 |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1855 while( |
371 | 1856 #ifdef HAVE_LIRC |
723 | 1857 lirc_mp_getinput()<=0 && |
371 | 1858 #endif |
1467 | 1859 (use_stdin || getch2(20)<=0) && mplayer_get_key()<=0){ |
1422 | 1860 #ifndef USE_LIBVO2 |
723 | 1861 video_out->check_events(); |
1422 | 1862 #endif |
1709 | 1863 #ifdef HAVE_NEW_GUI |
1864 if(use_gui){ | |
1802 | 1865 EventHandling(); |
1817
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
1866 if(mplShMem->Playing!=2 || (rel_seek_secs || abs_seek_pos)) |
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
1867 { gui_pause_flag=1; break; } // end of pause or seek |
1709 | 1868 } |
1869 #endif | |
1467 | 1870 if(use_stdin) usec_sleep(1000); // do not eat the CPU |
723 | 1871 } |
3322
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1872 } |
723 | 1873 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
|
1874 if (audio_out && sh_audio) |
1156 | 1875 audio_out->resume(); // resume audio |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1876 (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
|
1877 #ifdef HAVE_NEW_GUI |
1817
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
1878 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
|
1879 #endif |
371 | 1880 } |
1881 | |
746 | 1882 |
1883 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
|
1884 } // while(sh_video->timer<sh_audio->timer || force_redraw) |
1 | 1885 |
2436 | 1886 // skip some seconds... added by fly |
1887 | |
1888 if(step_sec>0) { | |
1889 osd_function=OSD_FFW; | |
1890 rel_seek_secs+=step_sec; | |
1891 } | |
1 | 1892 |
1893 //================= Keyboard events, SEEKing ==================== | |
1894 | |
3322
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1895 /* slave mode */ |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1896 if(slave_mode) { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1897 char buffer[1024]; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1898 fd_set set; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1899 struct timeval timeout; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1900 int arg; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1901 |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1902 FD_ZERO (&set); |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1903 FD_SET (STDIN_FILENO, &set); |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1904 timeout.tv_sec = 0; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1905 timeout.tv_usec = 1000; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1906 |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1907 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
|
1908 fgets(buffer, 1024, stdin); |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1909 if(!strcmp("play\n", buffer)) { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1910 osd_function=OSD_PLAY; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1911 } else if(!strcmp("stop\n", buffer)) { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1912 osd_function=OSD_PAUSE; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1913 } else if(!strncmp("seek ", buffer, 5)) { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1914 sscanf(buffer+5, "%d", &arg); |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1915 rel_seek_secs = arg-d_video->pts; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1916 } else if(!strncmp("skip ", buffer, 5)) { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1917 sscanf(buffer+5, "%d", &arg); |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1918 rel_seek_secs = arg; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1919 } else if(!strcmp("quit\n", buffer)) { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1920 exit_player(MSGTR_Exit_quit); |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1921 } |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1922 } else { |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1923 osd_function=OSD_PLAY; |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1924 } |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1925 } else |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1926 |
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
1927 /* interactive mode */ |
723 | 1928 { int c; |
1 | 1929 while( |
1930 #ifdef HAVE_LIRC | |
1931 (c=lirc_mp_getinput())>0 || | |
1932 #endif | |
1467 | 1933 (!use_stdin && (c=getch2(0))>0) || (c=mplayer_get_key())>0) switch(c){ |
1 | 1934 // seek 10 sec |
1935 case KEY_RIGHT: | |
220 | 1936 osd_function=OSD_FFW; |
1 | 1937 rel_seek_secs+=10;break; |
1938 case KEY_LEFT: | |
220 | 1939 osd_function=OSD_REW; |
1 | 1940 rel_seek_secs-=10;break; |
1941 // seek 1 min | |
1942 case KEY_UP: | |
220 | 1943 osd_function=OSD_FFW; |
1 | 1944 rel_seek_secs+=60;break; |
1945 case KEY_DOWN: | |
220 | 1946 osd_function=OSD_REW; |
1 | 1947 rel_seek_secs-=60;break; |
651 | 1948 // seek 10 min |
1949 case KEY_PAGE_UP: | |
1950 rel_seek_secs+=600;break; | |
1951 case KEY_PAGE_DOWN: | |
1952 rel_seek_secs-=600;break; | |
1 | 1953 // delay correction: |
1954 case '+': | |
746 | 1955 audio_delay+=0.1; // increase audio buffer delay |
3783 | 1956 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
|
1957 if(sh_audio) sh_audio->timer-=0.1; |
1 | 1958 break; |
1959 case '-': | |
746 | 1960 audio_delay-=0.1; // decrease audio buffer delay |
3783 | 1961 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
|
1962 if(sh_audio) sh_audio->timer+=0.1; |
1 | 1963 break; |
1964 // quit | |
1965 case KEY_ESC: // ESC | |
1639 | 1966 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
|
1967 case '>': |
679d3b21bedb
-playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents:
2567
diff
changeset
|
1968 if(curr_filename>=num_filenames-1) |
679d3b21bedb
-playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents:
2567
diff
changeset
|
1969 break; |
1 | 1970 case KEY_ENTER: // ESC |
3540 | 1971 eof=2; // jump to next file |
1639 | 1972 break; |
2647
679d3b21bedb
-playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents:
2567
diff
changeset
|
1973 case '<': |
679d3b21bedb
-playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents:
2567
diff
changeset
|
1974 if(curr_filename < 1) |
679d3b21bedb
-playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents:
2567
diff
changeset
|
1975 break; |
679d3b21bedb
-playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents:
2567
diff
changeset
|
1976 curr_filename-=2; |
3540 | 1977 eof=2; |
2647
679d3b21bedb
-playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents:
2567
diff
changeset
|
1978 break; |
36 | 1979 case 'g': grab_frames=2;break; |
1 | 1980 // pause |
1981 case 'p': | |
1982 case ' ': | |
220 | 1983 osd_function=OSD_PAUSE; |
371 | 1984 break; |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1985 case KEY_HOME: |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1986 { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1987 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
|
1988 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
|
1989 eof = 1; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1990 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
|
1991 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1992 break; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1993 case KEY_END: |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1994 { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1995 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
|
1996 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
|
1997 eof = -1; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1998 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
|
1999 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2000 break; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2001 case KEY_INS: |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2002 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
|
2003 eof = 2; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2004 break; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2005 case KEY_DEL: |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2006 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
|
2007 eof = -2; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2008 break; |
371 | 2009 case 'o': // toggle OSD |
2010 osd_level=(osd_level+1)%3; | |
1 | 2011 break; |
939 | 2012 case 'z': |
2013 sub_delay -= 0.1; | |
3234
d1e891c1e548
dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3201
diff
changeset
|
2014 osd_show_sub_delay = 9; // show the subdelay in OSD |
939 | 2015 break; |
2016 case 'x': | |
2017 sub_delay += 0.1; | |
3234
d1e891c1e548
dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3201
diff
changeset
|
2018 osd_show_sub_delay = 9; // show the subdelay in OSD |
939 | 2019 break; |
1626 | 2020 case '9': |
2021 case '0': | |
459 | 2022 case '*': |
555 | 2023 case '/': { |
1626 | 2024 if(c=='*' || c=='0'){ |
1881
d75b24bda7ce
Applied fix for mixercontrol w/alsa ossemu by Christian Ohm.
atmos4
parents:
1863
diff
changeset
|
2025 mixer_incvolume(); |
555 | 2026 } else { |
1881
d75b24bda7ce
Applied fix for mixercontrol w/alsa ossemu by Christian Ohm.
atmos4
parents:
1863
diff
changeset
|
2027 mixer_decvolume(); |
555 | 2028 } |
2029 | |
1422 | 2030 #ifdef USE_OSD |
555 | 2031 if(osd_level){ |
2032 osd_visible=sh_video->fps; // 1 sec | |
2033 vo_osd_progbar_type=OSD_VOLUME; | |
1881
d75b24bda7ce
Applied fix for mixercontrol w/alsa ossemu by Christian Ohm.
atmos4
parents:
1863
diff
changeset
|
2034 vo_osd_progbar_value=(mixer_getbothvolume()*256.0)/100.0; |
1852 | 2035 //printf("volume: %d\n",vo_osd_progbar_value); |
555 | 2036 } |
1422 | 2037 #endif |
555 | 2038 } |
2039 break; | |
459 | 2040 case 'm': |
510 | 2041 mixer_usemaster=!mixer_usemaster; |
459 | 2042 break; |
1429 | 2043 |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2044 #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
|
2045 case '1': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2046 case '2': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2047 case '3': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2048 case '4': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2049 case '5': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2050 case '6': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2051 case '7': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2052 case '8': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2053 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
|
2054 abs_seek_pos=3; |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2055 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
|
2056 break; |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2057 #else |
1429 | 2058 // Contrast: |
2059 case '1': | |
2060 case '2': | |
2061 if(c=='2'){ | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
2062 if ( ++v_cont > 100 ) v_cont = 100; |
1429 | 2063 } else { |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
2064 if ( --v_cont < 0 ) v_cont = 0; |
1429 | 2065 } |
2066 if(set_video_colors(sh_video,"Contrast",v_cont)){ | |
2067 #ifdef USE_OSD | |
2068 if(osd_level){ | |
2069 osd_visible=sh_video->fps; // 1 sec | |
2070 vo_osd_progbar_type=OSD_CONTRAST; | |
1726 | 2071 vo_osd_progbar_value=((v_cont)<<8)/100; |
1429 | 2072 } |
2073 #endif | |
2074 } | |
2075 break; | |
2076 | |
2077 // Brightness: | |
2078 case '3': | |
2079 case '4': | |
2080 if(c=='4'){ | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
2081 if ( ++v_bright > 100 ) v_bright = 100; |
1429 | 2082 } else { |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
2083 if ( --v_bright < 0 ) v_bright = 0; |
1429 | 2084 } |
2085 if(set_video_colors(sh_video,"Brightness",v_bright)){ | |
2086 #ifdef USE_OSD | |
2087 if(osd_level){ | |
2088 osd_visible=sh_video->fps; // 1 sec | |
2089 vo_osd_progbar_type=OSD_BRIGHTNESS; | |
1726 | 2090 vo_osd_progbar_value=((v_bright)<<8)/100; |
1429 | 2091 } |
2092 #endif | |
2093 } | |
2094 break; | |
2095 | |
2096 // Hue: | |
2097 case '5': | |
2098 case '6': | |
2099 if(c=='6'){ | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
2100 if ( ++v_hue > 100 ) v_hue = 100; |
1429 | 2101 } else { |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
2102 if ( --v_hue < 0 ) v_hue = 0; |
1429 | 2103 } |
2104 if(set_video_colors(sh_video,"Hue",v_hue)){ | |
2105 #ifdef USE_OSD | |
2106 if(osd_level){ | |
2107 osd_visible=sh_video->fps; // 1 sec | |
2108 vo_osd_progbar_type=OSD_HUE; | |
1726 | 2109 vo_osd_progbar_value=((v_hue)<<8)/100; |
1429 | 2110 } |
2111 #endif | |
2112 } | |
2113 break; | |
2114 | |
2115 // Saturation: | |
2116 case '7': | |
2117 case '8': | |
2118 if(c=='8'){ | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
2119 if ( ++v_saturation > 100 ) v_saturation = 100; |
1429 | 2120 } else { |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
2121 if ( --v_saturation < 0 ) v_saturation = 0; |
1429 | 2122 } |
2123 if(set_video_colors(sh_video,"Saturation",v_saturation)){ | |
2124 #ifdef USE_OSD | |
2125 if(osd_level){ | |
2126 osd_visible=sh_video->fps; // 1 sec | |
2127 vo_osd_progbar_type=OSD_SATURATION; | |
1726 | 2128 vo_osd_progbar_value=((v_saturation)<<8)/100; |
1429 | 2129 } |
2130 #endif | |
2131 } | |
2132 break; | |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2133 #endif |
1429 | 2134 |
715 | 2135 case 'd': |
798 | 2136 frame_dropping=(frame_dropping+1)%3; |
1567 | 2137 mp_msg(MSGT_CPLAYER,MSGL_V,"== drop: %d == \n",frame_dropping); |
715 | 2138 break; |
2941
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2139 |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2140 #ifdef USE_TV |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2141 case 'h': |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2142 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
|
2143 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
|
2144 break; |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2145 case 'l': |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2146 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
|
2147 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
|
2148 break; |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2149 case 'n': |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2150 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
|
2151 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
|
2152 break; |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2153 case 'b': |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2154 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
|
2155 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
|
2156 break; |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
2157 #endif |
1 | 2158 } |
1406 | 2159 } // keyboard event handler |
2160 | |
651 | 2161 if (seek_to_sec) { |
937 | 2162 int a,b; float d; |
2163 | |
2164 if (sscanf(seek_to_sec, "%d:%d:%f", &a,&b,&d)==3) | |
2165 rel_seek_secs += 3600*a +60*b +d ; | |
2166 else if (sscanf(seek_to_sec, "%d:%f", &a, &d)==2) | |
2167 rel_seek_secs += 60*a +d; | |
2168 else if (sscanf(seek_to_sec, "%f", &d)==1) | |
2169 rel_seek_secs += d; | |
2170 | |
2171 seek_to_sec = NULL; | |
651 | 2172 } |
937 | 2173 |
2365 | 2174 /* Looping. */ |
3540 | 2175 if(eof==1 && loop_times>=0) { |
2176 | |
2177 mp_msg(MSGT_CPLAYER,MSGL_V,"loop_times = %d, eof = %d\n", loop_times,eof); | |
2365 | 2178 |
3540 | 2179 if(loop_times>1) loop_times--; else |
2180 if(loop_times==1) loop_times=-1; | |
2181 | |
2365 | 2182 eof=0; |
3540 | 2183 abs_seek_pos=3; rel_seek_secs=0; // seek to start of movie (0%) |
2365 | 2184 |
2185 } | |
2186 | |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2187 if(rel_seek_secs || abs_seek_pos){ |
1466 | 2188 current_module="seek"; |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2189 if(demux_seek(demuxer,rel_seek_secs,abs_seek_pos)){ |
1405 | 2190 // success: |
4079 | 2191 /* FIXME there should be real seeking for vobsub */ |
2192 if (vo_vobsub) | |
2193 vobsub_reset(vo_vobsub); | |
889 | 2194 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
2195 if(sh_audio){ |
1459
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
2196 if(verbose){ |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
2197 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
|
2198 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; |
1567 | 2199 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
|
2200 } |
1567 | 2201 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
|
2202 } else { |
1567 | 2203 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
|
2204 } |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
2205 fflush(stdout); |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
2206 |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
2207 if(sh_audio){ |
1466 | 2208 current_module="seek_audio_reset"; |
1334 | 2209 audio_out->reset(); // stop audio, throwing away buffered data |
1 | 2210 } |
2211 | |
1422 | 2212 #ifdef USE_OSD |
1334 | 2213 // Set OSD: |
2214 if(osd_level){ | |
2215 int len=((demuxer->movi_end-demuxer->movi_start)>>8); | |
1727 | 2216 if (len>0){ |
2217 osd_visible=sh_video->fps; // 1 sec | |
2218 vo_osd_progbar_type=0; | |
2219 vo_osd_progbar_value=(demuxer->filepos-demuxer->movi_start)/len; | |
2220 } | |
1334 | 2221 } |
1422 | 2222 #endif |
1405 | 2223 |
1420 | 2224 c_total=0; |
1 | 2225 max_pts_correction=0.1; |
1504
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
2226 osd_visible=sh_video->fps; // to rewert to PLAY pointer after 1 sec |
3823 | 2227 // 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
|
2228 drop_frame_cnt=0; |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2229 too_slow_frame_cnt=0; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2230 too_fast_frame_cnt=0; |
3744 | 2231 |
2232 #ifdef USE_DVDREAD | |
2233 if(vo_spudec) spudec_reset(vo_spudec); | |
2234 #endif | |
1 | 2235 } |
1405 | 2236 rel_seek_secs=0; |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
2237 abs_seek_pos=0; |
1466 | 2238 current_module=NULL; |
2239 } | |
2240 | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2241 #ifdef HAVE_NEW_GUI |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2242 if(use_gui){ |
1735 | 2243 if(demuxer->file_format==DEMUXER_TYPE_AVI && sh_video->video.dwLength>2){ |
2244 // get pos from frame number / total frames | |
2245 mplShMem->Position=(float)d_video->pack_no*100.0f/sh_video->video.dwLength; | |
2246 } else { | |
2247 // get pos from file position / filesize | |
2248 int len=((demuxer->movi_end-demuxer->movi_start)); | |
2249 int pos=(demuxer->file_format==DEMUXER_TYPE_AVI)?demuxer->filepos:d_video->pos; | |
2250 mplShMem->Position=(len<=0)?0:((float)(pos-demuxer->movi_start) / len * 100.0f); | |
2251 } | |
1729 | 2252 mplShMem->TimeSec=d_video->pts; |
1772 | 2253 if(mplShMem->Playing==0) break; // STOP |
2254 if(mplShMem->Playing==2) osd_function=OSD_PAUSE; | |
1852 | 2255 if ( mplShMem->VolumeChanged ) |
1848 | 2256 { |
1852 | 2257 mixer_setvolume( mplShMem->Volume,mplShMem->Volume ); |
2258 mplShMem->VolumeChanged=0; | |
2259 #ifdef USE_OSD | |
2260 if ( osd_level ) | |
2261 { | |
2262 osd_visible=sh_video->fps; // 1 sec | |
2263 vo_osd_progbar_type=OSD_VOLUME; | |
2264 vo_osd_progbar_value=( ( mplShMem->Volume ) * 256.0 ) / 100.0; | |
2265 } | |
1848 | 2266 #endif |
1852 | 2267 } |
2268 mplShMem->Volume=(float)mixer_getbothvolume(); | |
3054 | 2269 #ifdef USE_DVDREAD |
3618 | 2270 if ( mplShMem->DVDChanged ) goto goto_next_file; |
3054 | 2271 if ( stream->type == STREAMTYPE_DVD ) |
2272 { | |
2273 dvd_priv_t * dvdp = stream->priv; | |
2274 mplShMem->DVD.current_chapter=dvdp->cur_cell + 1; | |
2275 } | |
2276 #endif | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2277 } |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2278 #endif |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2279 |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2280 |
220 | 2281 //================= Update OSD ==================== |
1422 | 2282 #ifdef USE_OSD |
1421 | 2283 if(osd_level>=2){ |
780 | 2284 int pts=d_video->pts; |
595 | 2285 if(pts==osd_last_pts-1) ++pts; else osd_last_pts=pts; |
371 | 2286 vo_osd_text=osd_text_buffer; |
3234
d1e891c1e548
dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3201
diff
changeset
|
2287 if (osd_show_sub_delay) { |
d1e891c1e548
dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3201
diff
changeset
|
2288 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
|
2289 osd_show_sub_delay--; |
d1e891c1e548
dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3201
diff
changeset
|
2290 } else |
3783 | 2291 if (osd_show_av_delay) { |
2292 sprintf(vo_osd_text, "A-V delay: %d ms",(int)(audio_delay*1000)); | |
2293 osd_show_av_delay--; | |
2294 } else | |
3234
d1e891c1e548
dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3201
diff
changeset
|
2295 sprintf(vo_osd_text,"%c %02d:%02d:%02d",osd_function,pts/3600,(pts/60)%60,pts%60); |
371 | 2296 } else { |
2297 vo_osd_text=NULL; | |
2298 } | |
220 | 2299 // for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0; |
371 | 2300 // vo_osd_text=osd_text_buffer; |
1422 | 2301 #endif |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
2302 |
1422 | 2303 #ifdef USE_SUB |
258 | 2304 // find sub |
1204 | 2305 if(subtitles && d_video->pts>0){ |
1762 | 2306 float pts=d_video->pts; |
398 | 2307 if(sub_fps==0) sub_fps=sh_video->fps; |
482 | 2308 current_module="find_sub"; |
3274
ac7ded58b6df
mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3257
diff
changeset
|
2309 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
|
2310 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
|
2311 sub_last_pts = pts; |
ac7ded58b6df
mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3257
diff
changeset
|
2312 } |
482 | 2313 current_module=NULL; |
258 | 2314 } |
1422 | 2315 #endif |
554 | 2316 |
3180
d53f70e3c794
spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents:
3166
diff
changeset
|
2317 |
4079 | 2318 // VobSub subtitles |
2319 if(vo_vobsub){ | |
2320 current_module="vobsub"; | |
2321 vobsub_process(vo_vobsub,d_video->pts); | |
2322 current_module=NULL; | |
2323 } | |
2324 | |
3180
d53f70e3c794
spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents:
3166
diff
changeset
|
2325 #ifdef USE_DVDREAD |
554 | 2326 // DVD sub: |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
2327 if(vo_spudec){ |
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
2328 unsigned char* packet=NULL; |
3843 | 2329 int len; |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
2330 current_module="spudec"; |
3843 | 2331 while((len=ds_get_packet_sub(d_dvdsub,&packet))>0){ |
2332 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 | 2333 spudec_assemble(vo_spudec,packet,len,100*d_dvdsub->pts); |
554 | 2334 } |
3842 | 2335 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
|
2336 current_module=NULL; |
554 | 2337 } |
3180
d53f70e3c794
spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents:
3166
diff
changeset
|
2338 #endif |
554 | 2339 |
1421 | 2340 } // while(!eof) |
1 | 2341 |
1567 | 2342 mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d \n",eof); |
1 | 2343 |
1639 | 2344 } |
2345 | |
3618 | 2346 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
|
2347 |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2348 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
|
2349 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
|
2350 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
|
2351 eof = 1; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2352 } else { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2353 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
|
2354 playtree_iter = NULL; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2355 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2356 } else { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2357 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
|
2358 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
|
2359 } |
1639 | 2360 |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2361 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
|
2362 |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2363 if(eof == 0) eof = 1; |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2364 |
1797 | 2365 #ifdef HAVE_NEW_GUI |
2366 if(use_gui) | |
2367 { | |
3618 | 2368 #ifdef USE_DVDREAD |
2369 if ( !mplShMem->DVDChanged ) | |
2370 #endif | |
2371 mplStop(); | |
1797 | 2372 } |
2373 #endif | |
2374 | |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2375 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
|
2376 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
|
2377 if(filename == NULL) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2378 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
|
2379 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
|
2380 playtree_iter = NULL; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2381 }; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2382 } else |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2383 break; |
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 |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2386 if(use_gui || playtree_iter != NULL |
3618 | 2387 #if defined( HAVE_NEW_GUI ) && defined( USE_DVDREAD ) |
3723 | 2388 || (mplShMem && mplShMem->DVDChanged) |
3618 | 2389 #endif |
2390 ){ | |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2391 |
1654 | 2392 current_module="uninit_vcodec"; |
2393 if(sh_video) uninit_video(sh_video); | |
2394 | |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2395 current_module="free_demuxer"; |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2396 if(demuxer) free_demuxer(demuxer); |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2397 |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2398 current_module="free_stream"; |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2399 if(stream) free_stream(stream); |
3543 | 2400 |
2401 current_module="sub_free"; | |
2402 if ( subtitles ) | |
2403 { | |
2404 sub_free( subtitles ); | |
2405 sub_name=NULL; | |
2406 vo_sub=NULL; | |
2407 } | |
2408 | |
1639 | 2409 video_out=NULL; |
2410 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
|
2411 eof = 0; |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2412 goto play_next_file; |
1639 | 2413 } |
2414 | |
1582 | 2415 exit_player(MSGTR_Exit_eof); |
1639 | 2416 |
109 | 2417 return 1; |
2418 } |