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