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