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