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