Mercurial > mplayer.hg
annotate mplayer.c @ 2492:e5bed36e6dea
implied "SUB: " when can't read 0 subtitle from a file
author | laaz |
---|---|
date | Fri, 26 Oct 2001 20:55:45 +0000 |
parents | c6421946d07c |
children | 6fe4d4a5a0ff |
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); | |
2492
e5bed36e6dea
implied "SUB: " when can't read 0 subtitle from a file
laaz
parents:
2491
diff
changeset
|
610 if (sub_num == 0) printf ("SUB: No subtitles found in %s\n",sub_name); |
2491 | 611 if(!subtitles || sub_num == 0) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name); |
1651 | 612 } |
613 #endif | |
614 | |
1709 | 615 // It's time to init the GUI code: (and fork() the GTK process) |
616 #ifdef HAVE_NEW_GUI | |
617 if(use_gui){ | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
618 appInit( argc,argv,envp,(void*)mDisplay ); |
1856 | 619 inited_flags|=INITED_GUI; |
1803 | 620 mplShMem->Playing= (gui_no_filename) ? 0 : 1; |
1709 | 621 } |
622 #endif | |
1639 | 623 |
624 #ifdef HAVE_LIRC | |
625 lirc_mp_setup(); | |
1856 | 626 inited_flags|=INITED_LIRC; |
1639 | 627 #endif |
628 | |
629 #ifdef USE_TERMCAP | |
1729 | 630 if ( !use_gui ) load_termcap(NULL); // load key-codes |
1639 | 631 #endif |
632 | |
1816 | 633 // ========== Init keyboard FIFO (connection to libvo) ============ |
634 make_pipe(&keyb_fifo_get,&keyb_fifo_put); | |
1694 | 635 |
1639 | 636 //========= Catch terminate signals: ================ |
637 // terminate requests: | |
638 signal(SIGTERM,exit_sighandler); // kill | |
639 signal(SIGHUP,exit_sighandler); // kill -HUP / xterm closed | |
640 | |
1729 | 641 signal(SIGINT,exit_sighandler); // Interrupt from keyboard |
1639 | 642 |
643 signal(SIGQUIT,exit_sighandler); // Quit from keyboard | |
644 // fatal errors: | |
645 signal(SIGBUS,exit_sighandler); // bus error | |
646 signal(SIGSEGV,exit_sighandler); // segfault | |
647 signal(SIGILL,exit_sighandler); // illegal instruction | |
648 signal(SIGFPE,exit_sighandler); // floating point exc. | |
649 signal(SIGABRT,exit_sighandler); // abort() | |
650 | |
651 // ******************* Now, let's see the per-file stuff ******************** | |
652 | |
653 curr_filename=0; | |
654 play_next_file: | |
655 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
|
656 |
1745 | 657 #ifdef HAVE_NEW_GUI |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
658 if ( use_gui ) { |
1817
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
659 if(filename && !mplShMem->FilenameChanged) strcpy( mplShMem->Filename,filename ); |
1803 | 660 // mplShMem->Playing= (gui_no_filename) ? 0 : 1; |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
661 while(mplShMem->Playing!=1){ |
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
662 usleep(20000); |
1802 | 663 EventHandling(); |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
664 } |
1817
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
665 if(mplShMem->FilenameChanged){ |
1790 | 666 filename=mplShMem->Filename; |
667 } | |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
668 } |
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
669 #endif |
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
670 |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1962
diff
changeset
|
671 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
|
672 |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
673 #ifdef USE_SUB |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
674 // check .sub |
1651 | 675 if(!sub_name){ |
1650
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
676 if(sub_auto && filename) { // auto load sub file ... |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
677 subtitles=sub_read_file( sub_filename( get_path("sub/"), filename ) ); |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
678 } |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
679 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
|
680 } |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
681 #endif |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
682 |
1762 | 683 if(subtitles && stream_dump_type==3) list_sub_file(subtitles); |
2178 | 684 if(subtitles && stream_dump_type==4) dump_mpsub(subtitles); |
1762 | 685 |
1654 | 686 stream=NULL; |
687 demuxer=NULL; | |
688 d_audio=NULL; | |
689 d_video=NULL; | |
690 sh_audio=NULL; | |
691 sh_video=NULL; | |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
692 |
1639 | 693 #ifdef USE_LIBVO2 |
694 current_module="vo2_new"; | |
695 video_out=vo2_new(video_driver); | |
696 current_module=NULL; | |
697 #else | |
698 // check video_out driver name: | |
699 if (video_driver) | |
700 if ((i = strcspn(video_driver, ":")) > 0) | |
701 { | |
702 size_t i2 = strlen(video_driver); | |
703 | |
704 if (video_driver[i] == ':') | |
705 { | |
706 vo_subdevice = malloc(i2-i); | |
707 if (vo_subdevice != NULL) | |
708 strncpy(vo_subdevice, (char *)(video_driver+i+1), i2-i); | |
709 video_driver[i] = '\0'; | |
710 } | |
711 // printf("video_driver: %s, subdevice: %s\n", video_driver, vo_subdevice); | |
712 } | |
713 if(!video_driver) | |
714 video_out=video_out_drivers[0]; | |
715 else | |
716 for (i=0; video_out_drivers[i] != NULL; i++){ | |
717 const vo_info_t *info = video_out_drivers[i]->get_info (); | |
718 if(strcmp(info->short_name,video_driver) == 0){ | |
719 video_out = video_out_drivers[i];break; | |
720 } | |
721 } | |
722 #endif | |
723 if(!video_out){ | |
724 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidVOdriver,video_driver?video_driver:"?"); | |
725 exit_player(MSGTR_Exit_error); | |
726 } | |
727 | |
728 // check audio_out driver name: | |
729 if (audio_driver) | |
730 if ((i = strcspn(audio_driver, ":")) > 0) | |
731 { | |
732 size_t i2 = strlen(audio_driver); | |
733 | |
734 if (audio_driver[i] == ':') | |
735 { | |
736 ao_subdevice = malloc(i2-i); | |
737 if (ao_subdevice != NULL) | |
738 strncpy(ao_subdevice, (char *)(audio_driver+i+1), i2-i); | |
739 audio_driver[i] = '\0'; | |
740 } | |
741 // printf("audio_driver: %s, subdevice: %s\n", audio_driver, ao_subdevice); | |
742 } | |
743 if(!audio_driver) | |
744 audio_out=audio_out_drivers[0]; | |
745 else | |
746 for (i=0; audio_out_drivers[i] != NULL; i++){ | |
747 const ao_info_t *info = audio_out_drivers[i]->info; | |
748 if(strcmp(info->short_name,audio_driver) == 0){ | |
749 audio_out = audio_out_drivers[i];break; | |
750 } | |
751 } | |
752 if (!audio_out){ | |
753 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidAOdriver,audio_driver); | |
754 exit_player(MSGTR_Exit_error); | |
755 } | |
756 /*DSP!! if(dsp) audio_out->control(AOCONTROL_SET_DEVICE,(int)dsp);*/ | |
757 | |
758 | |
759 current_module="open_stream"; | |
1467 | 760 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
|
761 if(!stream) goto goto_next_file;// exit_player(MSGTR_Exit_error); // error... |
2321 | 762 inited_flags|=INITED_STREAM; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
763 stream->start_pos+=seek_to_byte; |
598 | 764 |
2332 | 765 if(stream_cache_size) stream_enable_cache(stream,stream_cache_size*1024); |
2321 | 766 |
1639 | 767 use_stdin=filename && (!strcmp(filename,"-")); |
768 | |
492 | 769 #ifdef HAVE_LIBCSS |
1639 | 770 current_module="libcss"; |
546 | 771 if (dvdimportkey) { |
772 if (dvd_import_key(dvdimportkey)) { | |
1582 | 773 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorDVDkey); |
1639 | 774 exit_player(MSGTR_Exit_error); |
546 | 775 } |
1582 | 776 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CmdlineDVDkey); |
546 | 777 } |
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
|
778 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
|
779 // 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
|
780 if (dvd_auth(dvd_auth_device,filename)) { |
1809 | 781 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Error in DVD auth...\n"); |
1639 | 782 exit_player(MSGTR_Exit_error); |
723 | 783 } |
1582 | 784 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_DVDauthOk); |
492 | 785 } |
786 #endif | |
1 | 787 |
788 //============ Open & Sync stream and detect file format =============== | |
789 | |
442 | 790 if(!has_audio) audio_id=-2; // do NOT read audio packets... |
1 | 791 |
1639 | 792 current_module="demux_open"; |
793 | |
1496 | 794 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
|
795 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
|
796 |
1660 | 797 //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
|
798 |
1 | 799 d_audio=demuxer->audio; |
800 d_video=demuxer->video; | |
554 | 801 d_dvdsub=demuxer->sub; |
1 | 802 |
792 | 803 // DUMP STREAMS: |
804 if(stream_dump_type){ | |
805 FILE *f; | |
806 demux_stream_t *ds=NULL; | |
1639 | 807 current_module="dump"; |
792 | 808 // select stream to dump |
809 switch(stream_dump_type){ | |
810 case 1: ds=d_audio;break; | |
811 case 2: ds=d_video;break; | |
2178 | 812 case 3: |
813 case 4: ds=d_dvdsub;break; | |
792 | 814 } |
815 if(!ds){ | |
1582 | 816 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpSelectedSteramMissing); |
1639 | 817 exit_player(MSGTR_Exit_error); |
792 | 818 } |
819 // disable other streams: | |
820 if(d_audio && d_audio!=ds) {ds_free_packs(d_audio); d_audio->id=-2; } | |
821 if(d_video && d_video!=ds) {ds_free_packs(d_video); d_video->id=-2; } | |
822 if(d_dvdsub && d_dvdsub!=ds) {ds_free_packs(d_dvdsub); d_dvdsub->id=-2; } | |
823 // let's dump it! | |
824 f=fopen(stream_dump_name?stream_dump_name:"stream.dump","wb"); | |
1639 | 825 if(!f){ |
826 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile); | |
827 exit_player(MSGTR_Exit_error); | |
828 } | |
792 | 829 while(!ds->eof){ |
830 unsigned char* start; | |
831 int in_size=ds_get_packet(ds,&start); | |
2102 | 832 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
|
833 && stream_dump_type==2) fwrite(&in_size,1,4,f); |
792 | 834 if(in_size>0) fwrite(start,in_size,1,f); |
835 } | |
836 fclose(f); | |
1582 | 837 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped); |
1639 | 838 exit_player(MSGTR_Exit_eof); |
792 | 839 } |
840 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
841 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
|
842 sh_video=d_video->sh; |
792 | 843 |
1639 | 844 current_module="video_read_properties"; |
845 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
846 if(sh_video){ |
1 | 847 |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
848 if(!video_read_properties(sh_video)) goto goto_next_file; // exit_player(MSGTR_Exit_error); // couldn't read header? |
1 | 849 |
1567 | 850 mp_msg(MSGT_CPLAYER,MSGL_INFO,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n", |
1660 | 851 demuxer->file_format,sh_video->format, sh_video->disp_w,sh_video->disp_h, |
398 | 852 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
|
853 ); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
854 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
855 if(!sh_video->fps && !force_fps){ |
1582 | 856 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
|
857 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
|
858 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
859 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
860 } |
398 | 861 |
1 | 862 fflush(stdout); |
863 | |
778
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
864 if(!sh_video){ |
1582 | 865 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
|
866 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
|
867 } |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
868 |
303 | 869 //================== Init AUDIO (codec) ========================== |
1639 | 870 |
871 current_module="init_audio_codec"; | |
872 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
873 if(sh_audio){ |
303 | 874 // Go through the codec.conf and find the best codec... |
626 | 875 sh_audio->codec=NULL; |
1582 | 876 if(audio_family!=-1) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceAudioFmt,audio_family); |
626 | 877 while(1){ |
878 sh_audio->codec=find_codec(sh_audio->format,NULL,sh_audio->codec,1); | |
879 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
|
880 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
|
881 sh_audio->codec=NULL; /* re-search */ |
1582 | 882 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
|
883 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
|
884 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
|
885 } |
1582 | 886 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantFindAudioCodec,sh_audio->format); |
887 mp_msg(MSGT_CPLAYER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf")); | |
1792 | 888 sh_audio=d_audio->sh=NULL; |
626 | 889 break; |
890 } | |
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
|
891 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
|
892 else if(audio_family!=-1 && sh_audio->codec->driver!=audio_family) continue; |
1567 | 893 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 | 894 break; |
303 | 895 } |
1 | 896 } |
897 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
898 if(sh_audio){ |
1567 | 899 mp_msg(MSGT_CPLAYER,MSGL_V,"Initializing audio codec...\n"); |
442 | 900 if(!init_audio(sh_audio)){ |
1582 | 901 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CouldntInitAudioCodec); |
1792 | 902 sh_audio=d_audio->sh=NULL; |
1889 | 903 #ifdef HAVE_NEW_GUI |
904 if ( use_gui ) mplShMem->AudioType=0; | |
905 #endif | |
303 | 906 } else { |
1567 | 907 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 | 908 sh_audio->sample_format,sh_audio->i_bps,sh_audio->o_bps); |
1889 | 909 #ifdef HAVE_NEW_GUI |
910 if ( use_gui ) mplShMem->AudioType=sh_audio->channels; | |
911 #endif | |
303 | 912 } |
175 | 913 } |
914 | |
303 | 915 //================== Init VIDEO (codec & libvo) ========================== |
916 | |
1639 | 917 current_module="init_video_codec"; |
918 | |
303 | 919 // Go through the codec.conf and find the best codec... |
626 | 920 sh_video->codec=NULL; |
1582 | 921 if(video_family!=-1) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceVideoFmt,video_family); |
626 | 922 while(1){ |
923 sh_video->codec=find_codec(sh_video->format, | |
924 sh_video->bih?((unsigned int*) &sh_video->bih->biCompression):NULL,sh_video->codec,0); | |
925 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
|
926 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
|
927 sh_video->codec=NULL; /* re-search */ |
1582 | 928 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
|
929 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
|
930 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
|
931 } |
1582 | 932 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantFindVideoCodec,sh_video->format); |
933 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
|
934 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
626 | 935 } |
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
|
936 // is next line needed anymore? - atmos :: |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1406
diff
changeset
|
937 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
|
938 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
|
939 else if(video_family!=-1 && sh_video->codec->driver!=video_family) continue; |
626 | 940 break; |
303 | 941 } |
942 | |
1567 | 943 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 | 944 |
945 for(i=0;i<CODECS_MAX_OUTFMT;i++){ | |
487 | 946 int ret; |
303 | 947 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
|
948 if(out_fmt==0xFFFFFFFF) continue; |
1422 | 949 #ifdef USE_LIBVO2 |
950 ret=vo2_query_format(video_out); | |
951 #else | |
487 | 952 ret=video_out->query_format(out_fmt); |
1422 | 953 #endif |
1567 | 954 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: query(%s) returned 0x%X\n",vo_format_name(out_fmt),ret); |
487 | 955 if(ret) break; |
303 | 956 } |
957 if(i>=CODECS_MAX_OUTFMT){ | |
1582 | 958 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
|
959 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
303 | 960 } |
961 sh_video->outfmtidx=i; | |
962 | |
778
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
963 if(flip==-1){ |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
964 // autodetect flipping |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
965 flip=0; |
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_FLIP) |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
967 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
|
968 flip=1; |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
969 } |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
970 |
1567 | 971 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug1: out_fmt=%s\n",vo_format_name(out_fmt)); |
487 | 972 |
1291 | 973 if(!init_video(sh_video)){ |
1582 | 974 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
|
975 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
1 | 976 } |
977 | |
1439 | 978 if(auto_quality>0){ |
979 // Auto quality option enabled | |
980 output_quality=get_video_quality_max(sh_video); | |
981 if(auto_quality>output_quality) auto_quality=output_quality; | |
982 else output_quality=auto_quality; | |
1567 | 983 mp_msg(MSGT_CPLAYER,MSGL_V,"AutoQ: setting quality to %d\n",output_quality); |
1439 | 984 set_video_quality(sh_video,output_quality); |
985 } | |
986 | |
1 | 987 // ================== Init output files for encoding =============== |
988 if(encode_name){ | |
989 // encode file!!! | |
990 FILE *encode_file=fopen(encode_name,"rb"); | |
991 if(encode_file){ | |
992 fclose(encode_file); | |
1582 | 993 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_EncodeFileExists,encode_name); |
1639 | 994 exit_player(MSGTR_Exit_error); |
1 | 995 } |
996 encode_file=fopen(encode_name,"wb"); | |
997 if(!encode_file){ | |
1582 | 998 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantCreateEncodeFile); |
1639 | 999 exit_player(MSGTR_Exit_error); |
1 | 1000 } |
398 | 1001 write_avi_header_1(encode_file,mmioFOURCC('d', 'i', 'v', 'x'),sh_video->fps,sh_video->disp_w,sh_video->disp_h); |
1 | 1002 fclose(encode_file); |
1003 encode_index_name=malloc(strlen(encode_name)+8); | |
1004 strcpy(encode_index_name,encode_name); | |
1005 strcat(encode_index_name,".index"); | |
1006 if((encode_file=fopen(encode_index_name,"wb"))) | |
1007 fclose(encode_file); | |
1008 else encode_index_name=NULL; | |
1856 | 1009 sh_audio=d_audio->sh=NULL; // force nosound |
1010 inited_flags|=INITED_ENCODE; | |
1 | 1011 } |
1012 | |
398 | 1013 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============ |
1 | 1014 |
1639 | 1015 current_module="init_libvo"; |
1016 | |
2034
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1017 #if 0 /* was X11_FULLSCREEN hack -> moved to libvo/vo_xv.c where it belongs ::atmos */ |
1 | 1018 if(fullscreen){ |
1019 if(vo_init()){ | |
1020 //if(verbose) printf("X11 running at %dx%d depth: %d\n",vo_screenwidth,vo_screenheight,vo_depthonscreen); | |
1021 } | |
1022 if(!screen_size_xy) screen_size_xy=vo_screenwidth; // scale with asp.ratio | |
1023 } | |
1024 #endif | |
2034
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1025 // Set default VGA 1:1 aspect as fallback ::atmos |
2042 | 1026 if(movie_aspect) sh_video->aspect = movie_aspect; // cmdline overrides autodetect |
1027 // if(!sh_video->aspect) sh_video->aspect=1.0; | |
1 | 1028 |
2034
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1029 if(screen_size_xy||screen_size_x||screen_size_y){ |
1 | 1030 if(screen_size_xy>0){ |
1031 if(screen_size_xy<=8){ | |
398 | 1032 screen_size_x=screen_size_xy*sh_video->disp_w; |
1033 screen_size_y=screen_size_xy*sh_video->disp_h; | |
1 | 1034 } else { |
1035 screen_size_x=screen_size_xy; | |
398 | 1036 screen_size_y=screen_size_xy*sh_video->disp_h/sh_video->disp_w; |
1 | 1037 } |
337 | 1038 } else if(!vidmode){ |
1039 if(!screen_size_x) screen_size_x=SCREEN_SIZE_X; | |
1040 if(!screen_size_y) screen_size_y=SCREEN_SIZE_Y; | |
398 | 1041 if(screen_size_x<=8) screen_size_x*=sh_video->disp_w; |
1042 if(screen_size_y<=8) screen_size_y*=sh_video->disp_h; | |
1 | 1043 } |
2034
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1044 } else { |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1045 // 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
|
1046 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
|
1047 screen_size_y=sh_video->disp_h; |
2042 | 1048 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
|
1049 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
|
1050 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=(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
|
1052 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
|
1053 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
|
1054 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
|
1055 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
|
1056 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
|
1057 } |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1058 } else { |
2042 | 1059 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
|
1060 } |
2f1974590f88
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
2020
diff
changeset
|
1061 } |
208
ae0f909ccc7c
Adds code to deal with vidmode selection. -- mgraffam
mgraffam
parents:
190
diff
changeset
|
1062 |
1422 | 1063 #ifndef USE_LIBVO2 |
340 | 1064 { const vo_info_t *info = video_out->get_info(); |
1567 | 1065 mp_msg(MSGT_CPLAYER,MSGL_INFO,"VO: [%s] %dx%d => %dx%d %s %s%s%s%s\n",info->short_name, |
398 | 1066 sh_video->disp_w,sh_video->disp_h, |
340 | 1067 screen_size_x,screen_size_y, |
1183 | 1068 vo_format_name(out_fmt), |
340 | 1069 fullscreen?"fs ":"", |
1070 vidmode?"vm ":"", | |
766 | 1071 softzoom?"zoom ":"", |
778
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1072 (flip==1)?"flip ":"" |
766 | 1073 // fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3) |
340 | 1074 ); |
1567 | 1075 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Description: %s\n",info->name); |
1076 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Author: %s\n", info->author); | |
1237 | 1077 if(strlen(info->comment) > 0) |
1567 | 1078 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Comment: %s\n", info->comment); |
340 | 1079 } |
1422 | 1080 #endif |
340 | 1081 |
1753 | 1082 #ifdef HAVE_NEW_GUI |
1083 if ( use_gui ) | |
1084 { | |
1952 | 1085 mplResizeToMovieSize( sh_video->disp_w,sh_video->disp_h ); |
1086 moviewidth=screen_size_x=sh_video->disp_w; | |
1087 movieheight=screen_size_y=sh_video->disp_h; | |
2447 | 1088 mplShMem->StreamType=stream->type; |
1753 | 1089 } |
1090 #endif | |
1091 | |
1567 | 1092 mp_msg(MSGT_CPLAYER,MSGL_V,"video_out->init(%dx%d->%dx%d,flags=%d,'%s',0x%X)\n", |
398 | 1093 sh_video->disp_w,sh_video->disp_h, |
1 | 1094 screen_size_x,screen_size_y, |
766 | 1095 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3), |
337 | 1096 title,out_fmt); |
1 | 1097 |
1422 | 1098 #ifdef USE_LIBVO2 |
1099 if(!vo2_start(video_out, | |
1100 sh_video->disp_w,sh_video->disp_h,out_fmt,0, | |
1101 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3) )){ | |
1102 #else | |
398 | 1103 if(video_out->init(sh_video->disp_w,sh_video->disp_h, |
1 | 1104 screen_size_x,screen_size_y, |
766 | 1105 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3), |
337 | 1106 title,out_fmt)){ |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1107 #endif |
1582 | 1108 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
|
1109 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
1 | 1110 } |
1856 | 1111 inited_flags|=INITED_VO; |
1567 | 1112 mp_msg(MSGT_CPLAYER,MSGL_V,"INFO: Video OUT driver init OK!\n"); |
1 | 1113 |
1114 fflush(stdout); | |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1115 |
1 | 1116 //================== MAIN: ========================== |
1117 { | |
746 | 1118 |
1420 | 1119 //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
|
1120 //float v_frame=0; // Video |
1 | 1121 float time_frame=0; // Timer |
1122 int eof=0; | |
1123 int force_redraw=0; | |
1400 | 1124 //float num_frames=0; // number of frames played |
1382 | 1125 int grab_frames=0; |
212 | 1126 char osd_text_buffer[64]; |
715 | 1127 int drop_frame=0; |
1128 int drop_frame_cnt=0; | |
1439 | 1129 // 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
|
1130 float AV_delay=0; // average of A-V timestamp differences |
1439 | 1131 double cvideo_base_vtime; |
1132 double cvideo_base_vframe; | |
1133 double vdecode_time; | |
1 | 1134 |
1135 | |
1136 //================ SETUP AUDIO ========================== | |
1137 current_module="setup_audio"; | |
1138 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1139 if(sh_audio){ |
1237 | 1140 |
1141 const ao_info_t *info=audio_out->info; | |
1567 | 1142 mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %iHz %s %s\n", |
1237 | 1143 info->short_name, |
1144 force_srate?force_srate:sh_audio->samplerate, | |
1145 sh_audio->channels>1?"Stereo":"Mono", | |
1456
8c57a5a3c645
printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents:
1449
diff
changeset
|
1146 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
|
1147 ); |
1567 | 1148 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Description: %s\nAO: Author: %s\n", |
1237 | 1149 info->name, |
1150 info->author | |
1151 ); | |
1456
8c57a5a3c645
printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents:
1449
diff
changeset
|
1152 if(strlen(info->comment) > 0) |
1567 | 1153 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Comment: %s\n", info->comment); |
969 | 1154 if(!audio_out->init(force_srate?force_srate:sh_audio->samplerate, |
1155 sh_audio->channels,sh_audio->sample_format,0)){ | |
1582 | 1156 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO); |
1792 | 1157 sh_audio=d_audio->sh=NULL; |
1856 | 1158 } else { |
1159 inited_flags|=INITED_AO; | |
1 | 1160 } |
1161 | |
955 | 1162 // printf("Audio buffer size: %d bytes, delay: %5.3fs\n",audio_buffer_size,audio_buffer_delay); |
746 | 1163 |
758 | 1164 // fixup audio buffer size: |
782 | 1165 // if(outburst<MAX_OUTBURST){ |
1166 // sh_audio->a_buffer_size=sh_audio->audio_out_minsize+outburst; | |
1167 // printf("Audio out buffer size reduced to %d bytes\n",sh_audio->a_buffer_size); | |
1168 // } | |
758 | 1169 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1170 // sh_audio->timer=-(audio_buffer_delay); |
1 | 1171 } |
1172 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1173 sh_video->timer=0; |
2000 | 1174 if(sh_audio) sh_audio->timer=-audio_delay; |
1 | 1175 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1176 if(!sh_audio){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1962
diff
changeset
|
1177 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_NoSound); |
1567 | 1178 if(verbose) mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused audio chunks\n",d_audio->packs); |
1 | 1179 ds_free_packs(d_audio); // free buffered chunks |
1180 d_audio->id=-2; // do not read audio chunks | |
1856 | 1181 if(audio_out) uninit_player(INITED_AO); // close device |
1 | 1182 } |
1183 | |
1184 current_module=NULL; | |
1185 | |
1660 | 1186 if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf! |
398 | 1187 if(force_fps){ |
1188 sh_video->fps=force_fps; | |
1189 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
|
1190 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FPSforced,sh_video->fps,sh_video->frametime); |
398 | 1191 } |
1 | 1192 |
1639 | 1193 //==================== START PLAYING ======================= |
1194 | |
1582 | 1195 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_StartPlaying);fflush(stdout); |
1 | 1196 |
1856 | 1197 if(!use_stdin){ |
1198 getch2_enable(); // prepare stdin for hotkeys... | |
1199 inited_flags|=INITED_GETCH2; | |
1200 } | |
1639 | 1201 |
1 | 1202 InitTimer(); |
1203 | |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
1204 total_time_usage_start=GetTimer(); |
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
1205 |
1 | 1206 while(!eof){ |
1439 | 1207 unsigned int aq_total_time=GetTimer(); |
1208 float aq_sleep_time=0; | |
1 | 1209 |
1125 | 1210 if(play_n_frames>=0){ |
1211 --play_n_frames; | |
1582 | 1212 if(play_n_frames<0) exit_player(MSGTR_Exit_frames); |
1125 | 1213 } |
1214 | |
1 | 1215 /*========================== 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
|
1216 while(sh_audio){ |
746 | 1217 unsigned int t; |
955 | 1218 int playsize=audio_out->get_space(); |
746 | 1219 |
955 | 1220 if(!playsize) break; // buffer is full, do not block here!!! |
746 | 1221 |
1222 if(playsize>MAX_OUTBURST) playsize=MAX_OUTBURST; // we shouldn't exceed it! | |
1223 //if(playsize>outburst) playsize=outburst; | |
291 | 1224 |
1225 // Update buffer if needed | |
1639 | 1226 current_module="decode_audio"; // Enter AUDIO decoder module |
746 | 1227 t=GetTimer(); |
1228 while(sh_audio->a_buffer_len<playsize && !d_audio->eof){ | |
1229 int ret=decode_audio(sh_audio,&sh_audio->a_buffer[sh_audio->a_buffer_len], | |
1230 playsize-sh_audio->a_buffer_len,sh_audio->a_buffer_size-sh_audio->a_buffer_len); | |
296 | 1231 if(ret>0) sh_audio->a_buffer_len+=ret; else break; |
1 | 1232 } |
1233 current_module=NULL; // Leave AUDIO decoder module | |
291 | 1234 t=GetTimer()-t;audio_time_usage+=t*0.000001; |
746 | 1235 |
1236 if(playsize>sh_audio->a_buffer_len) playsize=sh_audio->a_buffer_len; | |
1237 | |
955 | 1238 playsize=audio_out->play(sh_audio->a_buffer,playsize,0); |
1 | 1239 |
955 | 1240 if(playsize>0){ |
746 | 1241 sh_audio->a_buffer_len-=playsize; |
1242 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
|
1243 sh_audio->timer+=playsize/(float)(sh_audio->o_bps); |
1 | 1244 } |
1245 | |
1246 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
|
1247 } // if(sh_audio) |
1 | 1248 |
1249 /*========================== UPDATE TIMERS ============================*/ | |
746 | 1250 #if 0 |
1 | 1251 if(alsa){ |
1252 // Use system timer for sync, not audio card/driver | |
1253 time_frame-=GetRelativeTime(); | |
1254 if(time_frame<-0.1 || time_frame>0.1){ | |
1255 time_frame=0; | |
1256 } else { | |
398 | 1257 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
|
1258 usec_sleep(time_frame-0.022); |
398 | 1259 time_frame-=GetRelativeTime(); |
1260 } | |
103 | 1261 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
|
1262 usec_sleep(1000); // sleeps 1 clock tick (10ms)! |
103 | 1263 time_frame-=GetRelativeTime(); |
1264 } | |
398 | 1265 } |
1 | 1266 } |
746 | 1267 #endif |
1 | 1268 |
1269 /*========================== PLAY VIDEO ============================*/ | |
1270 | |
1439 | 1271 cvideo_base_vframe=sh_video->timer; |
1272 cvideo_base_vtime=video_time_usage; | |
1273 | |
1 | 1274 if(1) |
746 | 1275 while(1){ |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1276 |
398 | 1277 float frame_time=1; |
1278 float pts1=d_video->pts; | |
1291 | 1279 int blit_frame=0; |
1 | 1280 |
1281 current_module="decode_video"; | |
715 | 1282 |
1 | 1283 //-------------------- Decode a frame: ----------------------- |
1284 | |
1439 | 1285 vdecode_time=video_time_usage; |
1286 | |
1660 | 1287 if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES || demuxer->file_format==DEMUXER_TYPE_MPEG_PS){ |
111 | 1288 int in_frame=0; |
398 | 1289 float newfps; |
1462 | 1290 //videobuf_len=0; |
111 | 1291 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){ |
1292 int i=sync_video_packet(d_video); | |
1295 | 1293 void* buffer=&videobuffer[videobuf_len+4]; |
111 | 1294 if(in_frame){ |
1295 if(i<0x101 || i>=0x1B0){ // not slice code -> end of frame | |
398 | 1296 #if 1 |
111 | 1297 // send END OF FRAME code: |
1298 videobuffer[videobuf_len+0]=0; | |
1299 videobuffer[videobuf_len+1]=0; | |
1300 videobuffer[videobuf_len+2]=1; | |
1301 videobuffer[videobuf_len+3]=0xFF; | |
1302 videobuf_len+=4; | |
1303 #endif | |
1421 | 1304 if(!i) eof=2; // EOF |
111 | 1305 break; |
1306 } | |
1307 } else { | |
1308 //if(i==0x100) in_frame=1; // picture startcode | |
1309 if(i>=0x101 && i<0x1B0) in_frame=1; // picture startcode | |
1421 | 1310 else if(!i){ eof=3; break;} // EOF |
111 | 1311 } |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1312 if(grab_frames==2 && (i==0x1B3 || i==0x1B8)) grab_frames=1; |
1421 | 1313 if(!read_video_packet(d_video)){ eof=4; break;} // EOF |
111 | 1314 //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
|
1315 if(sh_video->codec->driver!=VFM_MPEG){ |
1296 | 1316 // if not libmpeg2: |
1295 | 1317 switch(i){ |
1318 case 0x1B3: header_process_sequence_header (picture, buffer);break; | |
1319 case 0x1B5: header_process_extension (picture, buffer);break; | |
1320 } | |
1321 } | |
111 | 1322 } |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1323 |
111 | 1324 if(videobuf_len>max_framesize) max_framesize=videobuf_len; // debug |
1325 //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
|
1326 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
|
1327 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
|
1328 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
|
1329 fclose(f); |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1330 } |
1291 | 1331 |
1332 blit_frame=decode_video(video_out,sh_video,videobuffer,videobuf_len,drop_frame); | |
111 | 1333 |
1291 | 1334 // get mpeg fps: |
1335 newfps=frameratecode2framerate[picture->frame_rate_code]*0.0001f; | |
1336 if(ABS(sh_video->fps-newfps)>0.01f) if(!force_fps){ | |
1567 | 1337 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 | 1338 sh_video->fps=newfps; |
1339 sh_video->frametime=10000.0f/(float)frameratecode2framerate[picture->frame_rate_code]; | |
1291 | 1340 } |
1341 | |
1342 // fix mpeg2 frametime: | |
2196 | 1343 frame_time=(picture->display_time)*0.01f; |
1344 picture->display_time=100; | |
1462 | 1345 videobuf_len=0; |
398 | 1346 |
1291 | 1347 } else { |
1348 // frame-based file formats: (AVI,ASF,MOV) | |
1349 unsigned char* start=NULL; | |
1350 int in_size=ds_get_packet(d_video,&start); | |
1421 | 1351 if(in_size<0){ eof=5;break;} |
1291 | 1352 if(in_size>max_framesize) max_framesize=in_size; |
1353 blit_frame=decode_video(video_out,sh_video,start,in_size,drop_frame); | |
1 | 1354 } |
1291 | 1355 |
1439 | 1356 vdecode_time=video_time_usage-vdecode_time; |
1357 | |
1 | 1358 //------------------------ frame decoded. -------------------- |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1359 //------------------------ add OSD to frame contents --------- |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1360 #ifndef USE_LIBVO2 |
1768 | 1361 current_module="draw_osd"; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1362 video_out->draw_osd(); |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1363 #endif |
1 | 1364 |
1768 | 1365 current_module="av_sync"; |
1366 | |
398 | 1367 // Increase video timers: |
1400 | 1368 sh_video->num_frames+=frame_time; |
1546 | 1369 ++sh_video->num_frames_decoded; |
398 | 1370 frame_time*=sh_video->frametime; |
1660 | 1371 if(demuxer->file_format==DEMUXER_TYPE_ASF && !force_fps){ |
398 | 1372 // .ASF files has no fixed FPS - just frame durations! |
1373 float d=d_video->pts-pts1; | |
1374 if(d>=0 && d<5) frame_time=d; | |
595 | 1375 if(d>0){ |
1376 if(verbose) | |
1377 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
|
1378 mp_msg(MSGT_CPLAYER,MSGL_STATUS,"\rASF framerate: %d fps \n",(int)(1.0f/d)); |
595 | 1379 sh_video->frametime=d; // 1ms |
1380 sh_video->fps=1.0f/d; | |
1381 } | |
2102 | 1382 } else |
1383 if(demuxer->file_format==DEMUXER_TYPE_MOV && !force_fps){ | |
1384 // .MOV files has no fixed FPS - just frame durations! | |
1385 float d=d_video->pts-pts1; | |
1386 frame_time=d; | |
398 | 1387 } |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1388 sh_video->timer+=frame_time; |
746 | 1389 time_frame+=frame_time; // for nosound |
1390 | |
1660 | 1391 if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS) d_video->pts+=frame_time; |
940 | 1392 |
1567 | 1393 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"*** ftime=%5.3f ***\n",frame_time); |
780 | 1394 |
798 | 1395 if(drop_frame){ |
746 | 1396 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1397 if(sh_audio && !d_audio->eof){ |
955 | 1398 int delay=audio_out->get_delay(); |
1567 | 1399 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
|
1400 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
|
1401 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
|
1402 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
|
1403 drop_frame=0; // stop dropping frames |
1567 | 1404 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
|
1405 }else{ |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1406 ++drop_frame_cnt; |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1407 if (verbose > 0 && drop_frame_cnt%10 == 0) |
1567 | 1408 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
|
1409 } |
798 | 1410 } |
1709 | 1411 #ifdef HAVE_NEW_GUI |
1412 if(use_gui){ | |
1802 | 1413 EventHandling(); |
1709 | 1414 } |
1415 #endif | |
1729 | 1416 video_out->check_events(); // check events AST |
798 | 1417 } else { |
780 | 1418 // It's time to sleep... |
1419 current_module="sleep"; | |
1420 | |
1421 time_frame-=GetRelativeTime(); // reset timer | |
1422 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1423 if(sh_audio && !d_audio->eof){ |
955 | 1424 int delay=audio_out->get_delay(); |
1567 | 1425 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
|
1426 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
|
1427 time_frame-=sh_audio->timer-(float)delay/(float)sh_audio->o_bps; |
798 | 1428 // we are out of time... drop next frame! |
940 | 1429 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
|
1430 static int drop_message=0; |
798 | 1431 drop_frame=frame_dropping; // tricky! |
1432 ++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
|
1433 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
|
1434 drop_message=1; |
1582 | 1435 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
|
1436 } |
1567 | 1437 mp_msg(MSGT_AVSYNC,MSGL_DBG2,"\nframe drop %d, %.2f\n", drop_frame, time_frame); |
798 | 1438 } |
780 | 1439 } else { |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
1440 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
|
1441 time_frame=0; |
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
1442 |
780 | 1443 } |
798 | 1444 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1445 // if(verbose>1)printf("sleep: %5.3f a:%6.3f v:%6.3f \n",time_frame,sh_audio->timer,sh_video->timer); |
1439 | 1446 |
1447 aq_sleep_time+=time_frame; | |
1709 | 1448 |
1449 #ifdef HAVE_NEW_GUI | |
1450 if(use_gui){ | |
1802 | 1451 EventHandling(); |
1709 | 1452 } |
1453 #endif | |
746 | 1454 |
1455 while(time_frame>0.005){ | |
1456 if(time_frame<=0.020) | |
1439 | 1457 // usec_sleep(10000); // sleeps 1 clock tick (10ms)! |
1458 usec_sleep(0); // sleeps 1 clock tick (10ms)! | |
746 | 1459 else |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1460 usec_sleep(1000000*(time_frame-0.002)); |
1709 | 1461 #ifdef HAVE_NEW_GUI |
1462 if(use_gui){ | |
1802 | 1463 EventHandling(); |
1709 | 1464 } |
1465 #endif | |
746 | 1466 time_frame-=GetRelativeTime(); |
1467 } | |
117 | 1468 |
715 | 1469 current_module="flip_page"; |
1422 | 1470 #ifdef USE_LIBVO2 |
1471 if(blit_frame) vo2_flip(video_out,0); | |
1472 #else | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1473 video_out->check_events(); |
1962 | 1474 if(blit_frame){ |
1475 unsigned int t2=GetTimer(); | |
1476 video_out->flip_page(); | |
1477 t2=GetTimer()-t2;vout_time_usage+=t2*0.000001f; | |
1478 } | |
1422 | 1479 #endif |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1480 // usec_sleep(50000); // test only! |
780 | 1481 |
715 | 1482 } |
780 | 1483 |
1484 current_module=NULL; | |
715 | 1485 |
1 | 1486 if(eof) break; |
220 | 1487 if(force_redraw){ |
1488 --force_redraw; | |
577 | 1489 if(!force_redraw) osd_function=OSD_PLAY; |
746 | 1490 continue; |
220 | 1491 } |
1 | 1492 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1493 // 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 | 1494 // fflush(stdout); |
1495 | |
1496 #if 1 | |
1497 /*================ 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
|
1498 if(sh_audio){ |
780 | 1499 float a_pts=0; |
1500 float v_pts=0; | |
1501 | |
746 | 1502 // unplayed bytes in our and soundcard/dma buffer: |
955 | 1503 int delay_bytes=audio_out->get_delay()+sh_audio->a_buffer_len; |
746 | 1504 float delay=(float)delay_bytes/(float)sh_audio->o_bps; |
1505 | |
780 | 1506 if(pts_from_bps){ |
1498 | 1507 #if 1 |
1508 unsigned int samples=(sh_audio->audio.dwSampleSize)? | |
1509 ((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) : | |
1510 (d_audio->pack_no); // <- used for VBR audio | |
1511 a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate; | |
1512 #else | |
1481 | 1513 if(sh_audio->audio.dwSampleSize) |
1514 a_pts=(ds_tell(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->wf->nAvgBytesPerSec; | |
1515 else // VBR: | |
1516 a_pts=d_audio->pack_no*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate; | |
1498 | 1517 #endif |
1518 // v_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; | |
1519 // printf("V_PTS: PTS: %8.3f BPS: %8.3f \n",d_video->pts,v_pts); | |
1520 delay_corrected=1; | |
780 | 1521 } else { |
1522 // PTS = (last timestamp) + (bytes after last timestamp)/(bytes per sec) | |
746 | 1523 a_pts=d_audio->pts; |
1498 | 1524 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
|
1525 //printf("*** %5.3f ***\n",a_pts); |
746 | 1526 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
|
1527 // v_pts=d_video->pts-frame_time; |
1498 | 1528 // v_pts=d_video->pts; |
780 | 1529 } |
1498 | 1530 v_pts=d_video->pts; |
746 | 1531 |
1567 | 1532 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 | 1533 |
398 | 1534 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
|
1535 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
|
1536 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
|
1537 x=AV_delay*0.1f; |
1 | 1538 if(x<-max_pts_correction) x=-max_pts_correction; else |
1539 if(x> max_pts_correction) x= max_pts_correction; | |
780 | 1540 if(default_max_pts_correction>=0) |
1541 max_pts_correction=default_max_pts_correction; | |
1542 else | |
1543 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
|
1544 sh_audio->timer+=x; c_total+=x; |
2353 | 1545 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 | 1546 a_pts-audio_delay-delay,v_pts,AV_delay,c_total, |
1546 | 1547 (int)sh_video->num_frames,(int)sh_video->num_frames_decoded, |
1498 | 1548 (sh_video->timer>0.5)?(int)(100.0*video_time_usage/(double)sh_video->timer):0, |
1549 (sh_video->timer>0.5)?(int)(100.0*vout_time_usage/(double)sh_video->timer):0, | |
1550 (sh_video->timer>0.5)?(100.0*audio_time_usage/(double)sh_video->timer):0 | |
1551 ,drop_frame_cnt | |
1552 ,output_quality | |
2353 | 1553 ,cache_fill_status |
1 | 1554 ); |
1555 fflush(stdout); | |
1556 } | |
780 | 1557 |
1 | 1558 } else { |
1559 // No audio: | |
1420 | 1560 |
1448 | 1561 if(!quiet) |
2353 | 1562 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"V:%6.1f %3d %2d%% %2d%% %4.1f%% %d %d %d%%\r",d_video->pts, |
1400 | 1563 (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
|
1564 (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
|
1565 (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
|
1566 (sh_video->timer>0.5)?(100.0*audio_time_usage/(double)sh_video->timer):0 |
2353 | 1567 ,drop_frame_cnt |
1568 ,output_quality | |
1569 ,cache_fill_status | |
442 | 1570 ); |
1 | 1571 |
1572 fflush(stdout); | |
1420 | 1573 |
1 | 1574 } |
1575 #endif | |
1576 | |
1439 | 1577 /*Output quality adjustments:*/ |
1578 if(auto_quality>0){ | |
1579 #if 0 | |
1580 /*If we took a long time decoding this frame, downgrade the quality.*/ | |
1581 if(output_quality>0&& | |
1582 (video_time_usage-cvideo_base_vtime)*sh_video->timer>= | |
1583 (0.95*sh_video->timer-(vout_time_usage+audio_time_usage))* | |
1584 (sh_video->timer-cvideo_base_vframe-frame_correction)){ | |
1585 output_quality>>=1; | |
1567 | 1586 mp_msg(MSGT_AUTOQ,MSGL_DBG2,"Downgrading quality to %i.\n",output_quality); |
1439 | 1587 set_video_quality(sh_video,output_quality); |
1588 } else | |
1589 /*If we had plenty of extra time, upgrade the quality.*/ | |
1590 if(output_quality<auto_quality&& | |
1591 vdecode_time<0.5*frame_time&& | |
1592 (video_time_usage-cvideo_base_vtime)*sh_video->timer< | |
1593 (0.67*sh_video->timer-(vout_time_usage+audio_time_usage))* | |
1594 (sh_video->timer-cvideo_base_vframe-frame_correction)){ | |
1595 output_quality++; | |
1567 | 1596 mp_msg(MSGT_AUTOQ,MSGL_DBG2,"Upgrading quality to %i.\n",output_quality); |
1439 | 1597 set_video_quality(sh_video,output_quality); |
1598 } | |
1599 #else | |
1496 | 1600 // float total=0.000001f * (GetTimer()-aq_total_time); |
1439 | 1601 // if(output_quality<auto_quality && aq_sleep_time>0.05f*total) |
1602 if(output_quality<auto_quality && aq_sleep_time>0) | |
1603 ++output_quality; | |
1604 else | |
1605 // if(output_quality>0 && aq_sleep_time<-0.05f*total) | |
1606 if(output_quality>1 && aq_sleep_time<0) | |
1607 --output_quality; | |
1608 else | |
1609 if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms | |
1610 output_quality=0; | |
1611 // printf("total: %8.6f sleep: %8.6f q: %d\n",(0.000001f*aq_total_time),aq_sleep_time,output_quality); | |
1612 set_video_quality(sh_video,output_quality); | |
1613 #endif | |
1614 } | |
1615 | |
1422 | 1616 #ifdef USE_OSD |
220 | 1617 if(osd_visible){ |
1504
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
1618 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
|
1619 if (osd_function != OSD_PAUSE) |
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
1620 osd_function = OSD_PLAY; |
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
1621 } |
220 | 1622 } |
1422 | 1623 #endif |
371 | 1624 |
1625 if(osd_function==OSD_PAUSE){ | |
1817
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
1626 int gui_pause_flag=0; // gany! |
1567 | 1627 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
|
1628 #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
|
1629 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
|
1630 #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
|
1631 if (audio_out && sh_audio) |
1156 | 1632 audio_out->pause(); // pause audio, keep data if possible |
723 | 1633 while( |
371 | 1634 #ifdef HAVE_LIRC |
723 | 1635 lirc_mp_getinput()<=0 && |
371 | 1636 #endif |
1467 | 1637 (use_stdin || getch2(20)<=0) && mplayer_get_key()<=0){ |
1422 | 1638 #ifndef USE_LIBVO2 |
723 | 1639 video_out->check_events(); |
1422 | 1640 #endif |
1709 | 1641 #ifdef HAVE_NEW_GUI |
1642 if(use_gui){ | |
1802 | 1643 EventHandling(); |
1817
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
1644 if(mplShMem->Playing!=2 || (rel_seek_secs || abs_seek_pos)) |
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
1645 { gui_pause_flag=1; break; } // end of pause or seek |
1709 | 1646 } |
1647 #endif | |
1467 | 1648 if(use_stdin) usec_sleep(1000); // do not eat the CPU |
723 | 1649 } |
1650 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
|
1651 if (audio_out && sh_audio) |
1156 | 1652 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
|
1653 #ifdef HAVE_NEW_GUI |
1817
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
1654 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
|
1655 #endif |
371 | 1656 } |
1657 | |
746 | 1658 |
1659 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
|
1660 } // while(sh_video->timer<sh_audio->timer || force_redraw) |
1 | 1661 |
2436 | 1662 // skip some seconds... added by fly |
1663 | |
1664 if(step_sec>0) { | |
1665 osd_function=OSD_FFW; | |
1666 rel_seek_secs+=step_sec; | |
1667 } | |
1 | 1668 |
1669 //================= Keyboard events, SEEKing ==================== | |
1670 | |
723 | 1671 { int c; |
1 | 1672 while( |
1673 #ifdef HAVE_LIRC | |
1674 (c=lirc_mp_getinput())>0 || | |
1675 #endif | |
1467 | 1676 (!use_stdin && (c=getch2(0))>0) || (c=mplayer_get_key())>0) switch(c){ |
1 | 1677 // seek 10 sec |
1678 case KEY_RIGHT: | |
220 | 1679 osd_function=OSD_FFW; |
1 | 1680 rel_seek_secs+=10;break; |
1681 case KEY_LEFT: | |
220 | 1682 osd_function=OSD_REW; |
1 | 1683 rel_seek_secs-=10;break; |
1684 // seek 1 min | |
1685 case KEY_UP: | |
220 | 1686 osd_function=OSD_FFW; |
1 | 1687 rel_seek_secs+=60;break; |
1688 case KEY_DOWN: | |
220 | 1689 osd_function=OSD_REW; |
1 | 1690 rel_seek_secs-=60;break; |
651 | 1691 // seek 10 min |
1692 case KEY_PAGE_UP: | |
1693 rel_seek_secs+=600;break; | |
1694 case KEY_PAGE_DOWN: | |
1695 rel_seek_secs-=600;break; | |
1 | 1696 // delay correction: |
1697 case '+': | |
746 | 1698 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
|
1699 if(sh_audio) sh_audio->timer-=0.1; |
1 | 1700 break; |
1701 case '-': | |
746 | 1702 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
|
1703 if(sh_audio) sh_audio->timer+=0.1; |
1 | 1704 break; |
1705 // quit | |
1706 case KEY_ESC: // ESC | |
1639 | 1707 case 'q': exit_player(MSGTR_Exit_quit); |
1 | 1708 case KEY_ENTER: // ESC |
1639 | 1709 eof=1; // jump to next file |
1710 break; | |
36 | 1711 case 'g': grab_frames=2;break; |
1 | 1712 // pause |
1713 case 'p': | |
1714 case ' ': | |
220 | 1715 osd_function=OSD_PAUSE; |
371 | 1716 break; |
1717 case 'o': // toggle OSD | |
1718 osd_level=(osd_level+1)%3; | |
1 | 1719 break; |
939 | 1720 case 'z': |
1721 sub_delay -= 0.1; | |
1722 break; | |
1723 case 'x': | |
1724 sub_delay += 0.1; | |
1725 break; | |
1626 | 1726 case '9': |
1727 case '0': | |
459 | 1728 case '*': |
555 | 1729 case '/': { |
1626 | 1730 if(c=='*' || c=='0'){ |
1881
d75b24bda7ce
Applied fix for mixercontrol w/alsa ossemu by Christian Ohm.
atmos4
parents:
1863
diff
changeset
|
1731 mixer_incvolume(); |
555 | 1732 } else { |
1881
d75b24bda7ce
Applied fix for mixercontrol w/alsa ossemu by Christian Ohm.
atmos4
parents:
1863
diff
changeset
|
1733 mixer_decvolume(); |
555 | 1734 } |
1735 | |
1422 | 1736 #ifdef USE_OSD |
555 | 1737 if(osd_level){ |
1738 osd_visible=sh_video->fps; // 1 sec | |
1739 vo_osd_progbar_type=OSD_VOLUME; | |
1881
d75b24bda7ce
Applied fix for mixercontrol w/alsa ossemu by Christian Ohm.
atmos4
parents:
1863
diff
changeset
|
1740 vo_osd_progbar_value=(mixer_getbothvolume()*256.0)/100.0; |
1852 | 1741 //printf("volume: %d\n",vo_osd_progbar_value); |
555 | 1742 } |
1422 | 1743 #endif |
555 | 1744 } |
1745 break; | |
459 | 1746 case 'm': |
510 | 1747 mixer_usemaster=!mixer_usemaster; |
459 | 1748 break; |
1429 | 1749 |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1750 #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
|
1751 case '1': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1752 case '2': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1753 case '3': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1754 case '4': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1755 case '5': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1756 case '6': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1757 case '7': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1758 case '8': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1759 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
|
1760 abs_seek_pos=3; |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1761 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
|
1762 break; |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1763 #else |
1429 | 1764 // Contrast: |
1765 case '1': | |
1766 case '2': | |
1767 if(c=='2'){ | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1768 if ( ++v_cont > 100 ) v_cont = 100; |
1429 | 1769 } else { |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1770 if ( --v_cont < 0 ) v_cont = 0; |
1429 | 1771 } |
1772 if(set_video_colors(sh_video,"Contrast",v_cont)){ | |
1773 #ifdef USE_OSD | |
1774 if(osd_level){ | |
1775 osd_visible=sh_video->fps; // 1 sec | |
1776 vo_osd_progbar_type=OSD_CONTRAST; | |
1726 | 1777 vo_osd_progbar_value=((v_cont)<<8)/100; |
1429 | 1778 } |
1779 #endif | |
1780 } | |
1781 break; | |
1782 | |
1783 // Brightness: | |
1784 case '3': | |
1785 case '4': | |
1786 if(c=='4'){ | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1787 if ( ++v_bright > 100 ) v_bright = 100; |
1429 | 1788 } else { |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1789 if ( --v_bright < 0 ) v_bright = 0; |
1429 | 1790 } |
1791 if(set_video_colors(sh_video,"Brightness",v_bright)){ | |
1792 #ifdef USE_OSD | |
1793 if(osd_level){ | |
1794 osd_visible=sh_video->fps; // 1 sec | |
1795 vo_osd_progbar_type=OSD_BRIGHTNESS; | |
1726 | 1796 vo_osd_progbar_value=((v_bright)<<8)/100; |
1429 | 1797 } |
1798 #endif | |
1799 } | |
1800 break; | |
1801 | |
1802 // Hue: | |
1803 case '5': | |
1804 case '6': | |
1805 if(c=='6'){ | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1806 if ( ++v_hue > 100 ) v_hue = 100; |
1429 | 1807 } else { |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1808 if ( --v_hue < 0 ) v_hue = 0; |
1429 | 1809 } |
1810 if(set_video_colors(sh_video,"Hue",v_hue)){ | |
1811 #ifdef USE_OSD | |
1812 if(osd_level){ | |
1813 osd_visible=sh_video->fps; // 1 sec | |
1814 vo_osd_progbar_type=OSD_HUE; | |
1726 | 1815 vo_osd_progbar_value=((v_hue)<<8)/100; |
1429 | 1816 } |
1817 #endif | |
1818 } | |
1819 break; | |
1820 | |
1821 // Saturation: | |
1822 case '7': | |
1823 case '8': | |
1824 if(c=='8'){ | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1825 if ( ++v_saturation > 100 ) v_saturation = 100; |
1429 | 1826 } else { |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1827 if ( --v_saturation < 0 ) v_saturation = 0; |
1429 | 1828 } |
1829 if(set_video_colors(sh_video,"Saturation",v_saturation)){ | |
1830 #ifdef USE_OSD | |
1831 if(osd_level){ | |
1832 osd_visible=sh_video->fps; // 1 sec | |
1833 vo_osd_progbar_type=OSD_SATURATION; | |
1726 | 1834 vo_osd_progbar_value=((v_saturation)<<8)/100; |
1429 | 1835 } |
1836 #endif | |
1837 } | |
1838 break; | |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1839 #endif |
1429 | 1840 |
715 | 1841 case 'd': |
798 | 1842 frame_dropping=(frame_dropping+1)%3; |
1567 | 1843 mp_msg(MSGT_CPLAYER,MSGL_V,"== drop: %d == \n",frame_dropping); |
715 | 1844 break; |
1 | 1845 } |
1406 | 1846 } // keyboard event handler |
1847 | |
651 | 1848 if (seek_to_sec) { |
937 | 1849 int a,b; float d; |
1850 | |
1851 if (sscanf(seek_to_sec, "%d:%d:%f", &a,&b,&d)==3) | |
1852 rel_seek_secs += 3600*a +60*b +d ; | |
1853 else if (sscanf(seek_to_sec, "%d:%f", &a, &d)==2) | |
1854 rel_seek_secs += 60*a +d; | |
1855 else if (sscanf(seek_to_sec, "%f", &d)==1) | |
1856 rel_seek_secs += d; | |
1857 | |
1858 seek_to_sec = NULL; | |
651 | 1859 } |
937 | 1860 |
2365 | 1861 /* Looping. */ |
1862 if(eof==5 && loop_times>-1) { | |
1863 | |
1864 if(loop_times!=0) { | |
1865 | |
1866 loop_times--; | |
1867 | |
1868 if(loop_times==0) | |
1869 loop_times=-1; | |
1870 | |
1871 } | |
1872 | |
1873 eof=0; | |
1874 abs_seek_pos=1; | |
1875 | |
1876 mp_msg(MSGT_CPLAYER,MSGL_V,"loop_times = %d, eof = 0\n", loop_times); | |
1877 | |
1878 } | |
1879 | |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1880 if(rel_seek_secs || abs_seek_pos){ |
1466 | 1881 current_module="seek"; |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1882 if(demux_seek(demuxer,rel_seek_secs,abs_seek_pos)){ |
1405 | 1883 // success: |
889 | 1884 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1885 if(sh_audio){ |
1459
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
1886 if(verbose){ |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
1887 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
|
1888 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; |
1567 | 1889 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
|
1890 } |
1567 | 1891 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
|
1892 } else { |
1567 | 1893 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
|
1894 } |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
1895 fflush(stdout); |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
1896 |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
1897 if(sh_audio){ |
1466 | 1898 current_module="seek_audio_reset"; |
1334 | 1899 audio_out->reset(); // stop audio, throwing away buffered data |
1 | 1900 } |
1901 | |
1422 | 1902 #ifdef USE_OSD |
1334 | 1903 // Set OSD: |
1904 if(osd_level){ | |
1905 int len=((demuxer->movi_end-demuxer->movi_start)>>8); | |
1727 | 1906 if (len>0){ |
1907 osd_visible=sh_video->fps; // 1 sec | |
1908 vo_osd_progbar_type=0; | |
1909 vo_osd_progbar_value=(demuxer->filepos-demuxer->movi_start)/len; | |
1910 } | |
1334 | 1911 } |
1422 | 1912 #endif |
1405 | 1913 |
1420 | 1914 c_total=0; |
1 | 1915 max_pts_correction=0.1; |
1504
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
1916 osd_visible=sh_video->fps; // to rewert to PLAY pointer after 1 sec |
1 | 1917 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
|
1918 drop_frame_cnt=0; |
1405 | 1919 |
1 | 1920 } |
1405 | 1921 rel_seek_secs=0; |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1922 abs_seek_pos=0; |
1466 | 1923 current_module=NULL; |
1924 } | |
1925 | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
1926 #ifdef HAVE_NEW_GUI |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
1927 if(use_gui){ |
1735 | 1928 if(demuxer->file_format==DEMUXER_TYPE_AVI && sh_video->video.dwLength>2){ |
1929 // get pos from frame number / total frames | |
1930 mplShMem->Position=(float)d_video->pack_no*100.0f/sh_video->video.dwLength; | |
1931 } else { | |
1932 // get pos from file position / filesize | |
1933 int len=((demuxer->movi_end-demuxer->movi_start)); | |
1934 int pos=(demuxer->file_format==DEMUXER_TYPE_AVI)?demuxer->filepos:d_video->pos; | |
1935 mplShMem->Position=(len<=0)?0:((float)(pos-demuxer->movi_start) / len * 100.0f); | |
1936 } | |
1729 | 1937 mplShMem->TimeSec=d_video->pts; |
1772 | 1938 if(mplShMem->Playing==0) break; // STOP |
1939 if(mplShMem->Playing==2) osd_function=OSD_PAUSE; | |
1852 | 1940 if ( mplShMem->VolumeChanged ) |
1848 | 1941 { |
1852 | 1942 mixer_setvolume( mplShMem->Volume,mplShMem->Volume ); |
1943 mplShMem->VolumeChanged=0; | |
1944 #ifdef USE_OSD | |
1945 if ( osd_level ) | |
1946 { | |
1947 osd_visible=sh_video->fps; // 1 sec | |
1948 vo_osd_progbar_type=OSD_VOLUME; | |
1949 vo_osd_progbar_value=( ( mplShMem->Volume ) * 256.0 ) / 100.0; | |
1950 } | |
1848 | 1951 #endif |
1852 | 1952 } |
1953 mplShMem->Volume=(float)mixer_getbothvolume(); | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
1954 } |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
1955 #endif |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
1956 |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
1957 |
220 | 1958 //================= Update OSD ==================== |
1422 | 1959 #ifdef USE_OSD |
1421 | 1960 if(osd_level>=2){ |
780 | 1961 int pts=d_video->pts; |
595 | 1962 if(pts==osd_last_pts-1) ++pts; else osd_last_pts=pts; |
371 | 1963 vo_osd_text=osd_text_buffer; |
595 | 1964 sprintf(vo_osd_text,"%c %02d:%02d:%02d",osd_function,pts/3600,(pts/60)%60,pts%60); |
371 | 1965 } else { |
1966 vo_osd_text=NULL; | |
1967 } | |
220 | 1968 // for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0; |
371 | 1969 // vo_osd_text=osd_text_buffer; |
1422 | 1970 #endif |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1971 |
1422 | 1972 #ifdef USE_SUB |
258 | 1973 // find sub |
1204 | 1974 if(subtitles && d_video->pts>0){ |
1762 | 1975 float pts=d_video->pts; |
398 | 1976 if(sub_fps==0) sub_fps=sh_video->fps; |
482 | 1977 current_module="find_sub"; |
780 | 1978 find_sub(subtitles,sub_uses_time?(100*(pts+sub_delay)):((pts+sub_delay)*sub_fps)); // FIXME! frame counter... |
482 | 1979 current_module=NULL; |
258 | 1980 } |
1422 | 1981 #endif |
554 | 1982 |
1983 // DVD sub: | |
557 | 1984 { unsigned char* packet=NULL; |
1985 int len=ds_get_packet_sub(d_dvdsub,&packet); | |
1986 if(len>=2){ | |
1987 int len2; | |
1988 len2=(packet[0]<<8)+packet[1]; | |
1567 | 1989 mp_msg(MSGT_CPLAYER,MSGL_V,"\rDVD sub: %d / %d \n",len,len2); |
561 | 1990 if(len==len2) |
1991 spudec_decode(packet,len); | |
1992 else | |
1567 | 1993 mp_msg(MSGT_CPLAYER,MSGL_V,"fragmented dvd-subs not yet supported!!!\n"); |
557 | 1994 } else if(len>=0) { |
1567 | 1995 mp_msg(MSGT_CPLAYER,MSGL_V,"invalid dvd sub\n"); |
554 | 1996 } |
1997 } | |
1998 | |
1421 | 1999 } // while(!eof) |
1 | 2000 |
1567 | 2001 mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d \n",eof); |
1 | 2002 |
1639 | 2003 } |
2004 | |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2005 |
1790 | 2006 if(curr_filename+1<num_filenames || use_gui){ |
1639 | 2007 // partial uninit: |
2008 | |
1857 | 2009 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
|
2010 |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2011 } |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2012 |
1808 | 2013 goto_next_file: // don't jump here after ao/vo/getch initialization! |
2014 | |
1797 | 2015 #ifdef HAVE_NEW_GUI |
2016 if(use_gui) | |
2017 { | |
2018 mplStop(); | |
2019 } | |
2020 #endif | |
2021 | |
1790 | 2022 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
|
2023 |
1654 | 2024 current_module="uninit_vcodec"; |
2025 if(sh_video) uninit_video(sh_video); | |
2026 | |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2027 current_module="free_demuxer"; |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2028 if(demuxer) free_demuxer(demuxer); |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2029 |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2030 current_module="free_stream"; |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2031 if(stream) free_stream(stream); |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2032 |
1639 | 2033 video_out=NULL; |
2034 audio_out=NULL; | |
2035 | |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
2036 goto play_next_file; |
1639 | 2037 } |
2038 | |
1582 | 2039 exit_player(MSGTR_Exit_eof); |
1639 | 2040 |
109 | 2041 return 1; |
2042 } |