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