Mercurial > mplayer.hg
annotate mplayer.c @ 1820:a04b2f92bd14
fix mixer
author | pontscho |
---|---|
date | Sat, 01 Sep 2001 14:44:23 +0000 |
parents | 35d88a433502 |
children | 9d62dcf8c7c5 |
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 |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
17 #include <time.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
18 |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
19 #include <fcntl.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
20 |
1430 | 21 #include "version.h" |
22 #include "config.h" | |
1584 | 23 |
1564 | 24 #include "mp_msg.h" |
1 | 25 |
1584 | 26 #define HELP_MP_DEFINE_STATIC |
27 #include "help_mp.h" | |
28 | |
147 | 29 #include "cfgparser.h" |
151 | 30 #include "cfg-mplayer-def.h" |
147 | 31 |
1422 | 32 #ifdef USE_SUB |
258 | 33 #include "subreader.h" |
1422 | 34 #endif |
258 | 35 |
1422 | 36 #ifdef USE_LIBVO2 |
37 #include "libvo2/libvo2.h" | |
38 #else | |
36 | 39 #include "libvo/video_out.h" |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
40 void* mDisplay; // Display* mDisplay; |
1422 | 41 #endif |
42 | |
43 //#ifdef USE_OSD | |
220 | 44 #include "libvo/sub.h" |
1422 | 45 //#endif |
36 | 46 |
955 | 47 #include "libao2/audio_out.h" |
48 | |
1 | 49 #include "libmpeg2/mpeg2.h" |
50 #include "libmpeg2/mpeg2_internal.h" | |
51 | |
52 #include "loader.h" | |
53 #include "wine/avifmt.h" | |
54 | |
303 | 55 #include "codec-cfg.h" |
175 | 56 |
492 | 57 #include "dvdauth.h" |
560
28ae99036574
Separated dvdsub code to be able to work with it easier
lgb
parents:
557
diff
changeset
|
58 #include "spudec.h" |
492 | 59 |
1 | 60 #include "linux/getch2.h" |
61 #include "linux/keycodes.h" | |
62 #include "linux/timer.h" | |
63 #include "linux/shmem.h" | |
64 | |
65 #ifdef HAVE_LIRC | |
66 #include "lirc_mp.h" | |
67 #endif | |
68 | |
1729 | 69 #ifdef HAVE_NEW_GUI |
70 #include "Gui/mplayer/play.h" | |
71 #endif | |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
72 |
1 | 73 #define DEBUG if(0) |
362 | 74 int verbose=0; |
1448 | 75 int quiet=0; |
1 | 76 |
398 | 77 #define ABS(x) (((x)>=0)?(x):(-(x))) |
78 | |
1422 | 79 #ifdef USE_SUB |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
578
diff
changeset
|
80 void find_sub(subtitle* subtitles,int key); |
1422 | 81 #endif |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
578
diff
changeset
|
82 |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
83 static int |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
84 usec_sleep(int usec_delay) |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
85 { |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
86 #if 1 |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
87 struct timespec ts; |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
88 ts.tv_sec = usec_delay / 1000000; |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
89 ts.tv_nsec = (usec_delay % 1000000) * 1000; |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
90 return nanosleep(&ts, NULL); |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
91 #else |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
92 return usleep(usec_delay); |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
93 #endif |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
94 } |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
95 |
258 | 96 //**************************************************************************// |
97 // Config file | |
98 //**************************************************************************// | |
99 | |
153 | 100 static int cfg_inc_verbose(struct config *conf){ |
101 ++verbose; | |
102 return 0; | |
103 } | |
104 | |
162 | 105 static int cfg_include(struct config *conf, char *filename){ |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
106 return parse_config_file(conf, filename); |
162 | 107 } |
108 | |
178 | 109 char *get_path(char *filename){ |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
110 char *homedir; |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
111 char *buff; |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
112 static char *config_dir = "/.mplayer"; |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
113 int len; |
178 | 114 |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
115 if ((homedir = getenv("HOME")) == NULL) |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
116 return NULL; |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
117 len = strlen(homedir) + strlen(config_dir) + 1; |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
118 if (filename == NULL) { |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
119 if ((buff = (char *) malloc(len)) == NULL) |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
120 return NULL; |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
121 sprintf(buff, "%s%s", homedir, config_dir); |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
122 } else { |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
123 len += strlen(filename) + 1; |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
124 if ((buff = (char *) malloc(len)) == NULL) |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
125 return NULL; |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
126 sprintf(buff, "%s%s/%s", homedir, config_dir, filename); |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
127 } |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
128 return buff; |
178 | 129 } |
130 | |
1 | 131 //**************************************************************************// |
442 | 132 //**************************************************************************// |
133 // Input media streaming & demultiplexer: | |
134 //**************************************************************************// | |
135 | |
1289 | 136 static int max_framesize=0; |
137 | |
578 | 138 #include "stream.h" |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
578
diff
changeset
|
139 #include "demuxer.h" |
442 | 140 |
141 #include "stheader.h" | |
1 | 142 |
442 | 143 char* encode_name=NULL; |
144 char* encode_index_name=NULL; | |
145 int encode_bitrate=0; | |
291 | 146 |
1429 | 147 int get_video_quality_max(sh_video_t *sh_video); |
148 void set_video_quality(sh_video_t *sh_video,int quality); | |
149 int set_video_colors(sh_video_t *sh_video,char *item,int value); | |
150 | |
1 | 151 // MPEG video stream parser: |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
152 #include "parse_es.h" |
1 | 153 |
1015 | 154 extern picture_t *picture; // exported from libmpeg2/decode.c |
442 | 155 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
156 int frameratecode2framerate[16] = { |
780 | 157 0, |
158 // Official mpeg1/2 framerates: | |
159 24000*10000/1001, 24*10000,25*10000, 30000*10000/1001, 30*10000,50*10000,60000*10000/1001, 60*10000, | |
160 // libmpeg3's "Unofficial economy rates": | |
161 1*10000,5*10000,10*10000,12*10000,15*10000,0,0 | |
112 | 162 }; |
163 | |
111 | 164 //**************************************************************************// |
1 | 165 //**************************************************************************// |
166 | |
112 | 167 // Common FIFO functions, and keyboard/event FIFO code |
168 #include "fifo.c" | |
169 | |
1 | 170 //**************************************************************************// |
171 | |
1422 | 172 #ifdef USE_LIBVO2 |
173 static vo2_handle_t *video_out=NULL; | |
174 #else | |
1 | 175 static vo_functions_t *video_out=NULL; |
1422 | 176 #endif |
1289 | 177 static ao_functions_t *audio_out=NULL; |
1 | 178 |
1496 | 179 static float c_total=0; |
1400 | 180 |
1291 | 181 double video_time_usage=0; |
182 double vout_time_usage=0; | |
1289 | 183 static double audio_time_usage=0; |
184 static int total_time_usage_start=0; | |
185 static int benchmark=0; | |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
186 |
1 | 187 static int play_in_bg=0; |
188 | |
606 | 189 extern void avi_fixate(); |
190 | |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
191 // options: |
1439 | 192 |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
193 int divx_quality=0; |
1496 | 194 static int auto_quality=0; |
195 static int output_quality=0; | |
1439 | 196 |
1709 | 197 int use_gui=0; |
198 | |
1439 | 199 int osd_level=2; |
937 | 200 char *seek_to_sec=NULL; |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
201 off_t seek_to_byte=0; |
442 | 202 int has_audio=1; |
1496 | 203 |
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
|
204 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
|
205 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
|
206 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
|
207 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
|
208 |
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
|
209 // 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
|
210 // 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
|
211 // yes, people without working c++ compiler can disable it - A'rpi |
626 | 212 #ifdef USE_DIRECTSHOW |
213 int allow_dshow=1; | |
214 #else | |
215 int allow_dshow=0; | |
216 #endif | |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
217 |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
218 //#ifdef ALSA_TIMER |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
219 //int alsa=1; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
220 //#else |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
221 //int alsa=0; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
222 //#endif |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
223 |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
224 // streaming: |
1496 | 225 static int audio_id=-1; |
226 static int video_id=-1; | |
227 static int dvdsub_id=-1; | |
228 static int vcd_track=0; | |
1498 | 229 static char *stream_dump_name=NULL; |
230 static int stream_dump_type=0; | |
231 | |
1596 | 232 extern int dvd_title; |
233 | |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
234 int index_mode=-1; // -1=untouched 0=don't use index 1=use (geneate) index |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
235 int force_ni=0; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
236 |
1498 | 237 static float default_max_pts_correction=-1;//0.01f; |
238 static float max_pts_correction=0;//default_max_pts_correction; | |
1 | 239 #ifdef AVI_SYNC_BPS |
240 int pts_from_bps=1; | |
241 #else | |
242 int pts_from_bps=0; | |
243 #endif | |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
244 |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
245 float force_fps=0; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
246 int force_srate=0; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
247 float audio_delay=0; |
798 | 248 int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
249 int play_n_frames=-1; |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
250 |
1 | 251 // screen info: |
252 char* video_driver=NULL; //"mga"; // default | |
956
a6cecd9a1bad
'-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents:
955
diff
changeset
|
253 char* audio_driver=NULL; |
1496 | 254 static int fullscreen=0; |
255 static int vidmode=0; | |
256 static int softzoom=0; | |
257 static int flip=-1; | |
258 static int screen_size_x=0;//SCREEN_SIZE_X; | |
259 static int screen_size_y=0;//SCREEN_SIZE_Y; | |
260 static int screen_size_xy=0; | |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
261 |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
262 // sub: |
212 | 263 char *font_name=NULL; |
215 | 264 float font_factor=0.75; |
258 | 265 char *sub_name=NULL; |
266 float sub_delay=0; | |
267 float sub_fps=0; | |
510 | 268 int sub_auto = 1; |
1255
94f2853ec6f4
-dsp option removed, displaying help text (-ao oss:dsp_path)
alex
parents:
1250
diff
changeset
|
269 /*DSP!!char *dsp=NULL;*/ |
723 | 270 |
1496 | 271 //float initial_pts_delay=0; |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
272 |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
273 float rel_seek_secs=0; |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
274 int abs_seek_pos=0; |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
275 |
1183 | 276 extern char *vo_subdevice; |
277 extern char *ao_subdevice; | |
1156 | 278 |
279 void exit_player(char* how){ | |
280 total_time_usage_start=GetTimer()-total_time_usage_start; | |
281 | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
282 // restore terminal: |
1729 | 283 getch2_disable(); |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
284 |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
285 #ifdef USE_LIBVO2 |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
286 if(video_out) vo2_close(video_out); |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
287 #else |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
288 if(video_out) video_out->uninit(); |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
289 #endif |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
290 |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
291 #ifdef HAVE_NEW_GUI |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
292 if(use_gui) mplDone(); |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
293 #endif |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
294 |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
295 if(audio_out) audio_out->uninit(); |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
296 |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
297 if(encode_name) avi_fixate(); |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
298 #ifdef HAVE_LIRC |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
299 lirc_mp_cleanup(); |
1156 | 300 #endif |
301 | |
1583 | 302 if(how) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Exiting,how); |
1567 | 303 mp_msg(MSGT_CPLAYER,MSGL_V,"max framesize was %d bytes\n",max_framesize); |
1156 | 304 if(benchmark){ |
305 double tot=video_time_usage+vout_time_usage+audio_time_usage; | |
306 double total_time_usage=(float)total_time_usage_start*0.000001; | |
1567 | 307 mp_msg(MSGT_CPLAYER,MSGL_INFO,"BENCHMARKs: V:%8.3fs VO:%8.3fs A:%8.3fs Sys:%8.3fs = %8.3fs\n", |
1156 | 308 video_time_usage,vout_time_usage,audio_time_usage, |
309 total_time_usage-tot,total_time_usage); | |
310 if(total_time_usage>0.0) | |
1567 | 311 mp_msg(MSGT_CPLAYER,MSGL_INFO,"BENCHMARK%%: V:%8.4f%% VO:%8.4f%% A:%8.4f%% Sys:%8.4f%% = %8.4f%%\n", |
1156 | 312 100.0*video_time_usage/total_time_usage, |
313 100.0*vout_time_usage/total_time_usage, | |
314 100.0*audio_time_usage/total_time_usage, | |
315 100.0*(total_time_usage-tot)/total_time_usage, | |
316 100.0); | |
317 } | |
1639 | 318 |
1156 | 319 exit(1); |
320 } | |
321 | |
1496 | 322 static char* current_module=NULL; // for debugging |
1156 | 323 |
324 void exit_sighandler(int x){ | |
325 static int sig_count=0; | |
326 ++sig_count; | |
327 if(sig_count==2) exit(1); | |
328 if(sig_count>2){ | |
329 // can't stop :( | |
330 kill(getpid(),SIGKILL); | |
331 } | |
1583 | 332 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_IntBySignal,x, |
1156 | 333 current_module?current_module:"unknown" |
334 ); | |
335 exit_player(NULL); | |
336 } | |
337 | |
1467 | 338 extern stream_t* open_stream(char* filename,int vcd_track,int* file_format); |
339 | |
1156 | 340 extern void write_avi_header_1(FILE *f,int fcc,float fps,int width,int height); |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1302
diff
changeset
|
341 |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1302
diff
changeset
|
342 // dec_audio.c: |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1302
diff
changeset
|
343 extern int init_audio(sh_audio_t *sh_audio); |
1156 | 344 extern int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen); |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1302
diff
changeset
|
345 extern void resync_audio_stream(sh_audio_t *sh_audio); |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1302
diff
changeset
|
346 extern void skip_audio_frame(sh_audio_t *sh_audio); |
1156 | 347 |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1302
diff
changeset
|
348 // dec_video.c: |
1496 | 349 extern int video_read_properties(sh_video_t *sh_video); |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1302
diff
changeset
|
350 extern int init_video(sh_video_t *sh_video); |
1422 | 351 #ifdef USE_LIBVO2 |
352 extern int decode_video(vo2_handle_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame); | |
353 #else | |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1302
diff
changeset
|
354 extern int decode_video(vo_functions_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame); |
1422 | 355 #endif |
1156 | 356 |
1439 | 357 extern int get_video_quality_max(sh_video_t *sh_video); |
358 extern void set_video_quality(sh_video_t *sh_video,int quality); | |
359 | |
459 | 360 #include "mixer.h" |
147 | 361 #include "cfg-mplayer.h" |
1 | 362 |
723 | 363 void parse_cfgfiles( void ) |
364 { | |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
365 char *conffile; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
366 int conffile_fd; |
147 | 367 if (parse_config_file(conf, "/etc/mplayer.conf") < 0) |
368 exit(1); | |
178 | 369 if ((conffile = get_path("")) == NULL) { |
1583 | 370 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoHomeDir); |
147 | 371 } else { |
178 | 372 mkdir(conffile, 0777); |
373 free(conffile); | |
374 if ((conffile = get_path("config")) == NULL) { | |
1583 | 375 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem); |
178 | 376 } else { |
377 if ((conffile_fd = open(conffile, O_CREAT | O_EXCL | O_WRONLY, 0666)) != -1) { | |
1582 | 378 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CreatingCfgFile, conffile); |
178 | 379 write(conffile_fd, default_config, strlen(default_config)); |
380 close(conffile_fd); | |
381 } | |
382 if (parse_config_file(conf, conffile) < 0) | |
383 exit(1); | |
384 free(conffile); | |
151 | 385 } |
1 | 386 } |
387 } | |
388 | |
1729 | 389 //ifndef HAVE_GUI |
723 | 390 int main(int argc,char* argv[], char *envp[]){ |
1729 | 391 //else |
392 // int mplayer(int argc,char* argv[], char *envp[]){ | |
393 //endif | |
723 | 394 |
1422 | 395 #ifdef USE_SUB |
1289 | 396 static subtitle* subtitles=NULL; |
1422 | 397 #endif |
1289 | 398 |
399 static demuxer_t *demuxer=NULL; | |
400 | |
401 static demux_stream_t *d_audio=NULL; | |
402 static demux_stream_t *d_video=NULL; | |
403 static demux_stream_t *d_dvdsub=NULL; | |
404 | |
405 static sh_audio_t *sh_audio=NULL; | |
406 static sh_video_t *sh_video=NULL; | |
407 | |
1629 | 408 // for multifile support: |
409 char **filenames=NULL; | |
410 int num_filenames=0; | |
411 int curr_filename=0; | |
412 | |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
413 char* filename=NULL; //"MI2-Trailer.avi"; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
414 stream_t* stream=NULL; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
415 int file_format=DEMUXER_TYPE_UNKNOWN; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
416 // |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
417 int delay_corrected=1; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
418 char* title="MPlayer"; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
419 |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
420 // movie info: |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
421 int out_fmt=0; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
422 |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
423 int osd_visible=100; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
424 int osd_function=OSD_PLAY; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
425 int osd_last_pts=-303; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
426 |
1429 | 427 int v_bright=50; |
428 int v_cont=50; | |
429 int v_hue=50; | |
430 int v_saturation=50; | |
431 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
432 //float a_frame=0; // Audio |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
433 |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
434 int i; |
1467 | 435 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
|
436 |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
437 int gui_no_filename=0; |
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
438 |
1567 | 439 mp_msg_init(MSGL_STATUS); |
440 | |
441 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s",banner_text); | |
723 | 442 |
1694 | 443 // this one segfaults if running 'mplayer' (without path containing '/') |
444 // if ( !strcmp( strrchr( argv[0],'/' ),"/gmplayer" ) ) appInit( argc,argv,envp ); | |
1709 | 445 if ( argv[0] ) |
446 if(!strcmp(argv[0],"gmplayer") || | |
447 (strrchr(argv[0],'/') && !strcmp(strrchr(argv[0],'/'),"/gmplayer") ) ) | |
448 use_gui=1; | |
1639 | 449 |
751 | 450 parse_cfgfiles(); |
1639 | 451 num_filenames=parse_command_line(conf, argc, argv, envp, &filenames); |
452 if(num_filenames<0) exit(1); // error parsing cmdline | |
723 | 453 |
1709 | 454 #ifndef HAVE_NEW_GUI |
455 if(use_gui){ | |
456 mp_msg(MSGT_CPLAYER,MSGL_WARN,"MPlayer was compiled WITHOUT GUI support!\n"); | |
457 use_gui=0; | |
458 } | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
459 #else |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
460 if(use_gui && !vo_init()){ |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
461 mp_msg(MSGT_CPLAYER,MSGL_WARN,"MPlayer GUI requires X11!\n"); |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
462 use_gui=0; |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
463 } |
1709 | 464 #endif |
465 | |
1422 | 466 #ifndef USE_LIBVO2 |
723 | 467 if(video_driver && strcmp(video_driver,"help")==0){ |
468 printf("Available video output drivers:\n"); | |
469 i=0; | |
470 while (video_out_drivers[i]) { | |
471 const vo_info_t *info = video_out_drivers[i++]->get_info (); | |
472 printf("\t%s\t%s\n", info->short_name, info->name); | |
473 } | |
474 printf("\n"); | |
475 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
|
476 } |
1422 | 477 #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
|
478 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
|
479 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
|
480 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
|
481 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
|
482 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
|
483 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
|
484 } |
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
|
485 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
|
486 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
|
487 } |
1639 | 488 |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
489 if(!num_filenames && !vcd_track && !dvd_title){ |
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
490 if(!use_gui){ |
1690 | 491 // no file/vcd/dvd -> show HELP: |
492 printf("%s",help_text); | |
493 exit(0); | |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
494 } else gui_no_filename=1; |
1690 | 495 } |
496 | |
497 // Many users forget to include command line in bugreports... | |
498 if(verbose){ | |
499 printf("CommandLine:"); | |
500 for(i=1;i<argc;i++)printf(" '%s'",argv[i]); | |
501 printf("\n"); | |
502 printf("num_filenames: %d\n",num_filenames); | |
503 } | |
504 | |
1639 | 505 mp_msg_init(verbose+MSGL_STATUS); |
1183 | 506 |
1639 | 507 //------ load global data first ------ |
955 | 508 |
442 | 509 // check codec.conf |
510 if(!parse_codec_cfg(get_path("codecs.conf"))){ | |
1353 | 511 if(!parse_codec_cfg(DATADIR"/codecs.conf")){ |
1582 | 512 mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf); |
442 | 513 exit(1); |
1353 | 514 } |
442 | 515 } |
516 | |
212 | 517 // check font |
1422 | 518 #ifdef USE_OSD |
212 | 519 if(font_name){ |
337 | 520 vo_font=read_font_desc(font_name,font_factor,verbose>1); |
1582 | 521 if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name); |
220 | 522 } else { |
523 // try default: | |
337 | 524 vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1); |
1353 | 525 if(!vo_font) |
526 vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1); | |
212 | 527 } |
1422 | 528 #endif |
212 | 529 |
1651 | 530 #ifdef USE_SUB |
531 // check .sub | |
532 if(sub_name){ | |
533 int l=strlen(sub_name); | |
534 if ((l>4) && ((0==strcmp(&sub_name[l-4],".utf")) | |
535 ||(0==strcmp(&sub_name[l-4],".UTF")))) | |
536 sub_utf8=1; | |
537 subtitles=sub_read_file(sub_name); | |
538 if(!subtitles) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name); | |
539 } | |
540 #endif | |
541 | |
1709 | 542 // It's time to init the GUI code: (and fork() the GTK process) |
543 #ifdef HAVE_NEW_GUI | |
544 if(use_gui){ | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
545 appInit( argc,argv,envp,(void*)mDisplay ); |
1803 | 546 mplShMem->Playing= (gui_no_filename) ? 0 : 1; |
1709 | 547 } |
548 #endif | |
1639 | 549 |
550 #ifdef HAVE_LIRC | |
551 lirc_mp_setup(); | |
552 #endif | |
553 | |
554 #ifdef USE_TERMCAP | |
1729 | 555 if ( !use_gui ) load_termcap(NULL); // load key-codes |
1639 | 556 #endif |
557 | |
1816 | 558 // ========== Init keyboard FIFO (connection to libvo) ============ |
559 make_pipe(&keyb_fifo_get,&keyb_fifo_put); | |
1694 | 560 |
1639 | 561 //========= Catch terminate signals: ================ |
562 // terminate requests: | |
563 signal(SIGTERM,exit_sighandler); // kill | |
564 signal(SIGHUP,exit_sighandler); // kill -HUP / xterm closed | |
565 | |
1729 | 566 signal(SIGINT,exit_sighandler); // Interrupt from keyboard |
1639 | 567 |
568 signal(SIGQUIT,exit_sighandler); // Quit from keyboard | |
569 // fatal errors: | |
570 signal(SIGBUS,exit_sighandler); // bus error | |
571 signal(SIGSEGV,exit_sighandler); // segfault | |
572 signal(SIGILL,exit_sighandler); // illegal instruction | |
573 signal(SIGFPE,exit_sighandler); // floating point exc. | |
574 signal(SIGABRT,exit_sighandler); // abort() | |
575 | |
576 // ******************* Now, let's see the per-file stuff ******************** | |
577 | |
578 curr_filename=0; | |
579 play_next_file: | |
580 filename=(num_filenames>0)?filenames[curr_filename]:NULL; | |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
581 |
1745 | 582 #ifdef HAVE_NEW_GUI |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
583 if ( use_gui ) { |
1817
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
584 if(filename && !mplShMem->FilenameChanged) strcpy( mplShMem->Filename,filename ); |
1803 | 585 // mplShMem->Playing= (gui_no_filename) ? 0 : 1; |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
586 while(mplShMem->Playing!=1){ |
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
587 usleep(20000); |
1802 | 588 EventHandling(); |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
589 } |
1817
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
590 if(mplShMem->FilenameChanged){ |
1790 | 591 filename=mplShMem->Filename; |
592 } | |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
593 } |
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
594 #endif |
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
595 |
1674 | 596 if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,"Playing %s\n", filename); |
1650
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
597 |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
598 #ifdef USE_SUB |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
599 // check .sub |
1651 | 600 if(!sub_name){ |
1650
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
601 if(sub_auto && filename) { // auto load sub file ... |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
602 subtitles=sub_read_file( sub_filename( get_path("sub/"), filename ) ); |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
603 } |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
604 if(!subtitles) subtitles=sub_read_file(get_path("default.sub")); // try default |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
605 } |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
606 #endif |
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
607 |
1762 | 608 if(subtitles && stream_dump_type==3) list_sub_file(subtitles); |
609 | |
1654 | 610 stream=NULL; |
611 demuxer=NULL; | |
612 d_audio=NULL; | |
613 d_video=NULL; | |
614 sh_audio=NULL; | |
615 sh_video=NULL; | |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
616 |
1639 | 617 #ifdef USE_LIBVO2 |
618 current_module="vo2_new"; | |
619 video_out=vo2_new(video_driver); | |
620 current_module=NULL; | |
621 #else | |
622 // check video_out driver name: | |
623 if (video_driver) | |
624 if ((i = strcspn(video_driver, ":")) > 0) | |
625 { | |
626 size_t i2 = strlen(video_driver); | |
627 | |
628 if (video_driver[i] == ':') | |
629 { | |
630 vo_subdevice = malloc(i2-i); | |
631 if (vo_subdevice != NULL) | |
632 strncpy(vo_subdevice, (char *)(video_driver+i+1), i2-i); | |
633 video_driver[i] = '\0'; | |
634 } | |
635 // printf("video_driver: %s, subdevice: %s\n", video_driver, vo_subdevice); | |
636 } | |
637 if(!video_driver) | |
638 video_out=video_out_drivers[0]; | |
639 else | |
640 for (i=0; video_out_drivers[i] != NULL; i++){ | |
641 const vo_info_t *info = video_out_drivers[i]->get_info (); | |
642 if(strcmp(info->short_name,video_driver) == 0){ | |
643 video_out = video_out_drivers[i];break; | |
644 } | |
645 } | |
646 #endif | |
647 if(!video_out){ | |
648 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidVOdriver,video_driver?video_driver:"?"); | |
649 exit_player(MSGTR_Exit_error); | |
650 } | |
651 | |
652 // check audio_out driver name: | |
653 if (audio_driver) | |
654 if ((i = strcspn(audio_driver, ":")) > 0) | |
655 { | |
656 size_t i2 = strlen(audio_driver); | |
657 | |
658 if (audio_driver[i] == ':') | |
659 { | |
660 ao_subdevice = malloc(i2-i); | |
661 if (ao_subdevice != NULL) | |
662 strncpy(ao_subdevice, (char *)(audio_driver+i+1), i2-i); | |
663 audio_driver[i] = '\0'; | |
664 } | |
665 // printf("audio_driver: %s, subdevice: %s\n", audio_driver, ao_subdevice); | |
666 } | |
667 if(!audio_driver) | |
668 audio_out=audio_out_drivers[0]; | |
669 else | |
670 for (i=0; audio_out_drivers[i] != NULL; i++){ | |
671 const ao_info_t *info = audio_out_drivers[i]->info; | |
672 if(strcmp(info->short_name,audio_driver) == 0){ | |
673 audio_out = audio_out_drivers[i];break; | |
674 } | |
675 } | |
676 if (!audio_out){ | |
677 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidAOdriver,audio_driver); | |
678 exit_player(MSGTR_Exit_error); | |
679 } | |
680 /*DSP!! if(dsp) audio_out->control(AOCONTROL_SET_DEVICE,(int)dsp);*/ | |
681 | |
682 | |
683 current_module="open_stream"; | |
1467 | 684 stream=open_stream(filename,vcd_track,&file_format); |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
685 if(!stream) goto goto_next_file;// exit_player(MSGTR_Exit_error); // error... |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
686 stream->start_pos+=seek_to_byte; |
598 | 687 |
1639 | 688 use_stdin=filename && (!strcmp(filename,"-")); |
689 | |
492 | 690 #ifdef HAVE_LIBCSS |
1639 | 691 current_module="libcss"; |
546 | 692 if (dvdimportkey) { |
693 if (dvd_import_key(dvdimportkey)) { | |
1582 | 694 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorDVDkey); |
1639 | 695 exit_player(MSGTR_Exit_error); |
546 | 696 } |
1582 | 697 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CmdlineDVDkey); |
546 | 698 } |
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
|
699 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
|
700 // 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
|
701 if (dvd_auth(dvd_auth_device,filename)) { |
1809 | 702 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Error in DVD auth...\n"); |
1639 | 703 exit_player(MSGTR_Exit_error); |
723 | 704 } |
1582 | 705 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_DVDauthOk); |
492 | 706 } |
707 #endif | |
1 | 708 |
709 //============ Open & Sync stream and detect file format =============== | |
710 | |
442 | 711 if(!has_audio) audio_id=-2; // do NOT read audio packets... |
1 | 712 |
1639 | 713 current_module="demux_open"; |
714 | |
1496 | 715 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
|
716 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
|
717 |
1660 | 718 //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
|
719 |
1 | 720 d_audio=demuxer->audio; |
721 d_video=demuxer->video; | |
554 | 722 d_dvdsub=demuxer->sub; |
1 | 723 |
792 | 724 // DUMP STREAMS: |
725 if(stream_dump_type){ | |
726 FILE *f; | |
727 demux_stream_t *ds=NULL; | |
1639 | 728 current_module="dump"; |
792 | 729 // select stream to dump |
730 switch(stream_dump_type){ | |
731 case 1: ds=d_audio;break; | |
732 case 2: ds=d_video;break; | |
733 case 3: ds=d_dvdsub;break; | |
734 } | |
735 if(!ds){ | |
1582 | 736 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpSelectedSteramMissing); |
1639 | 737 exit_player(MSGTR_Exit_error); |
792 | 738 } |
739 // disable other streams: | |
740 if(d_audio && d_audio!=ds) {ds_free_packs(d_audio); d_audio->id=-2; } | |
741 if(d_video && d_video!=ds) {ds_free_packs(d_video); d_video->id=-2; } | |
742 if(d_dvdsub && d_dvdsub!=ds) {ds_free_packs(d_dvdsub); d_dvdsub->id=-2; } | |
743 // let's dump it! | |
744 f=fopen(stream_dump_name?stream_dump_name:"stream.dump","wb"); | |
1639 | 745 if(!f){ |
746 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile); | |
747 exit_player(MSGTR_Exit_error); | |
748 } | |
792 | 749 while(!ds->eof){ |
750 unsigned char* start; | |
751 int in_size=ds_get_packet(ds,&start); | |
1660 | 752 if( (demuxer->file_format==DEMUXER_TYPE_AVI || demuxer->file_format==DEMUXER_TYPE_ASF) |
1246
7f69c1dd1e91
-dumpvideo stores frame size for avi/asf video frames (for ffmpeg testing)
arpi
parents:
1237
diff
changeset
|
753 && stream_dump_type==2) fwrite(&in_size,1,4,f); |
792 | 754 if(in_size>0) fwrite(start,in_size,1,f); |
755 } | |
756 fclose(f); | |
1582 | 757 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped); |
1639 | 758 exit_player(MSGTR_Exit_eof); |
792 | 759 } |
760 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
761 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
|
762 sh_video=d_video->sh; |
792 | 763 |
1639 | 764 current_module="video_read_properties"; |
765 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
766 if(sh_video){ |
1 | 767 |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
768 if(!video_read_properties(sh_video)) goto goto_next_file; // exit_player(MSGTR_Exit_error); // couldn't read header? |
1 | 769 |
1567 | 770 mp_msg(MSGT_CPLAYER,MSGL_INFO,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n", |
1660 | 771 demuxer->file_format,sh_video->format, sh_video->disp_w,sh_video->disp_h, |
398 | 772 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
|
773 ); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
774 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
775 if(!sh_video->fps && !force_fps){ |
1582 | 776 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
|
777 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
|
778 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
779 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
780 } |
398 | 781 |
1 | 782 fflush(stdout); |
783 | |
778
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
784 if(!sh_video){ |
1582 | 785 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
|
786 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
|
787 } |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
788 |
303 | 789 //================== Init AUDIO (codec) ========================== |
1639 | 790 |
791 current_module="init_audio_codec"; | |
792 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
793 if(sh_audio){ |
303 | 794 // Go through the codec.conf and find the best codec... |
626 | 795 sh_audio->codec=NULL; |
1582 | 796 if(audio_family!=-1) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceAudioFmt,audio_family); |
626 | 797 while(1){ |
798 sh_audio->codec=find_codec(sh_audio->format,NULL,sh_audio->codec,1); | |
799 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
|
800 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
|
801 sh_audio->codec=NULL; /* re-search */ |
1582 | 802 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
|
803 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
|
804 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
|
805 } |
1582 | 806 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantFindAudioCodec,sh_audio->format); |
807 mp_msg(MSGT_CPLAYER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf")); | |
1792 | 808 sh_audio=d_audio->sh=NULL; |
626 | 809 break; |
810 } | |
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
|
811 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
|
812 else if(audio_family!=-1 && sh_audio->codec->driver!=audio_family) continue; |
1567 | 813 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 | 814 break; |
303 | 815 } |
1 | 816 } |
817 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
818 if(sh_audio){ |
1567 | 819 mp_msg(MSGT_CPLAYER,MSGL_V,"Initializing audio codec...\n"); |
442 | 820 if(!init_audio(sh_audio)){ |
1582 | 821 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CouldntInitAudioCodec); |
1792 | 822 sh_audio=d_audio->sh=NULL; |
303 | 823 } else { |
1567 | 824 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 | 825 sh_audio->sample_format,sh_audio->i_bps,sh_audio->o_bps); |
303 | 826 } |
175 | 827 } |
828 | |
303 | 829 //================== Init VIDEO (codec & libvo) ========================== |
830 | |
1639 | 831 current_module="init_video_codec"; |
832 | |
303 | 833 // Go through the codec.conf and find the best codec... |
626 | 834 sh_video->codec=NULL; |
1582 | 835 if(video_family!=-1) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceVideoFmt,video_family); |
626 | 836 while(1){ |
837 sh_video->codec=find_codec(sh_video->format, | |
838 sh_video->bih?((unsigned int*) &sh_video->bih->biCompression):NULL,sh_video->codec,0); | |
839 if(!sh_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
|
840 if(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
|
841 sh_video->codec=NULL; /* re-search */ |
1582 | 842 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
|
843 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
|
844 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
|
845 } |
1582 | 846 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantFindVideoCodec,sh_video->format); |
847 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
|
848 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
626 | 849 } |
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
|
850 // is next line needed anymore? - atmos :: |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1406
diff
changeset
|
851 if(!allow_dshow && sh_video->codec->driver==VFM_DSHOW) continue; // skip DShow |
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
|
852 else if(video_codec && strcmp(sh_video->codec->name,video_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
|
853 else if(video_family!=-1 && sh_video->codec->driver!=video_family) continue; |
626 | 854 break; |
303 | 855 } |
856 | |
1567 | 857 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s video codec: [%s] drv:%d (%s)\n",video_codec?"Forcing":"Detected",sh_video->codec->name,sh_video->codec->driver,sh_video->codec->info); |
303 | 858 |
859 for(i=0;i<CODECS_MAX_OUTFMT;i++){ | |
487 | 860 int ret; |
303 | 861 out_fmt=sh_video->codec->outfmt[i]; |
534
2a45d5adcc88
do not query vo drivers for format 0xFFFFFFFF (thanx to szabi)
arpi_esp
parents:
510
diff
changeset
|
862 if(out_fmt==0xFFFFFFFF) continue; |
1422 | 863 #ifdef USE_LIBVO2 |
864 ret=vo2_query_format(video_out); | |
865 #else | |
487 | 866 ret=video_out->query_format(out_fmt); |
1422 | 867 #endif |
1567 | 868 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: query(%s) returned 0x%X\n",vo_format_name(out_fmt),ret); |
487 | 869 if(ret) break; |
303 | 870 } |
871 if(i>=CODECS_MAX_OUTFMT){ | |
1582 | 872 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
|
873 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
303 | 874 } |
875 sh_video->outfmtidx=i; | |
876 | |
778
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
877 if(flip==-1){ |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
878 // autodetect flipping |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
879 flip=0; |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
880 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
|
881 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
|
882 flip=1; |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
883 } |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
884 |
1567 | 885 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug1: out_fmt=%s\n",vo_format_name(out_fmt)); |
487 | 886 |
1291 | 887 if(!init_video(sh_video)){ |
1582 | 888 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
|
889 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
1 | 890 } |
891 | |
1439 | 892 if(auto_quality>0){ |
893 // Auto quality option enabled | |
894 output_quality=get_video_quality_max(sh_video); | |
895 if(auto_quality>output_quality) auto_quality=output_quality; | |
896 else output_quality=auto_quality; | |
1567 | 897 mp_msg(MSGT_CPLAYER,MSGL_V,"AutoQ: setting quality to %d\n",output_quality); |
1439 | 898 set_video_quality(sh_video,output_quality); |
899 } | |
900 | |
1 | 901 // ================== Init output files for encoding =============== |
902 if(encode_name){ | |
903 // encode file!!! | |
904 FILE *encode_file=fopen(encode_name,"rb"); | |
905 if(encode_file){ | |
906 fclose(encode_file); | |
1582 | 907 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_EncodeFileExists,encode_name); |
1639 | 908 exit_player(MSGTR_Exit_error); |
1 | 909 } |
910 encode_file=fopen(encode_name,"wb"); | |
911 if(!encode_file){ | |
1582 | 912 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantCreateEncodeFile); |
1639 | 913 exit_player(MSGTR_Exit_error); |
1 | 914 } |
398 | 915 write_avi_header_1(encode_file,mmioFOURCC('d', 'i', 'v', 'x'),sh_video->fps,sh_video->disp_w,sh_video->disp_h); |
1 | 916 fclose(encode_file); |
917 encode_index_name=malloc(strlen(encode_name)+8); | |
918 strcpy(encode_index_name,encode_name); | |
919 strcat(encode_index_name,".index"); | |
920 if((encode_file=fopen(encode_index_name,"wb"))) | |
921 fclose(encode_file); | |
922 else encode_index_name=NULL; | |
1792 | 923 sh_audio=d_audio->sh=NULL; |
1 | 924 } |
925 | |
398 | 926 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============ |
1 | 927 |
1639 | 928 current_module="init_libvo"; |
929 | |
1 | 930 #ifdef X11_FULLSCREEN |
931 if(fullscreen){ | |
932 if(vo_init()){ | |
933 //if(verbose) printf("X11 running at %dx%d depth: %d\n",vo_screenwidth,vo_screenheight,vo_depthonscreen); | |
934 } | |
935 if(!screen_size_xy) screen_size_xy=vo_screenwidth; // scale with asp.ratio | |
936 } | |
937 #endif | |
938 | |
939 if(screen_size_xy>0){ | |
940 if(screen_size_xy<=8){ | |
398 | 941 screen_size_x=screen_size_xy*sh_video->disp_w; |
942 screen_size_y=screen_size_xy*sh_video->disp_h; | |
1 | 943 } else { |
944 screen_size_x=screen_size_xy; | |
398 | 945 screen_size_y=screen_size_xy*sh_video->disp_h/sh_video->disp_w; |
1 | 946 } |
337 | 947 } else if(!vidmode){ |
948 if(!screen_size_x) screen_size_x=SCREEN_SIZE_X; | |
949 if(!screen_size_y) screen_size_y=SCREEN_SIZE_Y; | |
398 | 950 if(screen_size_x<=8) screen_size_x*=sh_video->disp_w; |
951 if(screen_size_y<=8) screen_size_y*=sh_video->disp_h; | |
1 | 952 } |
208
ae0f909ccc7c
Adds code to deal with vidmode selection. -- mgraffam
mgraffam
parents:
190
diff
changeset
|
953 |
1422 | 954 #ifndef USE_LIBVO2 |
340 | 955 { const vo_info_t *info = video_out->get_info(); |
1567 | 956 mp_msg(MSGT_CPLAYER,MSGL_INFO,"VO: [%s] %dx%d => %dx%d %s %s%s%s%s\n",info->short_name, |
398 | 957 sh_video->disp_w,sh_video->disp_h, |
340 | 958 screen_size_x,screen_size_y, |
1183 | 959 vo_format_name(out_fmt), |
340 | 960 fullscreen?"fs ":"", |
961 vidmode?"vm ":"", | |
766 | 962 softzoom?"zoom ":"", |
778
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
963 (flip==1)?"flip ":"" |
766 | 964 // fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3) |
340 | 965 ); |
1567 | 966 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Description: %s\n",info->name); |
967 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Author: %s\n", info->author); | |
1237 | 968 if(strlen(info->comment) > 0) |
1567 | 969 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Comment: %s\n", info->comment); |
340 | 970 } |
1422 | 971 #endif |
340 | 972 |
1753 | 973 #ifdef HAVE_NEW_GUI |
974 if ( use_gui ) | |
975 { | |
1765 | 976 if ( !appMPlayer.subWindow.isFullScreen ) wsResizeWindow( &appMPlayer.subWindow,sh_video->disp_w,sh_video->disp_h ); |
977 moviewidth=screen_size_x=appMPlayer.subWindow.Width; | |
978 movieheight=screen_size_y=appMPlayer.subWindow.Height; | |
1753 | 979 } |
980 #endif | |
981 | |
1567 | 982 mp_msg(MSGT_CPLAYER,MSGL_V,"video_out->init(%dx%d->%dx%d,flags=%d,'%s',0x%X)\n", |
398 | 983 sh_video->disp_w,sh_video->disp_h, |
1 | 984 screen_size_x,screen_size_y, |
766 | 985 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3), |
337 | 986 title,out_fmt); |
1 | 987 |
1422 | 988 #ifdef USE_LIBVO2 |
989 if(!vo2_start(video_out, | |
990 sh_video->disp_w,sh_video->disp_h,out_fmt,0, | |
991 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3) )){ | |
992 #else | |
398 | 993 if(video_out->init(sh_video->disp_w,sh_video->disp_h, |
1 | 994 screen_size_x,screen_size_y, |
766 | 995 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3), |
337 | 996 title,out_fmt)){ |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
997 #endif |
1582 | 998 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
|
999 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
1 | 1000 } |
1567 | 1001 mp_msg(MSGT_CPLAYER,MSGL_V,"INFO: Video OUT driver init OK!\n"); |
1 | 1002 |
1003 fflush(stdout); | |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1004 |
1 | 1005 //================== MAIN: ========================== |
1006 { | |
746 | 1007 |
1420 | 1008 //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
|
1009 //float v_frame=0; // Video |
1 | 1010 float time_frame=0; // Timer |
1011 int eof=0; | |
1012 int force_redraw=0; | |
1400 | 1013 //float num_frames=0; // number of frames played |
1382 | 1014 int grab_frames=0; |
212 | 1015 char osd_text_buffer[64]; |
715 | 1016 int drop_frame=0; |
1017 int drop_frame_cnt=0; | |
1439 | 1018 // 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
|
1019 float AV_delay=0; // average of A-V timestamp differences |
1439 | 1020 double cvideo_base_vtime; |
1021 double cvideo_base_vframe; | |
1022 double vdecode_time; | |
1 | 1023 |
1024 | |
1025 //================ SETUP AUDIO ========================== | |
1026 current_module="setup_audio"; | |
1027 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1028 if(sh_audio){ |
1237 | 1029 |
1030 const ao_info_t *info=audio_out->info; | |
1567 | 1031 mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %iHz %s %s\n", |
1237 | 1032 info->short_name, |
1033 force_srate?force_srate:sh_audio->samplerate, | |
1034 sh_audio->channels>1?"Stereo":"Mono", | |
1456
8c57a5a3c645
printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents:
1449
diff
changeset
|
1035 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
|
1036 ); |
1567 | 1037 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Description: %s\nAO: Author: %s\n", |
1237 | 1038 info->name, |
1039 info->author | |
1040 ); | |
1456
8c57a5a3c645
printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents:
1449
diff
changeset
|
1041 if(strlen(info->comment) > 0) |
1567 | 1042 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Comment: %s\n", info->comment); |
969 | 1043 if(!audio_out->init(force_srate?force_srate:sh_audio->samplerate, |
1044 sh_audio->channels,sh_audio->sample_format,0)){ | |
1582 | 1045 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO); |
1792 | 1046 sh_audio=d_audio->sh=NULL; |
1 | 1047 } |
1048 | |
955 | 1049 // printf("Audio buffer size: %d bytes, delay: %5.3fs\n",audio_buffer_size,audio_buffer_delay); |
746 | 1050 |
758 | 1051 // fixup audio buffer size: |
782 | 1052 // if(outburst<MAX_OUTBURST){ |
1053 // sh_audio->a_buffer_size=sh_audio->audio_out_minsize+outburst; | |
1054 // printf("Audio out buffer size reduced to %d bytes\n",sh_audio->a_buffer_size); | |
1055 // } | |
758 | 1056 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1057 // sh_audio->timer=-(audio_buffer_delay); |
1 | 1058 } |
1059 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1060 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
|
1061 if(sh_audio) sh_audio->timer=0; |
1 | 1062 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1063 if(!sh_audio){ |
1738 | 1064 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Audio: no sound!!!\n"); |
1567 | 1065 if(verbose) mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused audio chunks\n",d_audio->packs); |
1 | 1066 ds_free_packs(d_audio); // free buffered chunks |
1067 d_audio->id=-2; // do not read audio chunks | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1068 if(audio_out){ audio_out->uninit(); audio_out=NULL;} // close device |
1 | 1069 } |
1070 | |
1071 current_module=NULL; | |
1072 | |
1660 | 1073 if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf! |
398 | 1074 if(force_fps){ |
1075 sh_video->fps=force_fps; | |
1076 sh_video->frametime=1.0f/sh_video->fps; | |
1567 | 1077 mp_msg(MSGT_CPLAYER,MSGL_INFO,"FPS forced to be %5.3f (ftime: %5.3f)\n",sh_video->fps,sh_video->frametime); |
398 | 1078 } |
1 | 1079 |
1639 | 1080 //==================== START PLAYING ======================= |
1081 | |
1582 | 1082 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_StartPlaying);fflush(stdout); |
1 | 1083 |
1639 | 1084 if(!use_stdin) getch2_enable(); // prepare stdin for hotkeys... |
1085 | |
1 | 1086 InitTimer(); |
1087 | |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
1088 total_time_usage_start=GetTimer(); |
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
1089 |
1 | 1090 while(!eof){ |
1439 | 1091 unsigned int aq_total_time=GetTimer(); |
1092 float aq_sleep_time=0; | |
1 | 1093 |
1125 | 1094 if(play_n_frames>=0){ |
1095 --play_n_frames; | |
1582 | 1096 if(play_n_frames<0) exit_player(MSGTR_Exit_frames); |
1125 | 1097 } |
1098 | |
1 | 1099 /*========================== 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
|
1100 while(sh_audio){ |
746 | 1101 unsigned int t; |
955 | 1102 int playsize=audio_out->get_space(); |
746 | 1103 |
955 | 1104 if(!playsize) break; // buffer is full, do not block here!!! |
746 | 1105 |
1106 if(playsize>MAX_OUTBURST) playsize=MAX_OUTBURST; // we shouldn't exceed it! | |
1107 //if(playsize>outburst) playsize=outburst; | |
291 | 1108 |
1109 // Update buffer if needed | |
1639 | 1110 current_module="decode_audio"; // Enter AUDIO decoder module |
746 | 1111 t=GetTimer(); |
1112 while(sh_audio->a_buffer_len<playsize && !d_audio->eof){ | |
1113 int ret=decode_audio(sh_audio,&sh_audio->a_buffer[sh_audio->a_buffer_len], | |
1114 playsize-sh_audio->a_buffer_len,sh_audio->a_buffer_size-sh_audio->a_buffer_len); | |
296 | 1115 if(ret>0) sh_audio->a_buffer_len+=ret; else break; |
1 | 1116 } |
1117 current_module=NULL; // Leave AUDIO decoder module | |
291 | 1118 t=GetTimer()-t;audio_time_usage+=t*0.000001; |
746 | 1119 |
1120 if(playsize>sh_audio->a_buffer_len) playsize=sh_audio->a_buffer_len; | |
1121 | |
955 | 1122 playsize=audio_out->play(sh_audio->a_buffer,playsize,0); |
1 | 1123 |
955 | 1124 if(playsize>0){ |
746 | 1125 sh_audio->a_buffer_len-=playsize; |
1126 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
|
1127 sh_audio->timer+=playsize/(float)(sh_audio->o_bps); |
1 | 1128 } |
1129 | |
1130 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
|
1131 } // if(sh_audio) |
1 | 1132 |
1133 /*========================== UPDATE TIMERS ============================*/ | |
746 | 1134 #if 0 |
1 | 1135 if(alsa){ |
1136 // Use system timer for sync, not audio card/driver | |
1137 time_frame-=GetRelativeTime(); | |
1138 if(time_frame<-0.1 || time_frame>0.1){ | |
1139 time_frame=0; | |
1140 } else { | |
398 | 1141 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
|
1142 usec_sleep(time_frame-0.022); |
398 | 1143 time_frame-=GetRelativeTime(); |
1144 } | |
103 | 1145 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
|
1146 usec_sleep(1000); // sleeps 1 clock tick (10ms)! |
103 | 1147 time_frame-=GetRelativeTime(); |
1148 } | |
398 | 1149 } |
1 | 1150 } |
746 | 1151 #endif |
1 | 1152 |
1153 /*========================== PLAY VIDEO ============================*/ | |
1154 | |
1439 | 1155 cvideo_base_vframe=sh_video->timer; |
1156 cvideo_base_vtime=video_time_usage; | |
1157 | |
1 | 1158 if(1) |
746 | 1159 while(1){ |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1160 |
398 | 1161 float frame_time=1; |
1162 float pts1=d_video->pts; | |
1291 | 1163 int blit_frame=0; |
1 | 1164 |
1165 current_module="decode_video"; | |
715 | 1166 |
1 | 1167 //-------------------- Decode a frame: ----------------------- |
1168 | |
1439 | 1169 vdecode_time=video_time_usage; |
1170 | |
1660 | 1171 if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES || demuxer->file_format==DEMUXER_TYPE_MPEG_PS){ |
111 | 1172 int in_frame=0; |
398 | 1173 float newfps; |
1462 | 1174 //videobuf_len=0; |
111 | 1175 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){ |
1176 int i=sync_video_packet(d_video); | |
1295 | 1177 void* buffer=&videobuffer[videobuf_len+4]; |
111 | 1178 if(in_frame){ |
1179 if(i<0x101 || i>=0x1B0){ // not slice code -> end of frame | |
398 | 1180 #if 1 |
111 | 1181 // send END OF FRAME code: |
1182 videobuffer[videobuf_len+0]=0; | |
1183 videobuffer[videobuf_len+1]=0; | |
1184 videobuffer[videobuf_len+2]=1; | |
1185 videobuffer[videobuf_len+3]=0xFF; | |
1186 videobuf_len+=4; | |
1187 #endif | |
1421 | 1188 if(!i) eof=2; // EOF |
111 | 1189 break; |
1190 } | |
1191 } else { | |
1192 //if(i==0x100) in_frame=1; // picture startcode | |
1193 if(i>=0x101 && i<0x1B0) in_frame=1; // picture startcode | |
1421 | 1194 else if(!i){ eof=3; break;} // EOF |
111 | 1195 } |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1196 if(grab_frames==2 && (i==0x1B3 || i==0x1B8)) grab_frames=1; |
1421 | 1197 if(!read_video_packet(d_video)){ eof=4; break;} // EOF |
111 | 1198 //printf("read packet 0x%X, len=%d\n",i,videobuf_len); |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1406
diff
changeset
|
1199 if(sh_video->codec->driver!=VFM_MPEG){ |
1296 | 1200 // if not libmpeg2: |
1295 | 1201 switch(i){ |
1202 case 0x1B3: header_process_sequence_header (picture, buffer);break; | |
1203 case 0x1B5: header_process_extension (picture, buffer);break; | |
1204 } | |
1205 } | |
111 | 1206 } |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1207 |
111 | 1208 if(videobuf_len>max_framesize) max_framesize=videobuf_len; // debug |
1209 //printf("--- SEND %d bytes\n",videobuf_len); | |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1210 if(grab_frames==1){ |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1211 FILE *f=fopen("grab.mpg","ab"); |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1212 fwrite(videobuffer,videobuf_len-4,1,f); |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1213 fclose(f); |
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1214 } |
1291 | 1215 |
1216 blit_frame=decode_video(video_out,sh_video,videobuffer,videobuf_len,drop_frame); | |
111 | 1217 |
1291 | 1218 // get mpeg fps: |
1219 newfps=frameratecode2framerate[picture->frame_rate_code]*0.0001f; | |
1220 if(ABS(sh_video->fps-newfps)>0.01f) if(!force_fps){ | |
1567 | 1221 mp_msg(MSGT_CPLAYER,MSGL_WARN,"Warning! FPS changed %5.3f -> %5.3f (%f) [%d] \n",sh_video->fps,newfps,sh_video->fps-newfps,picture->frame_rate_code); |
398 | 1222 sh_video->fps=newfps; |
1223 sh_video->frametime=10000.0f/(float)frameratecode2framerate[picture->frame_rate_code]; | |
1291 | 1224 } |
1225 | |
1226 // fix mpeg2 frametime: | |
1227 frame_time=(100+picture->repeat_count)*0.01f; | |
1228 picture->repeat_count=0; | |
1462 | 1229 videobuf_len=0; |
398 | 1230 |
1291 | 1231 } else { |
1232 // frame-based file formats: (AVI,ASF,MOV) | |
1233 unsigned char* start=NULL; | |
1234 int in_size=ds_get_packet(d_video,&start); | |
1421 | 1235 if(in_size<0){ eof=5;break;} |
1291 | 1236 if(in_size>max_framesize) max_framesize=in_size; |
1237 blit_frame=decode_video(video_out,sh_video,start,in_size,drop_frame); | |
1 | 1238 } |
1291 | 1239 |
1439 | 1240 vdecode_time=video_time_usage-vdecode_time; |
1241 | |
1 | 1242 //------------------------ frame decoded. -------------------- |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1243 //------------------------ add OSD to frame contents --------- |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1244 #ifndef USE_LIBVO2 |
1768 | 1245 current_module="draw_osd"; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1246 video_out->draw_osd(); |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1247 #endif |
1 | 1248 |
1768 | 1249 current_module="av_sync"; |
1250 | |
398 | 1251 // Increase video timers: |
1400 | 1252 sh_video->num_frames+=frame_time; |
1546 | 1253 ++sh_video->num_frames_decoded; |
398 | 1254 frame_time*=sh_video->frametime; |
1660 | 1255 if(demuxer->file_format==DEMUXER_TYPE_ASF && !force_fps){ |
398 | 1256 // .ASF files has no fixed FPS - just frame durations! |
1257 float d=d_video->pts-pts1; | |
1258 if(d>=0 && d<5) frame_time=d; | |
595 | 1259 if(d>0){ |
1260 if(verbose) | |
1261 if((int)sh_video->fps==1000) | |
1262 printf("\rASF framerate: %d fps \n",(int)(1.0f/d)); | |
1263 sh_video->frametime=d; // 1ms | |
1264 sh_video->fps=1.0f/d; | |
1265 } | |
398 | 1266 } |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1267 sh_video->timer+=frame_time; |
746 | 1268 time_frame+=frame_time; // for nosound |
1269 | |
1660 | 1270 if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS) d_video->pts+=frame_time; |
940 | 1271 |
1567 | 1272 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"*** ftime=%5.3f ***\n",frame_time); |
780 | 1273 |
798 | 1274 if(drop_frame){ |
746 | 1275 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1276 if(sh_audio && !d_audio->eof){ |
955 | 1277 int delay=audio_out->get_delay(); |
1567 | 1278 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"delay=%d\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
|
1279 time_frame=sh_video->timer; |
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1280 time_frame-=sh_audio->timer-(float)delay/(float)sh_audio->o_bps; |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1281 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
|
1282 drop_frame=0; // stop dropping frames |
1567 | 1283 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
|
1284 }else{ |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1285 ++drop_frame_cnt; |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1286 if (verbose > 0 && drop_frame_cnt%10 == 0) |
1567 | 1287 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
|
1288 } |
798 | 1289 } |
1709 | 1290 #ifdef HAVE_NEW_GUI |
1291 if(use_gui){ | |
1802 | 1292 EventHandling(); |
1709 | 1293 } |
1294 #endif | |
1729 | 1295 video_out->check_events(); // check events AST |
798 | 1296 } else { |
780 | 1297 // It's time to sleep... |
1298 current_module="sleep"; | |
1299 | |
1300 time_frame-=GetRelativeTime(); // reset timer | |
1301 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1302 if(sh_audio && !d_audio->eof){ |
955 | 1303 int delay=audio_out->get_delay(); |
1567 | 1304 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"delay=%d\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
|
1305 time_frame=sh_video->timer; |
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1306 time_frame-=sh_audio->timer-(float)delay/(float)sh_audio->o_bps; |
798 | 1307 // we are out of time... drop next frame! |
940 | 1308 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
|
1309 static int drop_message=0; |
798 | 1310 drop_frame=frame_dropping; // tricky! |
1311 ++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
|
1312 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
|
1313 drop_message=1; |
1582 | 1314 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
|
1315 } |
1567 | 1316 mp_msg(MSGT_AVSYNC,MSGL_DBG2,"\nframe drop %d, %.2f\n", drop_frame, time_frame); |
798 | 1317 } |
780 | 1318 } else { |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
1319 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
|
1320 time_frame=0; |
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
1321 |
780 | 1322 } |
798 | 1323 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1324 // if(verbose>1)printf("sleep: %5.3f a:%6.3f v:%6.3f \n",time_frame,sh_audio->timer,sh_video->timer); |
1439 | 1325 |
1326 aq_sleep_time+=time_frame; | |
1709 | 1327 |
1328 #ifdef HAVE_NEW_GUI | |
1329 if(use_gui){ | |
1802 | 1330 EventHandling(); |
1709 | 1331 } |
1332 #endif | |
746 | 1333 |
1334 while(time_frame>0.005){ | |
1335 if(time_frame<=0.020) | |
1439 | 1336 // usec_sleep(10000); // sleeps 1 clock tick (10ms)! |
1337 usec_sleep(0); // sleeps 1 clock tick (10ms)! | |
746 | 1338 else |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1339 usec_sleep(1000000*(time_frame-0.002)); |
1709 | 1340 #ifdef HAVE_NEW_GUI |
1341 if(use_gui){ | |
1802 | 1342 EventHandling(); |
1709 | 1343 } |
1344 #endif | |
746 | 1345 time_frame-=GetRelativeTime(); |
1346 } | |
117 | 1347 |
715 | 1348 current_module="flip_page"; |
1422 | 1349 #ifdef USE_LIBVO2 |
1350 if(blit_frame) vo2_flip(video_out,0); | |
1351 #else | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1352 video_out->check_events(); |
1250 | 1353 if(blit_frame) video_out->flip_page(); |
1422 | 1354 #endif |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1355 // usec_sleep(50000); // test only! |
780 | 1356 |
715 | 1357 } |
780 | 1358 |
1359 current_module=NULL; | |
715 | 1360 |
1 | 1361 if(eof) break; |
220 | 1362 if(force_redraw){ |
1363 --force_redraw; | |
577 | 1364 if(!force_redraw) osd_function=OSD_PLAY; |
746 | 1365 continue; |
220 | 1366 } |
1 | 1367 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1368 // 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 | 1369 // fflush(stdout); |
1370 | |
1371 #if 1 | |
1372 /*================ 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
|
1373 if(sh_audio){ |
780 | 1374 float a_pts=0; |
1375 float v_pts=0; | |
1376 | |
746 | 1377 // unplayed bytes in our and soundcard/dma buffer: |
955 | 1378 int delay_bytes=audio_out->get_delay()+sh_audio->a_buffer_len; |
746 | 1379 float delay=(float)delay_bytes/(float)sh_audio->o_bps; |
1380 | |
780 | 1381 if(pts_from_bps){ |
1498 | 1382 #if 1 |
1383 unsigned int samples=(sh_audio->audio.dwSampleSize)? | |
1384 ((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) : | |
1385 (d_audio->pack_no); // <- used for VBR audio | |
1386 a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate; | |
1387 #else | |
1481 | 1388 if(sh_audio->audio.dwSampleSize) |
1389 a_pts=(ds_tell(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->wf->nAvgBytesPerSec; | |
1390 else // VBR: | |
1391 a_pts=d_audio->pack_no*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate; | |
1498 | 1392 #endif |
1393 // v_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; | |
1394 // printf("V_PTS: PTS: %8.3f BPS: %8.3f \n",d_video->pts,v_pts); | |
1395 delay_corrected=1; | |
780 | 1396 } else { |
1397 // PTS = (last timestamp) + (bytes after last timestamp)/(bytes per sec) | |
746 | 1398 a_pts=d_audio->pts; |
1498 | 1399 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
|
1400 //printf("*** %5.3f ***\n",a_pts); |
746 | 1401 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
|
1402 // v_pts=d_video->pts-frame_time; |
1498 | 1403 // v_pts=d_video->pts; |
780 | 1404 } |
1498 | 1405 v_pts=d_video->pts; |
746 | 1406 |
1567 | 1407 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 | 1408 |
398 | 1409 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
|
1410 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
|
1411 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
|
1412 x=AV_delay*0.1f; |
1 | 1413 if(x<-max_pts_correction) x=-max_pts_correction; else |
1414 if(x> max_pts_correction) x= max_pts_correction; | |
780 | 1415 if(default_max_pts_correction>=0) |
1416 max_pts_correction=default_max_pts_correction; | |
1417 else | |
1418 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
|
1419 sh_audio->timer+=x; c_total+=x; |
1567 | 1420 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\r", |
1498 | 1421 a_pts-audio_delay-delay,v_pts,AV_delay,c_total, |
1546 | 1422 (int)sh_video->num_frames,(int)sh_video->num_frames_decoded, |
1498 | 1423 (sh_video->timer>0.5)?(int)(100.0*video_time_usage/(double)sh_video->timer):0, |
1424 (sh_video->timer>0.5)?(int)(100.0*vout_time_usage/(double)sh_video->timer):0, | |
1425 (sh_video->timer>0.5)?(100.0*audio_time_usage/(double)sh_video->timer):0 | |
1426 ,drop_frame_cnt | |
1427 ,output_quality | |
1 | 1428 ); |
1429 fflush(stdout); | |
1430 } | |
780 | 1431 |
1 | 1432 } else { |
1433 // No audio: | |
1420 | 1434 |
1448 | 1435 if(!quiet) |
1567 | 1436 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"V:%6.1f %3d %2d%% %2d%% %3.1f%% \r",d_video->pts, |
1400 | 1437 (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
|
1438 (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
|
1439 (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
|
1440 (sh_video->timer>0.5)?(100.0*audio_time_usage/(double)sh_video->timer):0 |
442 | 1441 ); |
1 | 1442 |
1443 fflush(stdout); | |
1420 | 1444 |
1 | 1445 } |
1446 #endif | |
1447 | |
1439 | 1448 /*Output quality adjustments:*/ |
1449 if(auto_quality>0){ | |
1450 #if 0 | |
1451 /*If we took a long time decoding this frame, downgrade the quality.*/ | |
1452 if(output_quality>0&& | |
1453 (video_time_usage-cvideo_base_vtime)*sh_video->timer>= | |
1454 (0.95*sh_video->timer-(vout_time_usage+audio_time_usage))* | |
1455 (sh_video->timer-cvideo_base_vframe-frame_correction)){ | |
1456 output_quality>>=1; | |
1567 | 1457 mp_msg(MSGT_AUTOQ,MSGL_DBG2,"Downgrading quality to %i.\n",output_quality); |
1439 | 1458 set_video_quality(sh_video,output_quality); |
1459 } else | |
1460 /*If we had plenty of extra time, upgrade the quality.*/ | |
1461 if(output_quality<auto_quality&& | |
1462 vdecode_time<0.5*frame_time&& | |
1463 (video_time_usage-cvideo_base_vtime)*sh_video->timer< | |
1464 (0.67*sh_video->timer-(vout_time_usage+audio_time_usage))* | |
1465 (sh_video->timer-cvideo_base_vframe-frame_correction)){ | |
1466 output_quality++; | |
1567 | 1467 mp_msg(MSGT_AUTOQ,MSGL_DBG2,"Upgrading quality to %i.\n",output_quality); |
1439 | 1468 set_video_quality(sh_video,output_quality); |
1469 } | |
1470 #else | |
1496 | 1471 // float total=0.000001f * (GetTimer()-aq_total_time); |
1439 | 1472 // if(output_quality<auto_quality && aq_sleep_time>0.05f*total) |
1473 if(output_quality<auto_quality && aq_sleep_time>0) | |
1474 ++output_quality; | |
1475 else | |
1476 // if(output_quality>0 && aq_sleep_time<-0.05f*total) | |
1477 if(output_quality>1 && aq_sleep_time<0) | |
1478 --output_quality; | |
1479 else | |
1480 if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms | |
1481 output_quality=0; | |
1482 // printf("total: %8.6f sleep: %8.6f q: %d\n",(0.000001f*aq_total_time),aq_sleep_time,output_quality); | |
1483 set_video_quality(sh_video,output_quality); | |
1484 #endif | |
1485 } | |
1486 | |
1422 | 1487 #ifdef USE_OSD |
220 | 1488 if(osd_visible){ |
1504
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
1489 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
|
1490 if (osd_function != OSD_PAUSE) |
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
1491 osd_function = OSD_PLAY; |
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
1492 } |
220 | 1493 } |
1422 | 1494 #endif |
371 | 1495 |
1496 if(osd_function==OSD_PAUSE){ | |
1817
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
1497 int gui_pause_flag=0; // gany! |
1567 | 1498 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
|
1499 #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
|
1500 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
|
1501 #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
|
1502 if (audio_out && sh_audio) |
1156 | 1503 audio_out->pause(); // pause audio, keep data if possible |
723 | 1504 while( |
371 | 1505 #ifdef HAVE_LIRC |
723 | 1506 lirc_mp_getinput()<=0 && |
371 | 1507 #endif |
1467 | 1508 (use_stdin || getch2(20)<=0) && mplayer_get_key()<=0){ |
1422 | 1509 #ifndef USE_LIBVO2 |
723 | 1510 video_out->check_events(); |
1422 | 1511 #endif |
1709 | 1512 #ifdef HAVE_NEW_GUI |
1513 if(use_gui){ | |
1802 | 1514 EventHandling(); |
1817
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
1515 if(mplShMem->Playing!=2 || (rel_seek_secs || abs_seek_pos)) |
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
1516 { gui_pause_flag=1; break; } // end of pause or seek |
1709 | 1517 } |
1518 #endif | |
1467 | 1519 if(use_stdin) usec_sleep(1000); // do not eat the CPU |
723 | 1520 } |
1521 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
|
1522 if (audio_out && sh_audio) |
1156 | 1523 audio_out->resume(); // resume audio |
1793
ba11d77c587a
gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents:
1792
diff
changeset
|
1524 #ifdef HAVE_NEW_GUI |
1817
35d88a433502
fixed interaction between commandlien and fileselector
arpi
parents:
1816
diff
changeset
|
1525 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
|
1526 #endif |
371 | 1527 } |
1528 | |
746 | 1529 |
1530 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
|
1531 } // while(sh_video->timer<sh_audio->timer || force_redraw) |
1 | 1532 |
1533 | |
1534 //================= Keyboard events, SEEKing ==================== | |
1535 | |
723 | 1536 { int c; |
1 | 1537 while( |
1538 #ifdef HAVE_LIRC | |
1539 (c=lirc_mp_getinput())>0 || | |
1540 #endif | |
1467 | 1541 (!use_stdin && (c=getch2(0))>0) || (c=mplayer_get_key())>0) switch(c){ |
1 | 1542 // seek 10 sec |
1543 case KEY_RIGHT: | |
220 | 1544 osd_function=OSD_FFW; |
1 | 1545 rel_seek_secs+=10;break; |
1546 case KEY_LEFT: | |
220 | 1547 osd_function=OSD_REW; |
1 | 1548 rel_seek_secs-=10;break; |
1549 // seek 1 min | |
1550 case KEY_UP: | |
220 | 1551 osd_function=OSD_FFW; |
1 | 1552 rel_seek_secs+=60;break; |
1553 case KEY_DOWN: | |
220 | 1554 osd_function=OSD_REW; |
1 | 1555 rel_seek_secs-=60;break; |
651 | 1556 // seek 10 min |
1557 case KEY_PAGE_UP: | |
1558 rel_seek_secs+=600;break; | |
1559 case KEY_PAGE_DOWN: | |
1560 rel_seek_secs-=600;break; | |
1 | 1561 // delay correction: |
1562 case '+': | |
746 | 1563 audio_delay+=0.1; // increase audio buffer 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
|
1564 if(sh_audio) sh_audio->timer-=0.1; |
1 | 1565 break; |
1566 case '-': | |
746 | 1567 audio_delay-=0.1; // decrease audio buffer 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
|
1568 if(sh_audio) sh_audio->timer+=0.1; |
1 | 1569 break; |
1570 // quit | |
1571 case KEY_ESC: // ESC | |
1639 | 1572 case 'q': exit_player(MSGTR_Exit_quit); |
1 | 1573 case KEY_ENTER: // ESC |
1639 | 1574 eof=1; // jump to next file |
1575 break; | |
36 | 1576 case 'g': grab_frames=2;break; |
1 | 1577 // pause |
1578 case 'p': | |
1579 case ' ': | |
220 | 1580 osd_function=OSD_PAUSE; |
371 | 1581 break; |
1582 case 'o': // toggle OSD | |
1583 osd_level=(osd_level+1)%3; | |
1 | 1584 break; |
939 | 1585 case 'z': |
1586 sub_delay -= 0.1; | |
1587 break; | |
1588 case 'x': | |
1589 sub_delay += 0.1; | |
1590 break; | |
1626 | 1591 case '9': |
1592 case '0': | |
459 | 1593 case '*': |
555 | 1594 case '/': { |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1026
diff
changeset
|
1595 float mixer_l, mixer_r; |
555 | 1596 mixer_getvolume( &mixer_l,&mixer_r ); |
1626 | 1597 if(c=='*' || c=='0'){ |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1598 if ( ++mixer_l > 100 ) mixer_l = 100; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1599 if ( ++mixer_r > 100 ) mixer_r = 100; |
555 | 1600 } else { |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1601 if ( --mixer_l < 0 ) mixer_l = 0; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1602 if ( --mixer_r < 0 ) mixer_r = 0; |
555 | 1603 } |
1604 mixer_setvolume( mixer_l,mixer_r ); | |
1605 | |
1422 | 1606 #ifdef USE_OSD |
555 | 1607 if(osd_level){ |
1608 osd_visible=sh_video->fps; // 1 sec | |
1609 vo_osd_progbar_type=OSD_VOLUME; | |
1726 | 1610 vo_osd_progbar_value=((mixer_l+mixer_r)*256.0)/200.0; |
1611 // printf("volume: %d\n",vo_osd_progbar_value); | |
555 | 1612 } |
1422 | 1613 #endif |
555 | 1614 } |
1615 break; | |
459 | 1616 case 'm': |
510 | 1617 mixer_usemaster=!mixer_usemaster; |
459 | 1618 break; |
1429 | 1619 |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1620 #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
|
1621 case '1': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1622 case '2': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1623 case '3': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1624 case '4': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1625 case '5': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1626 case '6': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1627 case '7': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1628 case '8': |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1629 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
|
1630 abs_seek_pos=3; |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1631 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
|
1632 break; |
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1633 #else |
1429 | 1634 // Contrast: |
1635 case '1': | |
1636 case '2': | |
1637 if(c=='2'){ | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1638 if ( ++v_cont > 100 ) v_cont = 100; |
1429 | 1639 } else { |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1640 if ( --v_cont < 0 ) v_cont = 0; |
1429 | 1641 } |
1642 if(set_video_colors(sh_video,"Contrast",v_cont)){ | |
1643 #ifdef USE_OSD | |
1644 if(osd_level){ | |
1645 osd_visible=sh_video->fps; // 1 sec | |
1646 vo_osd_progbar_type=OSD_CONTRAST; | |
1726 | 1647 vo_osd_progbar_value=((v_cont)<<8)/100; |
1429 | 1648 } |
1649 #endif | |
1650 } | |
1651 break; | |
1652 | |
1653 // Brightness: | |
1654 case '3': | |
1655 case '4': | |
1656 if(c=='4'){ | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1657 if ( ++v_bright > 100 ) v_bright = 100; |
1429 | 1658 } else { |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1659 if ( --v_bright < 0 ) v_bright = 0; |
1429 | 1660 } |
1661 if(set_video_colors(sh_video,"Brightness",v_bright)){ | |
1662 #ifdef USE_OSD | |
1663 if(osd_level){ | |
1664 osd_visible=sh_video->fps; // 1 sec | |
1665 vo_osd_progbar_type=OSD_BRIGHTNESS; | |
1726 | 1666 vo_osd_progbar_value=((v_bright)<<8)/100; |
1429 | 1667 } |
1668 #endif | |
1669 } | |
1670 break; | |
1671 | |
1672 // Hue: | |
1673 case '5': | |
1674 case '6': | |
1675 if(c=='6'){ | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1676 if ( ++v_hue > 100 ) v_hue = 100; |
1429 | 1677 } else { |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1678 if ( --v_hue < 0 ) v_hue = 0; |
1429 | 1679 } |
1680 if(set_video_colors(sh_video,"Hue",v_hue)){ | |
1681 #ifdef USE_OSD | |
1682 if(osd_level){ | |
1683 osd_visible=sh_video->fps; // 1 sec | |
1684 vo_osd_progbar_type=OSD_HUE; | |
1726 | 1685 vo_osd_progbar_value=((v_hue)<<8)/100; |
1429 | 1686 } |
1687 #endif | |
1688 } | |
1689 break; | |
1690 | |
1691 // Saturation: | |
1692 case '7': | |
1693 case '8': | |
1694 if(c=='8'){ | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1695 if ( ++v_saturation > 100 ) v_saturation = 100; |
1429 | 1696 } else { |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1498
diff
changeset
|
1697 if ( --v_saturation < 0 ) v_saturation = 0; |
1429 | 1698 } |
1699 if(set_video_colors(sh_video,"Saturation",v_saturation)){ | |
1700 #ifdef USE_OSD | |
1701 if(osd_level){ | |
1702 osd_visible=sh_video->fps; // 1 sec | |
1703 vo_osd_progbar_type=OSD_SATURATION; | |
1726 | 1704 vo_osd_progbar_value=((v_saturation)<<8)/100; |
1429 | 1705 } |
1706 #endif | |
1707 } | |
1708 break; | |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1709 #endif |
1429 | 1710 |
715 | 1711 case 'd': |
798 | 1712 frame_dropping=(frame_dropping+1)%3; |
1567 | 1713 mp_msg(MSGT_CPLAYER,MSGL_V,"== drop: %d == \n",frame_dropping); |
715 | 1714 break; |
1 | 1715 } |
1406 | 1716 } // keyboard event handler |
1717 | |
651 | 1718 if (seek_to_sec) { |
937 | 1719 int a,b; float d; |
1720 | |
1721 if (sscanf(seek_to_sec, "%d:%d:%f", &a,&b,&d)==3) | |
1722 rel_seek_secs += 3600*a +60*b +d ; | |
1723 else if (sscanf(seek_to_sec, "%d:%f", &a, &d)==2) | |
1724 rel_seek_secs += 60*a +d; | |
1725 else if (sscanf(seek_to_sec, "%f", &d)==1) | |
1726 rel_seek_secs += d; | |
1727 | |
1728 seek_to_sec = NULL; | |
651 | 1729 } |
937 | 1730 |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1731 if(rel_seek_secs || abs_seek_pos){ |
1466 | 1732 current_module="seek"; |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1733 if(demux_seek(demuxer,rel_seek_secs,abs_seek_pos)){ |
1405 | 1734 // success: |
889 | 1735 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1736 if(sh_audio){ |
1459
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
1737 if(verbose){ |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
1738 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
|
1739 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; |
1567 | 1740 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
|
1741 } |
1567 | 1742 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
|
1743 } else { |
1567 | 1744 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
|
1745 } |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
1746 fflush(stdout); |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
1747 |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
1748 if(sh_audio){ |
1466 | 1749 current_module="seek_audio_reset"; |
1334 | 1750 audio_out->reset(); // stop audio, throwing away buffered data |
1 | 1751 } |
1752 | |
1422 | 1753 #ifdef USE_OSD |
1334 | 1754 // Set OSD: |
1755 if(osd_level){ | |
1756 int len=((demuxer->movi_end-demuxer->movi_start)>>8); | |
1727 | 1757 if (len>0){ |
1758 osd_visible=sh_video->fps; // 1 sec | |
1759 vo_osd_progbar_type=0; | |
1760 vo_osd_progbar_value=(demuxer->filepos-demuxer->movi_start)/len; | |
1761 } | |
1334 | 1762 } |
1422 | 1763 #endif |
1405 | 1764 |
1420 | 1765 c_total=0; |
1 | 1766 max_pts_correction=0.1; |
1504
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
1767 osd_visible=sh_video->fps; // to rewert to PLAY pointer after 1 sec |
1 | 1768 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
|
1769 drop_frame_cnt=0; |
1405 | 1770 |
1 | 1771 } |
1405 | 1772 rel_seek_secs=0; |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
1773 abs_seek_pos=0; |
1466 | 1774 current_module=NULL; |
1775 } | |
1776 | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
1777 #ifdef HAVE_NEW_GUI |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
1778 if(use_gui){ |
1735 | 1779 if(demuxer->file_format==DEMUXER_TYPE_AVI && sh_video->video.dwLength>2){ |
1780 // get pos from frame number / total frames | |
1781 mplShMem->Position=(float)d_video->pack_no*100.0f/sh_video->video.dwLength; | |
1782 } else { | |
1783 // get pos from file position / filesize | |
1784 int len=((demuxer->movi_end-demuxer->movi_start)); | |
1785 int pos=(demuxer->file_format==DEMUXER_TYPE_AVI)?demuxer->filepos:d_video->pos; | |
1786 mplShMem->Position=(len<=0)?0:((float)(pos-demuxer->movi_start) / len * 100.0f); | |
1787 } | |
1729 | 1788 mplShMem->TimeSec=d_video->pts; |
1790 | 1789 // printf("mplShMem->Playing=%d \n",mplShMem->Playing); |
1772 | 1790 if(mplShMem->Playing==0) break; // STOP |
1791 if(mplShMem->Playing==2) osd_function=OSD_PAUSE; | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
1792 } |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
1793 #endif |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
1794 |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
1795 |
220 | 1796 //================= Update OSD ==================== |
1422 | 1797 #ifdef USE_OSD |
1421 | 1798 if(osd_level>=2){ |
780 | 1799 int pts=d_video->pts; |
595 | 1800 if(pts==osd_last_pts-1) ++pts; else osd_last_pts=pts; |
371 | 1801 vo_osd_text=osd_text_buffer; |
595 | 1802 sprintf(vo_osd_text,"%c %02d:%02d:%02d",osd_function,pts/3600,(pts/60)%60,pts%60); |
371 | 1803 } else { |
1804 vo_osd_text=NULL; | |
1805 } | |
220 | 1806 // for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0; |
371 | 1807 // vo_osd_text=osd_text_buffer; |
1422 | 1808 #endif |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
1809 |
1422 | 1810 #ifdef USE_SUB |
258 | 1811 // find sub |
1204 | 1812 if(subtitles && d_video->pts>0){ |
1762 | 1813 float pts=d_video->pts; |
398 | 1814 if(sub_fps==0) sub_fps=sh_video->fps; |
482 | 1815 current_module="find_sub"; |
780 | 1816 find_sub(subtitles,sub_uses_time?(100*(pts+sub_delay)):((pts+sub_delay)*sub_fps)); // FIXME! frame counter... |
482 | 1817 current_module=NULL; |
258 | 1818 } |
1422 | 1819 #endif |
554 | 1820 |
1821 // DVD sub: | |
557 | 1822 { unsigned char* packet=NULL; |
1823 int len=ds_get_packet_sub(d_dvdsub,&packet); | |
1824 if(len>=2){ | |
1825 int len2; | |
1826 len2=(packet[0]<<8)+packet[1]; | |
1567 | 1827 mp_msg(MSGT_CPLAYER,MSGL_V,"\rDVD sub: %d / %d \n",len,len2); |
561 | 1828 if(len==len2) |
1829 spudec_decode(packet,len); | |
1830 else | |
1567 | 1831 mp_msg(MSGT_CPLAYER,MSGL_V,"fragmented dvd-subs not yet supported!!!\n"); |
557 | 1832 } else if(len>=0) { |
1567 | 1833 mp_msg(MSGT_CPLAYER,MSGL_V,"invalid dvd sub\n"); |
554 | 1834 } |
1835 } | |
1836 | |
1421 | 1837 } // while(!eof) |
1 | 1838 |
1567 | 1839 mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d \n",eof); |
1 | 1840 |
1639 | 1841 } |
1842 | |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1843 |
1790 | 1844 if(curr_filename+1<num_filenames || use_gui){ |
1639 | 1845 // partial uninit: |
1846 | |
1847 // restore terminal: | |
1729 | 1848 getch2_disable(); |
1639 | 1849 |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1850 current_module="uninit_vo"; |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1851 |
1639 | 1852 #ifdef USE_LIBVO2 |
1853 if(video_out) vo2_close(video_out); | |
1854 #else | |
1855 if(video_out) video_out->uninit(); | |
1856 #endif | |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1857 |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1858 current_module="uninit_ao"; |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1859 if(audio_out) audio_out->uninit(); |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1860 // if(encode_name) avi_fixate(); |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1861 } |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1862 |
1808 | 1863 goto_next_file: // don't jump here after ao/vo/getch initialization! |
1864 | |
1797 | 1865 #ifdef HAVE_NEW_GUI |
1866 if(use_gui) | |
1867 { | |
1868 mplStop(); | |
1869 mplSubRender=1; | |
1870 wsPostRedisplay( &appMPlayer.subWindow ); | |
1871 } | |
1872 #endif | |
1873 | |
1790 | 1874 if(use_gui || ++curr_filename<num_filenames){ |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1875 |
1654 | 1876 current_module="uninit_vcodec"; |
1877 if(sh_video) uninit_video(sh_video); | |
1878 | |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1879 current_module="free_demuxer"; |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1880 if(demuxer) free_demuxer(demuxer); |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1881 |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1882 current_module="free_stream"; |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1883 if(stream) free_stream(stream); |
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1884 |
1639 | 1885 video_out=NULL; |
1886 audio_out=NULL; | |
1887 | |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1888 goto play_next_file; |
1639 | 1889 } |
1890 | |
1582 | 1891 exit_player(MSGTR_Exit_eof); |
1639 | 1892 |
109 | 1893 return 1; |
1894 } |