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