annotate mplayer.c @ 5075:37e15b16e38d

libvo init moved to libmpcodecs
author arpi
date Thu, 14 Mar 2002 23:28:51 +0000
parents a760c9f074df
children cf9c0a6f76d5
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"
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
32 #endif
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
33
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
34 #include "libvo/video_out.h"
2550
7d6e5373fd68 mDisplay ?
arpi
parents: 2530
diff changeset
35 extern void* mDisplay; // Display* mDisplay;
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
36
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
37 #include "libvo/sub.h"
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
38
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
39 #include "libao2/audio_out.h"
3194
1648d11fc36c commandline configuration of audio plugins now through struct, format conversion plugin added
anders
parents: 3180
diff changeset
40 #include "libao2/audio_plugin.h"
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
41
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
42 #include "libmpeg2/mpeg2.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
43 #include "libmpeg2/mpeg2_internal.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
44
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
45 #include "codec-cfg.h"
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
46
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
47 #include "dvdauth.h"
3180
d53f70e3c794 spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents: 3166
diff changeset
48 #ifdef USE_DVDREAD
560
28ae99036574 Separated dvdsub code to be able to work with it easier
lgb
parents: 557
diff changeset
49 #include "spudec.h"
3180
d53f70e3c794 spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents: 3166
diff changeset
50 #endif
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
51 #include "vobsub.h"
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
52
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
53 #include "linux/getch2.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
54 #include "linux/keycodes.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
55 #include "linux/timer.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
56 #include "linux/shmem.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
57
2272
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
58 #include "cpudetect.h"
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
59
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
60 #ifdef HAVE_LIRC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
61 #include "lirc_mp.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
62 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63
2036
029bad24d022 baz.. fixed wrong cvs merge.
atmos4
parents: 2034
diff changeset
64 #ifdef HAVE_NEW_GUI
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4788
diff changeset
65 #include "Gui/interface.h"
2036
029bad24d022 baz.. fixed wrong cvs merge.
atmos4
parents: 2034
diff changeset
66 #endif
029bad24d022 baz.. fixed wrong cvs merge.
atmos4
parents: 2034
diff changeset
67
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
68 #ifdef HAVE_NEW_INPUT
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
69 #include "input/input.h"
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
70 #endif
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
71
3322
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
72 int slave_mode=0;
362
463699f15eb4 static removed from verbose definition
szabii
parents: 360
diff changeset
73 int verbose=0;
1448
e795527de16a -quiet option patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents: 1439
diff changeset
74 int quiet=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
75
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
76 #define ABS(x) (((x)>=0)?(x):(-(x)))
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
77
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
78 #ifdef HAVE_RTC
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
79 #include <linux/rtc.h>
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
80 #endif
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
81
2941
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
82 #ifdef USE_TV
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
83 #include "libmpdemux/tv.h"
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
84
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
85 extern int tv_param_on;
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
86 extern tvi_handle_t *tv_handler;
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
87 #endif
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
88
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
89 //**************************************************************************//
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
90 // Playtree
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
91 //**************************************************************************//
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
92 #include "playtree.h"
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
93
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
94 play_tree_t* playtree;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
95
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
96 #define PT_NEXT_ENTRY 1
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
97 #define PT_PREV_ENTRY -1
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
98 #define PT_NEXT_SRC 2
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
99 #define PT_PREV_SRC -2
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
100 #define PT_UP_NEXT 3
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
101 #define PT_UP_PREV -3
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
102
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
103 //**************************************************************************//
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
104 // Config
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
105 //**************************************************************************//
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
106
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
107 m_config_t* mconfig;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
108
4381
9768db9a360a query vaa
nick
parents: 4358
diff changeset
109 /**************************************************************************
9768db9a360a query vaa
nick
parents: 4358
diff changeset
110 Video accelerated architecture
9768db9a360a query vaa
nick
parents: 4358
diff changeset
111 **************************************************************************/
9768db9a360a query vaa
nick
parents: 4358
diff changeset
112 vo_vaa_t vo_vaa;
4388
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
113
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
114 //**************************************************************************//
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
115 // Config file
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
116 //**************************************************************************//
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
117
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
118 static int cfg_inc_verbose(struct config *conf){ ++verbose; return 0;}
153
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 151
diff changeset
119
162
effc62af528c new option: -include
szabii
parents: 154
diff changeset
120 static int cfg_include(struct config *conf, char *filename){
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
121 return m_config_parse_config_file(mconfig, filename);
162
effc62af528c new option: -include
szabii
parents: 154
diff changeset
122 }
effc62af528c new option: -include
szabii
parents: 154
diff changeset
123
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
124 #include "get_path.c"
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
125
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
126 //**************************************************************************//
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
127 //**************************************************************************//
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
128 // Input media streaming & demultiplexer:
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
129 //**************************************************************************//
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
130
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
131 static int max_framesize=0;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
132
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 577
diff changeset
133 #include "stream.h"
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
134 #include "demuxer.h"
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
135 #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
136 #include "parse_es.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
137
2563
fc124f9db88e more cleanup, warnings fixed
arpi
parents: 2557
diff changeset
138 #include "dec_audio.h"
fc124f9db88e more cleanup, warnings fixed
arpi
parents: 2557
diff changeset
139 #include "dec_video.h"
fc124f9db88e more cleanup, warnings fixed
arpi
parents: 2557
diff changeset
140
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
141 #if 0
1015
9744b50fe87f some cleanup, old unused stuff removed
arpi_esp
parents: 1014
diff changeset
142 extern picture_t *picture; // exported from libmpeg2/decode.c
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
143
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
144 int frameratecode2framerate[16] = {
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
145 0,
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
146 // Official mpeg1/2 framerates:
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
147 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
148 // libmpeg3's "Unofficial economy rates":
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
149 1*10000,5*10000,10*10000,12*10000,15*10000,0,0
112
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
150 };
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
151 #endif
112
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
152
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
153 //**************************************************************************//
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
154 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
155
112
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
156 // Common FIFO functions, and keyboard/event FIFO code
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
157 #include "fifo.c"
4892
35dd38bbd7f3 Fix when stdin is used as a file
albeu
parents: 4858
diff changeset
158 int use_stdin=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
159 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
160
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
161 static vo_functions_t *video_out=NULL;
4788
d678ce495a75 Moved HW dependent mixer stuff to libao and removed master switch
anders
parents: 4787
diff changeset
162 ao_functions_t *audio_out=NULL;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
163
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
164 // benchmark:
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
165 double video_time_usage=0;
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
166 double vout_time_usage=0;
4834
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
167 double max_video_time_usage=0;
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
168 double max_vout_time_usage=0;
4838
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
169 double cur_video_time_usage=0;
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
170 double cur_vout_time_usage=0;
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
171 static double audio_time_usage=0;
4834
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
172 static double max_audio_time_usage=0;
4838
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
173 static double cur_audio_time_usage=0;
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
174 static int total_time_usage_start=0;
4844
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
175 int benchmark=0;
4838
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
176 static unsigned bench_dropped_frames=0;
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
177
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
178 // static int play_in_bg=0;
606
0b1f9eda1ea6 warnings killed
szabii
parents: 598
diff changeset
179
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
180 // options:
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
181 static int auto_quality=0;
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
182 static int output_quality=0;
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
183
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
184 int use_gui=0;
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
185
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
186 int osd_level=2;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
187
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
188 // seek:
937
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
189 char *seek_to_sec=NULL;
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
190 off_t seek_to_byte=0;
2436
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
191 off_t step_sec=0;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
192 int loop_times=-1;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
193 float rel_seek_secs=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
194 int abs_seek_pos=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
195
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
196 // codecs:
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
197 int has_audio=1;
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
198 int has_video=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
199 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
200 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
201 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
202 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
203
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
204 // 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
205 // 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
206 // 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
207 #ifdef USE_DIRECTSHOW
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
208 int allow_dshow=1;
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
209 #else
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
210 int allow_dshow=0;
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
211 #endif
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
212
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
213 // streaming:
3532
19998399f4d5 Made audio_id and video_id non static variable.
bertrand
parents: 3499
diff changeset
214 int audio_id=-1;
19998399f4d5 Made audio_id and video_id non static variable.
bertrand
parents: 3499
diff changeset
215 int video_id=-1;
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
216 int dvdsub_id=-1;
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
217 int vobsub_id=-1;
3754
174e473f582d -alang/-slang options (audio/sub selection by language code)
arpi
parents: 3748
diff changeset
218 char* audio_lang=NULL;
174e473f582d -alang/-slang options (audio/sub selection by language code)
arpi
parents: 3748
diff changeset
219 char* dvdsub_lang=NULL;
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
220 static int vcd_track=0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
221
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
222 // cache2:
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
223 static int stream_cache_size=0;
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
224 #ifdef USE_STREAM_CACHE
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
225 extern int cache_fill_status;
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
226 #else
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
227 #define cache_fill_status 0
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
228 #endif
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
229
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
230 // dump:
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
231 static char *stream_dump_name="stream.dump";
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
232 static int stream_dump_type=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
233
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
234 // A-V sync:
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
235 static float default_max_pts_correction=-1;//0.01f;
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
236 static float max_pts_correction=0;//default_max_pts_correction;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
237 static float c_total=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
238 static float audio_delay=0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
239
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
240 static int dapsync=0;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
241 static int softsleep=0;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
242
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
243 static float force_fps=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
244 static int force_srate=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
245 static int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
246 static int play_n_frames=-1;
4843
00c875a22d10 make -frames key optional for max/total benchmark
nick
parents: 4840
diff changeset
247 static uint32_t our_n_frames=0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
248
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
249 // screen info:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
250 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
251 char* audio_driver=NULL;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
252
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
253 // libvo opts: (defiend at libmpcodecs/vd.c)
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
254 extern int opt_screen_size_x;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
255 extern int opt_screen_size_y;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
256 extern int screen_size_xy;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
257 extern float movie_aspect;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
258 extern int fullscreen;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
259 extern int vidmode;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
260 extern int softzoom;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
261 extern int flip;
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
262 extern int vo_flags;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
263
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
264 // sub:
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
265 char *font_name=NULL;
215
09d565842a33 font alpha resampling, see -ffactor
arpi_esp
parents: 212
diff changeset
266 float font_factor=0.75;
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
267 char *sub_name=NULL;
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
268 float sub_delay=0;
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
269 float sub_fps=0;
510
2951d138ddaf add sub autoread & remove 'c' key
pontscho
parents: 500
diff changeset
270 int sub_auto = 1;
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
271 char *vobsub_name=NULL;
1255
94f2853ec6f4 -dsp option removed, displaying help text (-ao oss:dsp_path)
alex
parents: 1250
diff changeset
272 /*DSP!!char *dsp=NULL;*/
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
273
1183
6fbcfe7f7f10 vo/ao_subdevice implemented
al3x
parents: 1177
diff changeset
274 extern char *vo_subdevice;
6fbcfe7f7f10 vo/ao_subdevice implemented
al3x
parents: 1177
diff changeset
275 extern char *ao_subdevice;
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
276
2321
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
277 static stream_t* stream=NULL;
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
278
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
279 char* current_module=NULL; // for debugging
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
280
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
281 #ifdef HAVE_RTC
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
282 int nortc;
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
283 #endif
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
284
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
285 static unsigned int inited_flags=0;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
286 #define INITED_VO 1
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
287 #define INITED_AO 2
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
288 #define INITED_GUI 4
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
289 #define INITED_GETCH2 8
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
290 #define INITED_LIRC 16
3034
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
291 #define INITED_SPUDEC 32
2321
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
292 #define INITED_STREAM 64
4431
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
293 #define INITED_INPUT 128
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
294 #define INITED_ALL 0xFFFF
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
295
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
296 void uninit_player(unsigned int mask){
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
297 mask=inited_flags&mask;
3180
d53f70e3c794 spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents: 3166
diff changeset
298 #ifdef USE_DVDREAD
3034
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
299 if (mask&INITED_SPUDEC){
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
300 inited_flags&=~INITED_SPUDEC;
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
301 current_module="uninit_spudec";
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
302 spudec_free(vo_spudec);
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
303 }
3180
d53f70e3c794 spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents: 3166
diff changeset
304 #endif
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
305 if(mask&INITED_VO){
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
306 inited_flags&=~INITED_VO;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
307 current_module="uninit_vo";
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
308 video_out->uninit();
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
309 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
310
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
311 if(mask&INITED_AO){
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
312 inited_flags&=~INITED_AO;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
313 current_module="uninit_ao";
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
314 audio_out->uninit();
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
315 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
316
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
317 if(mask&INITED_GETCH2){
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
318 inited_flags&=~INITED_GETCH2;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
319 current_module="uninit_getch2";
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
320 // restore terminal:
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
321 getch2_disable();
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
322 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
323
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
324 #ifdef HAVE_NEW_GUI
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
325 if(mask&INITED_GUI){
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
326 inited_flags&=~INITED_GUI;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
327 current_module="uninit_gui";
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
328 guiDone();
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
329 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
330 #endif
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
331
2321
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
332 if(mask&INITED_STREAM){
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
333 inited_flags&=~INITED_STREAM;
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
334 current_module="uninit_stream";
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
335 if(stream) free_stream(stream);
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
336 stream=NULL;
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
337 }
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
338
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
339 #if defined(HAVE_LIRC) && ! defined(HAVE_NEW_INPUT)
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
340 if(mask&INITED_LIRC){
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
341 inited_flags&=~INITED_LIRC;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
342 current_module="uninit_lirc";
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
343 lirc_mp_cleanup();
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
344 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
345 #endif
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
346
4431
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
347 #ifdef HAVE_NEW_INPUT
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
348 if(mask&INITED_INPUT){
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
349 inited_flags&=INITED_INPUT;
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
350 current_module="uninit_input";
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
351 mp_input_uninit();
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
352 }
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
353 #endif
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
354
1863
bb7710b16dc2 reset module status after uninit
arpi
parents: 1857
diff changeset
355 current_module=NULL;
bb7710b16dc2 reset module status after uninit
arpi
parents: 1857
diff changeset
356
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
357 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
358
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
359 void exit_player(char* how){
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
360
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
361 uninit_player(INITED_ALL);
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
362
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
363 current_module="exit_player";
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
364
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
365 if(how) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Exiting,how);
4733
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
366 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"max framesize was %d bytes\n",max_framesize);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
367
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
368 exit(1);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
369 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
370
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
371 void exit_sighandler(int x){
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
372 static int sig_count=0;
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
373 ++sig_count;
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
374 if(sig_count==2) exit(1);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
375 if(sig_count>2){
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
376 // can't stop :(
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
377 kill(getpid(),SIGKILL);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
378 }
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
379 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_IntBySignal,x,
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
380 current_module?current_module:"unknown"
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
381 );
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
382 exit_player(NULL);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
383 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
384
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
385 //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
386
4659
31265995cc3a Place holder for registering modules options
albeu
parents: 4655
diff changeset
387 extern void mp_register_options(m_config_t* cfg);
31265995cc3a Place holder for registering modules options
albeu
parents: 4655
diff changeset
388
459
9dfad88a8107 add mixer support
pontscho
parents: 458
diff changeset
389 #include "mixer.h"
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
390 #include "cfg-mplayer.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
391
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
392 void parse_cfgfiles( m_config_t* conf )
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
393 {
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
394 char *conffile;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
395 int conffile_fd;
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
396 if (m_config_parse_config_file(conf, "/etc/mplayer.conf") < 0)
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
397 exit(1);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
398 if ((conffile = get_path("")) == NULL) {
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
399 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoHomeDir);
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
400 } else {
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
401 mkdir(conffile, 0777);
55206b791586 get_path()
szabii
parents: 175
diff changeset
402 free(conffile);
55206b791586 get_path()
szabii
parents: 175
diff changeset
403 if ((conffile = get_path("config")) == NULL) {
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
404 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
405 } else {
55206b791586 get_path()
szabii
parents: 175
diff changeset
406 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
407 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CreatingCfgFile, conffile);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
408 write(conffile_fd, default_config, strlen(default_config));
55206b791586 get_path()
szabii
parents: 175
diff changeset
409 close(conffile_fd);
55206b791586 get_path()
szabii
parents: 175
diff changeset
410 }
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
411 if (m_config_parse_config_file(conf, conffile) < 0)
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
412 exit(1);
55206b791586 get_path()
szabii
parents: 175
diff changeset
413 free(conffile);
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
414 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
415 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
416 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
417
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
418 // When libmpdemux perform a blocking operation (network connection or cache filling)
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
419 // if the operation fail we use this function to check if it was interrupted by the user.
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
420 // The function return a new value for eof.
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
421 static int libmpdemux_was_interrupted(int eof) {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
422 #ifdef HAVE_NEW_INPUT
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
423 mp_cmd_t* cmd;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
424 if((cmd = mp_input_get_cmd(0,0)) != NULL) {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
425 switch(cmd->id) {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
426 case MP_CMD_QUIT:
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
427 exit_player(MSGTR_Exit_quit);
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
428 case MP_CMD_PLAY_TREE_STEP: {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
429 eof = (cmd->args[0].v.i > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
430 } break;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
431 case MP_CMD_PLAY_TREE_UP_STEP: {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
432 eof = (cmd->args[0].v.i > 0) ? PT_UP_NEXT : PT_UP_PREV;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
433 } break;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
434 case MP_CMD_PLAY_ALT_SRC_STEP: {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
435 eof = (cmd->args[0].v.i > 0) ? PT_NEXT_SRC : PT_PREV_SRC;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
436 } break;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
437 }
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
438 mp_cmd_free(cmd);
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
439 }
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
440 return eof;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
441 #else
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
442 return 0;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
443 #endif
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
444 }
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
445
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
446 int main(int argc,char* argv[], char *envp[]){
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
447
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
448 #ifdef USE_SUB
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
449 static subtitle* subtitles=NULL;
3274
ac7ded58b6df mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3257
diff changeset
450 float sub_last_pts = -303;
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
451 #endif
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
452
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
453 static demuxer_t *demuxer=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
454
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
455 static demux_stream_t *d_audio=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
456 static demux_stream_t *d_video=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
457 static demux_stream_t *d_dvdsub=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
458
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
459 static sh_audio_t *sh_audio=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
460 static sh_video_t *sh_video=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
461
1629
13aeaa05ac5e multifile support in config parser
arpi
parents: 1627
diff changeset
462 // for multifile support:
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
463 play_tree_iter_t* playtree_iter = NULL;
1629
13aeaa05ac5e multifile support in config parser
arpi
parents: 1627
diff changeset
464
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
465 char* filename=NULL; //"MI2-Trailer.avi";
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
466 int file_format=DEMUXER_TYPE_UNKNOWN;
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
467
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
468 int delay_corrected=1;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
469 //char* title="MPlayer";
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
470
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
471 // movie info:
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
472 int out_fmt=0;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
473 int eof=0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
474
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
475 int osd_visible=100;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
476 int osd_function=OSD_PLAY;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
477 int osd_last_pts=-303;
3783
de6b00131e95 show a-v delay in osd (based on subdelay osd patch)
arpi
parents: 3754
diff changeset
478 int osd_show_av_delay = 0;
3234
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
479 int osd_show_sub_delay = 0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
480
4395
817530449706 New logic of HW equalizing:
nick
parents: 4388
diff changeset
481 int v_hw_equ_cap=0;
817530449706 New logic of HW equalizing:
nick
parents: 4388
diff changeset
482 int v_bright=50;
817530449706 New logic of HW equalizing:
nick
parents: 4388
diff changeset
483 int v_cont=50;
817530449706 New logic of HW equalizing:
nick
parents: 4388
diff changeset
484 int v_hue=50;
817530449706 New logic of HW equalizing:
nick
parents: 4388
diff changeset
485 int v_saturation=50;
4388
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
486 /*
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
487 For future:
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
488 int v_red_intensity=0;
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
489 int v_green_intensity=0;
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
490 int v_blue_intensity=0;
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
491 */
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
492
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
493 int rtc_fd=-1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
494
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
495 //float a_frame=0; // Audio
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
496
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
497 int i;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
498
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
499 int gui_no_filename=0;
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
500
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
501 //vo_tune_info_t vtune;
4453
71d05615a378 Providing new tune info
nick
parents: 4433
diff changeset
502
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
503 mp_msg_init(MSGL_STATUS);
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
504
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
505 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s",banner_text);
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
506 // memset(&vtune,0,sizeof(vo_tune_info_t));
2272
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
507 /* Test for cpu capabilities (and corresponding OS support) for optimizing */
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
508 #ifdef ARCH_X86
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
509 GetCpuCaps(&gCpuCaps);
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
510 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
511 gCpuCaps.cpuType,gCpuCaps.hasMMX,gCpuCaps.hasMMX2,
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
512 gCpuCaps.has3DNow, gCpuCaps.has3DNowExt,
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
513 gCpuCaps.hasSSE, gCpuCaps.hasSSE2);
3742
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
514 #ifdef RUNTIME_CPUDETECT
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
515 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Compiled with RUNTIME CPU Detection - warning, it's untested!\n");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
516 #else
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
517 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Compiled for x86 CPU with features:");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
518 #ifdef HAVE_MMX
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
519 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
520 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
521 #ifdef HAVE_MMX2
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
522 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX2");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
523 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
524 #ifdef HAVE_3DNOW
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
525 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNow");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
526 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
527 #ifdef HAVE_3DNOWEX
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
528 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNowEx");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
529 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
530 #ifdef HAVE_SSE
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
531 mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
532 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
533 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
534 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
535
2272
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
536 #endif
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
537
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
538 if ( argv[0] )
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
539 if(!strcmp(argv[0],"gmplayer") ||
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
540 (strrchr(argv[0],'/') && !strcmp(strrchr(argv[0],'/'),"/gmplayer") ) )
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
541 use_gui=1;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
542
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
543 playtree = play_tree_new();
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
544
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
545 mconfig = m_config_new(playtree);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
546 m_config_register_options(mconfig,mplayer_opts);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
547 // TODO : add something to let modules register their options
4659
31265995cc3a Place holder for registering modules options
albeu
parents: 4655
diff changeset
548 mp_register_options(mconfig);
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
549 parse_cfgfiles(mconfig);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
550
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
551
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
552
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
553 if(m_config_parse_command_line(mconfig, argc, argv, envp) < 0) exit(1); // error parsing cmdline
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
554
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
555 playtree = play_tree_cleanup(playtree);
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
556 if(playtree) {
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
557 playtree_iter = play_tree_iter_new(playtree,mconfig);
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
558 if(playtree_iter) {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
559 if(play_tree_iter_step(playtree_iter,0,0) != PLAY_TREE_ITER_ENTRY) {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
560 play_tree_iter_free(playtree_iter);
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
561 playtree_iter = NULL;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
562 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
563 filename = play_tree_iter_get_file(playtree_iter,1);
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
564 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
565 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
566
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
567 #ifndef HAVE_NEW_GUI
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
568 if(use_gui){
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1962
diff changeset
569 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoGui);
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
570 use_gui=0;
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
571 }
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
572 #else
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
573 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
574 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
575 use_gui=0;
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
576 }
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
577 #endif
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
578
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
579 if(video_driver && strcmp(video_driver,"help")==0){
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
580 printf("Available video output drivers:\n");
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
581 i=0;
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
582 while (video_out_drivers[i]) {
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
583 const vo_info_t *info = video_out_drivers[i++]->get_info ();
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
584 printf("\t%s\t%s\n", info->short_name, info->name);
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
585 }
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
586 printf("\n");
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
587 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
588 }
5072
a760c9f074df libvo2 #ifs removed
arpi
parents: 5055
diff changeset
589
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
590 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
591 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
592 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
593 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
594 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
595 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
596 }
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
597 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
598 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
599 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
600
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
601 // check codec.conf
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
602 if(!parse_codec_cfg(get_path("codecs.conf"))){
3748
6da59751fb20 search codecs.conf at CONFDIR
arpi
parents: 3744
diff changeset
603 if(!parse_codec_cfg(CONFDIR"/codecs.conf")){
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
604 mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
2116
6365b02ccc6e ugly hack for bad codecs.conf hangup
arpi
parents: 2102
diff changeset
605 // printf("Exit.\n");
3934
e8e7ca8995a1 codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents: 3843
diff changeset
606 exit(0); // From unknown reason a hangup occurs here :((((((
e8e7ca8995a1 codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents: 3843
diff changeset
607 // kill(getpid(),SIGTERM);
e8e7ca8995a1 codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents: 3843
diff changeset
608 // usleep(20000);
e8e7ca8995a1 codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents: 3843
diff changeset
609 // kill(getpid(),SIGKILL);
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
610 }
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
611 }
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
612
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
613 if(audio_codec && strcmp(audio_codec,"help")==0){
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
614 printf("Available audio codecs:\n");
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
615 list_codecs(1);
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
616 printf("\n");
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
617 exit(0);
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
618 }
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
619 if(video_codec && strcmp(video_codec,"help")==0){
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
620 printf("Available video codecs:\n");
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
621 list_codecs(0);
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
622 printf("\n");
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
623 exit(0);
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
624 }
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
625
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
626
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
627 if(!filename && !vcd_track && !dvd_title && !tv_param_on){
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
628 if(!use_gui){
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
629 // no file/vcd/dvd -> show HELP:
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
630 printf("%s",help_text);
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
631 exit(0);
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
632 } else gui_no_filename=1;
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
633 }
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
634
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
635 // Many users forget to include command line in bugreports...
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
636 if(verbose){
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
637 printf("CommandLine:");
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
638 for(i=1;i<argc;i++)printf(" '%s'",argv[i]);
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
639 printf("\n");
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
640 }
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
641
4152
da00e9f57949 10l to Alban B. - restored removed verbose level setting
arpi
parents: 4087
diff changeset
642 mp_msg_init(verbose+MSGL_STATUS);
1183
6fbcfe7f7f10 vo/ao_subdevice implemented
al3x
parents: 1177
diff changeset
643
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
644 //------ load global data first ------
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
645
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
646
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
647 // check font
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
648 #ifdef USE_OSD
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
649 if(font_name){
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
650 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
651 if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
652 } else {
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
653 // try default:
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
654 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
655 if(!vo_font)
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 1338
diff changeset
656 vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1);
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
657 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
658 #endif
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
659
4431
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
660 #if defined(HAVE_LIRC) && ! defined(HAVE_NEW_INPUT)
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
661 lirc_mp_setup();
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
662 inited_flags|=INITED_LIRC;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
663 #endif
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
664
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
665 #ifdef HAVE_RTC
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
666 if(!nortc)
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
667 {
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
668 if ((rtc_fd = open("/dev/rtc", O_RDONLY)) < 0)
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
669 perror ("Linux RTC init: open");
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
670 else {
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
671 unsigned long irqp;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
672
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
673 /* if (ioctl(rtc_fd, RTC_IRQP_SET, _) < 0) { */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
674 if (ioctl(rtc_fd, RTC_IRQP_READ, &irqp) < 0) {
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
675 perror ("Linux RTC init: ioctl (rtc_irqp_read)");
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
676 close (rtc_fd);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
677 rtc_fd = -1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
678 } else if (ioctl(rtc_fd, RTC_PIE_ON, 0) < 0) {
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
679 /* variable only by the root */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
680 perror ("Linux RTC init: ioctl (rtc_pie_on)");
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
681 close (rtc_fd);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
682 rtc_fd = -1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
683 } else
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
684 printf("Using Linux's hardware RTC timing (%ldHz)\n", irqp);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
685 }
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
686 }
4176
116abdd0aed1 small gtk bug fix (-display bug, baze gabu, miattad fogok elkarhozni:), and remove gui dependencie in mencoder
pontscho
parents: 4160
diff changeset
687 #ifdef HAVE_NEW_GUI
3825
7735c5a87121 setuid hack disabled
arpi
parents: 3823
diff changeset
688 // breaks DGA and SVGAlib and VESA drivers: --A'rpi
4176
116abdd0aed1 small gtk bug fix (-display bug, baze gabu, miattad fogok elkarhozni:), and remove gui dependencie in mencoder
pontscho
parents: 4160
diff changeset
689 // and now ? -- Pontscho
116abdd0aed1 small gtk bug fix (-display bug, baze gabu, miattad fogok elkarhozni:), and remove gui dependencie in mencoder
pontscho
parents: 4160
diff changeset
690 if(use_gui) setuid( getuid() ); // strongly test, please check this.
116abdd0aed1 small gtk bug fix (-display bug, baze gabu, miattad fogok elkarhozni:), and remove gui dependencie in mencoder
pontscho
parents: 4160
diff changeset
691 #endif
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
692 if(rtc_fd<0)
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
693 #endif
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
694 printf("Using %s timing\n",softsleep?"software":"usleep()");
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
695
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
696 #ifdef USE_TERMCAP
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
697 if ( !use_gui ) load_termcap(NULL); // load key-codes
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
698 #endif
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
699
1816
c8bc613eb4f8 fixed 'n' key bug :)
arpi
parents: 1809
diff changeset
700 // ========== Init keyboard FIFO (connection to libvo) ============
c8bc613eb4f8 fixed 'n' key bug :)
arpi
parents: 1809
diff changeset
701 make_pipe(&keyb_fifo_get,&keyb_fifo_put);
1694
0def229bd8bc GUI support (--enable-gui)
arpi
parents: 1690
diff changeset
702
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
703 // Init input system
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
704 #ifdef HAVE_NEW_INPUT
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
705 current_module = "init_input";
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
706 mp_input_init();
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
707 if(keyb_fifo_get > 0)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
708 mp_input_add_key_fd(keyb_fifo_get,1,NULL,NULL);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
709 if(slave_mode)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
710 mp_input_add_cmd_fd(0,1,NULL,NULL);
4892
35dd38bbd7f3 Fix when stdin is used as a file
albeu
parents: 4858
diff changeset
711 else if(!use_stdin)
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
712 mp_input_add_key_fd(0,1,NULL,NULL);
4431
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
713 inited_flags|=INITED_INPUT;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
714 current_module = NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
715 #endif
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
716
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
717
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
718 //========= Catch terminate signals: ================
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
719 // terminate requests:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
720 signal(SIGTERM,exit_sighandler); // kill
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
721 signal(SIGHUP,exit_sighandler); // kill -HUP / xterm closed
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
722
1729
d6c99f70449e fix hprogressbar
pontscho
parents: 1727
diff changeset
723 signal(SIGINT,exit_sighandler); // Interrupt from keyboard
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
724
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
725 signal(SIGQUIT,exit_sighandler); // Quit from keyboard
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
726 // fatal errors:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
727 signal(SIGBUS,exit_sighandler); // bus error
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
728 signal(SIGSEGV,exit_sighandler); // segfault
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
729 signal(SIGILL,exit_sighandler); // illegal instruction
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
730 signal(SIGFPE,exit_sighandler); // floating point exc.
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
731 signal(SIGABRT,exit_sighandler); // abort()
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
732
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
733 // ******************* Now, let's see the per-file stuff ********************
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
734
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
735 #ifdef HAVE_NEW_GUI
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
736 if(use_gui){
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
737 guiInit( argc,argv,envp );
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
738 inited_flags|=INITED_GUI;
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
739 guiGetEvent( guiCEvent,(char *)((gui_no_filename) ? 0 : 1) );
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
740 }
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
741 #endif
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
742
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
743 play_next_file:
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
744
4835
1f59d4d73558 Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents: 4834
diff changeset
745 // We must enable getch2 here to be able to interrupt network connection
1f59d4d73558 Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents: 4834
diff changeset
746 // or cache filling
1f59d4d73558 Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents: 4834
diff changeset
747 if(!use_stdin && !slave_mode){
1f59d4d73558 Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents: 4834
diff changeset
748 getch2_enable(); // prepare stdin for hotkeys...
1f59d4d73558 Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents: 4834
diff changeset
749 inited_flags|=INITED_GETCH2;
1f59d4d73558 Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents: 4834
diff changeset
750 }
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
751
1745
64247d7d0076 add filename drawing
pontscho
parents: 1738
diff changeset
752 #ifdef HAVE_NEW_GUI
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
753 if ( use_gui ) {
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
754
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
755 #ifdef USE_DVDREAD
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
756 if ( guiIntfStruct.DVDChanged )
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
757 {
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
758 guiIntfStruct.DVDChanged=0;
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
759 guiGetEvent( guiCEvent,(char *)guiSetPlay );
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
760 filename="/dev/dvd";
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
761 goto play_dvd;
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
762 }
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
763 #endif
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
764
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
765 while(guiIntfStruct.Playing!=1){
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
766 mp_cmd_t* cmd;
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
767 usleep(20000);
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4788
diff changeset
768 guiEventHandling();
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
769 if ( (cmd = mp_input_get_cmd(0,0)) != NULL) guiGetEvent( guiIEvent,(char *)cmd->id );
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
770 }
3560
61e0e3ecf47a kurva sub fix.
pontscho
parents: 3558
diff changeset
771
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
772 play_dvd:
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
773
3499
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
774 #ifdef USE_SUB
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
775 if ( guiIntfStruct.SubtitleChanged || !guiIntfStruct.FilenameChanged )
3560
61e0e3ecf47a kurva sub fix.
pontscho
parents: 3558
diff changeset
776 {
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
777 if ( ( guiIntfStruct.Subtitlename )&&( guiIntfStruct.Subtitlename[0] != 0 ) ) sub_name=guiIntfStruct.Subtitlename;
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
778 guiIntfStruct.SubtitleChanged=0;
3560
61e0e3ecf47a kurva sub fix.
pontscho
parents: 3558
diff changeset
779 }
3499
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
780 #endif
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
781 if ( guiIntfStruct.FilenameChanged || !filename )
3543
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
782 {
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
783 play_tree_t * entry = play_tree_new();
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
784 play_tree_add_file( entry,guiIntfStruct.Filename );
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
785 if ( playtree ) play_tree_free_list( playtree->child,1 );
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
786 else playtree=play_tree_new();
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
787 play_tree_set_child( playtree,entry );
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
788 if(playtree)
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
789 {
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
790 playtree_iter = play_tree_iter_new(playtree,mconfig);
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
791 if(playtree_iter)
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
792 {
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
793 if(play_tree_iter_step(playtree_iter,0,0) != PLAY_TREE_ITER_ENTRY)
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
794 {
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
795 play_tree_iter_free(playtree_iter);
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
796 playtree_iter = NULL;
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
797 }
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
798 filename = play_tree_iter_get_file(playtree_iter,1);
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
799 }
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
800 }
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
801 // filename=playtree->child->files[0];
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
802 guiIntfStruct.FilenameChanged=0;
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
803 }
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
804 }
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
805 #endif
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
806
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1962
diff changeset
807 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
808
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
809 current_module="vobsub";
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
810 if (vobsub_name){
4787
1ee5574d67d6 Fix automatic vobsub detection and make it silent.
atmos4
parents: 4770
diff changeset
811 vo_vobsub=vobsub_open(vobsub_name,1);
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
812 if(vo_vobsub==NULL)
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
813 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,vobsub_name);
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
814 }else if(sub_auto && filename && (strlen(filename)>=5)){
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
815 /* try to autodetect vobsub from movie filename ::atmos */
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
816 char *buf = malloc((strlen(filename)-3) * sizeof(char));
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
817 memset(buf,0,strlen(filename)-3); // make sure string is terminated
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
818 strncpy(buf, filename, strlen(filename)-4);
4787
1ee5574d67d6 Fix automatic vobsub detection and make it silent.
atmos4
parents: 4770
diff changeset
819 vo_vobsub=vobsub_open(buf,0);
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
820 free(buf);
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
821 }
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
822 if(vo_vobsub)
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
823 sub_auto=0; // don't do autosub for textsubs if vobsub found
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
824
4064
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
825 #ifdef USE_SUB_OLD
1650
7502b16bce63 make automatic subfile detection working with many files
atlka
parents: 1641
diff changeset
826 // check .sub
3499
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
827 if(sub_name){
3580
ce6845de334c small changes
pontscho
parents: 3563
diff changeset
828 #if 0
3499
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
829 int l=strlen(sub_name);
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
830 if ((l>4) && ((0==strcmp(&sub_name[l-4],".utf"))
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
831 ||(0==strcmp(&sub_name[l-4],".UTF"))))
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
832 sub_utf8=1;
3580
ce6845de334c small changes
pontscho
parents: 3563
diff changeset
833 #endif
3499
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
834 subtitles=sub_read_file(sub_name);
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
835 if(!subtitles || sub_num == 0) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name);
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
836 }
1651
b8721b5ab23e fixed duplicated loading of sub
arpi
parents: 1650
diff changeset
837 if(!sub_name){
1650
7502b16bce63 make automatic subfile detection working with many files
atlka
parents: 1641
diff changeset
838 if(sub_auto && filename) { // auto load sub file ...
7502b16bce63 make automatic subfile detection working with many files
atlka
parents: 1641
diff changeset
839 subtitles=sub_read_file( sub_filename( get_path("sub/"), filename ) );
7502b16bce63 make automatic subfile detection working with many files
atlka
parents: 1641
diff changeset
840 }
3580
ce6845de334c small changes
pontscho
parents: 3563
diff changeset
841 #if 0
1650
7502b16bce63 make automatic subfile detection working with many files
atlka
parents: 1641
diff changeset
842 if(!subtitles) subtitles=sub_read_file(get_path("default.sub")); // try default
3580
ce6845de334c small changes
pontscho
parents: 3563
diff changeset
843 #endif
1650
7502b16bce63 make automatic subfile detection working with many files
atlka
parents: 1641
diff changeset
844 }
7502b16bce63 make automatic subfile detection working with many files
atlka
parents: 1641
diff changeset
845
1762
914bdbe33cf8 -dumpsub works for avi, then dumps .sub file
arpi
parents: 1753
diff changeset
846 if(subtitles && stream_dump_type==3) list_sub_file(subtitles);
4064
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
847 if(subtitles && stream_dump_type==4) dump_mpsub(subtitles, fps);
3736
689986c2af9b wannabe compilation breaker
pl
parents: 3723
diff changeset
848 #endif
1762
914bdbe33cf8 -dumpsub works for avi, then dumps .sub file
arpi
parents: 1753
diff changeset
849
1654
9d85b84e367e dec_video uninit
arpi
parents: 1651
diff changeset
850 stream=NULL;
9d85b84e367e dec_video uninit
arpi
parents: 1651
diff changeset
851 demuxer=NULL;
9d85b84e367e dec_video uninit
arpi
parents: 1651
diff changeset
852 d_audio=NULL;
9d85b84e367e dec_video uninit
arpi
parents: 1651
diff changeset
853 d_video=NULL;
9d85b84e367e dec_video uninit
arpi
parents: 1651
diff changeset
854 sh_audio=NULL;
9d85b84e367e dec_video uninit
arpi
parents: 1651
diff changeset
855 sh_video=NULL;
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
856
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
857 // check video_out driver name:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
858 if (video_driver)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
859 if ((i = strcspn(video_driver, ":")) > 0)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
860 {
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
861 size_t i2 = strlen(video_driver);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
862
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
863 if (video_driver[i] == ':')
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
864 {
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
865 vo_subdevice = malloc(i2-i);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
866 if (vo_subdevice != NULL)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
867 strncpy(vo_subdevice, (char *)(video_driver+i+1), i2-i);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
868 video_driver[i] = '\0';
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
869 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
870 // printf("video_driver: %s, subdevice: %s\n", video_driver, vo_subdevice);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
871 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
872 if(!video_driver)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
873 video_out=video_out_drivers[0];
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
874 else
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
875 for (i=0; video_out_drivers[i] != NULL; i++){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
876 const vo_info_t *info = video_out_drivers[i]->get_info ();
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
877 if(strcmp(info->short_name,video_driver) == 0){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
878 video_out = video_out_drivers[i];break;
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
879 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
880 }
5072
a760c9f074df libvo2 #ifs removed
arpi
parents: 5055
diff changeset
881
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
882 if(!video_out){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
883 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidVOdriver,video_driver?video_driver:"?");
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
884 exit_player(MSGTR_Exit_error);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
885 }
4358
b313f88cd0dc vo's preinit support
nick
parents: 4335
diff changeset
886 if((i=video_out->preinit(vo_subdevice))!=0)
b313f88cd0dc vo's preinit support
nick
parents: 4335
diff changeset
887 {
b313f88cd0dc vo's preinit support
nick
parents: 4335
diff changeset
888 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"error on vo preinit = %u\n",i);
b313f88cd0dc vo's preinit support
nick
parents: 4335
diff changeset
889 exit_player(MSGTR_Exit_error);
b313f88cd0dc vo's preinit support
nick
parents: 4335
diff changeset
890 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
891 // check audio_out driver name:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
892 if (audio_driver)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
893 if ((i = strcspn(audio_driver, ":")) > 0)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
894 {
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
895 size_t i2 = strlen(audio_driver);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
896
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
897 if (audio_driver[i] == ':')
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
898 {
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
899 ao_subdevice = malloc(i2-i);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
900 if (ao_subdevice != NULL)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
901 strncpy(ao_subdevice, (char *)(audio_driver+i+1), i2-i);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
902 audio_driver[i] = '\0';
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
903 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
904 // printf("audio_driver: %s, subdevice: %s\n", audio_driver, ao_subdevice);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
905 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
906 if(!audio_driver)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
907 audio_out=audio_out_drivers[0];
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
908 else
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
909 for (i=0; audio_out_drivers[i] != NULL; i++){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
910 const ao_info_t *info = audio_out_drivers[i]->info;
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
911 if(strcmp(info->short_name,audio_driver) == 0){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
912 audio_out = audio_out_drivers[i];break;
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
913 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
914 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
915 if (!audio_out){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
916 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidAOdriver,audio_driver);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
917 exit_player(MSGTR_Exit_error);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
918 }
3107
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
919 /* Initailize audio plugin interface if used */
3194
1648d11fc36c commandline configuration of audio plugins now through struct, format conversion plugin added
anders
parents: 3180
diff changeset
920 if(ao_plugin_cfg.plugin_list){
3107
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
921 for (i=0; audio_out_drivers[i] != NULL; i++){
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
922 const ao_info_t *info = audio_out_drivers[i]->info;
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
923 if(strcmp(info->short_name,"plugin") == 0){
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
924 audio_out_drivers[i]->control(AOCONTROL_SET_PLUGIN_DRIVER,(int)audio_out);
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
925 audio_out = audio_out_drivers[i];
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
926 break;
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
927 }
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
928 }
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
929 }
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
930
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
931 current_module="open_stream";
1467
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
932 stream=open_stream(filename,vcd_track,&file_format);
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
933 if(!stream) { // error...
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
934 eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY);
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
935 goto goto_next_file;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
936 }
2321
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
937 inited_flags|=INITED_STREAM;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
938 if(stream->type == STREAMTYPE_PLAYLIST) {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
939 play_tree_t* entry;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
940 // Handle playlist
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
941 mp_msg(MSGT_CPLAYER,MSGL_V,"Parsing playlist %s...\n",filename);
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
942 entry = parse_playtree(stream);
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
943 if(!entry) {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
944 entry = playtree_iter->tree;
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
945 if(play_tree_iter_step(playtree_iter,1,0) != PLAY_TREE_ITER_ENTRY) {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
946 eof = PT_NEXT_ENTRY;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
947 goto goto_next_file;
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
948 }
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
949 if(playtree_iter->tree == entry ) { // Loop with a single file
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
950 if(play_tree_iter_up_step(playtree_iter,1,0) != PLAY_TREE_ITER_ENTRY) {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
951 eof = PT_NEXT_ENTRY;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
952 goto goto_next_file;
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
953 }
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
954 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
955 play_tree_remove(entry,1,1);
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
956 eof = PT_NEXT_SRC;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
957 goto goto_next_file;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
958 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
959 play_tree_insert_entry(playtree_iter->tree,entry);
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
960 entry = playtree_iter->tree;
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
961 if(play_tree_iter_step(playtree_iter,1,0) != PLAY_TREE_ITER_ENTRY) {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
962 eof = PT_NEXT_ENTRY;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
963 goto goto_next_file;
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
964 }
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
965 play_tree_remove(entry,1,1);
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
966 eof = PT_NEXT_SRC;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
967 goto goto_next_file;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
968 }
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
969 stream->start_pos+=seek_to_byte;
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
970
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
971 if(stream_dump_type==5){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
972 unsigned char buf[4096];
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
973 int len;
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
974 FILE *f;
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
975 current_module="dump";
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
976 stream_reset(stream);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
977 stream_seek(stream,stream->start_pos);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
978 f=fopen(stream_dump_name,"wb");
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
979 if(!f){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
980 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
981 exit_player(MSGTR_Exit_error);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
982 }
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
983 while(!stream->eof){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
984 len=stream_read(stream,buf,4096);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
985 if(len>0) fwrite(buf,len,1,f);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
986 }
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
987 fclose(f);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
988 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
989 exit_player(MSGTR_Exit_eof);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
990 }
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
991
4274
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
992 #ifdef USE_DVDREAD
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
993 current_module="dvd lang->id";
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
994 if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang);
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
995 if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang);
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
996 current_module=NULL;
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
997 #endif
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
998
3563
3d73514ddefc precaching
arpi
parents: 3560
diff changeset
999 // initial prefill: 20% later: 5% (should be set by -cacheopts)
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1000 if(stream_cache_size && ! stream_enable_cache(stream,stream_cache_size*1024,stream_cache_size*1024/5,stream_cache_size*1024/20)) {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1001 eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY);
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1002 if(eof)
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1003 goto goto_next_file;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1004 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1005
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
1006 #ifdef HAVE_LIBCSS
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1007 current_module="libcss";
546
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
1008 if (dvdimportkey) {
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
1009 if (dvd_import_key(dvdimportkey)) {
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1010 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorDVDkey);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1011 exit_player(MSGTR_Exit_error);
546
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
1012 }
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1013 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CmdlineDVDkey);
546
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
1014 }
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
1015 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
1016 // 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
1017 if (dvd_auth(dvd_auth_device,filename)) {
1809
84c9a29bb6c3 GUI_MSG bug fixed - thanx Attila Kinali
arpi
parents: 1808
diff changeset
1018 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Error in DVD auth...\n");
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1019 exit_player(MSGTR_Exit_error);
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1020 }
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1021 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_DVDauthOk);
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
1022 }
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
1023 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1024
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1025 //============ Open & Sync stream and detect file format ===============
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1026
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1027
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1028 if(!has_audio) audio_id=-2; // do NOT read audio packets...
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1029
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1030 current_module="demux_open";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1031
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
1032 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
1033 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
1034
1660
0ed5a9568d0f file_format -> demuxer->file_format
arpi
parents: 1654
diff changeset
1035 //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
1036
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1037 d_audio=demuxer->audio;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1038 d_video=demuxer->video;
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
1039 d_dvdsub=demuxer->sub;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1040
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1041 // DUMP STREAMS:
4335
270cbfe45b30 mpsub dump bug fix. 100l for laaz
pontscho
parents: 4274
diff changeset
1042 if((stream_dump_type)&&(stream_dump_type!=4)){
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1043 FILE *f;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1044 demux_stream_t *ds=NULL;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1045 current_module="dump";
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1046 // select stream to dump
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1047 switch(stream_dump_type){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1048 case 1: ds=d_audio;break;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1049 case 2: ds=d_video;break;
4335
270cbfe45b30 mpsub dump bug fix. 100l for laaz
pontscho
parents: 4274
diff changeset
1050 case 3: ds=d_dvdsub;break;
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1051 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1052 if(!ds){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1053 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpSelectedSteramMissing);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1054 exit_player(MSGTR_Exit_error);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1055 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1056 // disable other streams:
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1057 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
1058 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
1059 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
1060 // let's dump it!
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1061 f=fopen(stream_dump_name,"wb");
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1062 if(!f){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1063 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1064 exit_player(MSGTR_Exit_error);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1065 }
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1066 while(!ds->eof){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1067 unsigned char* start;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1068 int in_size=ds_get_packet(ds,&start);
2102
569a5d7b5d8a mov timing fixes (same way as asf)
arpi
parents: 2042
diff changeset
1069 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
1070 && stream_dump_type==2) fwrite(&in_size,1,4,f);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1071 if(in_size>0) fwrite(start,in_size,1,f);
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1072 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1073 fclose(f);
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1074 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1075 exit_player(MSGTR_Exit_eof);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1076 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1077
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1078 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
1079 sh_video=d_video->sh;
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1080
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1081 current_module="video_read_properties";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1082
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1083 if(sh_video){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1084
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1085 if(!video_read_properties(sh_video)) {
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1086 mp_msg(MSGT_CPLAYER,MSGL_ERR,"Video: can't read properties\n");
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1087 sh_video=d_video->sh=NULL;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1088 } else {
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1089 mp_msg(MSGT_CPLAYER,MSGL_INFO,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n",
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1090 demuxer->file_format,sh_video->format, sh_video->disp_w,sh_video->disp_h,
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1091 sh_video->fps,sh_video->frametime
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1092 );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1093
4598
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1094 vo_fps = sh_video->fps;
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1095 /* need to set fps here for output encoders to pick it up in their init */
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1096 if(force_fps){
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1097 sh_video->fps=force_fps;
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1098 sh_video->frametime=1.0f/sh_video->fps;
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1099 vo_fps = force_fps;
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1100 }
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1101
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1102 if(!sh_video->fps && !force_fps){
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1103 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_FPSnotspecified);
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1104 sh_video=d_video->sh=NULL;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1105 }
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1106 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1107
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1108 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1109
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1110 fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1111
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1112 if(!sh_video && !sh_audio){
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1113 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"No stream found\n");
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1114 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
1115 }
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1116
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1117 if(!sh_video) goto init_audio;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1118
4087
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1119 #ifdef USE_DVDREAD
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1120 current_module="spudec";
4552
46ccfbb41f9c fix spudec bug
pontscho
parents: 4515
diff changeset
1121 vo_spudec=spudec_new_scaled(stream->type==STREAMTYPE_DVD?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL,
4087
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1122 sh_video->disp_w, sh_video->disp_h);
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1123 if (vo_spudec!=NULL)
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1124 inited_flags|=INITED_SPUDEC;
4274
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
1125 current_module=NULL;
4087
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1126 #endif
4274
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
1127
4052
505f206d80d1 corrections to adjust_subs_time function which now uses fps if needed
atlka
parents: 4045
diff changeset
1128 #ifdef USE_SUB
4064
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1129 // after reading video params we should load subtitles because
4052
505f206d80d1 corrections to adjust_subs_time function which now uses fps if needed
atlka
parents: 4045
diff changeset
1130 // we know fps so now we can adjust subtitles time to ~6 seconds AST
4064
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1131 // check .sub
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1132 current_module="read_subtitles_file";
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1133 if(sub_name){
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1134 #if 0
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1135 int l=strlen(sub_name);
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1136 if ((l>4) && ((0==strcmp(&sub_name[l-4],".utf"))
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1137 ||(0==strcmp(&sub_name[l-4],".UTF"))))
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1138 sub_utf8=1;
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1139 #endif
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1140 subtitles=sub_read_file(sub_name, sh_video->fps);
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1141 if(!subtitles || sub_num == 0) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name);
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1142 }
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1143 if(!sub_name){
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1144 if(sub_auto && filename) { // auto load sub file ...
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1145 subtitles=sub_read_file( sub_filename( get_path("sub/"), filename ),
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1146 sh_video->fps );
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1147 }
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1148 #if 0
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1149 if(!subtitles) subtitles=sub_read_file(get_path("default.sub"),
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1150 sh_video->fps); // try default
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1151 #endif
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1152 }
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1153
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1154 if(subtitles && stream_dump_type==3) list_sub_file(subtitles);
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1155 if(subtitles && stream_dump_type==4) dump_mpsub(subtitles, sh_video->fps);
4052
505f206d80d1 corrections to adjust_subs_time function which now uses fps if needed
atlka
parents: 4045
diff changeset
1156 #endif
4064
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1157
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1158 //================== Init AUDIO (codec) ==========================
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1159 init_audio:
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1160 current_module="init_audio_codec";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1161
4693
20d5cc87be20 Also display clip info for audio only contents
albeu
parents: 4659
diff changeset
1162 /* display clip info */
20d5cc87be20 Also display clip info for audio only contents
albeu
parents: 4659
diff changeset
1163 demux_info_print(demuxer);
20d5cc87be20 Also display clip info for audio only contents
albeu
parents: 4659
diff changeset
1164
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1165 if(sh_audio){
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1166 // 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
1167 sh_audio->codec=NULL;
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1168 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
1169 while(1){
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1170 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
1171 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
1172 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
1173 sh_audio->codec=NULL; /* re-search */
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1174 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
1175 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
1176 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
1177 }
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1178 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
1179 mp_msg(MSGT_CPLAYER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf"));
1792
89f616b1c2ae nosound fixed. again. :(
arpi
parents: 1790
diff changeset
1180 sh_audio=d_audio->sh=NULL;
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1181 break;
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1182 }
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
1183 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
1184 else if(audio_family!=-1 && sh_audio->codec->driver!=audio_family) continue;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1185 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
1186 break;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1187 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1188 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1189
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1190 if(sh_audio){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1191 mp_msg(MSGT_CPLAYER,MSGL_V,"Initializing audio codec...\n");
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1192 if(!init_audio(sh_audio)){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1193 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CouldntInitAudioCodec);
1792
89f616b1c2ae nosound fixed. again. :(
arpi
parents: 1790
diff changeset
1194 sh_audio=d_audio->sh=NULL;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1195 } else {
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1196 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
1197 sh_audio->sample_format,sh_audio->i_bps,sh_audio->o_bps);
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1198 }
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1199 }
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1200
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1201 //================== Init VIDEO (codec & libvo) ==========================
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1202 if(!sh_video)
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1203 goto main;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1204 current_module="init_video_codec";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1205
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1206 // 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
1207 sh_video->codec=NULL;
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1208 if(video_family!=-1) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceVideoFmt,video_family);
3712
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1209 { /* local vars */
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1210 short bestprio=-1;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1211 struct codecs_st *bestcodec=NULL;
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1212 while(1){
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1213 sh_video->codec=find_codec(sh_video->format,
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1214 sh_video->bih?((unsigned int*) &sh_video->bih->biCompression):NULL,sh_video->codec,0);
3712
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1215 if(!sh_video->codec/* && bestprio==-1*/){
1299
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
1216 if(video_family!=-1) {
3712
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1217 //sh_video->codec=NULL; /* re-search */
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1218 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
1219 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
1220 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
1221 }
3712
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1222 if(bestprio==-1 || !video_codec) {
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1223 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
1224 mp_msg(MSGT_CPLAYER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf"));
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1225 sh_video = d_video->sh = NULL;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1226 goto main; // exit_player(MSGTR_Exit_error);
3712
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1227 }
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1228 } else {
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1229 // is next line needed anymore? - atmos ::
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1230 if(!allow_dshow && sh_video->codec->driver==VFM_DSHOW) continue; // skip DShow
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1231 else if(video_codec && strcmp(sh_video->codec->name,video_codec)) continue;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1232 else if(video_family!=-1 && sh_video->codec->driver!=video_family) continue;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1233 else if(video_family==-1 && !video_codec && sh_video->codec->priority) {
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1234 if(sh_video->codec->priority > bestprio) {
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1235 //printf("\n\n!!! setting bestprio from %d to %d for %s!!!\n\n", bestprio, sh_video->codec->priority, sh_video->codec->name);
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1236 bestprio=sh_video->codec->priority;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1237 bestcodec=sh_video->codec;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1238 }
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1239 continue;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1240 }
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1241 } /* sh_video->codec */
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1242 break;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1243 }
3712
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1244 if(bestprio!=-1) {
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1245 //printf("chose codec %s by priority.\n", bestcodec->name);
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1246 sh_video->codec=bestcodec;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1247 }
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1248
3712
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1249 } /* end local vars */
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1250
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1251 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s video codec: [%s] drv:%d prio:%d (%s)\n",video_codec?"Forcing":"Detected",sh_video->codec->name,sh_video->codec->driver,sh_video->codec->priority!=-1?sh_video->codec->priority:0,sh_video->codec->info);
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1252
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
1253 sh_video->video_out=video_out;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1254
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
1255 // init codec:
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
1256 //if(!init_video(sh_video,&vtune.pitch[0])){
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
1257 if(!init_video(sh_video,NULL)){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1258 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
1259 goto goto_next_file; // exit_player(MSGTR_Exit_error);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1260 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1261
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1262 if(auto_quality>0){
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1263 // Auto quality option enabled
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1264 output_quality=get_video_quality_max(sh_video);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1265 if(auto_quality>output_quality) auto_quality=output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1266 else output_quality=auto_quality;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1267 mp_msg(MSGT_CPLAYER,MSGL_V,"AutoQ: setting quality to %d\n",output_quality);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1268 set_video_quality(sh_video,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1269 }
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1270
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1271 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1272
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1273 current_module="init_libvo";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1274
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
1275 #if 0
208
ae0f909ccc7c Adds code to deal with vidmode selection. -- mgraffam
mgraffam
parents: 190
diff changeset
1276
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1277 { const vo_info_t *info = video_out->get_info();
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1278 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
1279 sh_video->disp_w,sh_video->disp_h,
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1280 screen_size_x,screen_size_y,
1183
6fbcfe7f7f10 vo/ao_subdevice implemented
al3x
parents: 1177
diff changeset
1281 vo_format_name(out_fmt),
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1282 fullscreen?"fs ":"",
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1283 vidmode?"vm ":"",
766
479f753a66ae Added -flip passing to init.
atmosfear
parents: 758
diff changeset
1284 softzoom?"zoom ":"",
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1285 (flip==1)?"flip ":""
766
479f753a66ae Added -flip passing to init.
atmosfear
parents: 758
diff changeset
1286 // fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3)
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1287 );
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1288 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Description: %s\n",info->name);
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1289 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
1290 if(strlen(info->comment) > 0)
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1291 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
1292 }
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
1293 #endif
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1294
1753
pontscho
parents: 1745
diff changeset
1295 #ifdef HAVE_NEW_GUI
pontscho
parents: 1745
diff changeset
1296 if ( use_gui )
pontscho
parents: 1745
diff changeset
1297 {
1952
b55163894e30 compile bug fixed.
pontscho
parents: 1889
diff changeset
1298 mplResizeToMovieSize( sh_video->disp_w,sh_video->disp_h );
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
1299 guiIntfStruct.MovieWidth=sh_video->disp_w;
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
1300 guiIntfStruct.MovieHeight=sh_video->disp_h;
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
1301 guiIntfStruct.StreamType=stream->type;
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1302 guiSetFilename( guiIntfStruct.Filename,filename );
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1303 if ( sh_audio ) guiIntfStruct.AudioType=sh_audio->channels;
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1304 else guiIntfStruct.AudioType=0;
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1305 #ifdef USE_DVDREAD
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1306 if ( stream->type == STREAMTYPE_DVD )
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1307 {
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1308 dvd_priv_t * dvdp = stream->priv;
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1309 guiIntfStruct.DVD.titles=dvdp->vmg_file->tt_srpt->nr_of_srpts;
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1310 guiIntfStruct.DVD.chapters=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_ptts;
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1311 guiIntfStruct.DVD.angles=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_angles;
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1312 guiIntfStruct.DVD.nr_of_audio_channels=dvdp->nr_of_channels;
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1313 memcpy( guiIntfStruct.DVD.audio_streams,dvdp->audio_streams,sizeof( dvdp->audio_streams ) );
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1314 guiIntfStruct.DVD.nr_of_subtitles=dvdp->nr_of_subtitles;
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1315 memcpy( guiIntfStruct.DVD.subtitles,dvdp->subtitles,sizeof( dvdp->subtitles ) );
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1316 guiIntfStruct.DVD.current_title=dvd_title + 1;
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1317 guiIntfStruct.DVD.current_chapter=dvd_chapter + 1;
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1318 guiIntfStruct.DVD.current_angle=dvd_angle + 1;
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1319 guiIntfStruct.Track=dvd_title + 1;
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1320 }
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1321 #endif
1753
pontscho
parents: 1745
diff changeset
1322 }
pontscho
parents: 1745
diff changeset
1323 #endif
pontscho
parents: 1745
diff changeset
1324
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
1325 inited_flags|=INITED_VO;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1326 mp_msg(MSGT_CPLAYER,MSGL_V,"INFO: Video OUT driver init OK!\n");
4593
3769ccb8da8b libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4587
diff changeset
1327 if(video_out->control(VOCTRL_QUERY_VAA, &vo_vaa)==VO_NOTIMPL)
3769ccb8da8b libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4587
diff changeset
1328 memset(&vo_vaa,0,sizeof(vo_vaa_t));
4388
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
1329 /*
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
1330 get_hw_eq
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
1331 */
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
1332 if(vo_vaa.get_video_eq)
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
1333 {
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
1334 vidix_video_eq_t veq;
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
1335 if(vo_vaa.get_video_eq(&veq) == 0)
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
1336 {
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
1337 v_hw_equ_cap = veq.cap;
4395
817530449706 New logic of HW equalizing:
nick
parents: 4388
diff changeset
1338 if(veq.cap & VEQ_CAP_BRIGHTNESS) v_bright = veq.brightness/10;
817530449706 New logic of HW equalizing:
nick
parents: 4388
diff changeset
1339 if(veq.cap & VEQ_CAP_CONTRAST) v_cont = veq.contrast/10;
817530449706 New logic of HW equalizing:
nick
parents: 4388
diff changeset
1340 if(veq.cap & VEQ_CAP_HUE) v_hue = veq.hue/10;
817530449706 New logic of HW equalizing:
nick
parents: 4388
diff changeset
1341 if(veq.cap & VEQ_CAP_SATURATION) v_saturation=veq.saturation/10;
4388
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
1342 /*
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
1343 v_red_intensity=veq.red_intensity/10;
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
1344 v_green_intensity=veq.green_intensity/10;
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
1345 v_blue_intensity=veq.blue_intensity/10;
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
1346 */
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
1347 }
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
1348 }
4741
d3a52470594c More correct direct rendering usage
nick
parents: 4738
diff changeset
1349 init_video_vaa(sh_video->disp_w);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1350 fflush(stdout);
4655
364cf7cc77be Unroll -ni usage for deint. Anyway it doesn't help :(
nick
parents: 4610
diff changeset
1351
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1352 //================== MAIN: ==========================
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1353 main:
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1354 if(!sh_video) osd_level = 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1355 {
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1356
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
1357 //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
1358 //float v_frame=0; // Video
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1359 float time_frame=0; // Timer
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1360 int force_redraw=0;
1400
2bf9c561b01d stage2 step 1
arpi
parents: 1382
diff changeset
1361 //float num_frames=0; // number of frames played
1382
9e8781a3eefc grab.mpg fixed
arpi
parents: 1375
diff changeset
1362 int grab_frames=0;
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
1363 char osd_text_buffer[64];
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1364 int drop_frame=0;
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1365 int drop_frame_cnt=0;
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1366 int too_slow_frame_cnt=0;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1367 int too_fast_frame_cnt=0;
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1368 // 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
1369 float AV_delay=0; // average of A-V timestamp differences
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1370 double cvideo_base_vtime;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1371 double cvideo_base_vframe;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1372 double vdecode_time;
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1373 unsigned int lastframeout_ts;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1374 float time_frame_corr_avg=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1375
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1376 //================ SETUP AUDIO ==========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1377 current_module="setup_audio";
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1378
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1379 if(sh_audio){
1237
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1380
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1381 const ao_info_t *info=audio_out->info;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1382 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
1383 info->short_name,
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1384 force_srate?force_srate:sh_audio->samplerate,
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1385 sh_audio->channels>1?"Stereo":"Mono",
1456
8c57a5a3c645 printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents: 1449
diff changeset
1386 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
1387 );
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1388 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
1389 info->name,
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1390 info->author
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1391 );
1456
8c57a5a3c645 printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents: 1449
diff changeset
1392 if(strlen(info->comment) > 0)
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1393 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Comment: %s\n", info->comment);
969
a2a296d46bff new option: -srate
arpi_esp
parents: 967
diff changeset
1394 if(!audio_out->init(force_srate?force_srate:sh_audio->samplerate,
a2a296d46bff new option: -srate
arpi_esp
parents: 967
diff changeset
1395 sh_audio->channels,sh_audio->sample_format,0)){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1396 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO);
1792
89f616b1c2ae nosound fixed. again. :(
arpi
parents: 1790
diff changeset
1397 sh_audio=d_audio->sh=NULL;
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1398 if(sh_video == NULL)
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1399 goto goto_next_file;
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
1400 } else {
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
1401 inited_flags|=INITED_AO;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1402 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1403
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1404 // 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
1405
758
5a92a5601666 better audio out buffering & sample_format added
arpi_esp
parents: 751
diff changeset
1406 // fixup audio buffer size:
782
14bac9d91e22 audio buffering fixed
arpi_esp
parents: 780
diff changeset
1407 // if(outburst<MAX_OUTBURST){
14bac9d91e22 audio buffering fixed
arpi_esp
parents: 780
diff changeset
1408 // sh_audio->a_buffer_size=sh_audio->audio_out_minsize+outburst;
14bac9d91e22 audio buffering fixed
arpi_esp
parents: 780
diff changeset
1409 // 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
1410 // }
758
5a92a5601666 better audio out buffering & sample_format added
arpi_esp
parents: 751
diff changeset
1411
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1412 // sh_audio->timer=-(audio_buffer_delay);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1413 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1414
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1415 if(sh_video) sh_video->timer=0;
2000
5fd3f344fc89 -delay fixed
arpi
parents: 1983
diff changeset
1416 if(sh_audio) sh_audio->timer=-audio_delay;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1417
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1418 if(!sh_audio){
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1962
diff changeset
1419 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_NoSound);
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1420 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
1421 ds_free_packs(d_audio); // free buffered chunks
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1422 d_audio->id=-2; // do not read audio chunks
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
1423 if(audio_out) uninit_player(INITED_AO); // close device
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1424 }
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1425 if(!sh_video){
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1426 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Video: no video!!!\n");
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1427 if(verbose) mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused video chunks\n",d_video->packs);
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1428 ds_free_packs(d_video);
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1429 d_video->id=-2;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1430 if(video_out) uninit_player(INITED_VO);
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1431 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1432 current_module=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1433
1660
0ed5a9568d0f file_format -> demuxer->file_format
arpi
parents: 1654
diff changeset
1434 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
1435 if(force_fps){
4598
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1436 vo_fps = sh_video->fps=force_fps;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1437 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
1438 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
1439 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1440
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1441 //==================== START PLAYING =======================
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1442
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1443 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_StartPlaying);fflush(stdout);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1444
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1445 InitTimer();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1446
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
1447 total_time_usage_start=GetTimer();
3934
e8e7ca8995a1 codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents: 3843
diff changeset
1448 audio_time_usage=0; video_time_usage=0; vout_time_usage=0;
4844
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
1449 if(benchmark)
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
1450 {
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
1451 max_audio_time_usage=0; max_video_time_usage=0; max_vout_time_usage=0;
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
1452 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1453 while(!eof){
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1454 // unsigned int aq_total_time=GetTimer();
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1455 float aq_sleep_time=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1456
1125
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
1457 if(play_n_frames>=0){
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
1458 --play_n_frames;
4260
d0b80b2a136f Fixed bug with -frames option : don't quit, go to next file !!
albeu
parents: 4224
diff changeset
1459 if(play_n_frames<0) eof = PT_NEXT_ENTRY;
1125
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
1460 }
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
1461
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1462 /*========================== 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
1463 while(sh_audio){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1464 unsigned int t;
4834
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
1465 double tt;
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1466 int playsize;
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1467
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1468 ao_data.pts=sh_audio->timer*90000.0;
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1469 playsize=audio_out->get_space();
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1470
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1471 if(!playsize) {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1472 if(sh_video)
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1473 break; // buffer is full, do not block here!!!
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1474 usec_sleep(10000); // Wait a tick before retry
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1475 continue;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1476 }
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1477
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1478 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
1479 //if(playsize>outburst) playsize=outburst;
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
1480
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
1481 // Update buffer if needed
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1482 current_module="decode_audio"; // Enter AUDIO decoder module
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1483 t=GetTimer();
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1484 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
1485 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
1486 playsize-sh_audio->a_buffer_len,sh_audio->a_buffer_size-sh_audio->a_buffer_len);
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1487 if(ret>0) sh_audio->a_buffer_len+=ret;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1488 else {
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1489 if(!sh_video)
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1490 eof = PT_NEXT_ENTRY;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1491 break;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1492 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1493 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1494 current_module=NULL; // Leave AUDIO decoder module
4834
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
1495 t=GetTimer()-t;
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
1496 tt = t*0.000001f;
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
1497 audio_time_usage+=tt;
4844
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
1498 if(benchmark)
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
1499 {
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
1500 if(tt > max_audio_time_usage) max_audio_time_usage = tt;
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
1501 cur_audio_time_usage=tt;
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
1502 }
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1503 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
1504
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1505 playsize=audio_out->play(sh_audio->a_buffer,playsize,0);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1506
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1507 if(playsize>0){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1508 sh_audio->a_buffer_len-=playsize;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1509 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
1510 sh_audio->timer+=playsize/(float)(sh_audio->o_bps);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1511 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1512
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1513 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
1514 } // if(sh_audio)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1515
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1516 /*========================== UPDATE TIMERS ============================*/
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1517 #if 0
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1518 if(alsa){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1519 // Use system timer for sync, not audio card/driver
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1520 time_frame-=GetRelativeTime();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1521 if(time_frame<-0.1 || time_frame>0.1){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1522 time_frame=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1523 } else {
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1524 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
1525 usec_sleep(time_frame-0.022);
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1526 time_frame-=GetRelativeTime();
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1527 }
103
506d7560279c timer fixes
arpi_esp
parents: 92
diff changeset
1528 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
1529 usec_sleep(1000); // sleeps 1 clock tick (10ms)!
103
506d7560279c timer fixes
arpi_esp
parents: 92
diff changeset
1530 time_frame-=GetRelativeTime();
506d7560279c timer fixes
arpi_esp
parents: 92
diff changeset
1531 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1532 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1533 }
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1534 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1535
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1536 if(!sh_video) {
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1537 if(!quiet) mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A:%6.1f %4.1f%% %d%% \r"
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1538 ,sh_audio->timer-audio_out->get_delay()
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1539 ,(sh_audio->timer>0.5)?100.0*audio_time_usage/(double)sh_audio->timer:0
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1540 ,cache_fill_status
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1541 );
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1542 goto read_input;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1543 }
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1544
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1545 /*========================== PLAY VIDEO ============================*/
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1546
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1547 vo_pts=sh_video->timer*90000.0;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1548 vo_fps=sh_video->fps;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1549
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1550 cvideo_base_vframe=sh_video->timer;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1551 cvideo_base_vtime=video_time_usage;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1552
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1553 if(1)
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1554 while(1){
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1555
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1556 float frame_time=0;
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1557 int blit_frame=0;
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1558
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1559 //-------------------- Decode a frame: -----------------------
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1560 vdecode_time=video_time_usage;
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1561 { unsigned char* start=NULL;
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1562 int in_size;
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1563 // get it!
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1564 current_module="video_read_frame";
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1565 in_size=video_read_frame(sh_video,&frame_time,&start,force_fps);
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1566 if(in_size<0){ eof=1; break; }
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1567 if(in_size>max_framesize) max_framesize=in_size; // stats
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1568 // decode:
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1569 current_module="decode_video";
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1570 // printf("Decode! %p %d \n",start,in_size);
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1571 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
1572 }
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1573 vdecode_time=video_time_usage-vdecode_time;
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1574 //------------------------ frame decoded. --------------------
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1575
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1576 //------------------------ add OSD to frame contents ---------
1768
63db543aae94 set current_module for OSD
arpi
parents: 1765
diff changeset
1577 current_module="draw_osd";
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1578 video_out->draw_osd();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1579
1768
63db543aae94 set current_module for OSD
arpi
parents: 1765
diff changeset
1580 current_module="av_sync";
63db543aae94 set current_module for OSD
arpi
parents: 1765
diff changeset
1581
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1582 sh_video->timer+=frame_time;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1583 time_frame+=frame_time; // for nosound
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1584
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1585 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
1586
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1587 if(drop_frame){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1588
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1589 if(sh_audio && !d_audio->eof){
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1590 float delay=audio_out->get_delay();
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1591 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"delay=%f\n",delay);
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1592 time_frame=sh_video->timer;
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1593 time_frame-=sh_audio->timer-delay;
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1594 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
1595 drop_frame=0; // stop dropping frames
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1596 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
1597 }else{
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1598 ++drop_frame_cnt;
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1599 if (verbose > 0 && drop_frame_cnt%10 == 0)
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1600 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
1601 }
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1602 }
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1603 #ifdef HAVE_NEW_GUI
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4788
diff changeset
1604 if(use_gui) guiEventHandling();
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1605 #endif
1729
d6c99f70449e fix hprogressbar
pontscho
parents: 1727
diff changeset
1606 video_out->check_events(); // check events AST
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1607 } else {
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1608 // It's time to sleep...
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1609 current_module="sleep";
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1610
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1611 time_frame-=GetRelativeTime(); // reset timer
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1612
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1613 if(sh_audio && !d_audio->eof){
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1614 float delay=audio_out->get_delay();
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1615 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"delay=%f\n",delay);
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1616
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1617 if(!dapsync){
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1618
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1619 /* Arpi's AV-sync */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1620
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1621 time_frame=sh_video->timer;
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1622 time_frame-=sh_audio->timer-delay;
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1623
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1624 // we are out of time... drop next frame!
940
108ac8795d19 -fps 1 fixed
arpi_esp
parents: 939
diff changeset
1625 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
1626 static int drop_message=0;
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1627 drop_frame=frame_dropping; // tricky!
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1628 ++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
1629 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
1630 drop_message=1;
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1631 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
1632 }
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1633 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
1634 }
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1635
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1636 } else {
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1637
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1638 /* DaP's AV-sync */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1639
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1640 float SH_AV_delay;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1641 /* SH_AV_delay = sh_video->timer - (sh_audio->timer - (float)((float)delay + sh_audio->a_buffer_len) / (float)sh_audio->o_bps); */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1642 SH_AV_delay = sh_video->timer - (sh_audio->timer - (float)((float)delay) / (float)sh_audio->o_bps);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1643 // printf ("audio slp req: %.3f TF: %.3f delta: %.3f (v: %.3f a: %.3f) | ", i, time_frame,
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1644 // i - time_frame, sh_video->timer, sh_audio->timer - (float)((float)delay / (float)sh_audio->o_bps));
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1645 if(SH_AV_delay<-2*frame_time){
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1646 static int drop_message=0;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1647 drop_frame=frame_dropping; // tricky!
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1648 ++drop_frame_cnt;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1649 if(drop_frame_cnt>50 && AV_delay>0.5 && !drop_message){
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1650 drop_message=1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1651 mp_msg(MSGT_AVSYNC,MSGL_WARN,MSGTR_SystemTooSlow);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1652 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1653 printf ("A-V SYNC: FRAMEDROP (SH_AV_delay=%.3f)!\n", SH_AV_delay);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1654 mp_msg(MSGT_AVSYNC,MSGL_DBG2,"\nframe drop %d, %.2f\n", drop_frame, time_frame);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1655 /* go into unlimited-TF cycle */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1656 time_frame = SH_AV_delay;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1657 } else {
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1658 #define SL_CORR_AVG_LEN 125
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1659 /* don't adjust under framedropping */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1660 time_frame_corr_avg = (time_frame_corr_avg * (SL_CORR_AVG_LEN - 1) +
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1661 (SH_AV_delay - time_frame)) / SL_CORR_AVG_LEN;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1662 #define UNEXP_CORR_MAX 0.1 /* limit of unexpected correction between two frames (percentage) */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1663 #define UNEXP_CORR_WARN 1.0 /* warn limit of A-V lag (percentage) */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1664 time_frame += time_frame_corr_avg;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1665 // printf ("{%.3f - %.3f}\n", i - time_frame, frame_time + frame_time_corr_avg);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1666 if (SH_AV_delay - time_frame < (frame_time + time_frame_corr_avg) * UNEXP_CORR_MAX &&
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1667 SH_AV_delay - time_frame > (frame_time + time_frame_corr_avg) * -UNEXP_CORR_MAX)
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1668 time_frame = SH_AV_delay;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1669 else {
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1670 if (SH_AV_delay - time_frame > (frame_time + time_frame_corr_avg) * UNEXP_CORR_WARN ||
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1671 SH_AV_delay - time_frame < (frame_time + time_frame_corr_avg) * -UNEXP_CORR_WARN)
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1672 printf ("WARNING: A-V SYNC LAG TOO LARGE: %.3f {%.3f - %.3f} (too little UNEXP_CORR_MAX?)\n",
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1673 SH_AV_delay - time_frame, SH_AV_delay, time_frame);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1674 time_frame += (frame_time + time_frame_corr_avg) * ((SH_AV_delay > time_frame) ?
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1675 UNEXP_CORR_MAX : -UNEXP_CORR_MAX);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1676 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1677 } /* /start dropframe */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1678
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1679 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1680
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1681 } else {
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1682 // NOSOUND:
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
1683 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
1684 time_frame=0;
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
1685
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1686 }
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1687
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1688 // 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
1689
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1690 aq_sleep_time+=time_frame;
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1691
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1692 #ifdef HAVE_NEW_GUI
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1693 if(use_gui) guiEventHandling();
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1694 #endif
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1695
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1696 if(!(vo_flags&256)){ // flag 256 means: libvo driver does its timing (dvb card)
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1697
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
1698 #ifdef HAVE_RTC
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1699 if(rtc_fd>=0){
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1700 // -------- RTC -----------
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1701 while (time_frame > 0.000) {
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1702 unsigned long long rtc_ts;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1703 if (read (rtc_fd, &rtc_ts, sizeof(rtc_ts)) <= 0)
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1704 perror ("read (rtc_fd)");
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1705 time_frame-=GetRelativeTime();
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1706 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1707 } else
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1708 #endif
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1709 {
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1710 // -------- USLEEP + SOFTSLEEP -----------
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1711 float min=softsleep?0.021:0.005;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1712 while(time_frame>min){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1713 if(time_frame<=0.020)
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1714 usec_sleep(0); // sleeps 1 clock tick (10ms)!
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1715 else
2757
b8b92c4afa22 fixed usleep() - 10l?
arpi
parents: 2705
diff changeset
1716 usec_sleep(1000000*(time_frame-0.020));
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1717 time_frame-=GetRelativeTime();
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1718 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1719 if(softsleep){
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1720 if(time_frame<0) printf("Warning! softsleep underflow!\n");
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1721 while(time_frame>0) time_frame-=GetRelativeTime(); // burn the CPU
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1722 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1723 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1724
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1725 }
117
b21b7c2fa180 common vo->flip_page() call
arpi_esp
parents: 112
diff changeset
1726
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1727 current_module="flip_page";
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1728 video_out->check_events();
1962
a0bd07b10667 fixed VO time usage (now including page-flip)
arpi
parents: 1953
diff changeset
1729 if(blit_frame){
a0bd07b10667 fixed VO time usage (now including page-flip)
arpi
parents: 1953
diff changeset
1730 unsigned int t2=GetTimer();
4838
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
1731 double tt;
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1732 float j;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1733 #define FRAME_LAG_WARN 0.2
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1734 j = ((float)t2 - lastframeout_ts) / 1000000;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1735 lastframeout_ts = GetTimer();
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1736 if (j < frame_time + frame_time * -FRAME_LAG_WARN)
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1737 too_fast_frame_cnt++;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1738 /* printf ("PANIC: too fast frame (%.3f)!\n", j); */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1739 else if (j > frame_time + frame_time * FRAME_LAG_WARN)
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1740 too_slow_frame_cnt++;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1741 /* printf ("PANIC: too slow frame (%.3f)!\n", j); */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1742
1962
a0bd07b10667 fixed VO time usage (now including page-flip)
arpi
parents: 1953
diff changeset
1743 video_out->flip_page();
4838
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
1744 t2=GetTimer()-t2;
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
1745 tt = t2*0.000001f;
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
1746 vout_time_usage+=tt;
4844
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
1747 if(benchmark)
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
1748 {
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
1749 if(cur_vout_time_usage + tt > max_vout_time_usage)
4838
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
1750 max_vout_time_usage = cur_vout_time_usage + tt;
4844
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
1751 our_n_frames++;
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
1752 }
1962
a0bd07b10667 fixed VO time usage (now including page-flip)
arpi
parents: 1953
diff changeset
1753 }
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1754 // usec_sleep(50000); // test only!
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1755
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1756 }
4838
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
1757 /* Compute total frame dropping here */
4844
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
1758 if(benchmark)
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
1759 {
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
1760 if((cur_video_time_usage + cur_vout_time_usage + cur_audio_time_usage)*vo_fps > 1)
4838
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
1761 bench_dropped_frames ++;
4844
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
1762 }
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1763 current_module=NULL;
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1764
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1765 if(eof) break;
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1766 if(force_redraw){
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1767 --force_redraw;
577
feeb61dd92ea Fixed broken pause function.
atmosfear
parents: 564
diff changeset
1768 if(!force_redraw) osd_function=OSD_PLAY;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1769 continue;
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1770 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1771
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1772 // 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
1773 // fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1774
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1775 #if 1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1776 /*================ 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
1777 if(sh_audio){
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1778 float a_pts=0;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1779 float v_pts=0;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1780
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1781 // unplayed bytes in our and soundcard/dma buffer:
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1782 float delay=audio_out->get_delay()+(float)sh_audio->a_buffer_len/(float)sh_audio->o_bps;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1783
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1784 if(pts_from_bps){
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1785 #if 1
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1786 unsigned int samples=(sh_audio->audio.dwSampleSize)?
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1787 ((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
1788 (d_audio->pack_no); // <- used for VBR audio
3302
e75454b489df using audio.dwStart too... (for baittest.avi)
arpi
parents: 3274
diff changeset
1789 samples+=sh_audio->audio.dwStart; // offset
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1790 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
1791 #else
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1478
diff changeset
1792 if(sh_audio->audio.dwSampleSize)
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1478
diff changeset
1793 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
1794 else // VBR:
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1478
diff changeset
1795 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
1796 #endif
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1797 // 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
1798 // 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
1799 delay_corrected=1;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1800 } else {
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1801 // 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
1802 a_pts=d_audio->pts;
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1803 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
1804 //printf("*** %5.3f ***\n",a_pts);
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1805 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
1806 // v_pts=d_video->pts-frame_time;
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1807 // v_pts=d_video->pts;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1808 }
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1809 v_pts=d_video->pts;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1810
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1811 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
1812
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1813 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
1814 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
1815 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
1816 x=AV_delay*0.1f;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1817 if(x<-max_pts_correction) x=-max_pts_correction; else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1818 if(x> max_pts_correction) x= max_pts_correction;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1819 if(default_max_pts_correction>=0)
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1820 max_pts_correction=default_max_pts_correction;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1821 else
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1822 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
1823 sh_audio->timer+=x; c_total+=x;
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
1824 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
1825 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
1826 (int)sh_video->num_frames,(int)sh_video->num_frames_decoded,
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1827 (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
1828 (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
1829 (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
1830 ,drop_frame_cnt
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1831 ,output_quality
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
1832 ,cache_fill_status
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1833 );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1834 fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1835 }
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1836
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1837 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1838 // No audio:
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
1839
1448
e795527de16a -quiet option patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents: 1439
diff changeset
1840 if(!quiet)
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
1841 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
1842 (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
1843 (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
1844 (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
1845 (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
1846 ,drop_frame_cnt
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
1847 ,output_quality
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
1848 ,cache_fill_status
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1849 );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1850
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1851 fflush(stdout);
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
1852
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1853 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1854 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1855
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1856 /*Output quality adjustments:*/
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1857 if(auto_quality>0){
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1858 #if 0
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1859 /*If we took a long time decoding this frame, downgrade the quality.*/
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1860 if(output_quality>0&&
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1861 (video_time_usage-cvideo_base_vtime)*sh_video->timer>=
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1862 (0.95*sh_video->timer-(vout_time_usage+audio_time_usage))*
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1863 (sh_video->timer-cvideo_base_vframe-frame_correction)){
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1864 output_quality>>=1;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1865 mp_msg(MSGT_AUTOQ,MSGL_DBG2,"Downgrading quality to %i.\n",output_quality);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1866 set_video_quality(sh_video,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1867 } else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1868 /*If we had plenty of extra time, upgrade the quality.*/
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1869 if(output_quality<auto_quality&&
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1870 vdecode_time<0.5*frame_time&&
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1871 (video_time_usage-cvideo_base_vtime)*sh_video->timer<
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1872 (0.67*sh_video->timer-(vout_time_usage+audio_time_usage))*
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1873 (sh_video->timer-cvideo_base_vframe-frame_correction)){
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1874 output_quality++;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1875 mp_msg(MSGT_AUTOQ,MSGL_DBG2,"Upgrading quality to %i.\n",output_quality);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1876 set_video_quality(sh_video,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1877 }
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1878 #else
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
1879 // float total=0.000001f * (GetTimer()-aq_total_time);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1880 // if(output_quality<auto_quality && aq_sleep_time>0.05f*total)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1881 if(output_quality<auto_quality && aq_sleep_time>0)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1882 ++output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1883 else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1884 // if(output_quality>0 && aq_sleep_time<-0.05f*total)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1885 if(output_quality>1 && aq_sleep_time<0)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1886 --output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1887 else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1888 if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1889 output_quality=0;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1890 // 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
1891 set_video_quality(sh_video,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1892 #endif
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1893 }
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1894
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1895 read_input:
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1896
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1897 #ifdef USE_OSD
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1898 if(osd_visible){
1504
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
1899 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
1900 if (osd_function != OSD_PAUSE)
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
1901 osd_function = OSD_PLAY;
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
1902 }
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1903 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1904 #endif
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1905
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1906 if(osd_function==OSD_PAUSE){
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1907 #ifdef HAVE_NEW_INPUT
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1908 mp_cmd_t* cmd;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1909 #endif
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1910 if(!quiet) {
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1911 mp_msg(MSGT_CPLAYER,MSGL_STATUS,"\n------ PAUSED -------\r");
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1912 fflush(stdout);
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1913 }
1793
ba11d77c587a gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents: 1792
diff changeset
1914 #ifdef HAVE_NEW_GUI
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
1915 if(use_gui) guiGetEvent( guiCEvent,(char *)guiSetPause );
1793
ba11d77c587a gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents: 1792
diff changeset
1916 #endif
4754
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4747
diff changeset
1917 if (video_out && sh_video)
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4747
diff changeset
1918 video_out->control(VOCTRL_PAUSE, NULL);
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4747
diff changeset
1919
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1920 if (audio_out && sh_audio)
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
1921 audio_out->pause(); // pause audio, keep data if possible
3322
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1922
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1923 #ifdef HAVE_NEW_INPUT
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1924 while( (cmd = mp_input_get_cmd(20,1)) == NULL) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1925 #else /* HAVE_NEW_INPUT */
3322
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1926 if(slave_mode) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1927 fd_set set;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1928 struct timeval timeout;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1929 while (1) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1930 usec_sleep(1000);
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1931 FD_ZERO (&set);
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1932 FD_SET (STDIN_FILENO, &set);
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1933 timeout.tv_sec = 0;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1934 timeout.tv_usec = 1000;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1935 if(1==select(FD_SETSIZE, &set, NULL, NULL, &timeout)) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1936 break;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1937 }
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1938 }
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1939 } else {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1940
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1941 while(
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1942 #ifdef HAVE_LIRC
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1943 lirc_mp_getinput()<=0 &&
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1944 #endif
1467
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
1945 (use_stdin || getch2(20)<=0) && mplayer_get_key()<=0){
4849
9be4ac85dd35 Moved the call to VOCTRL_FULLSCREEN outside of #ifdef USE_TV block
albeu
parents: 4844
diff changeset
1946 #endif /* HAVE_NEW_INPUT */
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1947 if(sh_video && video_out) video_out->check_events();
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1948 #ifdef HAVE_NEW_GUI
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1949 if(use_gui){
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4788
diff changeset
1950 guiEventHandling();
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1951 if(guiIntfStruct.Playing!=2 || (rel_seek_secs || abs_seek_pos)) break;
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1952 }
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1953 #endif
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1954 usleep(20000);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1955 #ifdef HAVE_NEW_INPUT
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1956 }
5046
b3bd4b29a03b remove obsoleted function (mplResize)
pontscho
parents: 5015
diff changeset
1957 mp_cmd_free(cmd);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1958 #else
1467
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
1959 if(use_stdin) usec_sleep(1000); // do not eat the CPU
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1960 }
3322
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1961 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1962 #endif /* HAVE_NEW_INPUT */
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1963 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
1964 if (audio_out && sh_audio)
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
1965 audio_out->resume(); // resume audio
4754
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4747
diff changeset
1966 if (video_out && sh_video)
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4747
diff changeset
1967 video_out->control(VOCTRL_RESUME, NULL); // resume video
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1968 (void)GetRelativeTime(); // keep TF around FT in next cycle
1793
ba11d77c587a gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents: 1792
diff changeset
1969 #ifdef HAVE_NEW_GUI
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
1970 if (use_gui) guiGetEvent( guiCEvent,(char *)guiSetPlay );
1793
ba11d77c587a gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents: 1792
diff changeset
1971 #endif
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1972 }
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1973
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1974
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1975 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
1976 } // while(sh_video->timer<sh_audio->timer || force_redraw)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1977
2436
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
1978 // skip some seconds... added by fly
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
1979
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
1980 if(step_sec>0) {
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
1981 osd_function=OSD_FFW;
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
1982 rel_seek_secs+=step_sec;
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
1983 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1984
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1985 //================= Keyboard events, SEEKing ====================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1986
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1987 #ifndef HAVE_NEW_INPUT
3322
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1988 /* slave mode */
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1989 if(slave_mode) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1990 char buffer[1024];
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1991 fd_set set;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1992 struct timeval timeout;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1993 int arg;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1994
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1995 FD_ZERO (&set);
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1996 FD_SET (STDIN_FILENO, &set);
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1997 timeout.tv_sec = 0;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1998 timeout.tv_usec = 1000;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1999
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2000 if(1 == select (FD_SETSIZE, &set, NULL, NULL, &timeout)) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2001 fgets(buffer, 1024, stdin);
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2002 if(!strcmp("play\n", buffer)) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2003 osd_function=OSD_PLAY;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2004 } else if(!strcmp("stop\n", buffer)) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2005 osd_function=OSD_PAUSE;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2006 } else if(!strncmp("seek ", buffer, 5)) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2007 sscanf(buffer+5, "%d", &arg);
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2008 rel_seek_secs = arg-d_video->pts;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2009 } else if(!strncmp("skip ", buffer, 5)) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2010 sscanf(buffer+5, "%d", &arg);
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2011 rel_seek_secs = arg;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2012 } else if(!strcmp("quit\n", buffer)) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2013 exit_player(MSGTR_Exit_quit);
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2014 }
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2015 } else {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2016 osd_function=OSD_PLAY;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2017 }
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2018 } else
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2019
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
2020 /* interactive mode */
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
2021 { int c;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2022 while(
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2023 #ifdef HAVE_LIRC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2024 (c=lirc_mp_getinput())>0 ||
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2025 #endif
1467
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
2026 (!use_stdin && (c=getch2(0))>0) || (c=mplayer_get_key())>0) switch(c){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2027 // seek 10 sec
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2028 case KEY_RIGHT:
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2029 osd_function=OSD_FFW;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2030 rel_seek_secs+=10;break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2031 case KEY_LEFT:
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2032 osd_function=OSD_REW;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2033 rel_seek_secs-=10;break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2034 // seek 1 min
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2035 case KEY_UP:
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2036 osd_function=OSD_FFW;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2037 rel_seek_secs+=60;break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2038 case KEY_DOWN:
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2039 osd_function=OSD_REW;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2040 rel_seek_secs-=60;break;
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
2041 // seek 10 min
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
2042 case KEY_PAGE_UP:
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
2043 rel_seek_secs+=600;break;
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
2044 case KEY_PAGE_DOWN:
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
2045 rel_seek_secs-=600;break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2046 // delay correction:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2047 case '+':
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2048 audio_delay+=0.1; // increase audio buffer delay
3783
de6b00131e95 show a-v delay in osd (based on subdelay osd patch)
arpi
parents: 3754
diff changeset
2049 osd_show_av_delay = 9; // show the A-V delay in OSD
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
2050 if(sh_audio) sh_audio->timer-=0.1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2051 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2052 case '-':
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2053 audio_delay-=0.1; // decrease audio buffer delay
3783
de6b00131e95 show a-v delay in osd (based on subdelay osd patch)
arpi
parents: 3754
diff changeset
2054 osd_show_av_delay = 9; // show the A-V delay in OSD
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
2055 if(sh_audio) sh_audio->timer+=0.1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2056 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2057 // quit
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2058 case KEY_ESC: // ESC
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2059 case 'q':
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2060 exit_player(MSGTR_Exit_quit);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2061 case KEY_ENTER: // ESC
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2062 eof=1; // force jump to next file : quit if no next file
2647
679d3b21bedb -playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents: 2567
diff changeset
2063 break;
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
2064 case 'g': grab_frames=2;break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2065 // pause
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2066 case 'p':
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2067 case ' ':
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2068 osd_function=OSD_PAUSE;
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2069 break;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2070 case KEY_HOME:
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2071 {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2072 play_tree_iter_t* i = play_tree_iter_new_copy(playtree_iter);
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2073 if(play_tree_iter_up_step(i,1,0) == PLAY_TREE_ITER_ENTRY)
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2074 eof = PT_UP_NEXT;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2075 play_tree_iter_free(i);
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2076 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2077 break;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2078 case KEY_END:
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2079 {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2080 play_tree_iter_t* i = play_tree_iter_new_copy(playtree_iter);
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2081 if(play_tree_iter_up_step(i,-1,0) == PLAY_TREE_ITER_ENTRY)
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2082 eof = PT_UP_PREV;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2083 play_tree_iter_free(i);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2084 }
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2085 break;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2086 case '>':
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2087 {
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2088 play_tree_iter_t* i = play_tree_iter_new_copy(playtree_iter);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2089 if(play_tree_iter_step(i,1,0) == PLAY_TREE_ITER_ENTRY)
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2090 eof = PT_NEXT_ENTRY;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2091 play_tree_iter_free(i);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2092 }
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2093 break;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2094 case '<':
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2095 {
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2096 play_tree_iter_t* i = play_tree_iter_new_copy(playtree_iter);
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2097 if(play_tree_iter_step(i,-1,0) == PLAY_TREE_ITER_ENTRY)
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2098 eof = PT_PREV_ENTRY;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2099 play_tree_iter_free(i);
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2100 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2101 break;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2102 case KEY_INS:
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2103 if(playtree_iter->num_files > 1 && playtree_iter->file < playtree_iter->num_files)
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2104 eof = PT_NEXT_SRC;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2105 break;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2106 case KEY_DEL:
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2107 if(playtree_iter->num_files > 1 && playtree_iter->file > 1)
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2108 eof = PT_PREV_SRC;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2109 break;
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2110 case 'o': // toggle OSD
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2111 if(sh_video)
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2112 osd_level=(osd_level+1)%3;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2113 break;
939
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
2114 case 'z':
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
2115 sub_delay -= 0.1;
3234
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
2116 osd_show_sub_delay = 9; // show the subdelay in OSD
939
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
2117 break;
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
2118 case 'x':
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
2119 sub_delay += 0.1;
3234
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
2120 osd_show_sub_delay = 9; // show the subdelay in OSD
939
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
2121 break;
1626
5f5505e4bb2d removed ugly switch/goto hack
arpi
parents: 1604
diff changeset
2122 case '9':
5f5505e4bb2d removed ugly switch/goto hack
arpi
parents: 1604
diff changeset
2123 case '0':
459
9dfad88a8107 add mixer support
pontscho
parents: 458
diff changeset
2124 case '*':
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2125 case '/': {
1626
5f5505e4bb2d removed ugly switch/goto hack
arpi
parents: 1604
diff changeset
2126 if(c=='*' || c=='0'){
1881
d75b24bda7ce Applied fix for mixercontrol w/alsa ossemu by Christian Ohm.
atmos4
parents: 1863
diff changeset
2127 mixer_incvolume();
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2128 } else {
1881
d75b24bda7ce Applied fix for mixercontrol w/alsa ossemu by Christian Ohm.
atmos4
parents: 1863
diff changeset
2129 mixer_decvolume();
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2130 }
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2131
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2132 #ifdef USE_OSD
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2133 if(osd_level){
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2134 osd_visible=sh_video->fps; // 1 sec
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2135 vo_osd_progbar_type=OSD_VOLUME;
1881
d75b24bda7ce Applied fix for mixercontrol w/alsa ossemu by Christian Ohm.
atmos4
parents: 1863
diff changeset
2136 vo_osd_progbar_value=(mixer_getbothvolume()*256.0)/100.0;
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2137 //printf("volume: %d\n",vo_osd_progbar_value);
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2138 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2139 #endif
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2140 }
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2141 break;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2142
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2143 #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
2144 case '1':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2145 case '2':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2146 case '3':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2147 case '4':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2148 case '5':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2149 case '6':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2150 case '7':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2151 case '8':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2152 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
2153 abs_seek_pos=3;
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2154 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
2155 break;
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2156 #else
4738
77519b9ac057 Screenshot on the fly
nick
parents: 4733
diff changeset
2157 /* User wants to have screen shot */
77519b9ac057 Screenshot on the fly
nick
parents: 4733
diff changeset
2158 case 'S':
77519b9ac057 Screenshot on the fly
nick
parents: 4733
diff changeset
2159 case 's':
77519b9ac057 Screenshot on the fly
nick
parents: 4733
diff changeset
2160 video_out->control(VOCTRL_SCREENSHOT, NULL);
77519b9ac057 Screenshot on the fly
nick
parents: 4733
diff changeset
2161 break;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2162 // Contrast:
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2163 case '1':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2164 case '2':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2165 if(c=='2'){
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
2166 if ( ++v_cont > 100 ) v_cont = 100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2167 } else {
4388
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2168 --v_cont;
4395
817530449706 New logic of HW equalizing:
nick
parents: 4388
diff changeset
2169 if(v_hw_equ_cap & VEQ_CAP_CONTRAST)
4388
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2170 {
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2171 if(v_cont < -100) v_cont = -100;
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2172 }
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2173 else
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2174 {
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2175 if ( v_cont < 0 ) v_cont = 0;
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2176 }
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2177 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2178 if(set_video_colors(sh_video,"Contrast",v_cont)){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2179 #ifdef USE_OSD
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2180 if(osd_level){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2181 osd_visible=sh_video->fps; // 1 sec
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2182 vo_osd_progbar_type=OSD_CONTRAST;
1726
38871427a131 corrections to OSD progbar position calculations
atlka
parents: 1724
diff changeset
2183 vo_osd_progbar_value=((v_cont)<<8)/100;
4388
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2184 if(v_hw_equ_cap) vo_osd_progbar_value = ((v_cont+100)<<8)/200;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2185 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2186 #endif
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2187 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2188 break;
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2189
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2190 // Brightness:
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2191 case '3':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2192 case '4':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2193 if(c=='4'){
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
2194 if ( ++v_bright > 100 ) v_bright = 100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2195 } else {
4388
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2196 --v_bright;
4395
817530449706 New logic of HW equalizing:
nick
parents: 4388
diff changeset
2197 if(v_hw_equ_cap & VEQ_CAP_BRIGHTNESS)
4388
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2198 {
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2199 if(v_bright < -100) v_bright = -100;
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2200 }
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2201 else
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2202 {
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2203 if ( v_bright < 0 ) v_bright = 0;
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2204 }
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2205 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2206 if(set_video_colors(sh_video,"Brightness",v_bright)){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2207 #ifdef USE_OSD
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2208 if(osd_level){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2209 osd_visible=sh_video->fps; // 1 sec
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2210 vo_osd_progbar_type=OSD_BRIGHTNESS;
1726
38871427a131 corrections to OSD progbar position calculations
atlka
parents: 1724
diff changeset
2211 vo_osd_progbar_value=((v_bright)<<8)/100;
4388
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2212 if(v_hw_equ_cap) vo_osd_progbar_value = ((v_bright+100)<<8)/200;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2213 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2214 #endif
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2215 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2216 break;
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2217
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2218 // Hue:
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2219 case '5':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2220 case '6':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2221 if(c=='6'){
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
2222 if ( ++v_hue > 100 ) v_hue = 100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2223 } else {
4388
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2224 --v_hue;
4395
817530449706 New logic of HW equalizing:
nick
parents: 4388
diff changeset
2225 if(v_hw_equ_cap & VEQ_CAP_HUE)
4388
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2226 {
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2227 if(v_hue < -100) v_hue = -100;
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2228 }
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2229 else
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2230 {
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2231 if ( v_hue < 0 ) v_hue = 0;
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2232 }
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2233 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2234 if(set_video_colors(sh_video,"Hue",v_hue)){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2235 #ifdef USE_OSD
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2236 if(osd_level){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2237 osd_visible=sh_video->fps; // 1 sec
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2238 vo_osd_progbar_type=OSD_HUE;
1726
38871427a131 corrections to OSD progbar position calculations
atlka
parents: 1724
diff changeset
2239 vo_osd_progbar_value=((v_hue)<<8)/100;
4388
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2240 if(v_hw_equ_cap) vo_osd_progbar_value = ((v_hue+100)<<8)/200;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2241 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2242 #endif
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2243 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2244 break;
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2245
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2246 // Saturation:
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2247 case '7':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2248 case '8':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2249 if(c=='8'){
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
2250 if ( ++v_saturation > 100 ) v_saturation = 100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2251 } else {
4388
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2252 --v_saturation;
4395
817530449706 New logic of HW equalizing:
nick
parents: 4388
diff changeset
2253 if(v_hw_equ_cap & VEQ_CAP_SATURATION)
4388
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2254 {
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2255 if(v_saturation < -100) v_saturation = -100;
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2256 }
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2257 else
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2258 {
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2259 if ( v_saturation < 0 ) v_saturation = 0;
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2260 }
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2261 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2262 if(set_video_colors(sh_video,"Saturation",v_saturation)){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2263 #ifdef USE_OSD
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2264 if(osd_level){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2265 osd_visible=sh_video->fps; // 1 sec
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2266 vo_osd_progbar_type=OSD_SATURATION;
1726
38871427a131 corrections to OSD progbar position calculations
atlka
parents: 1724
diff changeset
2267 vo_osd_progbar_value=((v_saturation)<<8)/100;
4388
b6b429d10296 Support for HW equalizing
nick
parents: 4381
diff changeset
2268 if(v_hw_equ_cap) vo_osd_progbar_value = ((v_saturation+100)<<8)/200;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2269 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2270 #endif
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2271 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2272 break;
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2273 #endif
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2274
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
2275 case 'd':
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
2276 frame_dropping=(frame_dropping+1)%3;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
2277 mp_msg(MSGT_CPLAYER,MSGL_V,"== drop: %d == \n",frame_dropping);
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
2278 break;
2941
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2279
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2280 #ifdef USE_TV
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2281 case 'h':
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2282 if (tv_param_on == 1)
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2283 tv_step_channel(tv_handler, TV_CHANNEL_HIGHER);
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2284 break;
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2285 case 'l':
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2286 if (tv_param_on == 1)
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2287 tv_step_channel(tv_handler, TV_CHANNEL_LOWER);
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2288 break;
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2289 case 'n':
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2290 if (tv_param_on == 1)
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2291 tv_step_norm(tv_handler);
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2292 break;
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2293 case 'b':
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2294 if (tv_param_on == 1)
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2295 tv_step_chanlist(tv_handler);
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2296 break;
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2297 #endif
4733
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
2298
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
2299 case 'f':
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
2300 video_out->control(VOCTRL_FULLSCREEN, 0);
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
2301 break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2302 }
1406
bf9fcd656ee9 small cosmetics fix
arpi
parents: 1405
diff changeset
2303 } // keyboard event handler
bf9fcd656ee9 small cosmetics fix
arpi
parents: 1405
diff changeset
2304
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2305 #else /* HAVE_NEW_INPUT */
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2306 {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2307 mp_cmd_t* cmd;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2308 while( (cmd = mp_input_get_cmd(0,0)) != NULL) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2309 switch(cmd->id) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2310 case MP_CMD_SEEK : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2311 int v,abs;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2312 v = cmd->args[0].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2313 abs = (cmd->nargs > 1) ? cmd->args[1].v.i : 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2314 if(abs) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2315 abs_seek_pos = 3;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2316 osd_function= (v > sh_video->timer) ? OSD_FFW : OSD_REW;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2317 rel_seek_secs = v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2318 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2319 else {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2320 rel_seek_secs+= v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2321 osd_function= (v > 0) ? OSD_FFW : OSD_REW;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2322 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2323 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2324 case MP_CMD_AUDIO_DELAY : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2325 float v = cmd->args[0].v.f;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2326 audio_delay += v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2327 osd_show_av_delay = 9;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2328 if(sh_audio) sh_audio->timer+= v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2329 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2330 case MP_CMD_PAUSE : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2331 osd_function=OSD_PAUSE;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2332 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2333 case MP_CMD_QUIT : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2334 exit_player(MSGTR_Exit_quit);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2335 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2336 case MP_CMD_GRAB_FRAMES : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2337 grab_frames=2;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2338 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2339 case MP_CMD_PLAY_TREE_STEP : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2340 int n = cmd->args[0].v.i > 0 ? 1 : -1;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2341 play_tree_iter_t* i = play_tree_iter_new_copy(playtree_iter);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2342
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2343 if(play_tree_iter_step(i,n,0) == PLAY_TREE_ITER_ENTRY)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2344 eof = (n > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2345 play_tree_iter_free(i);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2346 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2347 case MP_CMD_PLAY_TREE_UP_STEP : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2348 int n = cmd->args[0].v.i > 0 ? 1 : -1;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2349 play_tree_iter_t* i = play_tree_iter_new_copy(playtree_iter);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2350 if(play_tree_iter_up_step(i,n,0) == PLAY_TREE_ITER_ENTRY)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2351 eof = (n > 0) ? PT_UP_NEXT : PT_UP_PREV;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2352 play_tree_iter_free(i);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2353 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2354 case MP_CMD_PLAY_ALT_SRC_STEP : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2355 if(playtree_iter->num_files > 1) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2356 int v = cmd->args[0].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2357 if(v > 0 && playtree_iter->file < playtree_iter->num_files)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2358 eof = PT_NEXT_SRC;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2359 else if(v < 0 && playtree_iter->file > 1)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2360 eof = PT_PREV_SRC;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2361 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2362 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2363 case MP_CMD_SUB_DELAY : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2364 int abs= cmd->args[1].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2365 float v = cmd->args[0].v.f;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2366 if(abs)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2367 sub_delay = v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2368 else
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2369 sub_delay += v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2370 osd_show_sub_delay = 9; // show the subdelay in OSD
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2371 } break;
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2372 case MP_CMD_OSD :
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2373 if(sh_video) {
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2374 int v = cmd->args[0].v.i;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2375 if(v < 0)
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2376 osd_level=(osd_level+1)%3;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2377 else
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2378 osd_level= v > 2 ? 2 : v;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2379 } break;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2380 case MP_CMD_VOLUME : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2381 int v = cmd->args[0].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2382 if(v > 0)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2383 mixer_incvolume();
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2384 else
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2385 mixer_decvolume();
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2386 #ifdef USE_OSD
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2387 if(osd_level){
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2388 osd_visible=sh_video->fps; // 1 sec
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2389 vo_osd_progbar_type=OSD_VOLUME;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2390 vo_osd_progbar_value=(mixer_getbothvolume()*256.0)/100.0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2391 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2392 #endif
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2393 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2394 case MP_CMD_MIXER_USEMASTER : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2395 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2396 case MP_CMD_CONTRAST : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2397 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2398 if(abs)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2399 v_cont = v > 100 ? 100 : v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2400 else {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2401 if ( (v_cont += v) > 100 ) v_cont = 100;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2402 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2403 if(v_cont < 0) v_cont = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2404
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2405 if(set_video_colors(sh_video,"Contrast",v_cont)){
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2406 #ifdef USE_OSD
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2407 if(osd_level){
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2408 osd_visible=sh_video->fps; // 1 sec
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2409 vo_osd_progbar_type=OSD_CONTRAST;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2410 vo_osd_progbar_value=((v_cont)<<8)/100;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2411 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2412 #endif
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2413 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2414 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2415 case MP_CMD_BRIGHTNESS : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2416 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2417 if(abs)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2418 v_bright = v > 100 ? 100 : v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2419 else {
4940
098970f06dc2 patch by Nilmoni Deb <ndeb@ece.cmu.edu>:
pl
parents: 4892
diff changeset
2420 if ( (v_bright += v) > 100 ) v_bright = 100;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2421 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2422 if(v_hw_equ_cap & VEQ_CAP_BRIGHTNESS) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2423 if(v_bright < -100) v_bright = -100;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2424 } else {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2425 if ( v_bright < 0 ) v_bright = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2426 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2427 if(set_video_colors(sh_video,"Brightness",v_bright)){
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2428 #ifdef USE_OSD
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2429 if(osd_level){
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2430 osd_visible=sh_video->fps; // 1 sec
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2431 vo_osd_progbar_type=OSD_BRIGHTNESS;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2432 vo_osd_progbar_value=((v_bright)<<8)/100;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2433 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2434 #endif
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2435 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2436 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2437 case MP_CMD_HUE : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2438 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2439 if(abs)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2440 v_hue = v > 100 ? 100 : v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2441 else {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2442 if ( (v_hue += v) > 100 ) v_hue = 100;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2443 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2444 if(v_hw_equ_cap & VEQ_CAP_HUE) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2445 if(v_hue < -100) v_hue = -100;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2446 } else {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2447 if ( v_hue < 0 ) v_hue = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2448 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2449 if(set_video_colors(sh_video,"Hue",v_hue)){
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2450 #ifdef USE_OSD
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2451 if(osd_level){
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2452 osd_visible=sh_video->fps; // 1 sec
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2453 vo_osd_progbar_type=OSD_HUE;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2454 vo_osd_progbar_value=((v_hue)<<8)/100;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2455 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2456 #endif
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2457 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2458 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2459 case MP_CMD_SATURATION : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2460 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2461 if(abs)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2462 v_saturation = v > 100 ? 100 : v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2463 else {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2464 if ( (v_saturation += v) > 100 ) v_saturation = 100;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2465 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2466 if(v_hw_equ_cap & VEQ_CAP_SATURATION) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2467 if(v_saturation < -100) v_saturation = -100;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2468 } else {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2469 if ( v_saturation < 0 ) v_saturation = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2470 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2471 if(set_video_colors(sh_video,"Saturation",v_saturation)){
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2472 #ifdef USE_OSD
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2473 if(osd_level){
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2474 osd_visible=sh_video->fps; // 1 sec
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2475 vo_osd_progbar_type=OSD_SATURATION;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2476 vo_osd_progbar_value=((v_saturation)<<8)/100;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2477 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2478 #endif
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2479 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2480 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2481 case MP_CMD_FRAMEDROPPING : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2482 int v = cmd->args[0].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2483 if(v < 0)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2484 frame_dropping = (frame_dropping+1)%3;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2485 else
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2486 frame_dropping = v > 2 ? 2 : v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2487 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2488 #ifdef USE_TV
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2489 case MP_CMD_TV_STEP_CHANNEL : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2490 if (tv_param_on == 1) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2491 int v = cmd->args[0].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2492 if(v > 0)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2493 tv_step_channel(tv_handler, TV_CHANNEL_HIGHER);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2494 else
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2495 tv_step_channel(tv_handler, TV_CHANNEL_LOWER);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2496 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2497 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2498 case MP_CMD_TV_STEP_NORM : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2499 if (tv_param_on == 1)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2500 tv_step_norm(tv_handler);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2501 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2502 case MP_CMD_TV_STEP_CHANNEL_LIST : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2503 if (tv_param_on == 1)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2504 tv_step_chanlist(tv_handler);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2505 } break;
4849
9be4ac85dd35 Moved the call to VOCTRL_FULLSCREEN outside of #ifdef USE_TV block
albeu
parents: 4844
diff changeset
2506 #endif
4733
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
2507 case MP_CMD_VO_FULLSCREEN:
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
2508 {
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2509 #ifdef HAVE_NEW_GUI
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2510 if ( use_gui ) guiGetEvent( guiIEvent,(char *)MP_CMD_GUI_FULLSCREEN );
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2511 else
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2512 #endif
4733
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
2513 video_out->control(VOCTRL_FULLSCREEN, 0);
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
2514 } break;
5015
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
2515 case MP_CMD_SUB_POS:
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
2516 {
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
2517 int v;
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
2518 v = cmd->args[0].v.i;
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
2519
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
2520 sub_pos+=v;
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
2521 if(sub_pos >100) sub_pos=100;
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
2522 if(sub_pos <0) sub_pos=0;
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
2523 } break;
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2524 default : {
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2525 #ifdef HAVE_NEW_GUI
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2526 if ( ( use_gui )&&( cmd->id > MP_CMD_GUI_EVENTS ) ) guiGetEvent( guiIEvent,(char *)cmd->id );
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2527 else
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2528 #endif
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2529 printf("Received unknow cmd %s\n",cmd->name);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2530 }
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2531 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2532 mp_cmd_free(cmd);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2533 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2534 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2535 #endif
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
2536 if (seek_to_sec) {
937
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2537 int a,b; float d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2538
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2539 if (sscanf(seek_to_sec, "%d:%d:%f", &a,&b,&d)==3)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2540 rel_seek_secs += 3600*a +60*b +d ;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2541 else if (sscanf(seek_to_sec, "%d:%f", &a, &d)==2)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2542 rel_seek_secs += 60*a +d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2543 else if (sscanf(seek_to_sec, "%f", &d)==1)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2544 rel_seek_secs += d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2545
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2546 seek_to_sec = NULL;
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
2547 }
937
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2548
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
2549 /* Looping. */
3540
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2550 if(eof==1 && loop_times>=0) {
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2551
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2552 mp_msg(MSGT_CPLAYER,MSGL_V,"loop_times = %d, eof = %d\n", loop_times,eof);
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
2553
3540
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2554 if(loop_times>1) loop_times--; else
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2555 if(loop_times==1) loop_times=-1;
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2556
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
2557 eof=0;
3540
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2558 abs_seek_pos=3; rel_seek_secs=0; // seek to start of movie (0%)
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
2559
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
2560 }
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
2561
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2562 if(rel_seek_secs || abs_seek_pos){
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
2563 current_module="seek";
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2564 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
2565 // success:
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2566 /* FIXME there should be real seeking for vobsub */
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2567 if (vo_vobsub)
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2568 vobsub_reset(vo_vobsub);
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
2569
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
2570 if(sh_audio){
1459
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
2571 if(verbose){
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
2572 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
2573 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
2574 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
2575 }
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
2576 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
2577 } else {
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
2578 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
2579 }
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
2580 fflush(stdout);
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
2581
4593
3769ccb8da8b libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4587
diff changeset
2582 if(sh_video){
3769ccb8da8b libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4587
diff changeset
2583 current_module="seek_video_reset";
3769ccb8da8b libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4587
diff changeset
2584 video_out->control(VOCTRL_RESET,NULL);
3769ccb8da8b libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4587
diff changeset
2585 }
3769ccb8da8b libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4587
diff changeset
2586
1459
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
2587 if(sh_audio){
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
2588 current_module="seek_audio_reset";
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
2589 audio_out->reset(); // stop audio, throwing away buffered data
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2590 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2591 #ifdef USE_OSD
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
2592 // Set OSD:
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
2593 if(osd_level){
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
2594 int len=((demuxer->movi_end-demuxer->movi_start)>>8);
1727
9da2b587b029 changes according to OSD calculations
atlka
parents: 1726
diff changeset
2595 if (len>0){
9da2b587b029 changes according to OSD calculations
atlka
parents: 1726
diff changeset
2596 osd_visible=sh_video->fps; // 1 sec
9da2b587b029 changes according to OSD calculations
atlka
parents: 1726
diff changeset
2597 vo_osd_progbar_type=0;
9da2b587b029 changes according to OSD calculations
atlka
parents: 1726
diff changeset
2598 vo_osd_progbar_value=(demuxer->filepos-demuxer->movi_start)/len;
9da2b587b029 changes according to OSD calculations
atlka
parents: 1726
diff changeset
2599 }
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
2600 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2601 #endif
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2602 if(sh_video) {
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2603 c_total=0;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2604 max_pts_correction=0.1;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2605 osd_visible=sh_video->fps; // to rewert to PLAY pointer after 1 sec
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2606 audio_time_usage=0; video_time_usage=0; vout_time_usage=0;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2607 drop_frame_cnt=0;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2608 too_slow_frame_cnt=0;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2609 too_fast_frame_cnt=0;
3744
d358f4a74690 dvd seeking -> subtitle disappearing bugs fixed
arpi
parents: 3742
diff changeset
2610
d358f4a74690 dvd seeking -> subtitle disappearing bugs fixed
arpi
parents: 3742
diff changeset
2611 #ifdef USE_DVDREAD
d358f4a74690 dvd seeking -> subtitle disappearing bugs fixed
arpi
parents: 3742
diff changeset
2612 if(vo_spudec) spudec_reset(vo_spudec);
d358f4a74690 dvd seeking -> subtitle disappearing bugs fixed
arpi
parents: 3742
diff changeset
2613 #endif
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2614 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2615 }
1405
8ecf18884ad8 seeking code moved out from mplayer.c -> seek.c
arpi
parents: 1402
diff changeset
2616 rel_seek_secs=0;
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2617 abs_seek_pos=0;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
2618 current_module=NULL;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
2619 }
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
2620
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2621 #ifdef HAVE_NEW_GUI
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2622 if(use_gui){
1735
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2623 if(demuxer->file_format==DEMUXER_TYPE_AVI && sh_video->video.dwLength>2){
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2624 // get pos from frame number / total frames
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
2625 guiIntfStruct.Position=(float)d_video->pack_no*100.0f/sh_video->video.dwLength;
1735
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2626 } else {
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2627 // get pos from file position / filesize
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2628 int len=((demuxer->movi_end-demuxer->movi_start));
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2629 int pos=(demuxer->file_format==DEMUXER_TYPE_AVI)?demuxer->filepos:d_video->pos;
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
2630 guiIntfStruct.Position=(len<=0)?0:((float)(pos-demuxer->movi_start) / len * 100.0f);
1735
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2631 }
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
2632 guiIntfStruct.TimeSec=d_video->pts;
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
2633 if(guiIntfStruct.Playing==0) break; // STOP
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
2634 if(guiIntfStruct.Playing==2) osd_function=OSD_PAUSE;
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
2635 if ( guiIntfStruct.VolumeChanged )
1848
8ce1c088d05d fix osd volume bar handling in gui
pontscho
parents: 1844
diff changeset
2636 {
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
2637 mixer_setvolume( guiIntfStruct.Volume,guiIntfStruct.Volume );
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
2638 guiIntfStruct.VolumeChanged=0;
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2639 #ifdef USE_OSD
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2640 if ( osd_level )
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2641 {
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2642 osd_visible=sh_video->fps; // 1 sec
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2643 vo_osd_progbar_type=OSD_VOLUME;
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
2644 vo_osd_progbar_value=( ( guiIntfStruct.Volume ) * 256.0 ) / 100.0;
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2645 }
1848
8ce1c088d05d fix osd volume bar handling in gui
pontscho
parents: 1844
diff changeset
2646 #endif
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2647 }
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
2648 guiIntfStruct.Volume=(float)mixer_getbothvolume();
3054
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2649 #ifdef USE_DVDREAD
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
2650 if ( guiIntfStruct.DVDChanged ) goto goto_next_file;
3054
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2651 if ( stream->type == STREAMTYPE_DVD )
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2652 {
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2653 dvd_priv_t * dvdp = stream->priv;
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
2654 guiIntfStruct.DVD.current_chapter=dvdp->cur_cell + 1;
3054
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2655 }
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2656 #endif
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2657 }
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2658 #endif
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2659
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2660
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2661 //================= Update OSD ====================
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2662 #ifdef USE_OSD
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1420
diff changeset
2663 if(osd_level>=2){
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2664 int pts=d_video->pts;
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2665 char osd_text_tmp[50];
595
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
2666 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
2667 vo_osd_text=osd_text_buffer;
3234
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
2668 if (osd_show_sub_delay) {
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2669 sprintf(osd_text_tmp, "Sub delay: %d ms",(int)(sub_delay*1000));
3234
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
2670 osd_show_sub_delay--;
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
2671 } else
3783
de6b00131e95 show a-v delay in osd (based on subdelay osd patch)
arpi
parents: 3754
diff changeset
2672 if (osd_show_av_delay) {
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2673 sprintf(osd_text_tmp, "A-V delay: %d ms",(int)(audio_delay*1000));
3783
de6b00131e95 show a-v delay in osd (based on subdelay osd patch)
arpi
parents: 3754
diff changeset
2674 osd_show_av_delay--;
de6b00131e95 show a-v delay in osd (based on subdelay osd patch)
arpi
parents: 3754
diff changeset
2675 } else
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2676 sprintf(osd_text_tmp,"%c %02d:%02d:%02d",osd_function,pts/3600,(pts/60)%60,pts%60);
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2677
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2678 if(strcmp(vo_osd_text, osd_text_tmp)) {
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2679 strcpy(vo_osd_text, osd_text_tmp);
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2680 vo_osd_changed(1);
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2681 }
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2682 } else {
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2683 if(vo_osd_text) {
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2684 vo_osd_text=NULL;
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2685 vo_osd_changed(1);
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2686 }
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2687 }
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2688 // 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
2689 // vo_osd_text=osd_text_buffer;
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2690 #endif
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
2691
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2692 #ifdef USE_SUB
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
2693 // find sub
1204
646ac6d78952 sub at key=0 fixed
arpi_esp
parents: 1190
diff changeset
2694 if(subtitles && d_video->pts>0){
1762
914bdbe33cf8 -dumpsub works for avi, then dumps .sub file
arpi
parents: 1753
diff changeset
2695 float pts=d_video->pts;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
2696 if(sub_fps==0) sub_fps=sh_video->fps;
482
1a2c4f3e7a10 sub control optimized
arpi_esp
parents: 470
diff changeset
2697 current_module="find_sub";
3274
ac7ded58b6df mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3257
diff changeset
2698 if (pts > sub_last_pts || pts < sub_last_pts-1.0 ) {
ac7ded58b6df mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3257
diff changeset
2699 find_sub(subtitles,sub_uses_time?(100*(pts+sub_delay)):((pts+sub_delay)*sub_fps)); // FIXME! frame counter...
ac7ded58b6df mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3257
diff changeset
2700 sub_last_pts = pts;
ac7ded58b6df mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3257
diff changeset
2701 }
482
1a2c4f3e7a10 sub control optimized
arpi_esp
parents: 470
diff changeset
2702 current_module=NULL;
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
2703 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2704 #endif
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2705
3180
d53f70e3c794 spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents: 3166
diff changeset
2706
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2707 // VobSub subtitles
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2708 if(vo_vobsub){
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2709 current_module="vobsub";
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2710 vobsub_process(vo_vobsub,d_video->pts);
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2711
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2712 /* Don't know how to detect wether the sub has changed or not */
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2713 vo_osd_changed(1);
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2714 current_module=NULL;
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2715 }
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2716
3180
d53f70e3c794 spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents: 3166
diff changeset
2717 #ifdef USE_DVDREAD
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2718 // DVD sub:
4160
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2719 if(vo_flags & 0x08){
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2720 static vo_mpegpes_t packet;
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2721 static vo_mpegpes_t *pkg=&packet;
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2722 packet.timestamp=sh_video->timer*90000.0;
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2723 packet.id=0x20; /* Subpic */
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2724 while((packet.size=ds_get_packet_sub(d_dvdsub,&packet.data))>0){
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2725 mp_msg(MSGT_CPLAYER,MSGL_V,"\rDVD sub: len=%d v_pts=%5.3f s_pts=%5.3f \n",packet.size,d_video->pts,d_dvdsub->pts);
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2726 video_out->draw_frame(&pkg);
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2727 }
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2728 }else if(vo_spudec){
3034
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
2729 unsigned char* packet=NULL;
3843
38e84c14280d some spudec cleanup
arpi
parents: 3842
diff changeset
2730 int len;
3034
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
2731 current_module="spudec";
3843
38e84c14280d some spudec cleanup
arpi
parents: 3842
diff changeset
2732 while((len=ds_get_packet_sub(d_dvdsub,&packet))>0){
38e84c14280d some spudec cleanup
arpi
parents: 3842
diff changeset
2733 mp_msg(MSGT_CPLAYER,MSGL_V,"\rDVD sub: len=%d v_pts=%5.3f s_pts=%5.3f \n",len,d_video->pts,d_dvdsub->pts);
3842
32e488a4fc40 dvdsub pts fix, based on patch by Kim Minh Kaplan
arpi
parents: 3825
diff changeset
2734 spudec_assemble(vo_spudec,packet,len,100*d_dvdsub->pts);
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2735 }
3842
32e488a4fc40 dvdsub pts fix, based on patch by Kim Minh Kaplan
arpi
parents: 3825
diff changeset
2736 spudec_heartbeat(vo_spudec,100*d_video->pts);
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2737
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2738 /* Don't know how to detect wether the sub has changed or not */
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2739 vo_osd_changed(1);
3034
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
2740 current_module=NULL;
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2741 }
3180
d53f70e3c794 spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents: 3166
diff changeset
2742 #endif
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2743
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1420
diff changeset
2744 } // while(!eof)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2745
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
2746 mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d \n",eof);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2747
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2748 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2749
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
2750 goto_next_file: // don't jump here after ao/vo/getch initialization!
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2751
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2752 if(benchmark){
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2753 double tot=video_time_usage+vout_time_usage+audio_time_usage;
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2754 double total_time_usage;
4834
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
2755 max_video_time_usage *= our_n_frames;
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
2756 max_vout_time_usage *= our_n_frames;
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
2757 max_audio_time_usage *= our_n_frames;
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2758 total_time_usage_start=GetTimer()-total_time_usage_start;
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2759 total_time_usage = (float)total_time_usage_start*0.000001;
4856
7dfcfd1b9bf7 rename V -> VC just for understanding
nick
parents: 4852
diff changeset
2760 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\nAVE BENCHMARKs: VC:%8.3fs VO:%8.3fs A:%8.3fs Sys:%8.3fs = %8.3fs\n",
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2761 video_time_usage,vout_time_usage,audio_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2762 total_time_usage-tot,total_time_usage);
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2763 if(total_time_usage>0.0)
4856
7dfcfd1b9bf7 rename V -> VC just for understanding
nick
parents: 4852
diff changeset
2764 mp_msg(MSGT_CPLAYER,MSGL_INFO,"AVE BENCHMARK%%: VC:%8.4f%% VO:%8.4f%% A:%8.4f%% Sys:%8.4f%% = %8.4f%%\n",
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2765 100.0*video_time_usage/total_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2766 100.0*vout_time_usage/total_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2767 100.0*audio_time_usage/total_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2768 100.0*(total_time_usage-tot)/total_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2769 100.0);
4856
7dfcfd1b9bf7 rename V -> VC just for understanding
nick
parents: 4852
diff changeset
2770 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\nMAX BENCHMARKs: VC:%8.3fs VO:%8.3fs A:%8.3fs\n",
4834
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
2771 max_video_time_usage,max_vout_time_usage,
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
2772 max_audio_time_usage);
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
2773 if(total_time_usage>0.0)
4856
7dfcfd1b9bf7 rename V -> VC just for understanding
nick
parents: 4852
diff changeset
2774 mp_msg(MSGT_CPLAYER,MSGL_INFO,"MAX BENCHMARK%%: VC:%8.4f%% VO:%8.4f%% A:%8.4f%% = %8.4f%%\n",
4834
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
2775 100.0*max_video_time_usage/total_time_usage,
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
2776 100.0*max_vout_time_usage/total_time_usage,
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
2777 100.0*max_audio_time_usage/total_time_usage,
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
2778 100.0*max_video_time_usage/total_time_usage+
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
2779 100.0*max_vout_time_usage/total_time_usage+
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
2780 100.0*max_audio_time_usage/total_time_usage
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
2781 );
4840
7e56b1480a24 Additional notes
nick
parents: 4839
diff changeset
2782 /* This code computes number of frame which should be dropped
7e56b1480a24 Additional notes
nick
parents: 4839
diff changeset
2783 in ideal case (without SYSTIME); i.e. when file is located
7e56b1480a24 Additional notes
nick
parents: 4839
diff changeset
2784 in RAM and kernel+other_tasks eat 0% of CPU. */
7e56b1480a24 Additional notes
nick
parents: 4839
diff changeset
2785 mp_msg(MSGT_CPLAYER,MSGL_INFO,"TOTAL BENCHMARK: from %u frames should be dropped: %u at least\n"
4839
d94ccbfec3e3 More info on dropped frames
nick
parents: 4838
diff changeset
2786 ,our_n_frames,bench_dropped_frames);
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2787 }
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2788
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
2789 #ifdef HAVE_NEW_GUI
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
2790 if( use_gui )
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
2791 {
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
2792 #ifdef USE_DVDREAD
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
2793 if ( !guiIntfStruct.DVDChanged )
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
2794 #endif
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
2795 mplStop();
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
2796 #warning workaround for kiba playtree with gui ... if i dont play the prev/next file, then playtree sig6 (assert)
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
2797 eof=0;
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
2798 }
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
2799 #endif
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
2800
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2801 if(eof == PT_NEXT_ENTRY || eof == PT_PREV_ENTRY) {
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2802 eof = eof == PT_NEXT_ENTRY ? 1 : -1;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2803 if(play_tree_iter_step(playtree_iter,eof,0) == PLAY_TREE_ITER_ENTRY) {
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
2804 uninit_player(INITED_ALL-(INITED_GUI+INITED_LIRC+INITED_INPUT+INITED_VO));
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2805 eof = 1;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2806 } else {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2807 play_tree_iter_free(playtree_iter);
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2808 playtree_iter = NULL;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2809 }
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2810 } else if (eof == PT_UP_NEXT || eof == PT_UP_PREV) {
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2811 eof = eof == PT_UP_NEXT ? 1 : -1;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2812 if(play_tree_iter_up_step(playtree_iter,eof,0) == PLAY_TREE_ITER_ENTRY) {
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
2813 uninit_player(INITED_ALL-(INITED_GUI+INITED_LIRC+INITED_INPUT+INITED_VO));
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2814 eof = 1;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2815 } else {
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2816 play_tree_iter_free(playtree_iter);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2817 playtree_iter = NULL;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2818 }
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2819 }else { // NEXT PREV SRC
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
2820 uninit_player(INITED_ALL-(INITED_GUI+INITED_LIRC+INITED_INPUT+INITED_VO));
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2821 eof = eof == PT_PREV_SRC ? -1 : 1;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2822 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2823
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
2824 uninit_player(INITED_VO);
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
2825
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2826 if(eof == 0) eof = 1;
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2827
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2828 while(playtree_iter != NULL) {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2829 filename = play_tree_iter_get_file(playtree_iter,eof);
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2830 if(filename == NULL) {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2831 if( play_tree_iter_step(playtree_iter,eof,0) != PLAY_TREE_ITER_ENTRY) {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2832 play_tree_iter_free(playtree_iter);
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2833 playtree_iter = NULL;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2834 };
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2835 } else
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2836 break;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2837 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2838
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2839 if(use_gui || playtree_iter != NULL
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
2840 #if defined( HAVE_NEW_GUI ) && defined( USE_DVDREAD )
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
2841 || ( guiIntfStruct.DVDChanged && use_gui )
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
2842 #endif
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
2843 ){
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2844
1654
9d85b84e367e dec_video uninit
arpi
parents: 1651
diff changeset
2845 current_module="uninit_vcodec";
9d85b84e367e dec_video uninit
arpi
parents: 1651
diff changeset
2846 if(sh_video) uninit_video(sh_video);
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
2847
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2848 current_module="free_demuxer";
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2849 if(demuxer) free_demuxer(demuxer);
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2850
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2851 current_module="free_stream";
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2852 if(stream) free_stream(stream);
3543
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
2853
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
2854 current_module="sub_free";
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
2855 if ( subtitles )
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
2856 {
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
2857 sub_free( subtitles );
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
2858 sub_name=NULL;
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
2859 vo_sub=NULL;
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
2860 subtitles=NULL;
3543
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
2861 }
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
2862
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2863 video_out=NULL;
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2864 audio_out=NULL;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2865 eof = 0;
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2866 goto play_next_file;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2867 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2868
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
2869 exit_player(MSGTR_Exit_eof);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2870
109
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
2871 return 1;
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
2872 }