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