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