annotate mplayer.c @ 8301:d867439e3940

- fixed 10l bug (imagedesc handle allocation) - enabled colorspace selection support, fixed yvu9, added yv12
author arpi
date Wed, 27 Nov 2002 23:47:14 +0000
parents 772d6d27fd66
children 4c23944315d6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
1 // Movie Player v0.90 (C) 2000-2002. by A'rpi/ESP-team & `cat AUTHORS`
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>
5288
370d13663229 we don't use mmap() in mplayer.c, so why should we include mman.h...
arpi
parents: 5221
diff changeset
9 // #include <sys/mman.h>
1428
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
5112
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
19 #include <errno.h>
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
20
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
21 #include "version.h"
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
22 #include "config.h"
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
23
1564
9fa2a290fa99 mp_msg init
arpi
parents: 1548
diff changeset
24 #include "mp_msg.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
25
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
26 #define HELP_MP_DEFINE_STATIC
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
27 #include "help_mp.h"
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
28
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
29 #ifdef NEW_CONFIG
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
30 #include "m_option.h"
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
31 #include "m_config.h"
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
32 #else
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
33 #include "cfgparser.h"
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
34 #endif
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
35 #include "cfg-mplayer-def.h"
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
36
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
37 #ifdef USE_SUB
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
38 #include "subreader.h"
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
39 #endif
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
40
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
41 #include "libvo/video_out.h"
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
42
5293
fd992ece4367 include font_load.h directly, instead of via video_out.h
arpi
parents: 5288
diff changeset
43 #include "libvo/font_load.h"
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
44 #include "libvo/sub.h"
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
45
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
46 #include "libao2/audio_out.h"
3194
1648d11fc36c commandline configuration of audio plugins now through struct, format conversion plugin added
anders
parents: 3180
diff changeset
47 #include "libao2/audio_plugin.h"
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
48
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
49 #include "codec-cfg.h"
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
50
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
51 #ifdef HAVE_LIBCSS
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
52 #include "libmpdemux/dvdauth.h"
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
53 #endif
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
54
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
55 #ifdef USE_DVDNAV
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
56 #include <dvdnav.h>
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
57 #endif
5488
3f183ca22747 fixed SPU pts, it's 1024/90000 based instead of 1/100
arpi
parents: 5463
diff changeset
58
560
28ae99036574 Separated dvdsub code to be able to work with it easier
lgb
parents: 557
diff changeset
59 #include "spudec.h"
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
60 #include "vobsub.h"
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
61
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
62 #include "linux/getch2.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63 #include "linux/timer.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
64
2272
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
65 #include "cpudetect.h"
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
66
2036
029bad24d022 baz.. fixed wrong cvs merge.
atmos4
parents: 2034
diff changeset
67 #ifdef HAVE_NEW_GUI
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4788
diff changeset
68 #include "Gui/interface.h"
2036
029bad24d022 baz.. fixed wrong cvs merge.
atmos4
parents: 2034
diff changeset
69 #endif
029bad24d022 baz.. fixed wrong cvs merge.
atmos4
parents: 2034
diff changeset
70
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
71 #include "input/input.h"
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
72
3322
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
73 int slave_mode=0;
362
463699f15eb4 static removed from verbose definition
szabii
parents: 360
diff changeset
74 int verbose=0;
7864
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
75 int identify=0;
7563
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
76 static int quiet=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
77
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
78 #define ABS(x) (((x)>=0)?(x):(-(x)))
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
79
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
80 #ifdef HAVE_RTC
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
81 #include <linux/rtc.h>
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
82 #endif
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
83
2941
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
84 #ifdef USE_TV
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
85 #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
86 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
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;
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
95 play_tree_iter_t* playtree_iter = NULL;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
96
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
97 #define PT_NEXT_ENTRY 1
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
98 #define PT_PREV_ENTRY -1
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
99 #define PT_NEXT_SRC 2
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
100 #define PT_PREV_SRC -2
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
101 #define PT_UP_NEXT 3
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
102 #define PT_UP_PREV -3
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 //**************************************************************************//
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
105 // Config
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
106 //**************************************************************************//
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
107
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
108 m_config_t* mconfig;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
109
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
110 #ifdef NEW_CONFIG
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
111 extern play_tree_t*
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
112 m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
113 extern int
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
114 m_config_parse_config_file(m_config_t* config, char *conffile);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
115 #endif
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
116
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
117 //**************************************************************************//
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
118 // Config file
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
119 //**************************************************************************//
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
120
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
121 static int cfg_inc_verbose(struct config *conf){ ++verbose; return 0;}
153
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 151
diff changeset
122
162
effc62af528c new option: -include
szabii
parents: 154
diff changeset
123 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
124 return m_config_parse_config_file(mconfig, filename);
162
effc62af528c new option: -include
szabii
parents: 154
diff changeset
125 }
effc62af528c new option: -include
szabii
parents: 154
diff changeset
126
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
127 #include "get_path.c"
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
128
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
129 //**************************************************************************//
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
130 //**************************************************************************//
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
131 // Input media streaming & demultiplexer:
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
132 //**************************************************************************//
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
133
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
134 static int max_framesize=0;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
135
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
136 #include "libmpdemux/stream.h"
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
137 #include "libmpdemux/demuxer.h"
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
138 #include "libmpdemux/stheader.h"
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
139 //#include "parse_es.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
140
5607
1972c3475d93 mp_image.h and img_format.h moved to libmpcodecs
arpi
parents: 5572
diff changeset
141 #include "libmpcodecs/dec_audio.h"
1972c3475d93 mp_image.h and img_format.h moved to libmpcodecs
arpi
parents: 5572
diff changeset
142 #include "libmpcodecs/dec_video.h"
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
143 #include "libmpcodecs/mp_image.h"
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
144 #include "libmpcodecs/vf.h"
2563
fc124f9db88e more cleanup, warnings fixed
arpi
parents: 2557
diff changeset
145
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8068
diff changeset
146 extern void vf_list_plugins();
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8068
diff changeset
147
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
148 //**************************************************************************//
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
149 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
150
112
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
151 // Common FIFO functions, and keyboard/event FIFO code
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
152 #include "fifo.c"
4892
35dd38bbd7f3 Fix when stdin is used as a file
albeu
parents: 4858
diff changeset
153 int use_stdin=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
154 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
155
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
156 vo_functions_t *video_out=NULL;
4788
d678ce495a75 Moved HW dependent mixer stuff to libao and removed master switch
anders
parents: 4787
diff changeset
157 ao_functions_t *audio_out=NULL;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
158
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
159 int fixed_vo=0;
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
160
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
161 // benchmark:
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
162 double video_time_usage=0;
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
163 double vout_time_usage=0;
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
164 static double audio_time_usage=0;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
165 static int total_time_usage_start=0;
5621
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
166 static int total_frame_cnt=0;
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
167 static int drop_frame_cnt=0; // total number of dropped frames
4844
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
168 int benchmark=0;
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
169
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
170 // options:
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
171 int auto_quality=0;
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
172 static int output_quality=0;
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
173
7605
c3bbe602aff3 new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents: 7604
diff changeset
174 float playback_speed=1.0;
c3bbe602aff3 new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents: 7604
diff changeset
175
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
176 int use_gui=0;
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
177
6921
762c98c47f01 osdlevel=1 by default
arpi
parents: 6914
diff changeset
178 int osd_level=1;
7516
657041b7236b when working through a mixed play tree with audi-only files and video files
arpi
parents: 7506
diff changeset
179 int osd_level_saved=-1;
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6590
diff changeset
180 int osd_visible=100;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
181
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
182 // seek:
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
183 static char *seek_to_sec=NULL;
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
184 static off_t seek_to_byte=0;
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
185 static off_t step_sec=0;
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
186 static int loop_times=-1;
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
187
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
188 // A/V sync:
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
189 static int autosync=0; // 30 might be a good default value.
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
190
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
191 // may be changed by GUI: (FIXME!)
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
192 float rel_seek_secs=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
193 int abs_seek_pos=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
194
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
195 // codecs:
7529
c276bfb414fb removed obsolete/unused audio|video_fm|codec, has_audio|video
arpi
parents: 7526
diff changeset
196 char **audio_codec_list=NULL; // override audio codec
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
197 char **video_codec_list=NULL; // override video codec
7529
c276bfb414fb removed obsolete/unused audio|video_fm|codec, has_audio|video
arpi
parents: 7526
diff changeset
198 char **audio_fm_list=NULL; // override audio codec family
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
199 char **video_fm_list=NULL; // 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
200
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
201 // streaming:
3532
19998399f4d5 Made audio_id and video_id non static variable.
bertrand
parents: 3499
diff changeset
202 int audio_id=-1;
19998399f4d5 Made audio_id and video_id non static variable.
bertrand
parents: 3499
diff changeset
203 int video_id=-1;
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
204 int dvdsub_id=-1;
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
205 int vobsub_id=-1;
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
206 static char* audio_lang=NULL;
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
207 static char* dvdsub_lang=NULL;
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5380
diff changeset
208 static char* spudec_ifo=NULL;
6280
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
209 int vcd_track=0;
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
210 char* filename=NULL; //"MI2-Trailer.avi";
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
211
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
212 // cache2:
7881
aba9301ed3c4 allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents: 7867
diff changeset
213 int stream_cache_size=-1;
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
214 #ifdef USE_STREAM_CACHE
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
215 extern int cache_fill_status;
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
216 #else
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
217 #define cache_fill_status 0
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
218 #endif
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
219
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
220 // dump:
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
221 static char *stream_dump_name="stream.dump";
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
222 int stream_dump_type=0;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
223
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
224 // A-V sync:
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
225 static float default_max_pts_correction=-1;//0.01f;
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
226 static float max_pts_correction=0;//default_max_pts_correction;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
227 static float c_total=0;
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
228 float audio_delay=0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
229
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
230 static int softsleep=0;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
231
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
232 static float force_fps=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
233 static int force_srate=0;
7614
ce6a938aa6d3 Adding -format and -af switches
anders
parents: 7605
diff changeset
234 static int audio_output_format=0;
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
235 int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
236 static int play_n_frames=-1;
6590
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
237 static int play_n_frames_mf=-1;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
238
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
239 // screen info:
7562
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
240 char** video_driver_list=NULL;
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
241 char** audio_driver_list=NULL;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
242
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
243 extern char *vo_subdevice;
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
244 extern char *ao_subdevice;
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
245
7451
8669e56d2d98 some mpcodecs option declaration moved to cfg-*, as aren;t used by
arpi
parents: 7450
diff changeset
246 // codec outfmt flags (defined in libmpcodecs/vd.c)
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
247 extern int vo_flags;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
248
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
249 // sub:
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
250 char *font_name=NULL;
215
09d565842a33 font alpha resampling, see -ffactor
arpi_esp
parents: 212
diff changeset
251 float font_factor=0.75;
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
252 char *sub_name=NULL;
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
253 float sub_delay=0;
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
254 float sub_fps=0;
510
2951d138ddaf add sub autoread & remove 'c' key
pontscho
parents: 500
diff changeset
255 int sub_auto = 1;
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
256 char *vobsub_name=NULL;
1255
94f2853ec6f4 -dsp option removed, displaying help text (-ao oss:dsp_path)
alex
parents: 1250
diff changeset
257 /*DSP!!char *dsp=NULL;*/
6784
b38e38b6f88f DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents: 6781
diff changeset
258 int subcc_enabled=0;
7150
b212f74e14ec - add play time subtitle change support
pontscho
parents: 7142
diff changeset
259 #ifdef USE_SUB
b212f74e14ec - add play time subtitle change support
pontscho
parents: 7142
diff changeset
260 subtitle* subtitles=NULL;
b212f74e14ec - add play time subtitle change support
pontscho
parents: 7142
diff changeset
261 float sub_last_pts = -303;
b212f74e14ec - add play time subtitle change support
pontscho
parents: 7142
diff changeset
262 #endif
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
263
2321
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
264 static stream_t* stream=NULL;
7058
2e5c07262861 new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents: 7055
diff changeset
265 static demuxer_t *demuxer=NULL;
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
266 static sh_audio_t *sh_audio=NULL;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
267 static sh_video_t *sh_video=NULL;
7058
2e5c07262861 new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents: 7055
diff changeset
268
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
269 char* current_module=NULL; // for debugging
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
270
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
271 // also modified by Gui/mplayer/gtk/eq.c:
7517
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
272 int vo_gamma_gamma = 1000;
6786
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
273 int vo_gamma_brightness = 1000;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
274 int vo_gamma_contrast = 1000;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
275 int vo_gamma_saturation = 1000;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
276 int vo_gamma_hue = 1000;
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
277
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
278 // ---
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
279
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
280 #ifdef HAVE_MENU
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
281 #include "m_struct.h"
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
282 #include "libmenu/menu.h"
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
283 extern void vf_menu_pause_update(struct vf_instance_s* vf);
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
284 extern vf_info_t vf_info_menu;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
285 static vf_info_t* libmenu_vfs[] = {
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
286 &vf_info_menu,
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
287 NULL
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
288 };
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
289 static vf_instance_t* vf_menu = NULL;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
290 static int use_menu = 0;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
291 static char* menu_cfg = NULL;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
292 static char* menu_root = "main";
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
293 #endif
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
294
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
295
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
296 #ifdef HAVE_RTC
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
297 static int nortc;
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
298 #endif
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
299
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
300 static unsigned int inited_flags=0;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
301 #define INITED_VO 1
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
302 #define INITED_AO 2
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
303 #define INITED_GUI 4
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
304 #define INITED_GETCH2 8
3034
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
305 #define INITED_SPUDEC 32
2321
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
306 #define INITED_STREAM 64
4431
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
307 #define INITED_INPUT 128
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
308 #define INITED_VOBSUB 256
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
309 #define INITED_DEMUXER 512
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
310 #define INITED_ACODEC 1024
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
311 #define INITED_VCODEC 2048
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
312 #define INITED_ALL 0xFFFF
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
313
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
314 static void uninit_player(unsigned int mask){
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
315 mask=inited_flags&mask;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
316
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
317 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n*** uninit(0x%X)\n",mask);
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
318
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
319 if(mask&INITED_ACODEC){
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
320 inited_flags&=~INITED_ACODEC;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
321 current_module="uninit_acodec";
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
322 if(sh_audio) uninit_audio(sh_audio);
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
323 sh_audio=NULL;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
324 }
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
325
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
326 if(mask&INITED_VCODEC){
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
327 inited_flags&=~INITED_VCODEC;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
328 current_module="uninit_vcodec";
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
329 if(sh_video) uninit_video(sh_video);
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
330 sh_video=NULL;
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
331 #ifdef HAVE_MENU
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
332 vf_menu=NULL;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
333 #endif
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
334 }
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
335
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
336 if(mask&INITED_DEMUXER){
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
337 inited_flags&=~INITED_DEMUXER;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
338 current_module="free_demuxer";
8023
3738cc2269a3 get stream back from the demuxer
arpi
parents: 7923
diff changeset
339 if(demuxer){
3738cc2269a3 get stream back from the demuxer
arpi
parents: 7923
diff changeset
340 stream=demuxer->stream;
3738cc2269a3 get stream back from the demuxer
arpi
parents: 7923
diff changeset
341 free_demuxer(demuxer);
3738cc2269a3 get stream back from the demuxer
arpi
parents: 7923
diff changeset
342 }
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
343 demuxer=NULL;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
344 }
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
345
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
346 // kill the cache process:
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
347 if(mask&INITED_STREAM){
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
348 inited_flags&=~INITED_STREAM;
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
349 current_module="uninit_stream";
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
350 if(stream) free_stream(stream);
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
351 stream=NULL;
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
352 }
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
353
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
354 if(mask&INITED_VO){
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
355 inited_flags&=~INITED_VO;
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
356 current_module="uninit_vo";
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
357 video_out->uninit();
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
358 video_out=NULL;
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
359 }
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
360
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
361 // must be after libvo uninit, as few vo drivers (svgalib) has tty code
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
362 if(mask&INITED_GETCH2){
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
363 inited_flags&=~INITED_GETCH2;
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
364 current_module="uninit_getch2";
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
365 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n[[[uninit getch2]]]\n");
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
366 // restore terminal:
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
367 getch2_disable();
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
368 }
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
369
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
370 if(mask&INITED_VOBSUB){
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
371 inited_flags&=~INITED_VOBSUB;
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
372 current_module="uninit_vobsub";
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
373 if(vo_vobsub) vobsub_close(vo_vobsub);
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
374 vo_vobsub=NULL;
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
375 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
376
3034
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
377 if (mask&INITED_SPUDEC){
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
378 inited_flags&=~INITED_SPUDEC;
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
379 current_module="uninit_spudec";
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
380 spudec_free(vo_spudec);
5411
6918c74caa4d 1 step closed to solving memory corruptions
arpi
parents: 5410
diff changeset
381 vo_spudec=NULL;
3034
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
382 }
5488
3f183ca22747 fixed SPU pts, it's 1024/90000 based instead of 1/100
arpi
parents: 5463
diff changeset
383
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
384 #ifdef USE_SUB
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
385 if ( subtitles )
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
386 {
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
387 current_module="sub_free";
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
388 sub_free( subtitles );
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
389 if ( sub_name ) free( sub_name );
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
390 sub_name=NULL;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
391 vo_sub=NULL;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
392 subtitles=NULL;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
393 }
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
394 #endif
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
395
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
396 if(mask&INITED_AO){
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
397 inited_flags&=~INITED_AO;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
398 current_module="uninit_ao";
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
399 audio_out->uninit(); audio_out=NULL;
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
400 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
401
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
402 #ifdef HAVE_NEW_GUI
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
403 if(mask&INITED_GUI){
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
404 inited_flags&=~INITED_GUI;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
405 current_module="uninit_gui";
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
406 guiDone();
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
407 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
408 #endif
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
409
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
410 if(mask&INITED_INPUT){
6429
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
411 inited_flags&=~INITED_INPUT;
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
412 current_module="uninit_input";
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
413 mp_input_uninit();
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
414 }
4431
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
415
1863
bb7710b16dc2 reset module status after uninit
arpi
parents: 1857
diff changeset
416 current_module=NULL;
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
417 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
418
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8068
diff changeset
419 #ifdef X11_FULLSCREEN
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8068
diff changeset
420 extern void vo_uninit( void );
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8068
diff changeset
421 #endif
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8068
diff changeset
422
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
423 void exit_player(char* how){
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
424
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
425 uninit_player(INITED_ALL);
6015
04fe086ae486 vo_uninit fixed
arpi
parents: 6013
diff changeset
426 #ifdef X11_FULLSCREEN
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6015
diff changeset
427 #ifdef HAVE_NEW_GUI
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6015
diff changeset
428 if ( !use_gui )
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6015
diff changeset
429 #endif
6015
04fe086ae486 vo_uninit fixed
arpi
parents: 6013
diff changeset
430 vo_uninit(); // close the X11 connection (if any opened)
04fe086ae486 vo_uninit fixed
arpi
parents: 6013
diff changeset
431 #endif
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
432
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
433 current_module="exit_player";
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
434
5106
40d2bcb1b671 using mp_gettext
alex
parents: 5091
diff changeset
435 if(how) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Exiting,mp_gettext(how));
4733
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
436 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"max framesize was %d bytes\n",max_framesize);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
437
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
438 exit(1);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
439 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
440
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
441 static void exit_sighandler(int x){
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
442 static int sig_count=0;
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
443 ++sig_count;
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
444 if(sig_count==5 || (inited_flags==0 && sig_count>1)) exit(1);
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
445 if(sig_count>5){
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
446 // can't stop :(
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
447 kill(getpid(),SIGKILL);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
448 }
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
449 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"\n" MSGTR_IntBySignal,x,
5106
40d2bcb1b671 using mp_gettext
alex
parents: 5091
diff changeset
450 current_module?current_module:mp_gettext("unknown")
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
451 );
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
452 if(sig_count==1)
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
453 switch(x){
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
454 case SIGINT:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
455 case SIGQUIT:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
456 case SIGTERM:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
457 case SIGKILL:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
458 break; // killed from keyboard (^C) or killed [-9]
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
459 case SIGILL:
5129
7de3c4209461 rtfm hint msg depends on runtime detection
arpi
parents: 5127
diff changeset
460 #ifdef RUNTIME_CPUDETECT
7de3c4209461 rtfm hint msg depends on runtime detection
arpi
parents: 5127
diff changeset
461 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"- MPlayer crashed by 'Illegal Instruction'. It may be a bug in our new runtime cpu-detection code... please read DOCS/bugreports.html\n");
7de3c4209461 rtfm hint msg depends on runtime detection
arpi
parents: 5127
diff changeset
462 #else
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
463 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"- MPlayer crashed by 'Illegal Instruction'. It usually happens when you run it on different CPU than it was compiled/optimized for. Verify this!\n");
5129
7de3c4209461 rtfm hint msg depends on runtime detection
arpi
parents: 5127
diff changeset
464 #endif
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
465 case SIGFPE:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
466 case SIGSEGV:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
467 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"- MPlayer crashed by bad usage of CPU/FPU/RAM. Recompile MPlayer with --enable-debug and make a 'gdb' backtrace and disassembly. For details, see DOCS/bugreports.html section 5.b.\n");
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
468 default:
5129
7de3c4209461 rtfm hint msg depends on runtime detection
arpi
parents: 5127
diff changeset
469 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"- MPlayer crashed. This shouldn't happen. It can be a bug in the MPlayer code _or_ in your drivers _or_ in your gcc version. If you think it's MPlayer's fault, please read DOCS/bugreports.html and follow instructions there. We can't and won't help unless you provide these informations when reporting a possible bug.\n");
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
470 }
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
471 exit_player(NULL);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
472 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
473
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
474 //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
475
7867
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7864
diff changeset
476 extern void mp_input_register_options(m_config_t* cfg);
4659
31265995cc3a Place holder for registering modules options
albeu
parents: 4655
diff changeset
477
459
9dfad88a8107 add mixer support
pontscho
parents: 458
diff changeset
478 #include "mixer.h"
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
479 #include "cfg-mplayer.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
480
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
481 void parse_cfgfiles( m_config_t* conf )
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
482 {
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
483 char *conffile;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
484 int conffile_fd;
6545
9df67606ef53 Patch by Dominik Mierzejewski:
atmos4
parents: 6429
diff changeset
485 if (m_config_parse_config_file(conf, CONFDIR"/mplayer.conf") < 0)
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
486 exit(1);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
487 if ((conffile = get_path("")) == NULL) {
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
488 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoHomeDir);
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
489 } else {
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
490 mkdir(conffile, 0777);
55206b791586 get_path()
szabii
parents: 175
diff changeset
491 free(conffile);
55206b791586 get_path()
szabii
parents: 175
diff changeset
492 if ((conffile = get_path("config")) == NULL) {
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
493 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
494 } else {
55206b791586 get_path()
szabii
parents: 175
diff changeset
495 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
496 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CreatingCfgFile, conffile);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
497 write(conffile_fd, default_config, strlen(default_config));
55206b791586 get_path()
szabii
parents: 175
diff changeset
498 close(conffile_fd);
55206b791586 get_path()
szabii
parents: 175
diff changeset
499 }
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
500 if (m_config_parse_config_file(conf, conffile) < 0)
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
501 exit(1);
55206b791586 get_path()
szabii
parents: 175
diff changeset
502 free(conffile);
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
503 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
504 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
505 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
506
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
507 // 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
508 // 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
509 // The function return a new value for eof.
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
510 static int libmpdemux_was_interrupted(int eof) {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
511 mp_cmd_t* cmd;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
512 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
513 switch(cmd->id) {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
514 case MP_CMD_QUIT:
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
515 exit_player(MSGTR_Exit_quit);
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
516 case MP_CMD_PLAY_TREE_STEP: {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
517 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
518 } break;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
519 case MP_CMD_PLAY_TREE_UP_STEP: {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
520 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
521 } break;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
522 case MP_CMD_PLAY_ALT_SRC_STEP: {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
523 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
524 } break;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
525 }
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
526 mp_cmd_free(cmd);
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
527 }
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
528 return eof;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
529 }
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
530
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
531 static int play_tree_step = 1;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
532
7201
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
533 /*
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
534 * In Mac OS X the SDL-lib is built upon Cocoa. The easiest way to
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
535 * make it all work is to use the builtin SDL-bootstrap code, which
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
536 * will be done automatically by replacing our main() if we include SDL.h.
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
537 */
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
538 #if defined(SYS_DARWIN) && defined(HAVE_SDL)
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
539 #include <SDL.h>
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
540 #endif
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
541
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
542 int main(int argc,char* argv[]){
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
543
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
544
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
545
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
546 static demux_stream_t *d_audio=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
547 static demux_stream_t *d_video=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
548 static demux_stream_t *d_dvdsub=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
549
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
550 int file_format=DEMUXER_TYPE_UNKNOWN;
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
551
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
552 int delay_corrected=1;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
553
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
554 // movie info:
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
555 int eof=0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
556
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
557 int osd_function=OSD_PLAY;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
558 int osd_last_pts=-303;
3783
de6b00131e95 show a-v delay in osd (based on subdelay osd patch)
arpi
parents: 3754
diff changeset
559 int osd_show_av_delay = 0;
3234
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
560 int osd_show_sub_delay = 0;
7628
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
561 int osd_show_sub_visibility = 0;
7780
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
562 int osd_show_vobsub_changed = 0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
563
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
564 int rtc_fd=-1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
565
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
566 //float a_frame=0; // Audio
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
567
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
568 int i;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
569
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
570 int gui_no_filename=0;
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
571
5221
533a58023392 splitted mp_msg_init and mp_msg_set_level
alex
parents: 5217
diff changeset
572 mp_msg_init();
533a58023392 splitted mp_msg_init and mp_msg_set_level
alex
parents: 5217
diff changeset
573 mp_msg_set_level(MSGL_STATUS);
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
574
5106
40d2bcb1b671 using mp_gettext
alex
parents: 5091
diff changeset
575 mp_msg(MSGT_CPLAYER,MSGL_INFO,banner_text);
2272
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
576 /* Test for cpu capabilities (and corresponding OS support) for optimizing */
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
577 #ifdef ARCH_X86
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
578 GetCpuCaps(&gCpuCaps);
6135
53a0e8f92bbd more cpudetect cosmetics
arpi
parents: 6134
diff changeset
579 mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n",
53a0e8f92bbd more cpudetect cosmetics
arpi
parents: 6134
diff changeset
580 gCpuCaps.hasMMX,gCpuCaps.hasMMX2,
2272
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
581 gCpuCaps.has3DNow, gCpuCaps.has3DNowExt,
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
582 gCpuCaps.hasSSE, gCpuCaps.hasSSE2);
3742
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
583 #ifdef RUNTIME_CPUDETECT
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
584 mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithRuntimeDetection);
3742
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
585 #else
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
586 mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithCPUExtensions);
3742
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
587 #ifdef HAVE_MMX
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
588 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
589 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
590 #ifdef HAVE_MMX2
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
591 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX2");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
592 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
593 #ifdef HAVE_3DNOW
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
594 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNow");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
595 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
596 #ifdef HAVE_3DNOWEX
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
597 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNowEx");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
598 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
599 #ifdef HAVE_SSE
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
600 mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
601 #endif
6135
53a0e8f92bbd more cpudetect cosmetics
arpi
parents: 6134
diff changeset
602 #ifdef HAVE_SSE2
53a0e8f92bbd more cpudetect cosmetics
arpi
parents: 6134
diff changeset
603 mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE2");
53a0e8f92bbd more cpudetect cosmetics
arpi
parents: 6134
diff changeset
604 #endif
53a0e8f92bbd more cpudetect cosmetics
arpi
parents: 6134
diff changeset
605 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n\n");
3742
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
606 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
607
2272
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
608 #endif
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
609
7068
6c2d746b17bf 10l, fix compiling without tv. patch by Andreas Hess <jaska@gmx.net>
arpi
parents: 7058
diff changeset
610 #ifdef USE_TV
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5520
diff changeset
611 tv_param_immediate = 1;
7068
6c2d746b17bf 10l, fix compiling without tv. patch by Andreas Hess <jaska@gmx.net>
arpi
parents: 7058
diff changeset
612 #endif
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5520
diff changeset
613
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
614 if ( argv[0] )
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
615 if(!strcmp(argv[0],"gmplayer") ||
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
616 (strrchr(argv[0],'/') && !strcmp(strrchr(argv[0],'/'),"/gmplayer") ) )
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
617 use_gui=1;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
618
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
619 #ifdef NEW_CONFIG
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
620 mconfig = m_config_new();
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
621 #else
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
622 playtree = play_tree_new();
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
623
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
624 mconfig = m_config_new(playtree);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
625 #endif
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
626 m_config_register_options(mconfig,mplayer_opts);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
627 // TODO : add something to let modules register their options
7867
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7864
diff changeset
628 mp_input_register_options(mconfig);
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
629 parse_cfgfiles(mconfig);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
630
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
631 #ifdef HAVE_NEW_GUI
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
632 if ( use_gui ) cfg_read();
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
633 #endif
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
634
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
635 #ifdef NEW_CONFIG
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
636 playtree = m_config_parse_mp_command_line(mconfig, argc, argv);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
637 if(playtree == NULL)
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
638 exit(1);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
639 #else
7201
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
640 if(m_config_parse_command_line(mconfig, argc, argv) < 0) exit(1); // error parsing cmdline
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
641 #endif
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
642
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
643 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
644 if(playtree) {
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
645 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
646 if(playtree_iter) {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
647 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
648 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
649 playtree_iter = NULL;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
650 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
651 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
652 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
653 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
654
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
655 #ifndef HAVE_NEW_GUI
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
656 if(use_gui){
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1962
diff changeset
657 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoGui);
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
658 use_gui=0;
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
659 }
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
660 #else
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
661 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
662 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
663 use_gui=0;
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
664 }
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
665 #endif
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
666
6081
47d6a4b0f971 -vop help, patch by Julian J. M. <bandit@telecable.es>
arpi
parents: 6028
diff changeset
667 if(vo_plugin_args && vo_plugin_args[0] && strcmp(vo_plugin_args[0],"help")==0){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
668 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoOutputPlugins);
6081
47d6a4b0f971 -vop help, patch by Julian J. M. <bandit@telecable.es>
arpi
parents: 6028
diff changeset
669 vf_list_plugins();
47d6a4b0f971 -vop help, patch by Julian J. M. <bandit@telecable.es>
arpi
parents: 6028
diff changeset
670 printf("\n");
47d6a4b0f971 -vop help, patch by Julian J. M. <bandit@telecable.es>
arpi
parents: 6028
diff changeset
671 exit(0);
47d6a4b0f971 -vop help, patch by Julian J. M. <bandit@telecable.es>
arpi
parents: 6028
diff changeset
672 }
47d6a4b0f971 -vop help, patch by Julian J. M. <bandit@telecable.es>
arpi
parents: 6028
diff changeset
673
7562
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
674 if(video_driver_list && strcmp(video_driver_list[0],"help")==0){
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
675 list_video_out();
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
676 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
677 }
5072
a760c9f074df libvo2 #ifs removed
arpi
parents: 5055
diff changeset
678
7563
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
679 if(audio_driver_list && strcmp(audio_driver_list[0],"help")==0){
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
680 list_audio_out();
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
681 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
682 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
683
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
684 // check codec.conf
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
685 if(!parse_codec_cfg(get_path("codecs.conf"))){
3748
6da59751fb20 search codecs.conf at CONFDIR
arpi
parents: 3744
diff changeset
686 if(!parse_codec_cfg(CONFDIR"/codecs.conf")){
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
687 mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
3934
e8e7ca8995a1 codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents: 3843
diff changeset
688 exit(0); // From unknown reason a hangup occurs here :((((((
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
689 }
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
690 }
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
691
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
692 #if 0
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
693 if(video_codec_list){
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
694 int i;
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
695 video_codec=video_codec_list[0];
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
696 for(i=0;video_codec_list[i];i++)
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
697 printf("vc#%d: '%s'\n",i,video_codec_list[i]);
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
698 }
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
699 #endif
7522
aa1a1249f239 -ac/-afm rewrite, now works the same way as -vc/-vfm
arpi
parents: 7517
diff changeset
700 if(audio_codec_list && strcmp(audio_codec_list[0],"help")==0){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
701 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioCodecs);
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
702 list_codecs(1);
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
703 printf("\n");
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
704 exit(0);
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
705 }
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
706 if(video_codec_list && strcmp(video_codec_list[0],"help")==0){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
707 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoCodecs);
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
708 list_codecs(0);
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
709 printf("\n");
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
710 exit(0);
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
711 }
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
712 if(video_fm_list && strcmp(video_fm_list[0],"help")==0){
7191
1eadce15446c -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents: 7180
diff changeset
713 vfm_help();
1eadce15446c -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents: 7180
diff changeset
714 printf("\n");
1eadce15446c -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents: 7180
diff changeset
715 exit(0);
1eadce15446c -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents: 7180
diff changeset
716 }
7522
aa1a1249f239 -ac/-afm rewrite, now works the same way as -vc/-vfm
arpi
parents: 7517
diff changeset
717 if(audio_fm_list && strcmp(audio_fm_list[0],"help")==0){
7191
1eadce15446c -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents: 7180
diff changeset
718 afm_help();
1eadce15446c -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents: 7180
diff changeset
719 printf("\n");
1eadce15446c -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents: 7180
diff changeset
720 exit(0);
1eadce15446c -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents: 7180
diff changeset
721 }
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
722
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
723
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
724 if(!filename && !vcd_track && !dvd_title && !dvd_nav && !tv_param_on){
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
725 if(!use_gui){
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
726 // no file/vcd/dvd -> show HELP:
5112
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
727 mp_msg(MSGT_CPLAYER, MSGL_INFO, help_text);
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
728 exit(0);
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
729 } else gui_no_filename=1;
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
730 }
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
731
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
732 // Many users forget to include command line in bugreports...
8027
b9da278e4c92 verbose can be negative
arpi
parents: 8023
diff changeset
733 if(verbose>0){
5112
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
734 mp_msg(MSGT_CPLAYER, MSGL_INFO, "CommandLine:");
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
735 for(i=1;i<argc;i++)printf(" '%s'",argv[i]);
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
736 printf("\n");
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
737 }
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
738
5221
533a58023392 splitted mp_msg_init and mp_msg_set_level
alex
parents: 5217
diff changeset
739 mp_msg_set_level(verbose+MSGL_STATUS);
1183
6fbcfe7f7f10 vo/ao_subdevice implemented
al3x
parents: 1177
diff changeset
740
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
741 //------ load global data first ------
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
742
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
743 #ifdef USE_OSD
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
744 #ifndef HAVE_FREETYPE
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
745 // check font
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
746 if(font_name){
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
747 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
748 if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
749 } else {
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
750 // try default:
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
751 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
752 if(!vo_font)
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 1338
diff changeset
753 vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1);
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
754 }
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
755 #else
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
756 init_freetype();
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
757 #endif
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
758 #endif
5638
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
759 vo_init_osd();
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
760
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
761 #ifdef HAVE_RTC
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
762 if(!nortc)
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
763 {
7494
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
764 // seteuid(0); /* Can't hurt to try to get root here */
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
765 if ((rtc_fd = open("/dev/rtc", O_RDONLY)) < 0)
7494
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
766 mp_msg(MSGT_CPLAYER, MSGL_WARN, "Failed to open /dev/rtc: %s (mplayer should be setuid root or /dev/rtc should be readable by the user.)\n", strerror(errno));
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
767 else {
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
768 unsigned long irqp = 1024; /* 512 seemed OK. 128 is jerky. */
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
769
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
770 if (ioctl(rtc_fd, RTC_IRQP_SET, irqp) < 0) {
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
771 mp_msg(MSGT_CPLAYER, MSGL_WARN, "Linux RTC init error in ioctl (rtc_irqp_set %lu): %s\n", irqp, strerror(errno));
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
772 mp_msg(MSGT_CPLAYER, MSGL_HINT, "Try adding \"echo %lu > /proc/sys/dev/rtc/max-user-freq\" to your system startup scripts.\n", irqp);
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
773 close (rtc_fd);
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
774 rtc_fd = -1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
775 } 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
776 /* variable only by the root */
5112
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
777 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Linux RTC init error in ioctl (rtc_pie_on): %s\n", strerror(errno));
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
778 close (rtc_fd);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
779 rtc_fd = -1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
780 } else
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
781 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_UsingRTCTiming, irqp);
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
782 }
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
783 }
4176
116abdd0aed1 small gtk bug fix (-display bug, baze gabu, miattad fogok elkarhozni:), and remove gui dependencie in mencoder
pontscho
parents: 4160
diff changeset
784 #ifdef HAVE_NEW_GUI
3825
7735c5a87121 setuid hack disabled
arpi
parents: 3823
diff changeset
785 // 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
786 // 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
787 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
788 #endif
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
789 if(rtc_fd<0)
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
790 #endif
5112
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
791 mp_msg(MSGT_CPLAYER, MSGL_INFO, "Using %s timing\n",softsleep?"software":"usleep()");
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
792
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
793 #ifdef USE_TERMCAP
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
794 if ( !use_gui ) load_termcap(NULL); // load key-codes
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
795 #endif
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
796
1816
c8bc613eb4f8 fixed 'n' key bug :)
arpi
parents: 1809
diff changeset
797 // ========== Init keyboard FIFO (connection to libvo) ============
c8bc613eb4f8 fixed 'n' key bug :)
arpi
parents: 1809
diff changeset
798 make_pipe(&keyb_fifo_get,&keyb_fifo_put);
1694
0def229bd8bc GUI support (--enable-gui)
arpi
parents: 1690
diff changeset
799
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
800 // Init input system
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
801 current_module = "init_input";
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
802 mp_input_init();
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
803 if(keyb_fifo_get > 0)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
804 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
805 if(slave_mode)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
806 mp_input_add_cmd_fd(0,1,NULL,NULL);
4892
35dd38bbd7f3 Fix when stdin is used as a file
albeu
parents: 4858
diff changeset
807 else if(!use_stdin)
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
808 mp_input_add_key_fd(0,1,NULL,NULL);
4431
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
809 inited_flags|=INITED_INPUT;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
810 current_module = NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
811
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
812 #ifdef HAVE_MENU
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
813 if(use_menu) {
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
814 if(!menu_cfg) menu_cfg = get_path("menu.conf");
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
815 if(menu_init(menu_cfg))
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
816 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu inited\n");
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
817 else {
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
818 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu init failed\n");
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
819 use_menu = 0;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
820 }
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
821 }
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
822 #endif
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
823
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
824
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
825
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
826 //========= Catch terminate signals: ================
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
827 // terminate requests:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
828 signal(SIGTERM,exit_sighandler); // kill
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
829 signal(SIGHUP,exit_sighandler); // kill -HUP / xterm closed
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
830
1729
d6c99f70449e fix hprogressbar
pontscho
parents: 1727
diff changeset
831 signal(SIGINT,exit_sighandler); // Interrupt from keyboard
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
832
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
833 signal(SIGQUIT,exit_sighandler); // Quit from keyboard
5367
658ea5d7316a Allow to disable crasj sighandler to enable creation of coredump files.
atmos4
parents: 5326
diff changeset
834 #ifdef ENABLE_SIGHANDLER
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
835 // fatal errors:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
836 signal(SIGBUS,exit_sighandler); // bus error
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
837 signal(SIGSEGV,exit_sighandler); // segfault
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
838 signal(SIGILL,exit_sighandler); // illegal instruction
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
839 signal(SIGFPE,exit_sighandler); // floating point exc.
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
840 signal(SIGABRT,exit_sighandler); // abort()
5367
658ea5d7316a Allow to disable crasj sighandler to enable creation of coredump files.
atmos4
parents: 5326
diff changeset
841 #endif
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
842
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
843 #ifdef HAVE_NEW_GUI
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
844 if(use_gui){
6218
8cfddba867b4 fix text render chrash ...
pontscho
parents: 6217
diff changeset
845 guiInit();
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
846 inited_flags|=INITED_GUI;
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
847 guiGetEvent( guiCEvent,(char *)((gui_no_filename) ? 0 : 1) );
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
848 }
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
849 #endif
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
850
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
851 // ******************* Now, let's see the per-file stuff ********************
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
852
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
853 play_next_file:
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
854
4835
1f59d4d73558 Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents: 4834
diff changeset
855 // 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
856 // or cache filling
1f59d4d73558 Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents: 4834
diff changeset
857 if(!use_stdin && !slave_mode){
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
858 if(inited_flags&INITED_GETCH2)
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
859 mp_msg(MSGT_CPLAYER,MSGL_WARN,"WARNING: getch2_init called twice!\n");
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
860 else
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
861 getch2_enable(); // prepare stdin for hotkeys...
4835
1f59d4d73558 Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents: 4834
diff changeset
862 inited_flags|=INITED_GETCH2;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
863 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n[[[init getch2]]]\n");
4835
1f59d4d73558 Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents: 4834
diff changeset
864 }
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
865
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
866 // =================== GUI idle loop (STOP state) ===========================
1745
64247d7d0076 add filename drawing
pontscho
parents: 1738
diff changeset
867 #ifdef HAVE_NEW_GUI
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
868 if ( use_gui ) {
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
869
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
870 guiGetEvent( guiReDrawSubWindow,0 );
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5655
diff changeset
871 while ( guiIntfStruct.Playing != 1 )
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5655
diff changeset
872 {
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
873 mp_cmd_t* cmd;
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6590
diff changeset
874 usleep(20000);
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4788
diff changeset
875 guiEventHandling();
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6590
diff changeset
876 guiGetEvent( guiReDraw,NULL );
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
877 if ( (cmd = mp_input_get_cmd(0,0)) != NULL) guiGetEvent( guiIEvent,(char *)cmd->id );
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5655
diff changeset
878 }
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5655
diff changeset
879
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
880 guiGetEvent( guiSetDefaults,NULL );
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
881
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5655
diff changeset
882 if ( ( guiIntfStruct.FilenameChanged || !filename )
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6971
diff changeset
883 //#ifdef USE_DVDREAD
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6971
diff changeset
884 // && ( guiIntfStruct.StreamType != STREAMTYPE_DVD )
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6971
diff changeset
885 //#endif
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5655
diff changeset
886 )
3543
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
887 {
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
888 play_tree_t * entry = play_tree_new();
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
889 play_tree_add_file( entry,guiIntfStruct.Filename );
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
890 if ( playtree ) play_tree_free_list( playtree->child,1 );
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
891 else playtree=play_tree_new();
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
892 play_tree_set_child( playtree,entry );
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
893 if(playtree)
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
894 {
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
895 playtree_iter = play_tree_iter_new(playtree,mconfig);
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
896 if(playtree_iter)
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
897 {
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
898 if(play_tree_iter_step(playtree_iter,0,0) != PLAY_TREE_ITER_ENTRY)
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
899 {
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
900 play_tree_iter_free(playtree_iter);
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
901 playtree_iter = NULL;
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
902 }
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
903 filename = play_tree_iter_get_file(playtree_iter,1);
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
904 }
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
905 }
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
906 guiIntfStruct.FilenameChanged=0;
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
907 }
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
908 }
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
909 #endif
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
910 //---------------------------------------------------------------------------
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
911
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6135
diff changeset
912 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n");
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1962
diff changeset
913 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
914
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
915 //==================== Open VOB-Sub ============================
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
916
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
917 current_module="vobsub";
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
918 if (vobsub_name){
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
919 vo_vobsub=vobsub_open(vobsub_name,spudec_ifo,1,&vo_spudec);
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
920 if(vo_vobsub==NULL)
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
921 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,vobsub_name);
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
922 }else if(sub_auto && filename && (strlen(filename)>=5)){
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
923 /* try to autodetect vobsub from movie filename ::atmos */
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
924 char *buf = malloc((strlen(filename)-3) * sizeof(char));
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
925 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
926 strncpy(buf, filename, strlen(filename)-4);
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
927 vo_vobsub=vobsub_open(buf,spudec_ifo,0,&vo_spudec);
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
928 free(buf);
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
929 }
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
930 if(vo_vobsub){
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
931 sub_auto=0; // don't do autosub for textsubs if vobsub found
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
932 inited_flags|=INITED_VOBSUB;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
933 }
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
934
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
935 //============ Open & Sync STREAM --- fork cache2 ====================
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
936
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
937 stream=NULL;
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
938 demuxer=NULL;
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
939 d_audio=NULL;
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
940 d_video=NULL;
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
941 sh_audio=NULL;
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
942 sh_video=NULL;
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
943
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
944 current_module="open_stream";
1467
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
945 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
946 if(!stream) { // error...
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
947 eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY);
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
948 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
949 }
2321
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
950 inited_flags|=INITED_STREAM;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
951
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
952 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
953 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
954 // Handle playlist
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
955 current_module="handle_playlist";
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
956 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
957 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
958 if(!entry) {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
959 entry = playtree_iter->tree;
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
960 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
961 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
962 goto goto_next_file;
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
963 }
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
964 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
965 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
966 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
967 goto goto_next_file;
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
968 }
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
969 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
970 play_tree_remove(entry,1,1);
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
971 eof = PT_NEXT_SRC;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
972 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
973 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
974 play_tree_insert_entry(playtree_iter->tree,entry);
5217
3e7152b383ca Set the params given to a playlist url to the playlist
albeu
parents: 5216
diff changeset
975 play_tree_set_params_from(entry,playtree_iter->tree);
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
976 entry = playtree_iter->tree;
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
977 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
978 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
979 goto goto_next_file;
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
980 }
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
981 play_tree_remove(entry,1,1);
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
982 eof = PT_NEXT_SRC;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
983 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
984 }
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
985 stream->start_pos+=seek_to_byte;
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
986
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
987 #ifdef HAVE_LIBCSS
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
988 current_module="libcss";
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
989 if (dvdimportkey) {
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
990 if (dvd_import_key(dvdimportkey)) {
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
991 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorDVDkey);
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
992 exit_player(MSGTR_Exit_error);
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
993 }
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
994 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CmdlineDVDkey);
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
995 }
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
996 if (dvd_auth_device) {
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
997 if (dvd_auth(dvd_auth_device,filename)) {
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
998 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Error in DVD auth...\n");
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
999 exit_player(MSGTR_Exit_error);
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1000 }
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1001 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_DVDauthOk);
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1002 }
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1003 #endif
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1004
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1005 if(stream_dump_type==5){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1006 unsigned char buf[4096];
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1007 int len;
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1008 FILE *f;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1009 current_module="dumpstream";
7204
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
1010 if(stream->type==STREAMTYPE_STREAM && stream->fd<0){
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
1011 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Cannot dump this stream - no 'fd' available\n");
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
1012 exit_player(MSGTR_Exit_error);
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
1013 }
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1014 stream_reset(stream);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1015 stream_seek(stream,stream->start_pos);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1016 f=fopen(stream_dump_name,"wb");
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1017 if(!f){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1018 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1019 exit_player(MSGTR_Exit_error);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1020 }
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1021 while(!stream->eof){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1022 len=stream_read(stream,buf,4096);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1023 if(len>0) fwrite(buf,len,1,f);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1024 }
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1025 fclose(f);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1026 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1027 exit_player(MSGTR_Exit_eof);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1028 }
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1029
4274
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
1030 #ifdef USE_DVDREAD
5425
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
1031 if(stream->type==STREAMTYPE_DVD){
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
1032 current_module="dvd lang->id";
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
1033 if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang);
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
1034 if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang);
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
1035 current_module=NULL;
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
1036 }
4274
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
1037 #endif
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
1038
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1039 #ifdef USE_DVDNAV
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1040 if (dvd_nav) stream_cache_size=0; // must disable caching...
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1041 #endif
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1042
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1043 // CACHE2: initial prefill: 20% later: 5% (should be set by -cacheopts)
7881
aba9301ed3c4 allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents: 7867
diff changeset
1044 if(stream_cache_size>0){
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1045 current_module="enable_cache";
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1046 if(!stream_enable_cache(stream,stream_cache_size*1024,stream_cache_size*1024/5,stream_cache_size*1024/20))
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1047 if((eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY))) goto goto_next_file;
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1048 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1049
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1050 //============ Open DEMUXERS --- DETECT file type =======================
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1051
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1052 current_module="demux_open";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1053
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
1054 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
1055 if(!demuxer) goto goto_next_file; // exit_player(MSGTR_Exit_error); // ERROR
7058
2e5c07262861 new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents: 7055
diff changeset
1056 inited_flags|=INITED_DEMUXER;
2e5c07262861 new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents: 7055
diff changeset
1057
5175
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
1058 current_module="demux_open2";
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
1059
1660
0ed5a9568d0f file_format -> demuxer->file_format
arpi
parents: 1654
diff changeset
1060 //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
1061
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1062 d_audio=demuxer->audio;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1063 d_video=demuxer->video;
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
1064 d_dvdsub=demuxer->sub;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1065
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1066 // DUMP STREAMS:
6209
e46b3bf16df5 added -dumpsrtsub option for SubRip format
iive
parents: 6204
diff changeset
1067 if((stream_dump_type)&&(stream_dump_type<4)){
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1068 FILE *f;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1069 demux_stream_t *ds=NULL;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1070 current_module="dump";
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1071 // select stream to dump
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1072 switch(stream_dump_type){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1073 case 1: ds=d_audio;break;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1074 case 2: ds=d_video;break;
4335
270cbfe45b30 mpsub dump bug fix. 100l for laaz
pontscho
parents: 4274
diff changeset
1075 case 3: ds=d_dvdsub;break;
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 if(!ds){
7805
f71bc57c4da9 Fixed two typos noticed by Sycotic Smith (I think).
diego
parents: 7790
diff changeset
1078 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpSelectedStreamMissing);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1079 exit_player(MSGTR_Exit_error);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1080 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1081 // disable other streams:
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1082 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
1083 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
1084 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
1085 // let's dump it!
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1086 f=fopen(stream_dump_name,"wb");
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1087 if(!f){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1088 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1089 exit_player(MSGTR_Exit_error);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1090 }
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1091 while(!ds->eof){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1092 unsigned char* start;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1093 int in_size=ds_get_packet(ds,&start);
2102
569a5d7b5d8a mov timing fixes (same way as asf)
arpi
parents: 2042
diff changeset
1094 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
1095 && stream_dump_type==2) fwrite(&in_size,1,4,f);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1096 if(in_size>0) fwrite(start,in_size,1,f);
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1097 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1098 fclose(f);
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1099 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1100 exit_player(MSGTR_Exit_eof);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1101 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1102
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1103 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
1104 sh_video=d_video->sh;
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
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 if(sh_video){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1107
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1108 current_module="video_read_properties";
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1109 if(!video_read_properties(sh_video)) {
7805
f71bc57c4da9 Fixed two typos noticed by Sycotic Smith (I think).
diego
parents: 7790
diff changeset
1110 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotReadVideoProperties);
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1111 sh_video=d_video->sh=NULL;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1112 } else {
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6135
diff changeset
1113 mp_msg(MSGT_CPLAYER,MSGL_V,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n",
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1114 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
1115 sh_video->fps,sh_video->frametime
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1116 );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1117
4598
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1118 /* 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
1119 if(force_fps){
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1120 sh_video->fps=force_fps;
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1121 sh_video->frametime=1.0f/sh_video->fps;
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1122 }
7562
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
1123 vo_fps = sh_video->fps;
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
1124 #ifdef X11_FULLSCREEN
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
1125 vo_mouse_timer_const=(int)sh_video->fps;
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
1126 #endif
4598
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1127
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1128 if(!sh_video->fps && !force_fps){
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1129 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
1130 sh_video=d_video->sh=NULL;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1131 }
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1132 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1133
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1134 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1135
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1136 fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1137
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1138 if(!sh_video && !sh_audio){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
1139 mp_msg(MSGT_CPLAYER,MSGL_FATAL, MSGTR_NoStreamFound);
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1140 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
1141 }
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1142
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1143 /* display clip info */
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1144 demux_info_print(demuxer);
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1145
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1146 //================== Read SUBTITLES (DVD & TEXT) ==========================
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1147 if(d_dvdsub->id >= 0 && vo_spudec==NULL && sh_video){
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1148
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5380
diff changeset
1149 if (spudec_ifo) {
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5380
diff changeset
1150 unsigned int palette[16], width, height;
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1151 current_module="spudec_init_vobsub";
6674
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6627
diff changeset
1152 if (vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1, -1, NULL) >= 0)
7790
kmkaplan
parents: 7780
diff changeset
1153 vo_spudec=spudec_new_scaled(palette, width, height);
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5380
diff changeset
1154 }
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5380
diff changeset
1155
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1156 #ifdef USE_DVDNAV
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1157 if (vo_spudec==NULL && stream->type==STREAMTYPE_DVDNAV) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1158 current_module="spudec_init_dvdnav";
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1159 vo_spudec=spudec_new_scaled(dvdnav_stream_get_palette((dvdnav_priv_t*)(stream->priv)),
4087
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1160 sh_video->disp_w, sh_video->disp_h);
5411
6918c74caa4d 1 step closed to solving memory corruptions
arpi
parents: 5410
diff changeset
1161 }
6918c74caa4d 1 step closed to solving memory corruptions
arpi
parents: 5410
diff changeset
1162 #endif
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1163
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1164 #ifdef USE_DVDREAD
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1165 if (vo_spudec==NULL && stream->type==STREAMTYPE_DVD) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1166 current_module="spudec_init_dvdread";
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1167 vo_spudec=spudec_new_scaled(((dvd_priv_t *)(stream->priv))->cur_pgc->palette,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1168 sh_video->disp_w, sh_video->disp_h);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1169 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1170 #endif
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1171
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1172 if (vo_spudec==NULL) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1173 current_module="spudec_init_normal";
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1174 vo_spudec=spudec_new_scaled(NULL, sh_video->disp_w, sh_video->disp_h);
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1175 spudec_set_font_factor(vo_spudec,font_factor);
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1176 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1177
4087
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1178 if (vo_spudec!=NULL)
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1179 inited_flags|=INITED_SPUDEC;
4274
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
1180
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1181 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1182
4052
505f206d80d1 corrections to adjust_subs_time function which now uses fps if needed
atlka
parents: 4045
diff changeset
1183 #ifdef USE_SUB
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1184 if(sh_video) {
4064
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1185 // 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
1186 // 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
1187 // check .sub
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1188 current_module="read_subtitles_file";
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1189 if(sub_name){
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1190 subtitles=sub_read_file(sub_name, sh_video->fps);
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1191 if(!subtitles) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name);
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1192 } else
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1193 if(sub_auto) { // auto load sub file ...
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1194 subtitles=sub_read_file( filename ? sub_filename( get_path("sub/"), filename )
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
1195 : "default.sub", sh_video->fps );
4064
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1196 }
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1197 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
1198 if(subtitles && stream_dump_type==4) dump_mpsub(subtitles, sh_video->fps);
6792
0d08931fb3c3 Correct dump_srt millisecond output
kmkaplan
parents: 6786
diff changeset
1199 if(subtitles && stream_dump_type==6) dump_srt(subtitles, sh_video->fps);
7460
fdf31bb0450f New option for mplayer: -dumpmicrodvdsub
kmkaplan
parents: 7451
diff changeset
1200 if(subtitles && stream_dump_type==7) dump_microdvd(subtitles, sh_video->fps);
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1201 }
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1202 #endif
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1203
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1204 //================== Init AUDIO (codec) ==========================
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1205 if(sh_audio){
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1206 // Go through the codec.conf and find the best codec...
7502
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
1207 current_module="init_audio_codec";
7202
b414c2e34b2e removed buggy fd<0 check for disallowing dumpstream/cache
arpi
parents: 7201
diff changeset
1208 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
7522
aa1a1249f239 -ac/-afm rewrite, now works the same way as -vc/-vfm
arpi
parents: 7517
diff changeset
1209 if(!init_best_audio_codec(sh_audio,audio_codec_list,audio_fm_list)){
7502
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
1210 sh_audio=d_audio->sh=NULL; // failed to init :(
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
1211 } else
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
1212 inited_flags|=INITED_ACODEC;
7502
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
1213 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1214 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1215
7864
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1216 if(identify) {
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1217 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_FILENAME=%s\n", filename);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1218 if (sh_video) {
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1219 /* Assume FOURCC if all bytes >= 0x20 (' ') */
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1220 if (sh_video->format >= 0x20202020)
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1221 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_FORMAT=%.4s\n", &sh_video->format);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1222 else
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1223 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_FORMAT=%d\n", sh_video->format);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1224 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_BITRATE=%d\n", sh_video->i_bps*8);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1225 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_WIDTH=%d\n", sh_video->disp_w);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1226 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_HEIGHT=%d\n", sh_video->disp_h);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1227 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_FPS=%5.3f\n", sh_video->fps);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1228 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_ASPECT=%1.2f\n", sh_video->aspect);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1229 }
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1230 if (sh_audio) {
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1231 if (sh_audio->codec)
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1232 mp_msg(MSGT_GLOBAL,MSGL_INFO, "ID_AUDIO_CODEC=%s\n", sh_audio->codec->name);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1233 /* Assume FOURCC if all bytes >= 0x20 (' ') */
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1234 if (sh_audio->format >= 0x20202020)
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1235 mp_msg(MSGT_GLOBAL,MSGL_INFO, "ID_AUDIO_FORMAT=%.4s\n", &sh_audio->format);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1236 else
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1237 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_FORMAT=%d\n", sh_audio->format);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1238 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_BITRATE=%d\n", sh_audio->i_bps*8);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1239 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_RATE=%d\n", sh_audio->samplerate);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1240 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_NCH=%d\n", sh_audio->channels);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1241 }
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8198
diff changeset
1242 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_LENGTH=%ld\n", demuxer_get_time_length(demuxer));
7864
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1243 goto goto_next_file;
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1244 }
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1245
7502
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
1246 if(!sh_video) goto main; // audio-only
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1247
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1248 //================== Init VIDEO (codec & libvo) ==========================
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
1249 if(!fixed_vo || !(inited_flags&INITED_VO)){
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
1250 current_module="preinit_libvo";
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
1251
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
1252 vo_config_count=0;
7562
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
1253 //if((video_out->preinit(vo_subdevice))!=0){
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
1254 if(!(video_out=init_best_video_out(video_driver_list))){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
1255 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorInitializingVODevice);
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
1256 goto goto_next_file; // exit_player(MSGTR_Exit_error);
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
1257 }
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
1258 sh_video->video_out=video_out;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
1259 inited_flags|=INITED_VO;
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
1260 }
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
1261
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents: 5489
diff changeset
1262 current_module="init_video_filters";
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents: 5489
diff changeset
1263
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
1264 sh_video->vfilter=(void*)vf_open_filter(NULL,"vo",video_out);
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1265 #ifdef HAVE_MENU
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1266 if(use_menu) {
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1267 vf_menu = vf_open_plugin(libmenu_vfs,sh_video->vfilter,"menu",menu_root);
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1268 if(!vf_menu) {
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1269 mp_msg(MSGT_CPLAYER,MSGL_ERR,"Can't open libmenu video filter with root menu %s\n",menu_root);
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1270 use_menu = 0;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1271 }
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1272 }
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1273 if(vf_menu)
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1274 sh_video->vfilter=(void*)append_filters(vf_menu);
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1275 else
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1276 #endif
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
1277 sh_video->vfilter=(void*)append_filters(sh_video->vfilter);
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents: 5489
diff changeset
1278
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
1279 current_module="init_video_codec";
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1280
5175
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
1281 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
1282 init_best_video_codec(sh_video,video_codec_list,video_fm_list);
7502
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
1283 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
5175
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
1284
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
1285 if(!sh_video->inited){
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
1286 if(!fixed_vo) uninit_player(INITED_VO);
5175
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
1287 if(!sh_audio) goto goto_next_file;
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
1288 sh_video = d_video->sh = NULL;
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
1289 goto main; // exit_player(MSGTR_Exit_error);
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
1290 }
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
1291
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
1292 inited_flags|=INITED_VCODEC;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
1293
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1294 if(auto_quality>0){
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1295 // Auto quality option enabled
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1296 output_quality=get_video_quality_max(sh_video);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1297 if(auto_quality>output_quality) auto_quality=output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1298 else output_quality=auto_quality;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1299 mp_msg(MSGT_CPLAYER,MSGL_V,"AutoQ: setting quality to %d\n",output_quality);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1300 set_video_quality(sh_video,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1301 }
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1302
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1303 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1304
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
1305 current_module="init_vo";
6786
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
1306 if (sh_video)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
1307 {
7517
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
1308 if (vo_gamma_gamma != 1000)
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
1309 set_video_colors (sh_video, "gamma", vo_gamma_gamma);
6786
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
1310 if (vo_gamma_brightness != 1000)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
1311 set_video_colors(sh_video, "brightness", vo_gamma_brightness);
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
1312 if (vo_gamma_contrast != 1000)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
1313 set_video_colors(sh_video, "contrast", vo_gamma_contrast);
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
1314 if (vo_gamma_saturation != 1000)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
1315 set_video_colors(sh_video, "saturation", vo_gamma_saturation);
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
1316 if (vo_gamma_hue != 1000)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
1317 set_video_colors(sh_video, "hue", vo_gamma_hue);
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
1318 }
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
1319
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1320 if(vo_flags & 0x08 && vo_spudec)
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1321 spudec_set_hw_spu(vo_spudec,video_out);
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1322
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
1323 #ifdef HAVE_FREETYPE
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
1324 force_load_font = 1;
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
1325 #endif
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
1326
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1327 //================== MAIN: ==========================
7502
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
1328 main:
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
1329 current_module="main";
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
1330
7516
657041b7236b when working through a mixed play tree with audi-only files and video files
arpi
parents: 7506
diff changeset
1331 // If there is no video OSD has to be disabled.
657041b7236b when working through a mixed play tree with audi-only files and video files
arpi
parents: 7506
diff changeset
1332 // In case of playing a playtree we have to restore the
657041b7236b when working through a mixed play tree with audi-only files and video files
arpi
parents: 7506
diff changeset
1333 // old OSD level after playing one or more audio-only files.
657041b7236b when working through a mixed play tree with audi-only files and video files
arpi
parents: 7506
diff changeset
1334 if(!sh_video && osd_level > 0) { // save OSD level only once
657041b7236b when working through a mixed play tree with audi-only files and video files
arpi
parents: 7506
diff changeset
1335 osd_level_saved = osd_level;
657041b7236b when working through a mixed play tree with audi-only files and video files
arpi
parents: 7506
diff changeset
1336 osd_level = 0;
657041b7236b when working through a mixed play tree with audi-only files and video files
arpi
parents: 7506
diff changeset
1337 } else if (osd_level_saved > -1) { // if there is a saved OSD level, restore it
657041b7236b when working through a mixed play tree with audi-only files and video files
arpi
parents: 7506
diff changeset
1338 osd_level = osd_level_saved;
657041b7236b when working through a mixed play tree with audi-only files and video files
arpi
parents: 7506
diff changeset
1339 osd_level_saved = -1;
657041b7236b when working through a mixed play tree with audi-only files and video files
arpi
parents: 7506
diff changeset
1340 }
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1341
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
1342 fflush(stdout);
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1343
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
1344 #ifdef HAVE_NEW_GUI
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
1345 if ( use_gui )
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
1346 {
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
1347 guiGetEvent( guiSetStream,(char *)stream );
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
1348 guiGetEvent( guiSetFileName,filename );
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
1349 if ( sh_audio ) guiIntfStruct.AudioType=sh_audio->channels; else guiIntfStruct.AudioType=0;
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
1350 if ( !sh_video && sh_audio ) guiGetEvent( guiSetAudioOnly,(char *)1 ); else guiGetEvent( guiSetAudioOnly,(char *)0 );
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6971
diff changeset
1351 guiGetEvent( guiSetFileFormat,(char *)demuxer->file_format );
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6971
diff changeset
1352 if ( guiGetEvent( guiSetValues,(char *)sh_video ) ) goto goto_next_file;
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
1353 }
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
1354 #endif
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
1355
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
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
1400
2bf9c561b01d stage2 step 1
arpi
parents: 1382
diff changeset
1360 //float num_frames=0; // number of frames played
1382
9e8781a3eefc grab.mpg fixed
arpi
parents: 1375
diff changeset
1361 int grab_frames=0;
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
1362 char osd_text_buffer[64];
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1363 int drop_frame=0; // current dropping status
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1364 int dropped_frames=0; // how many frames dropped since last non-dropped frame
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1365 int too_slow_frame_cnt=0;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1366 int too_fast_frame_cnt=0;
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1367 // 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
1368 float AV_delay=0; // average of A-V timestamp differences
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1369 double vdecode_time;
6028
bd016664dc18 UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents: 6016
diff changeset
1370 unsigned int lastframeout_ts=0;
8254
772d6d27fd66 warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents: 8208
diff changeset
1371 /*float time_frame_corr_avg=0;*/ /* unused */
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1372
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1373 float next_frame_time=0;
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1374 int frame_time_remaining=0; // flag
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1375 int blit_frame=0;
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1376
6028
bd016664dc18 UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents: 6016
diff changeset
1377 osd_text_buffer[0]=0;
bd016664dc18 UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents: 6016
diff changeset
1378
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1379 //================ SETUP AUDIO ==========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1380
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1381 if(sh_audio){
7563
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1382 //const ao_info_t *info=audio_out->info;
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1383 current_module="ao2_init";
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1384 if(!(audio_out=init_best_audio_out(audio_driver_list,
7731
1f8961f2b34c compiler warning fixes
arpi
parents: 7677
diff changeset
1385 (ao_plugin_cfg.plugin_list!=NULL), // plugin flag
7605
c3bbe602aff3 new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents: 7604
diff changeset
1386 force_srate?force_srate:sh_audio->samplerate*playback_speed,
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1387 audio_output_channels?audio_output_channels:
7614
ce6a938aa6d3 Adding -format and -af switches
anders
parents: 7605
diff changeset
1388 sh_audio->channels,audio_output_format?audio_output_format:
ce6a938aa6d3 Adding -format and -af switches
anders
parents: 7605
diff changeset
1389 sh_audio->sample_format,0))){
7563
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1390 // FAILED:
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1391 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO);
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
1392 uninit_player(INITED_ACODEC); // close codec
7563
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1393 sh_audio=d_audio->sh=NULL; // -> nosound
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1394 } else {
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1395 // SUCCESS:
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1396 inited_flags|=INITED_AO;
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1397 mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %dHz %dch %s\n",
7563
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1398 audio_out->info->short_name,
7605
c3bbe602aff3 new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents: 7604
diff changeset
1399 force_srate?force_srate:((int)(sh_audio->samplerate*playback_speed)),
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6135
diff changeset
1400 sh_audio->channels,
7563
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1401 audio_out_format_name(sh_audio->sample_format));
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1402 mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_AODescription_AOAuthor,
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1403 audio_out->info->name, audio_out->info->author);
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1404 if(strlen(audio_out->info->comment) > 0)
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1405 mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_AOComment, audio_out->info->comment);
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1406 // init audio filters:
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1407 #if 1
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1408 current_module="af_init";
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1409 if(!init_audio_filters(sh_audio,
7605
c3bbe602aff3 new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents: 7604
diff changeset
1410 (int)(sh_audio->samplerate*playback_speed),
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1411 sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize,
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1412 ao_data.samplerate, ao_data.channels, ao_data.format,
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1413 audio_out_format_bits(ao_data.format)/8, /* ao_data.bps, */
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1414 ao_data.outburst*4, ao_data.buffersize)){
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
1415 mp_msg(MSGT_CPLAYER,MSGL_ERR,"Couldn't find matching filter / ao format!\n");
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
1416 // uninit_player(INITED_ACODEC|INITED_AO); // close codec & ao
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
1417 // sh_audio=d_audio->sh=NULL; // -> nosound
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1418 }
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1419 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1420 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1421 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1422
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1423 current_module="av_init";
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1424
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1425 if(sh_video) sh_video->timer=0;
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
1426 if(sh_audio) sh_audio->delay=-audio_delay;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1427
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1428 if(!sh_audio){
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1962
diff changeset
1429 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_NoSound);
8027
b9da278e4c92 verbose can be negative
arpi
parents: 8023
diff changeset
1430 mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused audio chunks\n",d_audio->packs);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1431 ds_free_packs(d_audio); // free buffered chunks
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1432 d_audio->id=-2; // do not read audio chunks
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
1433 //uninit_player(INITED_AO); // close device
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1434 }
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1435 if(!sh_video){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
1436 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Video_NoVideo);
8027
b9da278e4c92 verbose can be negative
arpi
parents: 8023
diff changeset
1437 mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused video chunks\n",d_video->packs);
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1438 ds_free_packs(d_video);
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1439 d_video->id=-2;
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
1440 //if(!fixed_vo) uninit_player(INITED_VO);
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1441 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1442
6185
7e769ea2acc7 jump to next file (or exit) if can't decode audio && video
alex
parents: 6183
diff changeset
1443 if (!sh_video && !sh_audio)
7e769ea2acc7 jump to next file (or exit) if can't decode audio && video
alex
parents: 6183
diff changeset
1444 goto goto_next_file;
7e769ea2acc7 jump to next file (or exit) if can't decode audio && video
alex
parents: 6183
diff changeset
1445
8030
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
1446 //if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf!
7923
bad21f499a9e avoids segfaults w.r.t to mp3 files handling:
pl
parents: 7906
diff changeset
1447 if(force_fps && sh_video){
4598
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1448 vo_fps = sh_video->fps=force_fps;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1449 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
1450 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
1451 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1452
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1453 //==================== START PLAYING =======================
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1454
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1455 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_StartPlaying);fflush(stdout);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1456
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1457 InitTimer();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1458
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1459 #ifdef USE_DVDNAV
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1460 if (dvd_nav && stream->type==STREAMTYPE_DVDNAV) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1461 dvdnav_stream_fullstart((dvdnav_priv_t *)stream->priv);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1462 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1463 #endif
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1464
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
1465 total_time_usage_start=GetTimer();
3934
e8e7ca8995a1 codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents: 3843
diff changeset
1466 audio_time_usage=0; video_time_usage=0; vout_time_usage=0;
6585
eb10ce6b3f18 multifile (informal output) fix by Balazs Tibor (tibcu)
alex
parents: 6545
diff changeset
1467 total_frame_cnt=0; drop_frame_cnt=0; // fix for multifile fps benchmark
6590
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
1468 play_n_frames=play_n_frames_mf;
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
1469
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
1470 if(play_n_frames==0){
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
1471 eof=PT_NEXT_ENTRY; goto goto_next_file;
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
1472 }
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
1473
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1474 while(!eof){
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1475 float aq_sleep_time=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1476
1125
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
1477 if(play_n_frames>=0){
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
1478 --play_n_frames;
6954
8e991cd2e727 10l bug, noticed by Alexander Neundorf <neundorf@dellingsoft.de>
arpi
parents: 6940
diff changeset
1479 if(play_n_frames<0) eof = PT_NEXT_ENTRY;
1125
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
1480 }
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
1481
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1482 /*========================== PLAY AUDIO ============================*/
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1483
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1484 while(sh_audio){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1485 unsigned int t;
4834
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
1486 double tt;
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1487 int playsize;
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1488
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1489 current_module="play_audio";
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1490
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
1491 ao_data.pts=((sh_video?sh_video->timer:0)+sh_audio->delay)*90000.0;
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1492 playsize=audio_out->get_space();
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1493
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1494 // handle audio-only case:
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1495 if(!playsize && !sh_video) { // buffer is full, do not block here!!!
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1496 usec_sleep(10000); // Wait a tick before retry
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1497 continue;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1498 }
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1499
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1500 if(playsize>MAX_OUTBURST) playsize=MAX_OUTBURST; // we shouldn't exceed it!
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1501
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1502 // Fill buffer if needed:
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1503 current_module="decode_audio"; // Enter AUDIO decoder module
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1504 t=GetTimer();
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1505 while(sh_audio->a_out_buffer_len<playsize && !d_audio->eof){
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1506 int ret=decode_audio(sh_audio,&sh_audio->a_out_buffer[sh_audio->a_out_buffer_len],
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1507 playsize-sh_audio->a_out_buffer_len,sh_audio->a_out_buffer_size-sh_audio->a_out_buffer_len);
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1508 if(ret<=0) break; // EOF?
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1509 sh_audio->a_out_buffer_len+=ret;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1510 }
4834
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
1511 t=GetTimer()-t;
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1512 tt = t*0.000001f; audio_time_usage+=tt;
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1513 if(playsize>sh_audio->a_out_buffer_len) playsize=sh_audio->a_out_buffer_len;
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1514
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1515 // play audio:
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1516 current_module="play_audio";
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1517 playsize=audio_out->play(sh_audio->a_out_buffer,playsize,0);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1518
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1519 if(playsize>0){
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1520 sh_audio->a_out_buffer_len-=playsize;
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1521 memmove(sh_audio->a_out_buffer,&sh_audio->a_out_buffer[playsize],sh_audio->a_out_buffer_len);
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
1522 sh_audio->delay+=playback_speed*playsize/((float)((ao_data.bps && sh_audio->afilter) ?
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1523 ao_data.bps : sh_audio->o_bps));
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1524 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1525
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1526 break;
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1527 } // while(sh_audio)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1528
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1529 if(!sh_video) {
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1530 // handle audio-only case:
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1531 if(!quiet) mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A:%6.1f %4.1f%% %d%% \r"
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
1532 ,sh_audio->delay-audio_out->get_delay()
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
1533 ,(sh_audio->delay>0.5)?100.0*audio_time_usage/(double)sh_audio->delay:0
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1534 ,cache_fill_status
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1535 );
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1536 if(d_audio->eof) eof = PT_NEXT_ENTRY;
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1537
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1538 } else {
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1539
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1540 /*========================== PLAY VIDEO ============================*/
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1541
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1542 float frame_time=next_frame_time;
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1543
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1544 vo_pts=sh_video->timer*90000.0;
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1545 vo_fps=sh_video->fps;
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1546
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1547 if(!frame_time_remaining){
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1548 //-------------------- Decode a frame: -----------------------
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1549 vdecode_time=video_time_usage;
5698
cb47abf3b511 Fix loop playback. Main loop was quited on end of video.
albeu
parents: 5681
diff changeset
1550 while(1)
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1551 { unsigned char* start=NULL;
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1552 int in_size;
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1553 // get it!
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1554 current_module="video_read_frame";
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1555 in_size=video_read_frame(sh_video,&next_frame_time,&start,force_fps);
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1556 if(in_size<0){ eof=1; break; }
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1557 if(in_size>max_framesize) max_framesize=in_size; // stats
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1558 sh_video->timer+=frame_time;
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
1559 if(sh_audio) sh_audio->delay-=frame_time;
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1560 time_frame+=frame_time; // for nosound
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1561 // check for frame-drop:
5643
3d9de27d9bd0 OSD handled by vf control()
arpi
parents: 5640
diff changeset
1562 current_module="check_framedrop";
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1563 if(sh_audio && !d_audio->eof){
7605
c3bbe602aff3 new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents: 7604
diff changeset
1564 float delay=playback_speed*audio_out->get_delay();
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
1565 float d=delay-sh_audio->delay;
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1566 // we should avoid dropping to many frames in sequence unless we
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1567 // are too late. and we allow 100ms A-V delay here:
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1568 if(d<-dropped_frames*frame_time-0.100){
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1569 drop_frame=frame_dropping;
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1570 ++drop_frame_cnt;
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1571 ++dropped_frames;
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1572 } else {
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1573 drop_frame=dropped_frames=0;
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1574 }
5621
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
1575 ++total_frame_cnt;
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1576 }
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1577 // decode:
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1578 current_module="decode_video";
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1579 // printf("Decode! %p %d \n",start,in_size);
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents: 5489
diff changeset
1580 blit_frame=decode_video(sh_video,start,in_size,drop_frame);
5698
cb47abf3b511 Fix loop playback. Main loop was quited on end of video.
albeu
parents: 5681
diff changeset
1581 break;
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1582 }
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1583 vdecode_time=video_time_usage-vdecode_time;
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1584 //------------------------ frame decoded. --------------------
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1585
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1586 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"*** ftime=%5.3f ***\n",frame_time);
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1587
5927
cffef9cc01bb catching vo/vf init failure
arpi
parents: 5910
diff changeset
1588 if(sh_video->vf_inited<0){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
1589 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_NotInitializeVOPorVO);
5927
cffef9cc01bb catching vo/vf init failure
arpi
parents: 5910
diff changeset
1590 eof=1; goto goto_next_file;
cffef9cc01bb catching vo/vf init failure
arpi
parents: 5910
diff changeset
1591 }
cffef9cc01bb catching vo/vf init failure
arpi
parents: 5910
diff changeset
1592
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1593 }
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1594
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1595 // ==========================================================================
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1596
5643
3d9de27d9bd0 OSD handled by vf control()
arpi
parents: 5640
diff changeset
1597 // current_module="draw_osd";
3d9de27d9bd0 OSD handled by vf control()
arpi
parents: 5640
diff changeset
1598 // if(vo_config_count) video_out->draw_osd();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1599
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1600 #ifdef HAVE_NEW_GUI
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1601 if(use_gui) guiEventHandling();
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1602 #endif
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1603
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1604 current_module="calc_sleep_time";
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1605
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1606 #if 0
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1607 { // debug frame dropping code
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1608 float delay=audio_out->get_delay();
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1609 mp_msg(MSGT_AVSYNC,MSGL_V,"\r[V] %5.3f [A] %5.3f => {%5.3f} (%5.3f) [%d] \n",
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1610 sh_video->timer,sh_audio->timer-delay,
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1611 sh_video->timer-(sh_audio->timer-delay),
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1612 delay,drop_frame);
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1613 }
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1614 #endif
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1615
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1616 if(drop_frame && !frame_time_remaining && !autosync){
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1617 /*
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1618 * Note: time_frame should not be forced to 0 in autosync mode.
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1619 * It is used as a cumulative counter to predict and correct the
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1620 * delay measurements from the audio driver. time_frame is already
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1621 * < 0, so the "time to sleep" code does not actually sleep. Also,
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1622 * blit_frame is already 0 because drop_frame was true when
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1623 * decode_video was called (which causes it to set blit_frame to 0.)
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1624 * When autosync==0, the default behavior is still completely unchanged.
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1625 */
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1626
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1627 time_frame=0; // don't sleep!
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1628 blit_frame=0; // don't display!
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1629
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1630 } else {
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1631
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1632 // It's time to sleep...
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1633
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1634 frame_time_remaining=0;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1635 time_frame-=GetRelativeTime(); // reset timer
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1636
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1637 if(sh_audio && !d_audio->eof){
7605
c3bbe602aff3 new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents: 7604
diff changeset
1638 float delay=playback_speed*audio_out->get_delay();
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1639 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
1640
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1641 if (autosync){
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1642 /*
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1643 * Adjust this raw delay value by calculating the expected
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1644 * delay for this frame and generating a new value which is
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1645 * weighted between the two. The higher autosync is, the
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1646 * closer to the delay value gets to that which "-nosound"
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1647 * would have used, and the longer it will take for A/V
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1648 * sync to settle at the right value (but it eventually will.)
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1649 * This settling time is very short for values below 100.
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1650 */
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
1651 float predicted = sh_audio->delay+time_frame;
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1652 float difference = delay - predicted;
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1653 delay = predicted + difference / (float)autosync;
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1654 }
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1655
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
1656 time_frame=delay-sh_audio->delay;
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1657
7495
12b2c735ad07 removed -dapsync (obsolete code)
arpi
parents: 7494
diff changeset
1658 // delay = amount of audio buffered in soundcard/driver
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1659 if(delay>0.25) delay=0.25; else
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1660 if(delay<0.10) delay=0.10;
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1661 if(time_frame>delay*0.6){
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1662 // sleep time too big - may cause audio drops (buffer underrun)
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1663 frame_time_remaining=1;
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1664 time_frame=delay*0.5;
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1665 }
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1666
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1667 } else {
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1668
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1669 // NOSOUND:
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
1670 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
1671 time_frame=0;
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
1672
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1673 }
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1674
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1675 // 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
1676
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1677 aq_sleep_time+=time_frame;
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1678
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1679 } // !drop_frame
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1680
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1681 //============================== SLEEP: ===================================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1682
8068
a9e2956905e6 scale sleep time too (-speed)
arpi
parents: 8056
diff changeset
1683 time_frame/=playback_speed;
a9e2956905e6 scale sleep time too (-speed)
arpi
parents: 8056
diff changeset
1684
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1685 // flag 256 means: libvo driver does its timing (dvb card)
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1686 if(time_frame>0.001 && !(vo_flags&256)){
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1687
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
1688 #ifdef HAVE_RTC
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1689 if(rtc_fd>=0){
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1690 // -------- RTC -----------
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1691 current_module="sleep_rtc";
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1692 while (time_frame > 0.000) {
7494
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
1693 unsigned long rtc_ts;
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1694 if (read (rtc_fd, &rtc_ts, sizeof(rtc_ts)) <= 0)
5112
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
1695 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Linux RTC read error: %s\n", strerror(errno));
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1696 time_frame-=GetRelativeTime();
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1697 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1698 } else
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1699 #endif
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1700 {
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1701 // -------- USLEEP + SOFTSLEEP -----------
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1702 float min=softsleep?0.021:0.005;
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1703 current_module="sleep_usleep";
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1704 while(time_frame>min){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1705 if(time_frame<=0.020)
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1706 usec_sleep(0); // sleeps 1 clock tick (10ms)!
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1707 else
2757
b8b92c4afa22 fixed usleep() - 10l?
arpi
parents: 2705
diff changeset
1708 usec_sleep(1000000*(time_frame-0.020));
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1709 time_frame-=GetRelativeTime();
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1710 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1711 if(softsleep){
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1712 current_module="sleep_soft";
5112
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
1713 if(time_frame<0) mp_msg(MSGT_AVSYNC, MSGL_WARN, "Warning! Softsleep underflow!\n");
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1714 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
1715 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1716 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1717
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1718 }
117
b21b7c2fa180 common vo->flip_page() call
arpi_esp
parents: 112
diff changeset
1719
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1720 //if(!frame_time_remaining){ // should we display the frame now?
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1721
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1722 //====================== FLIP PAGE (VIDEO BLT): =========================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1723
6123
d5606e4d0280 module name fixed for vo check_events
arpi
parents: 6112
diff changeset
1724 current_module="vo_check_events";
d5606e4d0280 module name fixed for vo check_events
arpi
parents: 6112
diff changeset
1725 if(vo_config_count) video_out->check_events();
d5606e4d0280 module name fixed for vo check_events
arpi
parents: 6112
diff changeset
1726
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1727 current_module="flip_page";
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1728 if(blit_frame && !frame_time_remaining){
1962
a0bd07b10667 fixed VO time usage (now including page-flip)
arpi
parents: 1953
diff changeset
1729 unsigned int t2=GetTimer();
4838
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
1730 double tt;
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1731 float j;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1732 #define FRAME_LAG_WARN 0.2
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1733 j = ((float)t2 - lastframeout_ts) / 1000000;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1734 lastframeout_ts = GetTimer();
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1735 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
1736 too_fast_frame_cnt++;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1737 /* printf ("PANIC: too fast frame (%.3f)!\n", j); */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1738 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
1739 too_slow_frame_cnt++;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1740 /* printf ("PANIC: too slow frame (%.3f)!\n", j); */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1741
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
1742 if(vo_config_count) video_out->flip_page();
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1743 // usec_sleep(50000); // test only!
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;
1962
a0bd07b10667 fixed VO time usage (now including page-flip)
arpi
parents: 1953
diff changeset
1747 }
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1748
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1749 //====================== A-V TIMESTAMP CORRECTION: =========================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1750
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1751 current_module="av_sync";
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1752
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1753 if(sh_audio){
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1754 float a_pts=0;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1755 float v_pts=0;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1756
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1757 // unplayed bytes in our and soundcard/dma buffer:
7605
c3bbe602aff3 new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents: 7604
diff changeset
1758 float delay=playback_speed*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
1759
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1760 if (autosync){
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1761 /*
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1762 * If autosync is enabled, the value for delay must be calculated
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1763 * a bit differently. It is set only to the difference between
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1764 * the audio and video timers. Any attempt to include the real
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1765 * or corrected delay causes the pts_correction code below to
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1766 * try to correct for the changes in delay which autosync is
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1767 * trying to measure. This keeps the two from competing, but still
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1768 * allows the code to correct for PTS drift *only*. (Using a delay
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1769 * value here, even a "corrected" one, would be incompatible with
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1770 * autosync mode.)
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1771 */
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
1772 delay=sh_audio->delay;
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1773 delay+=(float)sh_audio->a_buffer_len/(float)sh_audio->o_bps;
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1774 }
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
1775
8030
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
1776 #if 0
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1777 if(pts_from_bps){
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1778 // PTS = sample_no / samplerate
7735
197cee6aa59e always use rounded-up blocksize for .avi files (fixes Firestarter.mpg.avi)
arpi
parents: 7731
diff changeset
1779 unsigned int samples=
197cee6aa59e always use rounded-up blocksize for .avi files (fixes Firestarter.mpg.avi)
arpi
parents: 7731
diff changeset
1780 // (sh_audio->audio.dwSampleSize)?
197cee6aa59e always use rounded-up blocksize for .avi files (fixes Firestarter.mpg.avi)
arpi
parents: 7731
diff changeset
1781 // ((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) :
7749
48bf03297d48 more accurate a_pts calculation in AVI -bps (default) mode
arpi
parents: 7735
diff changeset
1782 ds_tell_block(d_audio); // <- used for VBR audio
3302
e75454b489df using audio.dwStart too... (for baittest.avi)
arpi
parents: 3274
diff changeset
1783 samples+=sh_audio->audio.dwStart; // offset
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1784 a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate;
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1785 delay_corrected=1;
7749
48bf03297d48 more accurate a_pts calculation in AVI -bps (default) mode
arpi
parents: 7735
diff changeset
1786 a_pts-=(sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
8030
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
1787 } else
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
1788 #endif
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
1789 {
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1790 // 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
1791 a_pts=d_audio->pts;
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1792 if(!delay_corrected) if(a_pts) delay_corrected=1;
6429
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
1793 #if 0
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
1794 printf("\n#X# pts=%5.3f ds_pts=%5.3f buff=%5.3f total=%5.3f\n",
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
1795 a_pts,
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
1796 ds_tell_pts(d_audio)/(float)sh_audio->i_bps,
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
1797 -sh_audio->a_in_buffer_len/(float)sh_audio->i_bps,
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
1798 a_pts+(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps);
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
1799 #endif
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1800 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1801 }
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1802 v_pts=d_video->pts;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1803
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1804 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
1805
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1806 if(delay_corrected){
6173
020bfd8ac9ef - put back SystemTooSlow message
arpi
parents: 6138
diff changeset
1807 static int drop_message=0;
1478
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
1808 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
1809 AV_delay=(a_pts-delay-audio_delay)-v_pts;
6173
020bfd8ac9ef - put back SystemTooSlow message
arpi
parents: 6138
diff changeset
1810 if(drop_frame_cnt>50+drop_message*250 && AV_delay>0.5){
020bfd8ac9ef - put back SystemTooSlow message
arpi
parents: 6138
diff changeset
1811 ++drop_message;
7205
9d11474c39af WARNING message gui windows disabled, the only critical warn message (too
arpi
parents: 7204
diff changeset
1812 mp_msg(MSGT_AVSYNC,MSGL_ERR,MSGTR_SystemTooSlow);
6173
020bfd8ac9ef - put back SystemTooSlow message
arpi
parents: 6138
diff changeset
1813 }
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 x=AV_delay*0.1f;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1815 if(x<-max_pts_correction) x=-max_pts_correction; else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1816 if(x> max_pts_correction) x= max_pts_correction;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1817 if(default_max_pts_correction>=0)
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1818 max_pts_correction=default_max_pts_correction;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1819 else
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1820 max_pts_correction=sh_video->frametime*0.10; // +-10% of time
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
1821 if(!frame_time_remaining){ sh_audio->delay+=x; c_total+=x;} // correction
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
1822 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
1823 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
1824 (int)sh_video->num_frames,(int)sh_video->num_frames_decoded,
7605
c3bbe602aff3 new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents: 7604
diff changeset
1825 (sh_video->timer>0.5)?(int)(100.0*video_time_usage*playback_speed/(double)sh_video->timer):0,
c3bbe602aff3 new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents: 7604
diff changeset
1826 (sh_video->timer>0.5)?(int)(100.0*vout_time_usage*playback_speed/(double)sh_video->timer):0,
c3bbe602aff3 new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents: 7604
diff changeset
1827 (sh_video->timer>0.5)?(100.0*audio_time_usage*playback_speed/(double)sh_video->timer):0
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1828 ,drop_frame_cnt
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1829 ,output_quality
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
1830 ,cache_fill_status
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1831 );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1832 fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1833 }
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1834
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1835 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1836 // No audio:
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
1837
1448
e795527de16a -quiet option patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents: 1439
diff changeset
1838 if(!quiet)
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
1839 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
1840 (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
1841 (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
1842 (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
1843 (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
1844 ,drop_frame_cnt
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
1845 ,output_quality
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
1846 ,cache_fill_status
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1847 );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1848
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1849 fflush(stdout);
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
1850
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1851 }
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1852
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1853 //============================ Auto QUALITY ============================
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1854
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1855 /*Output quality adjustments:*/
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1856 if(auto_quality>0){
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1857 current_module="autoq";
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
1858 // float total=0.000001f * (GetTimer()-aq_total_time);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1859 // if(output_quality<auto_quality && aq_sleep_time>0.05f*total)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1860 if(output_quality<auto_quality && aq_sleep_time>0)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1861 ++output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1862 else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1863 // if(output_quality>0 && aq_sleep_time<-0.05f*total)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1864 if(output_quality>1 && aq_sleep_time<0)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1865 --output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1866 else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1867 if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1868 output_quality=0;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1869 // 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
1870 set_video_quality(sh_video,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1871 }
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1872
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1873 } // end if(sh_video)
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1874
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1875 //============================ Handle PAUSE ===============================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1876
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1877 current_module="pause";
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1878
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1879 #ifdef USE_OSD
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1880 if(osd_visible){
5638
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
1881 if (!--osd_visible){
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
1882 vo_osd_progbar_type=-1; // disable
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
1883 vo_osd_changed(OSDTYPE_PROGBAR);
1504
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
1884 if (osd_function != OSD_PAUSE)
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
1885 osd_function = OSD_PLAY;
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
1886 }
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1887 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1888 #endif
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1889
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1890 if(osd_function==OSD_PAUSE){
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1891 mp_cmd_t* cmd;
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1892 if(!quiet) {
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
1893 mp_msg(MSGT_CPLAYER,MSGL_STATUS,MSGTR_Paused);
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1894 fflush(stdout);
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1895 }
1793
ba11d77c587a gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents: 1792
diff changeset
1896 #ifdef HAVE_NEW_GUI
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
1897 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
1898 #endif
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
1899 if (video_out && sh_video && vo_config_count)
4754
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4747
diff changeset
1900 video_out->control(VOCTRL_PAUSE, NULL);
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4747
diff changeset
1901
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1902 if (audio_out && sh_audio)
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
1903 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
1904
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1905 while( (cmd = mp_input_get_cmd(20,1)) == NULL) {
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
1906 if(sh_video && video_out && vo_config_count) video_out->check_events();
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1907 #ifdef HAVE_NEW_GUI
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1908 if(use_gui){
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4788
diff changeset
1909 guiEventHandling();
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6590
diff changeset
1910 guiGetEvent( guiReDraw,NULL );
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1911 if(guiIntfStruct.Playing!=2 || (rel_seek_secs || abs_seek_pos)) break;
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1912 }
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1913 #endif
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1914 #ifdef HAVE_MENU
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1915 if(vf_menu)
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1916 vf_menu_pause_update(vf_menu);
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1917 #endif
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1918 usleep(20000);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1919 }
5046
b3bd4b29a03b remove obsoleted function (mplResize)
pontscho
parents: 5015
diff changeset
1920 mp_cmd_free(cmd);
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1921 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
1922 if (audio_out && sh_audio)
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
1923 audio_out->resume(); // resume audio
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
1924 if (video_out && sh_video && vo_config_count)
4754
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4747
diff changeset
1925 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
1926 (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
1927 #ifdef HAVE_NEW_GUI
6183
a4bbda72ce86 fix two small bug and add multimedia keyboard support ( i tested with Acer AirKey V only )
pontscho
parents: 6173
diff changeset
1928 if (use_gui)
a4bbda72ce86 fix two small bug and add multimedia keyboard support ( i tested with Acer AirKey V only )
pontscho
parents: 6173
diff changeset
1929 {
a4bbda72ce86 fix two small bug and add multimedia keyboard support ( i tested with Acer AirKey V only )
pontscho
parents: 6173
diff changeset
1930 if ( guiIntfStruct.Playing == guiSetStop ) goto goto_next_file;
a4bbda72ce86 fix two small bug and add multimedia keyboard support ( i tested with Acer AirKey V only )
pontscho
parents: 6173
diff changeset
1931 guiGetEvent( guiCEvent,(char *)guiSetPlay );
a4bbda72ce86 fix two small bug and add multimedia keyboard support ( i tested with Acer AirKey V only )
pontscho
parents: 6173
diff changeset
1932 }
1793
ba11d77c587a gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents: 1792
diff changeset
1933 #endif
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1934 }
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1935
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1936 // handle -sstep
2436
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
1937 if(step_sec>0) {
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
1938 osd_function=OSD_FFW;
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
1939 rel_seek_secs+=step_sec;
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
1940 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1941
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1942 #ifdef USE_DVDNAV
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1943 if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1944 dvdnav_stream_sleeping((dvdnav_priv_t*)stream->priv);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1945 #endif
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1946
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1947 //================= Keyboard events, SEEKing ====================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1948
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1949 current_module="key_events";
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
1950
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1951 {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1952 mp_cmd_t* cmd;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1953 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
1954 switch(cmd->id) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1955 case MP_CMD_SEEK : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1956 int v,abs;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1957 v = cmd->args[0].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1958 abs = (cmd->nargs > 1) ? cmd->args[1].v.i : 0;
7450
9720e88cd0bc This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents: 7419
diff changeset
1959 if(abs==2) { /* Absolute seek to a specific timestamp in seconds */
9720e88cd0bc This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents: 7419
diff changeset
1960 abs_seek_pos = 1;
9720e88cd0bc This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents: 7419
diff changeset
1961 if(sh_video)
9720e88cd0bc This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents: 7419
diff changeset
1962 osd_function= (v > sh_video->timer) ? OSD_FFW : OSD_REW;
9720e88cd0bc This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents: 7419
diff changeset
1963 rel_seek_secs = v;
9720e88cd0bc This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents: 7419
diff changeset
1964 }
9720e88cd0bc This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents: 7419
diff changeset
1965 else if(abs) { /* Absolute seek by percentage */
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1966 abs_seek_pos = 3;
5798
pontscho
parents: 5797
diff changeset
1967 if(sh_video)
pontscho
parents: 5797
diff changeset
1968 osd_function= (v > sh_video->timer) ? OSD_FFW : OSD_REW;
pontscho
parents: 5797
diff changeset
1969 rel_seek_secs = v/100.0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1970 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1971 else {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1972 rel_seek_secs+= v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1973 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
1974 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1975 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1976 case MP_CMD_AUDIO_DELAY : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1977 float v = cmd->args[0].v.f;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1978 audio_delay += v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1979 osd_show_av_delay = 9;
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
1980 if(sh_audio) sh_audio->delay+= v;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1981 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1982 case MP_CMD_PAUSE : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1983 osd_function=OSD_PAUSE;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1984 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1985 case MP_CMD_QUIT : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1986 exit_player(MSGTR_Exit_quit);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1987 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1988 case MP_CMD_GRAB_FRAMES : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1989 grab_frames=2;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1990 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1991 case MP_CMD_PLAY_TREE_STEP : {
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1992 int n = cmd->args[0].v.i == 0 ? 1 : cmd->args[0].v.i;
5135
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
1993 int force = cmd->args[1].v.i;
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
1994
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
1995 if(!force) {
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
1996 play_tree_iter_t* i = play_tree_iter_new_copy(playtree_iter);
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
1997
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
1998 if(play_tree_iter_step(i,n,0) == PLAY_TREE_ITER_ENTRY)
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
1999 eof = (n > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY;
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2000 play_tree_iter_free(i);
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2001 } else
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2002 eof = (n > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY;
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2003 if(eof)
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2004 play_tree_step = n;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2005 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2006 case MP_CMD_PLAY_TREE_UP_STEP : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2007 int n = cmd->args[0].v.i > 0 ? 1 : -1;
5135
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2008 int force = cmd->args[1].v.i;
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2009
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2010 if(!force) {
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2011 play_tree_iter_t* i = play_tree_iter_new_copy(playtree_iter);
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2012 if(play_tree_iter_up_step(i,n,0) == PLAY_TREE_ITER_ENTRY)
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2013 eof = (n > 0) ? PT_UP_NEXT : PT_UP_PREV;
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2014 play_tree_iter_free(i);
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2015 } else
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2016 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
2017 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2018 case MP_CMD_PLAY_ALT_SRC_STEP : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2019 if(playtree_iter->num_files > 1) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2020 int v = cmd->args[0].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2021 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
2022 eof = PT_NEXT_SRC;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2023 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
2024 eof = PT_PREV_SRC;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2025 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2026 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2027 case MP_CMD_SUB_DELAY : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2028 int abs= cmd->args[1].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2029 float v = cmd->args[0].v.f;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2030 if(abs)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2031 sub_delay = v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2032 else
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2033 sub_delay += v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2034 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
2035 } break;
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2036 case MP_CMD_OSD :
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2037 if(sh_video) {
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2038 int v = cmd->args[0].v.i;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2039 if(v < 0)
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2040 osd_level=(osd_level+1)%3;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2041 else
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2042 osd_level= v > 2 ? 2 : v;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2043 } break;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2044 case MP_CMD_VOLUME : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2045 int v = cmd->args[0].v.i;
7055
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2046
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2047 // start change for absolute volume value
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2048 int abs = (cmd->nargs > 1) ? cmd->args[1].v.i : 0;
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2049
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2050 if( abs )
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2051 {
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2052 mixer_setvolume( (float)v, (float)v );
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2053 } else {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2054 if(v > 0)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2055 mixer_incvolume();
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2056 else
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2057 mixer_decvolume();
7055
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2058 }
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2059
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2060 #ifdef USE_OSD
7923
bad21f499a9e avoids segfaults w.r.t to mp3 files handling:
pl
parents: 7906
diff changeset
2061 if(osd_level && sh_video){
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2062 osd_visible=sh_video->fps; // 1 sec
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2063 vo_osd_progbar_type=OSD_VOLUME;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2064 vo_osd_progbar_value=(mixer_getbothvolume()*256.0)/100.0;
5638
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
2065 vo_osd_changed(OSDTYPE_PROGBAR);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2066 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2067 #endif
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2068 } break;
6940
335d827e8201 10l bug (missing break;) found by Jim Hawkins <jim@jawkins.com>
arpi
parents: 6930
diff changeset
2069 case MP_CMD_MUTE:
335d827e8201 10l bug (missing break;) found by Jim Hawkins <jim@jawkins.com>
arpi
parents: 6930
diff changeset
2070 mixer_mute();
335d827e8201 10l bug (missing break;) found by Jim Hawkins <jim@jawkins.com>
arpi
parents: 6930
diff changeset
2071 break;
6818
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2072 case MP_CMD_LOADFILE : {
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2073 play_tree_t* e = play_tree_new();
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2074 play_tree_add_file(e,cmd->args[0].v.s);
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2075
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2076 // Go back to the start point
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2077 while(play_tree_iter_up_step(playtree_iter,0,1) != PLAY_TREE_ITER_END)
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2078 /* NOP */;
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2079 play_tree_free_list(playtree->child,1);
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2080 play_tree_set_child(playtree,e);
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2081 play_tree_iter_step(playtree_iter,0,0);
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2082 eof = PT_NEXT_SRC;
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2083 } break;
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2084 case MP_CMD_LOADLIST : {
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2085 play_tree_t* e = parse_playlist_file(cmd->args[0].v.s);
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2086 if(!e)
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
2087 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_PlaylistLoadUnable,cmd->args[0].v.s);
6818
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2088 else {
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2089 // Go back to the start point
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2090 while(play_tree_iter_up_step(playtree_iter,0,1) != PLAY_TREE_ITER_END)
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2091 /* NOP */;
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2092 play_tree_free_list(playtree->child,1);
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2093 play_tree_set_child(playtree,e);
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2094 play_tree_iter_step(playtree_iter,0,0);
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2095 eof = PT_NEXT_SRC;
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2096 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2097 } break;
7517
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2098 case MP_CMD_GAMMA : {
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2099 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2100
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2101 if (!sh_video)
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2102 break;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2103
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2104 if (vo_gamma_gamma == 1000)
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2105 {
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2106 vo_gamma_gamma = 0;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2107 get_video_colors (sh_video, "gamma", &vo_gamma_gamma);
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2108 }
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2109
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2110 if (abs)
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2111 vo_gamma_gamma = v;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2112 else
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2113 vo_gamma_gamma += v;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2114
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2115 if (vo_gamma_gamma > 100)
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2116 vo_gamma_gamma = 100;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2117 else if (vo_gamma_gamma < -100)
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2118 vo_gamma_gamma = -100;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2119 set_video_colors(sh_video, "gamma", vo_gamma_gamma);
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2120 #ifdef USE_OSD
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2121 if(osd_level){
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2122 osd_visible=sh_video->fps; // 1 sec
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2123 vo_osd_progbar_type=OSD_BRIGHTNESS;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2124 vo_osd_progbar_value=(vo_gamma_gamma<<7)/100 + 128;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2125 vo_osd_changed(OSDTYPE_PROGBAR);
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2126 }
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2127 #endif // USE_OSD
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2128 } break;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2129 case MP_CMD_BRIGHTNESS : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2130 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i;
6786
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2131
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2132 if (!sh_video)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2133 break;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2134
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2135 if (vo_gamma_brightness == 1000)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2136 {
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2137 vo_gamma_brightness = 0;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2138 get_video_colors(sh_video, "brightness", &vo_gamma_brightness);
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2139 }
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2140
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2141 if (abs)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2142 vo_gamma_brightness = v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2143 else
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2144 vo_gamma_brightness += v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2145
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2146 if (vo_gamma_brightness > 100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2147 vo_gamma_brightness = 100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2148 else if (vo_gamma_brightness < -100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2149 vo_gamma_brightness = -100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2150 if(set_video_colors(sh_video, "brightness", vo_gamma_brightness)){
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2151 #ifdef USE_OSD
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
2152 if(osd_level){
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
2153 osd_visible=sh_video->fps; // 1 sec
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
2154 vo_osd_progbar_type=OSD_BRIGHTNESS;
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
2155 vo_osd_progbar_value=(vo_gamma_brightness<<7)/100 + 128;
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
2156 vo_osd_changed(OSDTYPE_PROGBAR);
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
2157 }
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
2158 #endif // USE_OSD
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
2159 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2160 } break;
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2161 case MP_CMD_CONTRAST : {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2162 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i;
6786
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2163
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2164 if (!sh_video)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2165 break;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2166
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2167 if (vo_gamma_contrast == 1000)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2168 {
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2169 vo_gamma_contrast = 0;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2170 get_video_colors(sh_video, "contrast", &vo_gamma_contrast);
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2171 }
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2172
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2173 if (abs)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2174 vo_gamma_contrast = v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2175 else
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2176 vo_gamma_contrast += v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2177
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2178 if (vo_gamma_contrast > 100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2179 vo_gamma_contrast = 100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2180 else if (vo_gamma_contrast < -100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2181 vo_gamma_contrast = -100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2182 if(set_video_colors(sh_video, "contrast", vo_gamma_contrast)){
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2183 #ifdef USE_OSD
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2184 if(osd_level){
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2185 osd_visible=sh_video->fps; // 1 sec
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2186 vo_osd_progbar_type=OSD_CONTRAST;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2187 vo_osd_progbar_value=(vo_gamma_contrast<<7)/100 + 128;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2188 vo_osd_changed(OSDTYPE_PROGBAR);
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2189 }
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2190 #endif // USE_OSD
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2191 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2192 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2193 case MP_CMD_SATURATION : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2194 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i;
6786
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2195
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2196 if (!sh_video)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2197 break;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2198
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2199 if (vo_gamma_saturation == 1000)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2200 {
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2201 vo_gamma_saturation = 0;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2202 get_video_colors(sh_video, "saturation", &vo_gamma_saturation);
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2203 }
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2204
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2205 if (abs)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2206 vo_gamma_saturation = v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2207 else
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2208 vo_gamma_saturation += v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2209
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2210 if (vo_gamma_saturation > 100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2211 vo_gamma_saturation = 100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2212 else if (vo_gamma_saturation < -100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2213 vo_gamma_saturation = -100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2214 if(set_video_colors(sh_video, "saturation", vo_gamma_saturation)){
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2215 #ifdef USE_OSD
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2216 if(osd_level){
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2217 osd_visible=sh_video->fps; // 1 sec
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2218 vo_osd_progbar_type=OSD_SATURATION;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2219 vo_osd_progbar_value=(vo_gamma_saturation<<7)/100 + 128;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2220 vo_osd_changed(OSDTYPE_PROGBAR);
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2221 }
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2222 #endif // USE_OSD
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2223 }
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2224 } break;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2225 case MP_CMD_HUE : {
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2226 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i;
6786
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2227
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2228 if (!sh_video)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2229 break;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2230
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2231 if (vo_gamma_hue == 1000)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2232 {
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2233 vo_gamma_hue = 0;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2234 get_video_colors(sh_video, "hue", &vo_gamma_hue);
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2235 }
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2236
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2237 if (abs)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2238 vo_gamma_hue = v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2239 else
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2240 vo_gamma_hue += v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2241
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2242 if (vo_gamma_hue > 100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2243 vo_gamma_hue = 100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2244 else if (vo_gamma_hue < -100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2245 vo_gamma_hue = -100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2246 if(set_video_colors(sh_video, "hue", vo_gamma_hue)){
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2247 #ifdef USE_OSD
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2248 if(osd_level){
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2249 osd_visible=sh_video->fps; // 1 sec
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2250 vo_osd_progbar_type=OSD_HUE;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2251 vo_osd_progbar_value=(vo_gamma_hue<<7)/100 + 128;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2252 vo_osd_changed(OSDTYPE_PROGBAR);
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2253 }
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2254 #endif // USE_OSD
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2255 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2256 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2257 case MP_CMD_FRAMEDROPPING : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2258 int v = cmd->args[0].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2259 if(v < 0)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2260 frame_dropping = (frame_dropping+1)%3;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2261 else
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2262 frame_dropping = v > 2 ? 2 : v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2263 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2264 #ifdef USE_TV
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2265 case MP_CMD_TV_STEP_CHANNEL : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2266 if (tv_param_on == 1) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2267 int v = cmd->args[0].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2268 if(v > 0)
7419
alex
parents: 7329
diff changeset
2269 tv_step_channel((tvi_handle_t*)(demuxer->priv), TV_CHANNEL_HIGHER);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2270 else
7419
alex
parents: 7329
diff changeset
2271 tv_step_channel((tvi_handle_t*)(demuxer->priv), TV_CHANNEL_LOWER);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2272 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2273 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2274 case MP_CMD_TV_STEP_NORM : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2275 if (tv_param_on == 1)
7419
alex
parents: 7329
diff changeset
2276 tv_step_norm((tvi_handle_t*)(demuxer->priv));
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2277 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2278 case MP_CMD_TV_STEP_CHANNEL_LIST : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2279 if (tv_param_on == 1)
7419
alex
parents: 7329
diff changeset
2280 tv_step_chanlist((tvi_handle_t*)(demuxer->priv));
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2281 } break;
4849
9be4ac85dd35 Moved the call to VOCTRL_FULLSCREEN outside of #ifdef USE_TV block
albeu
parents: 4844
diff changeset
2282 #endif
4733
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
2283 case MP_CMD_VO_FULLSCREEN:
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
2284 {
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2285 #ifdef HAVE_NEW_GUI
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2286 if ( use_gui ) guiGetEvent( guiIEvent,(char *)MP_CMD_GUI_FULLSCREEN );
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2287 else
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2288 #endif
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
2289 if(video_out && vo_config_count) video_out->control(VOCTRL_FULLSCREEN, 0);
4733
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
2290 } break;
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6280
diff changeset
2291 case MP_CMD_PANSCAN : {
6311
da2dda48b7ec add mute support ( step 1 ) and fixed panscan bugs (1000l for me)
pontscho
parents: 6307
diff changeset
2292 if ( !video_out ) break;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
2293 if ( video_out->control( VOCTRL_GET_PANSCAN,NULL ) == VO_TRUE )
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
2294 {
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
2295 int abs= cmd->args[1].v.i;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
2296 float v = cmd->args[0].v.f;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
2297 float res;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
2298 if(abs) res = v;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
2299 else res = vo_panscan+v;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
2300 vo_panscan = res > 1 ? 1 : res < 0 ? 0 : res;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
2301 video_out->control( VOCTRL_SET_PANSCAN,NULL );
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6280
diff changeset
2302 #ifdef USE_OSD
7923
bad21f499a9e avoids segfaults w.r.t to mp3 files handling:
pl
parents: 7906
diff changeset
2303 if(osd_level && sh_video){
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
2304 osd_visible=sh_video->fps; // 1 sec
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
2305 vo_osd_progbar_type=OSD_PANSCAN;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
2306 vo_osd_progbar_value=vo_panscan*256;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
2307 vo_osd_changed(OSDTYPE_PROGBAR);
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
2308 }
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6280
diff changeset
2309 #endif
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
2310 }
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6280
diff changeset
2311 } break;
5015
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
2312 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
2313 {
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
2314 int v;
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
2315 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
2316
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
2317 sub_pos+=v;
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
2318 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
2319 if(sub_pos <0) sub_pos=0;
5640
a0cee3bb7f78 osd: calculating bbox
arpi
parents: 5638
diff changeset
2320 vo_osd_changed(OSDTYPE_SUBTITLE);
5015
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
2321 } break;
7628
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
2322 case MP_CMD_SUB_VISIBILITY:
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
2323 {
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
2324 sub_visibility=1-sub_visibility;
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
2325 osd_show_sub_visibility = 9; // show state of subtitle visibility in OSD
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
2326 vo_osd_changed(OSDTYPE_SUBTITLE);
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
2327 break;
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
2328 }
7780
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
2329 case MP_CMD_VOBSUB_LANG:
7790
kmkaplan
parents: 7780
diff changeset
2330 if (vo_vobsub)
7780
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
2331 {
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
2332 int new_id = vobsub_id + 1;
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
2333 if (vobsub_id < 0)
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
2334 new_id = 0;
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
2335 if ((unsigned int) new_id >= vobsub_get_indexes_count(vo_vobsub))
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
2336 new_id = -1;
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
2337 if(new_id != vobsub_id)
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
2338 osd_show_vobsub_changed = 9;
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
2339 vobsub_id = new_id;
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
2340 break;
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
2341 }
6112
69b3c25728fb Add the forgoten scrennshot command
albeu
parents: 6110
diff changeset
2342 case MP_CMD_SCREENSHOT :
69b3c25728fb Add the forgoten scrennshot command
albeu
parents: 6110
diff changeset
2343 if(vo_config_count) video_out->control(VOCTRL_SCREENSHOT, NULL);
69b3c25728fb Add the forgoten scrennshot command
albeu
parents: 6110
diff changeset
2344 break;
6888
2dde1a1bc03a Add the input command "change_rectangle" to control the rectangle
kmkaplan
parents: 6871
diff changeset
2345 case MP_CMD_VF_CHANGE_RECTANGLE:
2dde1a1bc03a Add the input command "change_rectangle" to control the rectangle
kmkaplan
parents: 6871
diff changeset
2346 set_rectangle(sh_video, cmd->args[0].v.i, cmd->args[1].v.i);
2dde1a1bc03a Add the input command "change_rectangle" to control the rectangle
kmkaplan
parents: 6871
diff changeset
2347 break;
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2348 #ifdef USE_DVDNAV
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2349 case MP_CMD_DVDNAV_EVENT: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2350 dvdnav_priv_t * dvdnav_priv = (dvdnav_priv_t*)(stream->priv);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2351 dvdnav_event_t * dvdnav_event = (dvdnav_event_t *)(cmd->args[0].v.v);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2352
5627
a05efac12472 dvdnav hotfix
arpi
parents: 5621
diff changeset
2353 /* ignore these events if we're not in dvd_nav mode */
a05efac12472 dvdnav hotfix
arpi
parents: 5621
diff changeset
2354 if (!dvd_nav) break;
a05efac12472 dvdnav hotfix
arpi
parents: 5621
diff changeset
2355
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2356 if (!dvdnav_event) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2357 printf("DVDNAV Event NULL?!\n");
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2358 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2359 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2360
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2361 if (stream->type!=STREAMTYPE_DVDNAV) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2362 printf("Got DVDNAV event when not running a DVDNAV stream!?\n");
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2363 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2364 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2365
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2366 //printf("mplayer: got event: %d\n",dvdnav_event->event);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2367
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2368 switch (dvdnav_event->event) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2369 case DVDNAV_BLOCK_OK: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2370 /* be silent about this one */
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2371 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2372 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2373 case DVDNAV_HIGHLIGHT: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2374 dvdnav_highlight_event_t *hevent = (dvdnav_highlight_event_t*)(dvdnav_event->details);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2375 if (!hevent) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2376 printf("DVDNAV Event: Highlight event broken\n");
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2377 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2378 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2379
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2380 if (hevent->display && hevent->buttonN>0)
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2381 {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2382 //dvdnav_priv->seen_root_menu=1; /* if we got a highlight, we're on a menu */
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2383 sprintf( dvd_nav_text, "Highlight button %d (%u,%u)-(%u,%u) PTS %d (now is %5.2f)",
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2384 hevent->buttonN,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2385 hevent->sx,hevent->sy,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2386 hevent->ex,hevent->ey,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2387 hevent->pts, d_video->pts);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2388 printf("DVDNAV Event: %s\n",dvd_nav_text);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2389 //osd_show_dvd_nav_delay = 60;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2390
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2391 osd_show_dvd_nav_highlight=1;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2392 osd_show_dvd_nav_sx=hevent->sx;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2393 osd_show_dvd_nav_ex=hevent->ex;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2394 osd_show_dvd_nav_sy=hevent->sy;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2395 osd_show_dvd_nav_ey=hevent->ey;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2396 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2397 else {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2398 osd_show_dvd_nav_highlight=0;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2399 printf("DVDNAV Event: Highlight Hide\n");
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2400 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2401 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2402 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2403 case DVDNAV_STILL_FRAME: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2404 dvdnav_still_event_t *still_event = (dvdnav_still_event_t*)(dvdnav_event->details);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2405
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2406 printf( "######################################## DVDNAV Event: Still Frame: %d sec(s)\n", still_event->length );
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2407 while (dvdnav_stream_sleeping(dvdnav_priv)) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2408 usleep(1000); /* 1ms */
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2409 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2410 dvdnav_stream_sleep(dvdnav_priv,still_event->length);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2411 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2412 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2413 case DVDNAV_STOP: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2414 printf( "DVDNAV Event: Nav Stop\n" );
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2415 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2416 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2417 case DVDNAV_NOP: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2418 printf("DVDNAV Event: Nav NOP\n");
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2419 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2420 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2421 case DVDNAV_SPU_STREAM_CHANGE: {
6971
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2422 #if DVDNAVVERSION > 012
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2423 dvdnav_spu_stream_change_event_t *stream_change = (dvdnav_spu_stream_change_event_t*)(dvdnav_event->details);
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2424
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2425 printf("DVDNAV Event: Nav SPU Stream Change: phys: %d/%d/%d logical: %d\n",
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2426 stream_change->physical_wide,
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2427 stream_change->physical_letterbox,
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2428 stream_change->physical_pan_scan,
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2429 stream_change->logical);
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2430
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2431 if (vo_spudec && dvdsub_id!=stream_change->physical_wide) {
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2432 mp_msg(MSGT_INPUT,MSGL_DBG2,"d_dvdsub->id change: was %d is now %d\n",
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2433 d_dvdsub->id,stream_change->physical_wide);
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2434 // FIXME: need a better way to change SPU id
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2435 d_dvdsub->id=dvdsub_id=stream_change->physical_wide;
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2436 if (vo_spudec) spudec_reset(vo_spudec);
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2437 }
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2438 #else
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2439 dvdnav_stream_change_event_t *stream_change = (dvdnav_stream_change_event_t*)(dvdnav_event->details);
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2440
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2441 printf("DVDNAV Event: Nav SPU Stream Change: phys: %d logical: %d\n",
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2442 stream_change->physical,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2443 stream_change->logical);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2444
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2445 if (vo_spudec && dvdsub_id!=stream_change->physical) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2446 mp_msg(MSGT_INPUT,MSGL_DBG2,"d_dvdsub->id change: was %d is now %d\n",
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2447 d_dvdsub->id,stream_change->physical);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2448 // FIXME: need a better way to change SPU id
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2449 d_dvdsub->id=dvdsub_id=stream_change->physical;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2450 if (vo_spudec) spudec_reset(vo_spudec);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2451 }
6971
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2452 #endif
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2453 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2454 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2455 case DVDNAV_AUDIO_STREAM_CHANGE: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2456 int aid_temp;
6971
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2457 #if DVDNAVVERSION > 012
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2458 dvdnav_audio_stream_change_event_t *stream_change = (dvdnav_audio_stream_change_event_t*)(dvdnav_event->details);
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2459 #else
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2460 dvdnav_stream_change_event_t *stream_change = (dvdnav_stream_change_event_t*)(dvdnav_event->details);
6971
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
2461 #endif
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2462
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2463 printf("DVDNAV Event: Nav Audio Stream Change: phys: %d logical: %d\n",
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2464 stream_change->physical,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2465 stream_change->logical);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2466
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2467 aid_temp=stream_change->physical;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2468 if (aid_temp>=0) aid_temp+=128; // FIXME: is this sane?
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2469 if (d_audio && audio_id!=aid_temp) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2470 mp_msg(MSGT_INPUT,MSGL_DBG2,"d_audio->id change: was %d is now %d\n",
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2471 d_audio->id,aid_temp);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2472 // FIXME: need a bettery way to change audio stream id
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2473 d_audio->id=dvdsub_id=aid_temp;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2474 resync_audio_stream(sh_audio);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2475 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2476
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2477 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2478 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2479 case DVDNAV_VTS_CHANGE: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2480 printf("DVDNAV Event: Nav VTS Change\n");
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2481 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2482 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2483 case DVDNAV_CELL_CHANGE: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2484 dvdnav_cell_change_event_t *cell_change = (dvdnav_cell_change_event_t*)(dvdnav_event->details);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2485 cell_playback_t * cell_playback = cell_change->new_cell;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2486
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2487 printf("DVDNAV Event: Nav Cell Change\n");
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2488 osd_show_dvd_nav_highlight=0; /* screen changed, disable menu */
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2489 /*
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2490 printf("new still time: %d\n",cell_playback->still_time);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2491 printf("new cell_cmd_nr: %d\n",cell_playback->cell_cmd_nr);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2492 printf("new playback_time: %02d:%02d:%02d.%02d\n",
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2493 cell_playback->playback_time.hour,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2494 cell_playback->playback_time.minute,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2495 cell_playback->playback_time.second,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2496 cell_playback->playback_time.frame_u);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2497
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2498 */
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2499 //rel_seek_secs=1; // not really: we can't seek, but it'll reset the muxer
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2500 //abs_seek_pos=0;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2501 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2502 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2503 case DVDNAV_NAV_PACKET: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2504 // printf("DVDNAV Event: Nav Packet\n");
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2505 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2506 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2507 case DVDNAV_SPU_CLUT_CHANGE: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2508 uint32_t * new_clut = (uint32_t *)(dvdnav_event->details);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2509
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2510 printf("DVDNAV Event: Nav SPU CLUT Change\n");
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2511 // send new palette to SPU decoder
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2512 if (vo_spudec) spudec_update_palette(vo_spudec,new_clut);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2513
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2514 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2515 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2516 case DVDNAV_SEEK_DONE: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2517 printf("DVDNAV Event: Nav Seek Done\n");
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2518 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2519 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2520 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2521
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2522 // free the dvdnav event
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2523 free(dvdnav_event->details);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2524 free(dvdnav_event);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2525 cmd->args[0].v.v=NULL;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2526 }
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2527 case MP_CMD_DVDNAV: {
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2528 dvdnav_priv_t * dvdnav_priv=(dvdnav_priv_t*)stream->priv;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2529
5627
a05efac12472 dvdnav hotfix
arpi
parents: 5621
diff changeset
2530 /* ignore these events if we're not in dvd_nav mode */
a05efac12472 dvdnav hotfix
arpi
parents: 5621
diff changeset
2531 if (!dvd_nav) break;
a05efac12472 dvdnav hotfix
arpi
parents: 5621
diff changeset
2532
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2533 switch (cmd->args[0].v.i) {
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2534 case MP_CMD_DVDNAV_UP:
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2535 dvdnav_upper_button_select(dvdnav_priv->dvdnav);
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2536 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2537 case MP_CMD_DVDNAV_DOWN:
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2538 dvdnav_lower_button_select(dvdnav_priv->dvdnav);
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2539 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2540 case MP_CMD_DVDNAV_LEFT:
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2541 dvdnav_left_button_select(dvdnav_priv->dvdnav);
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2542 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2543 case MP_CMD_DVDNAV_RIGHT:
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2544 dvdnav_right_button_select(dvdnav_priv->dvdnav);
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2545 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2546 case MP_CMD_DVDNAV_MENU:
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2547 printf("Menu call\n");
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2548 dvdnav_menu_call(dvdnav_priv->dvdnav,DVD_MENU_Root);
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2549 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2550 case MP_CMD_DVDNAV_SELECT:
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2551 dvdnav_button_activate(dvdnav_priv->dvdnav);
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2552 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2553 default:
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2554 mp_msg(MSGT_CPLAYER, MSGL_V, "Weird DVD Nav cmd %d\n",cmd->args[0].v.i);
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2555 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2556 }
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2557 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2558 }
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
2559 #endif
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2560 default : {
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2561 #ifdef HAVE_NEW_GUI
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2562 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
2563 else
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2564 #endif
5112
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
2565 mp_msg(MSGT_CPLAYER, MSGL_V, "Received unknow cmd %s\n",cmd->name);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2566 }
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
2567 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2568 mp_cmd_free(cmd);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2569 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2570 }
7111
b65b78640d49 removed old input code
alex
parents: 7068
diff changeset
2571
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
2572 if (seek_to_sec) {
937
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2573 int a,b; float d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2574
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2575 if (sscanf(seek_to_sec, "%d:%d:%f", &a,&b,&d)==3)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2576 rel_seek_secs += 3600*a +60*b +d ;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2577 else if (sscanf(seek_to_sec, "%d:%f", &a, &d)==2)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2578 rel_seek_secs += 60*a +d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2579 else if (sscanf(seek_to_sec, "%f", &d)==1)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2580 rel_seek_secs += d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2581
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2582 seek_to_sec = NULL;
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
2583 }
937
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2584
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
2585 /* Looping. */
3540
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2586 if(eof==1 && loop_times>=0) {
5655
117f34bb7097 Add correct loop option parsing in command line parser.
albeu
parents: 5651
diff changeset
2587 int l = loop_times;
117f34bb7097 Add correct loop option parsing in command line parser.
albeu
parents: 5651
diff changeset
2588 play_tree_iter_step(playtree_iter,0,0);
117f34bb7097 Add correct loop option parsing in command line parser.
albeu
parents: 5651
diff changeset
2589 loop_times = l;
3540
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2590 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
2591
3540
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2592 if(loop_times>1) loop_times--; else
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2593 if(loop_times==1) loop_times=-1;
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2594 play_n_frames=play_n_frames_mf;
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
2595 eof=0;
3540
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2596 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
2597
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
2598 }
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
2599
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2600 if(rel_seek_secs || abs_seek_pos){
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
2601 current_module="seek";
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2602 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
2603 // success:
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2604 /* FIXME there should be real seeking for vobsub */
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2605 if (vo_vobsub)
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2606 vobsub_reset(vo_vobsub);
5942
fb3a76edddf1 100000l! it resets a/v buffers _after_ stream sync, dropping possible keyframe, and may causing a-v desync.. seems to fix mpg seek bug and avi desync bug
arpi
parents: 5929
diff changeset
2607 #if 0
5836
dcb0a2bf3345 Fix osd progress bar.
albeu
parents: 5830
diff changeset
2608 if(sh_video && d_video->packs == 0)
dcb0a2bf3345 Fix osd progress bar.
albeu
parents: 5830
diff changeset
2609 ds_fill_buffer(d_video);
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
2610 if(sh_audio){
5836
dcb0a2bf3345 Fix osd progress bar.
albeu
parents: 5830
diff changeset
2611 if(d_audio->packs == 0)
dcb0a2bf3345 Fix osd progress bar.
albeu
parents: 5830
diff changeset
2612 ds_fill_buffer(d_audio);
8027
b9da278e4c92 verbose can be negative
arpi
parents: 8023
diff changeset
2613 if(verbose>0){
1459
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
2614 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
2615 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
2616 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
2617 }
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
2618 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
2619 } else {
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
2620 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
2621 }
5942
fb3a76edddf1 100000l! it resets a/v buffers _after_ stream sync, dropping possible keyframe, and may causing a-v desync.. seems to fix mpg seek bug and avi desync bug
arpi
parents: 5929
diff changeset
2622 #endif
1459
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
2623 fflush(stdout);
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
2624
4593
3769ccb8da8b libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4587
diff changeset
2625 if(sh_video){
3769ccb8da8b libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4587
diff changeset
2626 current_module="seek_video_reset";
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
2627 if(vo_config_count) video_out->control(VOCTRL_RESET,NULL);
4593
3769ccb8da8b libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4587
diff changeset
2628 }
3769ccb8da8b libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4587
diff changeset
2629
1459
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
2630 if(sh_audio){
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
2631 current_module="seek_audio_reset";
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
2632 audio_out->reset(); // stop audio, throwing away buffered data
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2633 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2634 #ifdef USE_OSD
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
2635 // Set OSD:
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
2636 if(osd_level){
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
2637 int len=((demuxer->movi_end-demuxer->movi_start)>>8);
7906
40aa6cf5a66b fixes a segfault when seeking on some mp3 only files
pl
parents: 7881
diff changeset
2638 if (len>0 && sh_video){
1727
9da2b587b029 changes according to OSD calculations
atlka
parents: 1726
diff changeset
2639 osd_visible=sh_video->fps; // 1 sec
9da2b587b029 changes according to OSD calculations
atlka
parents: 1726
diff changeset
2640 vo_osd_progbar_type=0;
9da2b587b029 changes according to OSD calculations
atlka
parents: 1726
diff changeset
2641 vo_osd_progbar_value=(demuxer->filepos-demuxer->movi_start)/len;
5638
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
2642 vo_osd_changed(OSDTYPE_PROGBAR);
1727
9da2b587b029 changes according to OSD calculations
atlka
parents: 1726
diff changeset
2643 }
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
2644 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2645 #endif
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2646 if(sh_video) {
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2647 c_total=0;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2648 max_pts_correction=0.1;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2649 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
2650 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
2651 drop_frame_cnt=0;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2652 too_slow_frame_cnt=0;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2653 too_fast_frame_cnt=0;
3744
d358f4a74690 dvd seeking -> subtitle disappearing bugs fixed
arpi
parents: 3742
diff changeset
2654
5488
3f183ca22747 fixed SPU pts, it's 1024/90000 based instead of 1/100
arpi
parents: 5463
diff changeset
2655 if(vo_spudec) spudec_reset(vo_spudec);
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2656 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2657 }
1405
8ecf18884ad8 seeking code moved out from mplayer.c -> seek.c
arpi
parents: 1402
diff changeset
2658 rel_seek_secs=0;
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2659 abs_seek_pos=0;
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2660 frame_time_remaining=0;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
2661 current_module=NULL;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
2662 }
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
2663
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2664 #ifdef HAVE_NEW_GUI
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2665 if(use_gui){
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
2666 guiEventHandling();
7751
27c9c440536f - dvd aspect changing bug - fixed
pontscho
parents: 7749
diff changeset
2667 if(demuxer->file_format==DEMUXER_TYPE_AVI && sh_video && sh_video->video.dwLength>2){
1735
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2668 // 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
2669 guiIntfStruct.Position=(float)d_video->pack_no*100.0f/sh_video->video.dwLength;
1735
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2670 } else {
6914
d882c7063e6d gui seekbar pos calc overflow fixed
arpi
parents: 6912
diff changeset
2671 off_t len = ( demuxer->movi_end - demuxer->movi_start );
d882c7063e6d gui seekbar pos calc overflow fixed
arpi
parents: 6912
diff changeset
2672 off_t pos = ( demuxer->file_format == DEMUXER_TYPE_AUDIO?stream->pos:demuxer->filepos );
d882c7063e6d gui seekbar pos calc overflow fixed
arpi
parents: 6912
diff changeset
2673 guiIntfStruct.Position=(len <= 0? 0.0f : ( pos - demuxer->movi_start ) * 100.0f / len );
1735
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2674 }
5797
c31ad722f491 mostma' fix
pontscho
parents: 5795
diff changeset
2675 if ( sh_video ) guiIntfStruct.TimeSec=d_video->pts;
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
2676 else if ( sh_audio ) guiIntfStruct.TimeSec=sh_audio->delay;
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6590
diff changeset
2677 guiGetEvent( guiReDraw,NULL );
6903
c2d4100c964e - fix mixer handling
pontscho
parents: 6888
diff changeset
2678 guiGetEvent( guiSetVolume,NULL );
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
2679 if(guiIntfStruct.Playing==0) break; // STOP
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
2680 if(guiIntfStruct.Playing==2) osd_function=OSD_PAUSE;
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6699
diff changeset
2681 if ( guiIntfStruct.DiskChanged || guiIntfStruct.FilenameChanged ) goto goto_next_file;
3054
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2682 #ifdef USE_DVDREAD
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2683 if ( stream->type == STREAMTYPE_DVD )
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2684 {
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2685 dvd_priv_t * dvdp = stream->priv;
7854
d6c29d863f15 dvd chapter detect function from Gregory Kovriga
pontscho
parents: 7805
diff changeset
2686 /*guiIntfStruct.DVD.current_chapter=dvdp->cur_cell + 1;*/
d6c29d863f15 dvd chapter detect function from Gregory Kovriga
pontscho
parents: 7805
diff changeset
2687 guiIntfStruct.DVD.current_chapter=dvd_chapter_from_cell(dvdp,guiIntfStruct.DVD.current_title-1, dvdp->cur_cell)+1;
3054
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2688 }
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2689 #endif
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2690 }
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2691 #endif
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2692
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2693
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2694 //================= Update OSD ====================
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2695 #ifdef USE_OSD
5205
47259a4f3216 show sub/av delay at osdlevel=1 - patch by Marcin Juszkiewicz <marcinj@netbox.pl>
arpi
parents: 5202
diff changeset
2696 if(osd_level>=1){
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2697 int pts=d_video->pts;
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2698 char osd_text_tmp[50];
595
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
2699 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
2700 vo_osd_text=osd_text_buffer;
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2701 #ifdef USE_DVDNAV
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2702 if (osd_show_dvd_nav_delay) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2703 sprintf(osd_text_tmp, "DVDNAV: %s", dvd_nav_text);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2704 osd_show_dvd_nav_delay--;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2705 } else
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2706 #endif
7628
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
2707 if (osd_show_sub_visibility) {
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
2708 sprintf(osd_text_tmp, "Subtitles: %sabled", sub_visibility?"en":"dis");
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
2709 osd_show_sub_visibility--;
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
2710 } else
7780
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
2711 if (osd_show_vobsub_changed) {
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
2712 const char *language = "none";
7790
kmkaplan
parents: 7780
diff changeset
2713 if (vo_vobsub && vobsub_id >= 0)
7780
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
2714 language = vobsub_get_id(vo_vobsub, (unsigned int) vobsub_id);
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
2715 sprintf(osd_text_tmp, "Subtitles: (%d) %s", vobsub_id, language ? language : "unknown");
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
2716 osd_show_vobsub_changed--;
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
2717 } else
3234
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
2718 if (osd_show_sub_delay) {
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2719 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
2720 osd_show_sub_delay--;
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
2721 } else
3783
de6b00131e95 show a-v delay in osd (based on subdelay osd patch)
arpi
parents: 3754
diff changeset
2722 if (osd_show_av_delay) {
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2723 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
2724 osd_show_av_delay--;
5205
47259a4f3216 show sub/av delay at osdlevel=1 - patch by Marcin Juszkiewicz <marcinj@netbox.pl>
arpi
parents: 5202
diff changeset
2725 } else if(osd_level>=2)
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2726 sprintf(osd_text_tmp,"%c %02d:%02d:%02d",osd_function,pts/3600,(pts/60)%60,pts%60);
5205
47259a4f3216 show sub/av delay at osdlevel=1 - patch by Marcin Juszkiewicz <marcinj@netbox.pl>
arpi
parents: 5202
diff changeset
2727 else osd_text_tmp[0]=0;
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2728
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2729 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
2730 strcpy(vo_osd_text, osd_text_tmp);
5638
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
2731 vo_osd_changed(OSDTYPE_OSD);
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2732 }
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2733 } else {
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2734 if(vo_osd_text) {
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2735 vo_osd_text=NULL;
5638
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
2736 vo_osd_changed(OSDTYPE_OSD);
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
2737 }
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2738 }
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2739 // 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
2740 // vo_osd_text=osd_text_buffer;
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2741 #endif
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
2742
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2743 #ifdef USE_SUB
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
2744 // find sub
1204
646ac6d78952 sub at key=0 fixed
arpi_esp
parents: 1190
diff changeset
2745 if(subtitles && d_video->pts>0){
1762
914bdbe33cf8 -dumpsub works for avi, then dumps .sub file
arpi
parents: 1753
diff changeset
2746 float pts=d_video->pts;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
2747 if(sub_fps==0) sub_fps=sh_video->fps;
482
1a2c4f3e7a10 sub control optimized
arpi_esp
parents: 470
diff changeset
2748 current_module="find_sub";
3274
ac7ded58b6df mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3257
diff changeset
2749 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
2750 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
2751 sub_last_pts = pts;
ac7ded58b6df mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3257
diff changeset
2752 }
482
1a2c4f3e7a10 sub control optimized
arpi_esp
parents: 470
diff changeset
2753 current_module=NULL;
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
2754 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2755 #endif
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2756
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2757 // DVD sub:
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2758 if(vo_config_count && vo_spudec) {
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2759 unsigned char* packet=NULL;
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2760 int len,timestamp;
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2761 // Get a sub packet from the dvd or a vobsub and make a timestamp relative to sh_video->timer
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2762 int get_sub_packet(void) {
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2763 // Vobsub
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2764 len = 0;
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2765 if(vo_vobsub) {
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2766 if(d_video->pts+sub_delay>=0) {
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2767 // The + next_frame_time is there because we'll display the sub at the next frame
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2768 len = vobsub_get_packet(vo_vobsub,d_video->pts+sub_delay+next_frame_time,(void**)&packet,&timestamp);
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2769 if(len > 0) {
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2770 timestamp -= (d_video->pts + sub_delay - sh_video->timer)*90000;
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2771 mp_dbg(MSGT_CPLAYER,MSGL_V,"\rVOB sub: len=%d v_pts=%5.3f v_timer=%5.3f sub=%5.3f ts=%d \n",len,d_video->pts,sh_video->timer,timestamp / 90000.0);
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2772 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2773 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2774 } else {
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2775 // DVD sub
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2776 len = ds_get_packet_sub(d_dvdsub,(unsigned char**)&packet);
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2777 if(len > 0) {
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2778 timestamp = 90000*(sh_video->timer + d_dvdsub->pts + sub_delay - d_video->pts);
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2779 mp_dbg(MSGT_CPLAYER,MSGL_V,"\rDVD sub: len=%d v_pts=%5.3f s_pts=%5.3f ts=%d \n",len,d_video->pts,d_dvdsub->pts,timestamp);
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2780 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2781 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2782 return len;
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2783 }
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2784 current_module="spudec";
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2785 spudec_heartbeat(vo_spudec,90000*sh_video->timer);
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2786 while(get_sub_packet()>0 && packet){
6204
1ba75212f7ef Little fix for vobsub/dvd subtitles
albeu
parents: 6190
diff changeset
2787 if(timestamp < 0) timestamp = 0;
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2788 spudec_assemble(vo_spudec,packet,len,timestamp);
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2789 }
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2790
6190
bd6748605681 Bounding box and partial update patch for vob/dvdsub by Hephooey.
atmos4
parents: 6185
diff changeset
2791 /* detect wether the sub has changed or not */
bd6748605681 Bounding box and partial update patch for vob/dvdsub by Hephooey.
atmos4
parents: 6185
diff changeset
2792 if(spudec_changed(vo_spudec))
bd6748605681 Bounding box and partial update patch for vob/dvdsub by Hephooey.
atmos4
parents: 6185
diff changeset
2793 vo_osd_changed(OSDTYPE_SPU);
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2794 current_module=NULL;
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2795 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2796
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1420
diff changeset
2797 } // while(!eof)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2798
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
2799 mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d \n",eof);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2800
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2801 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2802
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
2803 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
2804
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6135
diff changeset
2805 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n");
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6135
diff changeset
2806
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2807 if(benchmark){
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2808 double tot=video_time_usage+vout_time_usage+audio_time_usage;
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2809 double total_time_usage;
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2810 total_time_usage_start=GetTimer()-total_time_usage_start;
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2811 total_time_usage = (float)total_time_usage_start*0.000001;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
2812 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\nBENCHMARKs: 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
2813 video_time_usage,vout_time_usage,audio_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2814 total_time_usage-tot,total_time_usage);
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2815 if(total_time_usage>0.0)
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
2816 mp_msg(MSGT_CPLAYER,MSGL_INFO,"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
2817 100.0*video_time_usage/total_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2818 100.0*vout_time_usage/total_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2819 100.0*audio_time_usage/total_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2820 100.0*(total_time_usage-tot)/total_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2821 100.0);
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
2822 if(total_frame_cnt && frame_dropping)
5621
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
2823 mp_msg(MSGT_CPLAYER,MSGL_INFO,"BENCHMARKn: disp: %d (%3.2f fps) drop: %d (%d%%) total: %d (%3.2f fps)\n",
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
2824 total_frame_cnt-drop_frame_cnt,
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
2825 (total_time_usage>0.5)?((total_frame_cnt-drop_frame_cnt)/total_time_usage):0,
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
2826 drop_frame_cnt,
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
2827 100*drop_frame_cnt/total_frame_cnt,
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
2828 total_frame_cnt,
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
2829 (total_time_usage>0.5)?(total_frame_cnt/total_time_usage):0);
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
2830
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2831 }
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2832
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
2833 // time to uninit all, except global stuff:
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
2834 uninit_player(INITED_ALL-(INITED_GUI+INITED_INPUT+(fixed_vo?INITED_VO:0)));
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
2835
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2836 if(eof == PT_NEXT_ENTRY || eof == PT_PREV_ENTRY) {
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
2837 eof = eof == PT_NEXT_ENTRY ? 1 : -1;
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2838 if(play_tree_iter_step(playtree_iter,play_tree_step,0) == PLAY_TREE_ITER_ENTRY) {
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2839 eof = 1;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2840 } else {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2841 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
2842 playtree_iter = NULL;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2843 }
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2844 play_tree_step = 1;
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2845 } 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
2846 eof = eof == PT_UP_NEXT ? 1 : -1;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2847 if(play_tree_iter_up_step(playtree_iter,eof,0) == PLAY_TREE_ITER_ENTRY) {
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2848 eof = 1;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2849 } else {
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2850 play_tree_iter_free(playtree_iter);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2851 playtree_iter = NULL;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2852 }
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
2853 } else { // NEXT PREV SRC
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2854 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
2855 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2856
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2857 if(eof == 0) eof = 1;
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2858
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2859 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
2860 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
2861 if(filename == NULL) {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2862 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
2863 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
2864 playtree_iter = NULL;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2865 };
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2866 } else
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2867 break;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2868 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2869
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
2870 #ifdef HAVE_NEW_GUI
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
2871 if( use_gui && !playtree_iter )
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
2872 {
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
2873 #ifdef USE_DVDREAD
6280
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
2874 if ( !guiIntfStruct.DiskChanged )
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
2875 #endif
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6699
diff changeset
2876 mplEnd();
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
2877 }
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
2878 #endif
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
2879
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6590
diff changeset
2880 if(use_gui || playtree_iter != NULL){
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2881
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2882 eof = 0;
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2883 goto play_next_file;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2884 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2885
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
2886 #ifdef HAVE_FREETYPE
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
2887 current_module="uninit_font";
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
2888 if (vo_font) free_font_desc(vo_font);
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
2889 vo_font = NULL;
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
2890 done_freetype();
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
2891 #endif
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
2892
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
2893 exit_player(MSGTR_Exit_eof);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2894
109
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
2895 return 1;
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
2896 }