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