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