annotate mplayer.c @ 2605:f629b154ecbf

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