annotate mplayer.c @ 4185:85c90bb8729a

initial stuff. comments welcomed...
author arpi
date Wed, 16 Jan 2002 00:14:59 +0000
parents 116abdd0aed1
children 7cfa69df9e0b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1237
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1 // AVI & MPEG Player v0.18 (C) 2000-2001. by A'rpi/ESP-team
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
3 #include <stdio.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
4 #include <stdlib.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
5 #include <string.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
6 #include <unistd.h>
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
7
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
8 #include <sys/ioctl.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
9 #include <sys/mman.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
10 #include <sys/types.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
11 #include <sys/wait.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
12 #include <sys/time.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
13 #include <sys/stat.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
14
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
15 #include <signal.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
16 #include <time.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
17 #include <fcntl.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
18
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
19 #include "version.h"
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
20 #include "config.h"
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
21
1564
9fa2a290fa99 mp_msg init
arpi
parents: 1548
diff changeset
22 #include "mp_msg.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
23
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
24 #define HELP_MP_DEFINE_STATIC
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
25 #include "help_mp.h"
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
26
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
27 #include "cfgparser.h"
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
28 #include "cfg-mplayer-def.h"
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
29
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
30 #ifdef USE_SUB
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
31 #include "subreader.h"
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
32 #endif
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
33
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
34 #ifdef USE_LIBVO2
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
35 #include "libvo2/libvo2.h"
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
36 #else
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
37 #include "libvo/video_out.h"
2550
7d6e5373fd68 mDisplay ?
arpi
parents: 2530
diff changeset
38 extern void* mDisplay; // Display* mDisplay;
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
39 #endif
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
40
2897
283eab7c4c8e Added proper #include's for libvo2
mswitch
parents: 2889
diff changeset
41 #ifdef USE_LIBVO2
283eab7c4c8e Added proper #include's for libvo2
mswitch
parents: 2889
diff changeset
42 #include "libvo2/sub.h"
283eab7c4c8e Added proper #include's for libvo2
mswitch
parents: 2889
diff changeset
43 #else
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
44 #include "libvo/sub.h"
2897
283eab7c4c8e Added proper #include's for libvo2
mswitch
parents: 2889
diff changeset
45 #endif
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
46
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
47 #include "libao2/audio_out.h"
3194
1648d11fc36c commandline configuration of audio plugins now through struct, format conversion plugin added
anders
parents: 3180
diff changeset
48 #include "libao2/audio_plugin.h"
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
49
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
50 #include "libmpeg2/mpeg2.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
51 #include "libmpeg2/mpeg2_internal.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
52
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
53 #include "codec-cfg.h"
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
54
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
55 #include "dvdauth.h"
3180
d53f70e3c794 spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents: 3166
diff changeset
56 #ifdef USE_DVDREAD
560
28ae99036574 Separated dvdsub code to be able to work with it easier
lgb
parents: 557
diff changeset
57 #include "spudec.h"
3180
d53f70e3c794 spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents: 3166
diff changeset
58 #endif
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
59 #include "vobsub.h"
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
60
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
61 #include "linux/getch2.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
62 #include "linux/keycodes.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63 #include "linux/timer.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
64 #include "linux/shmem.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
65
2272
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
66 #include "cpudetect.h"
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
67
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
68 #ifdef HAVE_LIRC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
69 #include "lirc_mp.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
70 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
71
2036
029bad24d022 baz.. fixed wrong cvs merge.
atmos4
parents: 2034
diff changeset
72 #ifdef HAVE_NEW_GUI
029bad24d022 baz.. fixed wrong cvs merge.
atmos4
parents: 2034
diff changeset
73 #include "Gui/mplayer/play.h"
029bad24d022 baz.. fixed wrong cvs merge.
atmos4
parents: 2034
diff changeset
74 #endif
029bad24d022 baz.. fixed wrong cvs merge.
atmos4
parents: 2034
diff changeset
75
3322
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
76 int slave_mode=0;
362
463699f15eb4 static removed from verbose definition
szabii
parents: 360
diff changeset
77 int verbose=0;
1448
e795527de16a -quiet option patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents: 1439
diff changeset
78 int quiet=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
79
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
80 #define ABS(x) (((x)>=0)?(x):(-(x)))
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
81
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
82 #ifdef HAVE_RTC
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
83 #include <linux/rtc.h>
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
84 #endif
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
85
2941
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
86 #ifdef USE_TV
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
87 #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
88
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
89 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
90 extern tvi_handle_t *tv_handler;
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
91 #endif
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
92
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
93 //**************************************************************************//
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
94 // Playtree
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
95 //**************************************************************************//
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
96 #include "playtree.h"
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
97
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
98 play_tree_t* playtree;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
99
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
100 #define PT_NEXT_ENTRY 1
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
101 #define PT_PREV_ENTRY -1
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
102 #define PT_NEXT_SRC 2
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
103 #define PT_PREV_SRC -2
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
104 #define PT_UP_NEXT 3
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
105 #define PT_UP_PREV -3
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 // Config
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
109 //**************************************************************************//
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
110
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
111 m_config_t* mconfig;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
112
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
113 //**************************************************************************//
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
114 // Config file
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
115 //**************************************************************************//
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
116
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
117 static int cfg_inc_verbose(struct config *conf){ ++verbose; return 0;}
153
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 151
diff changeset
118
162
effc62af528c new option: -include
szabii
parents: 154
diff changeset
119 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
120 return m_config_parse_config_file(mconfig, filename);
162
effc62af528c new option: -include
szabii
parents: 154
diff changeset
121 }
effc62af528c new option: -include
szabii
parents: 154
diff changeset
122
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
123 #include "get_path.c"
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
124
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
125 //**************************************************************************//
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
126 //**************************************************************************//
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
127 // Input media streaming & demultiplexer:
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
128 //**************************************************************************//
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
129
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
130 static int max_framesize=0;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
131
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 577
diff changeset
132 #include "stream.h"
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
133 #include "demuxer.h"
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
134 #include "stheader.h"
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
135 #include "parse_es.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
136
2563
fc124f9db88e more cleanup, warnings fixed
arpi
parents: 2557
diff changeset
137 #include "dec_audio.h"
fc124f9db88e more cleanup, warnings fixed
arpi
parents: 2557
diff changeset
138 #include "dec_video.h"
fc124f9db88e more cleanup, warnings fixed
arpi
parents: 2557
diff changeset
139
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
140 #if 0
1015
9744b50fe87f some cleanup, old unused stuff removed
arpi_esp
parents: 1014
diff changeset
141 extern picture_t *picture; // exported from libmpeg2/decode.c
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
142
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
143 int frameratecode2framerate[16] = {
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
144 0,
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
145 // Official mpeg1/2 framerates:
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
146 24000*10000/1001, 24*10000,25*10000, 30000*10000/1001, 30*10000,50*10000,60000*10000/1001, 60*10000,
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
147 // libmpeg3's "Unofficial economy rates":
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
148 1*10000,5*10000,10*10000,12*10000,15*10000,0,0
112
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
149 };
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
150 #endif
112
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
151
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
152 //**************************************************************************//
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
153 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
154
112
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
155 // Common FIFO functions, and keyboard/event FIFO code
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
156 #include "fifo.c"
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
157
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
158 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
159
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
160 #ifdef USE_LIBVO2
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
161 static vo2_handle_t *video_out=NULL;
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
162 #else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
163 static vo_functions_t *video_out=NULL;
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
164 #endif
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
165 static ao_functions_t *audio_out=NULL;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
166
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
167 // benchmark:
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
168 double video_time_usage=0;
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
169 double vout_time_usage=0;
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
170 static double audio_time_usage=0;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
171 static int total_time_usage_start=0;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
172 static int benchmark=0;
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
173
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
174 // static int play_in_bg=0;
606
0b1f9eda1ea6 warnings killed
szabii
parents: 598
diff changeset
175
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
176 // options:
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
177 static int auto_quality=0;
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
178 static int output_quality=0;
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
179
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
180 int use_gui=0;
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
181
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
182 int osd_level=2;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
183
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
184 // seek:
937
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
185 char *seek_to_sec=NULL;
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
186 off_t seek_to_byte=0;
2436
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
187 off_t step_sec=0;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
188 int loop_times=-1;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
189 float rel_seek_secs=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
190 int abs_seek_pos=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
191
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
192 // codecs:
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
193 int has_audio=1;
1286
543a94b241a2 Replaced LGBs video codec forcing change with mine for audio and video codecs, which is IMHO more convenient cause codecs are selected by name instead of number, one unclearity is left to me, that's why audio_format is used once before codecs selection for MPEG_PS files, that's why I left -afm in for that one.
atmos4
parents: 1285
diff changeset
194 char *audio_codec=NULL; // override audio codec
543a94b241a2 Replaced LGBs video codec forcing change with mine for audio and video codecs, which is IMHO more convenient cause codecs are selected by name instead of number, one unclearity is left to me, that's why audio_format is used once before codecs selection for MPEG_PS files, that's why I left -afm in for that one.
atmos4
parents: 1285
diff changeset
195 char *video_codec=NULL; // override video codec
1299
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
196 int audio_family=-1; // override audio codec family
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
197 int video_family=-1; // override video codec family
1285
202d9e2dc202 -vcodec option (maybe some other name would be better though) to select between driver types without editing codecs.conf. mplayer will default to normal codec search loop if it does not find codec for the specified driver type. config range checking for the parameter (an integer) should be cleaned, IMHO
lgb
parents: 1255
diff changeset
198
1299
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
199 // IMHO this stuff is no longer of use, or is there a special
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
200 // reason why dshow should be completely disabled? - atmos ::
1327
b12e1817bcc2 some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents: 1302
diff changeset
201 // yes, people without working c++ compiler can disable it - A'rpi
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
202 #ifdef USE_DIRECTSHOW
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
203 int allow_dshow=1;
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
204 #else
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
205 int allow_dshow=0;
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
206 #endif
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
207
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
208 // streaming:
3532
19998399f4d5 Made audio_id and video_id non static variable.
bertrand
parents: 3499
diff changeset
209 int audio_id=-1;
19998399f4d5 Made audio_id and video_id non static variable.
bertrand
parents: 3499
diff changeset
210 int video_id=-1;
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
211 int dvdsub_id=-1;
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
212 int vobsub_id=-1;
3754
174e473f582d -alang/-slang options (audio/sub selection by language code)
arpi
parents: 3748
diff changeset
213 char* audio_lang=NULL;
174e473f582d -alang/-slang options (audio/sub selection by language code)
arpi
parents: 3748
diff changeset
214 char* dvdsub_lang=NULL;
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
215 static int vcd_track=0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
216
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
217 // cache2:
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
218 static int stream_cache_size=0;
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
219 #ifdef USE_STREAM_CACHE
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
220 extern int cache_fill_status;
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
221 #else
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
222 #define cache_fill_status 0
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
223 #endif
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
224
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
225 // dump:
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
226 static char *stream_dump_name="stream.dump";
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
227 static int stream_dump_type=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
228
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
229 // A-V sync:
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
230 static float default_max_pts_correction=-1;//0.01f;
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
231 static float max_pts_correction=0;//default_max_pts_correction;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
232 static float c_total=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
233 static float audio_delay=0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
234
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
235 static int dapsync=0;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
236 static int softsleep=0;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
237
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
238 static float force_fps=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
239 static int force_srate=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
240 static int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
241 static int play_n_frames=-1;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
242
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
243 // screen info:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
244 char* video_driver=NULL; //"mga"; // default
956
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
245 char* audio_driver=NULL;
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
246 static int fullscreen=0;
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
247 static int vidmode=0;
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
248 static int softzoom=0;
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
249 static int flip=-1;
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
250 // We need this opt_* because the values are then calculated so the options use the opt_*
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
251 // and before each file we reset the calculated value using this opt_* values
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
252 static int opt_screen_size_x=0;//SCREEN_SIZE_X;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
253 static int opt_screen_size_y=0;//SCREEN_SIZE_Y;
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
254 static int screen_size_x=0;//SCREEN_SIZE_X;
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
255 static int screen_size_y=0;//SCREEN_SIZE_Y;
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
256 static int screen_size_xy=0;
3139
45d8fe54f1ea Fix -noaspect.
atmos4
parents: 3107
diff changeset
257 static float movie_aspect=-1.0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
258
2647
679d3b21bedb -playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents: 2567
diff changeset
259 char* playlist_file;
679d3b21bedb -playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents: 2567
diff changeset
260
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
261 // sub:
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
262 char *font_name=NULL;
215
09d565842a33 font alpha resampling, see -ffactor
arpi_esp
parents: 212
diff changeset
263 float font_factor=0.75;
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
264 char *sub_name=NULL;
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
265 float sub_delay=0;
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
266 float sub_fps=0;
510
2951d138ddaf add sub autoread & remove 'c' key
pontscho
parents: 500
diff changeset
267 int sub_auto = 1;
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
268 char *vobsub_name=NULL;
1255
94f2853ec6f4 -dsp option removed, displaying help text (-ao oss:dsp_path)
alex
parents: 1250
diff changeset
269 /*DSP!!char *dsp=NULL;*/
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
270
1183
6fbcfe7f7f10 vo/ao_subdevice implemented
al3x
parents: 1177
diff changeset
271 extern char *vo_subdevice;
6fbcfe7f7f10 vo/ao_subdevice implemented
al3x
parents: 1177
diff changeset
272 extern char *ao_subdevice;
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
273
2321
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
274 static stream_t* stream=NULL;
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
275
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
276 static char* current_module=NULL; // for debugging
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
277
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
278 static unsigned int inited_flags=0;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
279 #define INITED_VO 1
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
280 #define INITED_AO 2
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
281 #define INITED_GUI 4
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
282 #define INITED_GETCH2 8
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
283 #define INITED_LIRC 16
3034
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
284 #define INITED_SPUDEC 32
2321
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
285 #define INITED_STREAM 64
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
286 #define INITED_ALL 0xFFFF
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
287
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
288 void uninit_player(unsigned int mask){
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
289 mask=inited_flags&mask;
3180
d53f70e3c794 spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents: 3166
diff changeset
290 #ifdef USE_DVDREAD
3034
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
291 if (mask&INITED_SPUDEC){
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
292 inited_flags&=~INITED_SPUDEC;
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
293 current_module="uninit_spudec";
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
294 spudec_free(vo_spudec);
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
295 }
3180
d53f70e3c794 spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents: 3166
diff changeset
296 #endif
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
297 if(mask&INITED_VO){
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
298 inited_flags&=~INITED_VO;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
299 current_module="uninit_vo";
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
300 #ifdef USE_LIBVO2
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
301 vo2_close(video_out);
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
302 #else
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
303 video_out->uninit();
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
304 #endif
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
305 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
306
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
307 if(mask&INITED_AO){
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
308 inited_flags&=~INITED_AO;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
309 current_module="uninit_ao";
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
310 audio_out->uninit();
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
311 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
312
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
313 if(mask&INITED_GETCH2){
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
314 inited_flags&=~INITED_GETCH2;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
315 current_module="uninit_getch2";
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
316 // restore terminal:
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
317 getch2_disable();
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
318 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
319
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
320 #ifdef HAVE_NEW_GUI
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
321 if(mask&INITED_GUI){
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
322 inited_flags&=~INITED_GUI;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
323 current_module="uninit_gui";
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
324 mplDone();
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
325 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
326 #endif
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
327
2321
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
328 if(mask&INITED_STREAM){
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
329 inited_flags&=~INITED_STREAM;
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
330 current_module="uninit_stream";
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
331 if(stream) free_stream(stream);
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
332 stream=NULL;
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
333 }
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
334
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
335 #ifdef HAVE_LIRC
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
336 if(mask&INITED_LIRC){
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
337 inited_flags&=~INITED_LIRC;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
338 current_module="uninit_lirc";
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
339 lirc_mp_cleanup();
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
340 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
341 #endif
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
342
1863
bb7710b16dc2 reset module status after uninit
arpi
parents: 1857
diff changeset
343 current_module=NULL;
bb7710b16dc2 reset module status after uninit
arpi
parents: 1857
diff changeset
344
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
345 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
346
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
347 void exit_player(char* how){
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
348 total_time_usage_start=GetTimer()-total_time_usage_start;
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
349
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
350 uninit_player(INITED_ALL);
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
351
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
352 current_module="exit_player";
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
353
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
354 if(how) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Exiting,how);
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
355 mp_msg(MSGT_CPLAYER,MSGL_V,"max framesize was %d bytes\n",max_framesize);
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
356 if(benchmark){
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
357 double tot=video_time_usage+vout_time_usage+audio_time_usage;
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
358 double total_time_usage=(float)total_time_usage_start*0.000001;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
359 mp_msg(MSGT_CPLAYER,MSGL_INFO,"BENCHMARKs: V:%8.3fs VO:%8.3fs A:%8.3fs Sys:%8.3fs = %8.3fs\n",
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
360 video_time_usage,vout_time_usage,audio_time_usage,
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
361 total_time_usage-tot,total_time_usage);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
362 if(total_time_usage>0.0)
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
363 mp_msg(MSGT_CPLAYER,MSGL_INFO,"BENCHMARK%%: V:%8.4f%% VO:%8.4f%% A:%8.4f%% Sys:%8.4f%% = %8.4f%%\n",
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
364 100.0*video_time_usage/total_time_usage,
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
365 100.0*vout_time_usage/total_time_usage,
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
366 100.0*audio_time_usage/total_time_usage,
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
367 100.0*(total_time_usage-tot)/total_time_usage,
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
368 100.0);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
369 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
370
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
371 exit(1);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
372 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
373
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
374 void exit_sighandler(int x){
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
375 static int sig_count=0;
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
376 ++sig_count;
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
377 if(sig_count==2) exit(1);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
378 if(sig_count>2){
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
379 // can't stop :(
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
380 kill(getpid(),SIGKILL);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
381 }
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
382 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_IntBySignal,x,
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
383 current_module?current_module:"unknown"
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
384 );
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
385 exit_player(NULL);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
386 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
387
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
388 //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
389
459
9dfad88a8107 add mixer support
pontscho
parents: 458
diff changeset
390 #include "mixer.h"
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
391 #include "cfg-mplayer.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
392
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
393 void parse_cfgfiles( m_config_t* conf )
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
394 {
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
395 char *conffile;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
396 int conffile_fd;
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
397 if (m_config_parse_config_file(conf, "/etc/mplayer.conf") < 0)
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
398 exit(1);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
399 if ((conffile = get_path("")) == NULL) {
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
400 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoHomeDir);
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
401 } else {
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
402 mkdir(conffile, 0777);
55206b791586 get_path()
szabii
parents: 175
diff changeset
403 free(conffile);
55206b791586 get_path()
szabii
parents: 175
diff changeset
404 if ((conffile = get_path("config")) == NULL) {
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
405 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
406 } else {
55206b791586 get_path()
szabii
parents: 175
diff changeset
407 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
408 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CreatingCfgFile, conffile);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
409 write(conffile_fd, default_config, strlen(default_config));
55206b791586 get_path()
szabii
parents: 175
diff changeset
410 close(conffile_fd);
55206b791586 get_path()
szabii
parents: 175
diff changeset
411 }
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
412 if (m_config_parse_config_file(conf, conffile) < 0)
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
413 exit(1);
55206b791586 get_path()
szabii
parents: 175
diff changeset
414 free(conffile);
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
415 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
416 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
417 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
418
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
419 int main(int argc,char* argv[], char *envp[]){
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
420
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
421 #ifdef USE_SUB
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
422 static subtitle* subtitles=NULL;
3274
ac7ded58b6df mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3257
diff changeset
423 float sub_last_pts = -303;
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
424 #endif
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
425
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
426 static demuxer_t *demuxer=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
427
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
428 static demux_stream_t *d_audio=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
429 static demux_stream_t *d_video=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
430 static demux_stream_t *d_dvdsub=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
431
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
432 static sh_audio_t *sh_audio=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
433 static sh_video_t *sh_video=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
434
1629
13aeaa05ac5e multifile support in config parser
arpi
parents: 1627
diff changeset
435 // for multifile support:
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
436 play_tree_iter_t* playtree_iter = NULL;
1629
13aeaa05ac5e multifile support in config parser
arpi
parents: 1627
diff changeset
437
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
438 char* filename=NULL; //"MI2-Trailer.avi";
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
439 int file_format=DEMUXER_TYPE_UNKNOWN;
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
440
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
441 int delay_corrected=1;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
442 char* title="MPlayer";
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
443
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
444 // movie info:
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
445 int out_fmt=0;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
446 int eof=0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
447
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
448 int osd_visible=100;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
449 int osd_function=OSD_PLAY;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
450 int osd_last_pts=-303;
3783
de6b00131e95 show a-v delay in osd (based on subdelay osd patch)
arpi
parents: 3754
diff changeset
451 int osd_show_av_delay = 0;
3234
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
452 int osd_show_sub_delay = 0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
453
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
454 int v_bright=50;
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
455 int v_cont=50;
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
456 int v_hue=50;
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
457 int v_saturation=50;
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
458
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
459 int vo_flags=0;
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
460
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
461 int rtc_fd=-1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
462
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
463 //float a_frame=0; // Audio
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
464
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
465 int i;
1467
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
466 int use_stdin=0; //int f; // filedes
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
467
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
468 int gui_no_filename=0;
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
469
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
470 mp_msg_init(MSGL_STATUS);
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
471
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
472 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s",banner_text);
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
473
2272
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
474 /* Test for cpu capabilities (and corresponding OS support) for optimizing */
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
475 #ifdef ARCH_X86
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
476 GetCpuCaps(&gCpuCaps);
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
477 mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: Type: %d MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n",
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
478 gCpuCaps.cpuType,gCpuCaps.hasMMX,gCpuCaps.hasMMX2,
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
479 gCpuCaps.has3DNow, gCpuCaps.has3DNowExt,
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
480 gCpuCaps.hasSSE, gCpuCaps.hasSSE2);
3742
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
481 #ifdef RUNTIME_CPUDETECT
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
482 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Compiled with RUNTIME CPU Detection - warning, it's untested!\n");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
483 #else
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
484 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Compiled for x86 CPU with features:");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
485 #ifdef HAVE_MMX
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
486 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
487 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
488 #ifdef HAVE_MMX2
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
489 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX2");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
490 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
491 #ifdef HAVE_3DNOW
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
492 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNow");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
493 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
494 #ifdef HAVE_3DNOWEX
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
495 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNowEx");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
496 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
497 #ifdef HAVE_SSE
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
498 mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
499 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
500 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
501 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
502
2272
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
503 #endif
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
504
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
505 if ( argv[0] )
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
506 if(!strcmp(argv[0],"gmplayer") ||
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
507 (strrchr(argv[0],'/') && !strcmp(strrchr(argv[0],'/'),"/gmplayer") ) )
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
508 use_gui=1;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
509
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
510 playtree = play_tree_new();
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
511
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
512 mconfig = m_config_new(playtree);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
513 m_config_register_options(mconfig,mplayer_opts);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
514 // TODO : add something to let modules register their options
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
515 parse_cfgfiles(mconfig);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
516
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
517
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
518
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
519 if(m_config_parse_command_line(mconfig, argc, argv, envp) < 0) exit(1); // error parsing cmdline
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
520
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
521 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
522 if(playtree) {
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
523 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
524 if(playtree_iter) {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
525 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
526 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
527 playtree_iter = NULL;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
528 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
529 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
530 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
531 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
532
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
533 #ifndef HAVE_NEW_GUI
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
534 if(use_gui){
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1962
diff changeset
535 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoGui);
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
536 use_gui=0;
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
537 }
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
538 #else
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
539 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
540 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
541 use_gui=0;
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
542 }
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
543 #endif
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
544
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
545 #ifndef USE_LIBVO2
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
546 if(video_driver && strcmp(video_driver,"help")==0){
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
547 printf("Available video output drivers:\n");
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
548 i=0;
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
549 while (video_out_drivers[i]) {
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
550 const vo_info_t *info = video_out_drivers[i++]->get_info ();
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
551 printf("\t%s\t%s\n", info->short_name, info->name);
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
552 }
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
553 printf("\n");
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
554 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
555 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
556 #endif
956
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
557 if(audio_driver && strcmp(audio_driver,"help")==0){
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
558 printf("Available audio output drivers:\n");
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
559 i=0;
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
560 while (audio_out_drivers[i]) {
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
561 const ao_info_t *info = audio_out_drivers[i++]->info;
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
562 printf("\t%s\t%s\n", info->short_name, info->name);
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
563 }
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
564 printf("\n");
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
565 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
566 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
567
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
568 // check codec.conf
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
569 if(!parse_codec_cfg(get_path("codecs.conf"))){
3748
6da59751fb20 search codecs.conf at CONFDIR
arpi
parents: 3744
diff changeset
570 if(!parse_codec_cfg(CONFDIR"/codecs.conf")){
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
571 mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
2116
6365b02ccc6e ugly hack for bad codecs.conf hangup
arpi
parents: 2102
diff changeset
572 // printf("Exit.\n");
3934
e8e7ca8995a1 codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents: 3843
diff changeset
573 exit(0); // From unknown reason a hangup occurs here :((((((
e8e7ca8995a1 codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents: 3843
diff changeset
574 // kill(getpid(),SIGTERM);
e8e7ca8995a1 codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents: 3843
diff changeset
575 // usleep(20000);
e8e7ca8995a1 codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents: 3843
diff changeset
576 // kill(getpid(),SIGKILL);
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
577 }
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
578 }
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
579
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
580 if(audio_codec && strcmp(audio_codec,"help")==0){
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
581 printf("Available audio codecs:\n");
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
582 list_codecs(1);
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
583 printf("\n");
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
584 exit(0);
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
585 }
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
586 if(video_codec && strcmp(video_codec,"help")==0){
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
587 printf("Available video codecs:\n");
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
588 list_codecs(0);
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
589 printf("\n");
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
590 exit(0);
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
591 }
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
592
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
593
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
594 if(!filename && !vcd_track && !dvd_title && !tv_param_on){
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
595 if(!use_gui){
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
596 // no file/vcd/dvd -> show HELP:
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
597 printf("%s",help_text);
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
598 exit(0);
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
599 } else gui_no_filename=1;
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
600 }
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
601
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
602 // Many users forget to include command line in bugreports...
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
603 if(verbose){
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
604 printf("CommandLine:");
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
605 for(i=1;i<argc;i++)printf(" '%s'",argv[i]);
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
606 printf("\n");
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
607 }
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
608
4152
da00e9f57949 10l to Alban B. - restored removed verbose level setting
arpi
parents: 4087
diff changeset
609 mp_msg_init(verbose+MSGL_STATUS);
1183
6fbcfe7f7f10 vo/ao_subdevice implemented
al3x
parents: 1177
diff changeset
610
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
611 //------ load global data first ------
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
612
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
613
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
614 // check font
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
615 #ifdef USE_OSD
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
616 if(font_name){
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
617 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
618 if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
619 } else {
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
620 // try default:
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
621 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
622 if(!vo_font)
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 1338
diff changeset
623 vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1);
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
624 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
625 #endif
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
626
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
627 // It's time to init the GUI code: (and fork() the GTK process)
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
628 #ifdef HAVE_NEW_GUI
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
629 if(use_gui){
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
630 appInit( argc,argv,envp,(void*)mDisplay );
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
631 inited_flags|=INITED_GUI;
1803
8e0b52f2c215 stop fixed
arpi
parents: 1802
diff changeset
632 mplShMem->Playing= (gui_no_filename) ? 0 : 1;
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
633 }
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
634 #endif
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
635
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
636 #ifdef HAVE_LIRC
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
637 lirc_mp_setup();
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
638 inited_flags|=INITED_LIRC;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
639 #endif
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
640
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
641 #ifdef HAVE_RTC
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
642 if ((rtc_fd = open("/dev/rtc", O_RDONLY)) < 0)
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
643 perror ("Linux RTC init: open");
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
644 else {
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
645 unsigned long irqp;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
646
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
647 /* if (ioctl(rtc_fd, RTC_IRQP_SET, _) < 0) { */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
648 if (ioctl(rtc_fd, RTC_IRQP_READ, &irqp) < 0) {
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
649 perror ("Linux RTC init: ioctl (rtc_irqp_read)");
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
650 close (rtc_fd);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
651 rtc_fd = -1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
652 } 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
653 /* variable only by the root */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
654 perror ("Linux RTC init: ioctl (rtc_pie_on)");
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
655 close (rtc_fd);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
656 rtc_fd = -1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
657 } else
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
658 printf("Using Linux's hardware RTC timing (%ldHz)\n", irqp);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
659 }
4176
116abdd0aed1 small gtk bug fix (-display bug, baze gabu, miattad fogok elkarhozni:), and remove gui dependencie in mencoder
pontscho
parents: 4160
diff changeset
660 #ifdef HAVE_NEW_GUI
3825
7735c5a87121 setuid hack disabled
arpi
parents: 3823
diff changeset
661 // 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
662 // 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
663 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
664 #endif
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
665 if(rtc_fd<0)
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
666 #endif
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
667 printf("Using %s timing\n",softsleep?"software":"usleep()");
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
668
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
669 #ifdef USE_TERMCAP
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
670 if ( !use_gui ) load_termcap(NULL); // load key-codes
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
671 #endif
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
672
1816
c8bc613eb4f8 fixed 'n' key bug :)
arpi
parents: 1809
diff changeset
673 // ========== Init keyboard FIFO (connection to libvo) ============
c8bc613eb4f8 fixed 'n' key bug :)
arpi
parents: 1809
diff changeset
674 make_pipe(&keyb_fifo_get,&keyb_fifo_put);
1694
0def229bd8bc GUI support (--enable-gui)
arpi
parents: 1690
diff changeset
675
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
676 //========= Catch terminate signals: ================
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
677 // terminate requests:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
678 signal(SIGTERM,exit_sighandler); // kill
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
679 signal(SIGHUP,exit_sighandler); // kill -HUP / xterm closed
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
680
1729
d6c99f70449e fix hprogressbar
pontscho
parents: 1727
diff changeset
681 signal(SIGINT,exit_sighandler); // Interrupt from keyboard
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
682
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
683 signal(SIGQUIT,exit_sighandler); // Quit from keyboard
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
684 // fatal errors:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
685 signal(SIGBUS,exit_sighandler); // bus error
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
686 signal(SIGSEGV,exit_sighandler); // segfault
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
687 signal(SIGILL,exit_sighandler); // illegal instruction
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
688 signal(SIGFPE,exit_sighandler); // floating point exc.
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
689 signal(SIGABRT,exit_sighandler); // abort()
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
690
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
691 // ******************* Now, let's see the per-file stuff ********************
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
692
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
693 play_next_file:
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
694
1745
64247d7d0076 add filename drawing
pontscho
parents: 1738
diff changeset
695 #ifdef HAVE_NEW_GUI
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
696 if ( use_gui ) {
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
697
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
698 #ifdef USE_DVDREAD
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
699 if ( mplShMem->DVDChanged )
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
700 {
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
701 mplShMem->DVDChanged=0;
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
702 mplShMem->Playing=1;
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
703 filename="/dev/dvd";
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
704 goto play_dvd;
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
705 }
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
706 #endif
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
707
1817
35d88a433502 fixed interaction between commandlien and fileselector
arpi
parents: 1816
diff changeset
708 if(filename && !mplShMem->FilenameChanged) strcpy( mplShMem->Filename,filename );
1803
8e0b52f2c215 stop fixed
arpi
parents: 1802
diff changeset
709 // mplShMem->Playing= (gui_no_filename) ? 0 : 1;
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
710 while(mplShMem->Playing!=1){
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
711 usleep(20000);
1802
82e77faa7341 async reply fix ?
pontscho
parents: 1797
diff changeset
712 EventHandling();
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
713 }
3560
61e0e3ecf47a kurva sub fix.
pontscho
parents: 3558
diff changeset
714
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
715 play_dvd:
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
716
3499
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
717 #ifdef USE_SUB
3543
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
718 if ( mplShMem->SubtitleChanged || !mplShMem->FilenameChanged )
3560
61e0e3ecf47a kurva sub fix.
pontscho
parents: 3558
diff changeset
719 {
61e0e3ecf47a kurva sub fix.
pontscho
parents: 3558
diff changeset
720 if ( mplShMem->Subtitlename[0] != 0 ) sub_name=mplShMem->Subtitlename;
61e0e3ecf47a kurva sub fix.
pontscho
parents: 3558
diff changeset
721 mplShMem->SubtitleChanged=0;
61e0e3ecf47a kurva sub fix.
pontscho
parents: 3558
diff changeset
722 }
3499
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
723 #endif
3543
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
724
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
725 if ( mplShMem->FilenameChanged || !filename )
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
726 {
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
727 filename=mplShMem->Filename;
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
728 mplShMem->FilenameChanged=0;
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
729 }
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
730 }
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
731 #endif
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
732
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1962
diff changeset
733 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
734
4064
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
735 #ifdef USE_SUB_OLD
1650
7502b16bce63 make automatic subfile detection working with many files
atlka
parents: 1641
diff changeset
736 // check .sub
3499
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
737 if(sub_name){
3580
ce6845de334c small changes
pontscho
parents: 3563
diff changeset
738 #if 0
3499
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
739 int l=strlen(sub_name);
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
740 if ((l>4) && ((0==strcmp(&sub_name[l-4],".utf"))
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
741 ||(0==strcmp(&sub_name[l-4],".UTF"))))
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
742 sub_utf8=1;
3580
ce6845de334c small changes
pontscho
parents: 3563
diff changeset
743 #endif
3499
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
744 subtitles=sub_read_file(sub_name);
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
745 if(!subtitles || sub_num == 0) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name);
93351eec9f1f Add subtitle loader for gui
pontscho
parents: 3474
diff changeset
746 }
1651
b8721b5ab23e fixed duplicated loading of sub
arpi
parents: 1650
diff changeset
747 if(!sub_name){
1650
7502b16bce63 make automatic subfile detection working with many files
atlka
parents: 1641
diff changeset
748 if(sub_auto && filename) { // auto load sub file ...
7502b16bce63 make automatic subfile detection working with many files
atlka
parents: 1641
diff changeset
749 subtitles=sub_read_file( sub_filename( get_path("sub/"), filename ) );
7502b16bce63 make automatic subfile detection working with many files
atlka
parents: 1641
diff changeset
750 }
3580
ce6845de334c small changes
pontscho
parents: 3563
diff changeset
751 #if 0
1650
7502b16bce63 make automatic subfile detection working with many files
atlka
parents: 1641
diff changeset
752 if(!subtitles) subtitles=sub_read_file(get_path("default.sub")); // try default
3580
ce6845de334c small changes
pontscho
parents: 3563
diff changeset
753 #endif
1650
7502b16bce63 make automatic subfile detection working with many files
atlka
parents: 1641
diff changeset
754 }
7502b16bce63 make automatic subfile detection working with many files
atlka
parents: 1641
diff changeset
755
1762
914bdbe33cf8 -dumpsub works for avi, then dumps .sub file
arpi
parents: 1753
diff changeset
756 if(subtitles && stream_dump_type==3) list_sub_file(subtitles);
4064
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
757 if(subtitles && stream_dump_type==4) dump_mpsub(subtitles, fps);
3736
689986c2af9b wannabe compilation breaker
pl
parents: 3723
diff changeset
758 #endif
1762
914bdbe33cf8 -dumpsub works for avi, then dumps .sub file
arpi
parents: 1753
diff changeset
759
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
760 current_module="vobsub";
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
761 if (vobsub_name){
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
762 vo_vobsub=vobsub_open(vobsub_name);
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
763 if(vo_vobsub==NULL)
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
764 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,vobsub_name);
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
765 }
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
766
1654
9d85b84e367e dec_video uninit
arpi
parents: 1651
diff changeset
767 stream=NULL;
9d85b84e367e dec_video uninit
arpi
parents: 1651
diff changeset
768 demuxer=NULL;
9d85b84e367e dec_video uninit
arpi
parents: 1651
diff changeset
769 d_audio=NULL;
9d85b84e367e dec_video uninit
arpi
parents: 1651
diff changeset
770 d_video=NULL;
9d85b84e367e dec_video uninit
arpi
parents: 1651
diff changeset
771 sh_audio=NULL;
9d85b84e367e dec_video uninit
arpi
parents: 1651
diff changeset
772 sh_video=NULL;
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
773
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
774 #ifdef USE_LIBVO2
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
775 current_module="vo2_new";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
776 video_out=vo2_new(video_driver);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
777 current_module=NULL;
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
778 #else
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
779 // check video_out driver name:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
780 if (video_driver)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
781 if ((i = strcspn(video_driver, ":")) > 0)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
782 {
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
783 size_t i2 = strlen(video_driver);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
784
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
785 if (video_driver[i] == ':')
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
786 {
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
787 vo_subdevice = malloc(i2-i);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
788 if (vo_subdevice != NULL)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
789 strncpy(vo_subdevice, (char *)(video_driver+i+1), i2-i);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
790 video_driver[i] = '\0';
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
791 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
792 // printf("video_driver: %s, subdevice: %s\n", video_driver, vo_subdevice);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
793 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
794 if(!video_driver)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
795 video_out=video_out_drivers[0];
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
796 else
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
797 for (i=0; video_out_drivers[i] != NULL; i++){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
798 const vo_info_t *info = video_out_drivers[i]->get_info ();
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
799 if(strcmp(info->short_name,video_driver) == 0){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
800 video_out = video_out_drivers[i];break;
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
801 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
802 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
803 #endif
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
804 if(!video_out){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
805 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidVOdriver,video_driver?video_driver:"?");
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
806 exit_player(MSGTR_Exit_error);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
807 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
808
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
809 // check audio_out driver name:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
810 if (audio_driver)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
811 if ((i = strcspn(audio_driver, ":")) > 0)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
812 {
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
813 size_t i2 = strlen(audio_driver);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
814
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
815 if (audio_driver[i] == ':')
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
816 {
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
817 ao_subdevice = malloc(i2-i);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
818 if (ao_subdevice != NULL)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
819 strncpy(ao_subdevice, (char *)(audio_driver+i+1), i2-i);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
820 audio_driver[i] = '\0';
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
821 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
822 // printf("audio_driver: %s, subdevice: %s\n", audio_driver, ao_subdevice);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
823 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
824 if(!audio_driver)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
825 audio_out=audio_out_drivers[0];
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
826 else
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
827 for (i=0; audio_out_drivers[i] != NULL; i++){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
828 const ao_info_t *info = audio_out_drivers[i]->info;
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
829 if(strcmp(info->short_name,audio_driver) == 0){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
830 audio_out = audio_out_drivers[i];break;
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
831 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
832 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
833 if (!audio_out){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
834 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidAOdriver,audio_driver);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
835 exit_player(MSGTR_Exit_error);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
836 }
3107
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
837 /* Initailize audio plugin interface if used */
3194
1648d11fc36c commandline configuration of audio plugins now through struct, format conversion plugin added
anders
parents: 3180
diff changeset
838 if(ao_plugin_cfg.plugin_list){
3107
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
839 for (i=0; audio_out_drivers[i] != NULL; i++){
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
840 const ao_info_t *info = audio_out_drivers[i]->info;
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
841 if(strcmp(info->short_name,"plugin") == 0){
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
842 audio_out_drivers[i]->control(AOCONTROL_SET_PLUGIN_DRIVER,(int)audio_out);
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
843 audio_out = audio_out_drivers[i];
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
844 break;
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
845 }
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
846 }
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
847 }
ef2287ccc42b Changes to audio out plugin, first plugin added
anders
parents: 3097
diff changeset
848
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
849 current_module="open_stream";
1467
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
850 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
851 if(!stream) { // error...
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
852 uninit_player(inited_flags-(INITED_GUI+INITED_LIRC));
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
853 goto goto_next_file_src;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
854 }
2321
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
855 inited_flags|=INITED_STREAM;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
856 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
857 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
858 // Handle playlist
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
859 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
860 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
861 if(!entry) {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
862 entry = playtree_iter->tree;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
863 if(play_tree_iter_step(playtree_iter,1,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
864 goto goto_next_file;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
865 if(playtree_iter->tree == entry) { // Loop with a single file
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
866 if(play_tree_iter_up_step(playtree_iter,1,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
867 goto goto_next_file;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
868 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
869 play_tree_remove(entry,1,1);
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
870 uninit_player(inited_flags-(INITED_GUI+INITED_LIRC));
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
871 goto goto_next_file_src;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
872 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
873 play_tree_insert_entry(playtree_iter->tree,entry);
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
874 entry = playtree_iter->tree;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
875 if(play_tree_iter_step(playtree_iter,1,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
876 goto goto_next_file;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
877 play_tree_remove(entry,1,1);
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
878 uninit_player(inited_flags-(INITED_GUI+INITED_LIRC));
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
879 goto goto_next_file_src;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
880 }
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
881 stream->start_pos+=seek_to_byte;
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
882
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
883 if(stream_dump_type==5){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
884 unsigned char buf[4096];
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
885 int len;
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
886 FILE *f;
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
887 current_module="dump";
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
888 stream_reset(stream);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
889 stream_seek(stream,stream->start_pos);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
890 f=fopen(stream_dump_name,"wb");
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
891 if(!f){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
892 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
893 exit_player(MSGTR_Exit_error);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
894 }
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
895 while(!stream->eof){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
896 len=stream_read(stream,buf,4096);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
897 if(len>0) fwrite(buf,len,1,f);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
898 }
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
899 fclose(f);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
900 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
901 exit_player(MSGTR_Exit_eof);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
902 }
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
903
3563
3d73514ddefc precaching
arpi
parents: 3560
diff changeset
904 // initial prefill: 20% later: 5% (should be set by -cacheopts)
3d73514ddefc precaching
arpi
parents: 3560
diff changeset
905 if(stream_cache_size) stream_enable_cache(stream,stream_cache_size*1024,stream_cache_size*1024/5,stream_cache_size*1024/20);
2321
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
906
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
907 use_stdin=filename && (!strcmp(filename,"-"));
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
908
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
909 #ifdef HAVE_LIBCSS
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
910 current_module="libcss";
546
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
911 if (dvdimportkey) {
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
912 if (dvd_import_key(dvdimportkey)) {
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
913 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorDVDkey);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
914 exit_player(MSGTR_Exit_error);
546
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
915 }
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
916 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CmdlineDVDkey);
546
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
917 }
1018
e5fc7ec51fa3 -dvd is renamed to -dvdauth, variable dvd_device is renamed to dvd_auth_device. These changes are needed for future DVD playback developmenting
lgb
parents: 1015
diff changeset
918 if (dvd_auth_device) {
1042
b333271f4e7c Solaris 8 DVD support and other fixes by Juergen Keil <jk@tools.de>
arpi_esp
parents: 1039
diff changeset
919 // if (dvd_auth(dvd_auth_device,f)) {
b333271f4e7c Solaris 8 DVD support and other fixes by Juergen Keil <jk@tools.de>
arpi_esp
parents: 1039
diff changeset
920 if (dvd_auth(dvd_auth_device,filename)) {
1809
84c9a29bb6c3 GUI_MSG bug fixed - thanx Attila Kinali
arpi
parents: 1808
diff changeset
921 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Error in DVD auth...\n");
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
922 exit_player(MSGTR_Exit_error);
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
923 }
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
924 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_DVDauthOk);
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
925 }
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
926 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
927
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
928 //============ Open & Sync stream and detect file format ===============
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
929
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
930
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
931 if(!has_audio) audio_id=-2; // do NOT read audio packets...
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
932
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
933 current_module="demux_open";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
934
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
935 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
936 if(!demuxer) goto goto_next_file; // exit_player(MSGTR_Exit_error); // ERROR
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
937
1660
0ed5a9568d0f file_format -> demuxer->file_format
arpi
parents: 1654
diff changeset
938 //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
939
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
940 d_audio=demuxer->audio;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
941 d_video=demuxer->video;
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
942 d_dvdsub=demuxer->sub;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
943
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
944 // DUMP STREAMS:
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
945 if(stream_dump_type){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
946 FILE *f;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
947 demux_stream_t *ds=NULL;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
948 current_module="dump";
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
949 // select stream to dump
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
950 switch(stream_dump_type){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
951 case 1: ds=d_audio;break;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
952 case 2: ds=d_video;break;
2178
e509abdbf195 MPsub read/write support 0.5 (-dumpmpsub switch)
laaz
parents: 2116
diff changeset
953 case 3:
e509abdbf195 MPsub read/write support 0.5 (-dumpmpsub switch)
laaz
parents: 2116
diff changeset
954 case 4: ds=d_dvdsub;break;
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
955 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
956 if(!ds){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
957 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpSelectedSteramMissing);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
958 exit_player(MSGTR_Exit_error);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
959 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
960 // disable other streams:
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
961 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
962 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
963 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
964 // let's dump it!
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
965 f=fopen(stream_dump_name,"wb");
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
966 if(!f){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
967 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
968 exit_player(MSGTR_Exit_error);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
969 }
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
970 while(!ds->eof){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
971 unsigned char* start;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
972 int in_size=ds_get_packet(ds,&start);
2102
569a5d7b5d8a mov timing fixes (same way as asf)
arpi
parents: 2042
diff changeset
973 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
974 && stream_dump_type==2) fwrite(&in_size,1,4,f);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
975 if(in_size>0) fwrite(start,in_size,1,f);
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
976 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
977 fclose(f);
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
978 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
979 exit_player(MSGTR_Exit_eof);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
980 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
981
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
982 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
983 sh_video=d_video->sh;
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
984
3054
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
985 #ifdef HAVE_NEW_GUI
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
986 #ifdef USE_DVDREAD
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
987 if ( use_gui && stream->type == STREAMTYPE_DVD )
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
988 {
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
989 dvd_priv_t * dvdp = stream->priv;
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
990 mplShMem->DVD.titles=dvdp->vmg_file->tt_srpt->nr_of_srpts;
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
991 mplShMem->DVD.chapters=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_ptts;
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
992 mplShMem->DVD.angles=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_angles;
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
993 mplShMem->DVD.nr_of_audio_channels=dvdp->nr_of_channels;
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
994 memcpy( mplShMem->DVD.audio_streams,dvdp->audio_streams,sizeof( dvdp->audio_streams ) );
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
995 mplShMem->DVD.nr_of_subtitles=dvdp->nr_of_subtitles;
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
996 memcpy( mplShMem->DVD.subtitles,dvdp->subtitles,sizeof( dvdp->subtitles ) );
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
997 mplShMem->DVD.current_title=dvd_title + 1;
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
998 mplShMem->DVD.current_chapter=dvd_chapter + 1;
3597
fe1283137353 init title change basz.
pontscho
parents: 3580
diff changeset
999 mplShMem->DVD.current_angle=dvd_angle + 1;
3054
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
1000 mplShMem->Track=dvd_title + 1;
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
1001 }
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
1002 #endif
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
1003 #endif
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
1004
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1005 current_module="video_read_properties";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1006
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1007 if(sh_video){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1008
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1009 if(!video_read_properties(sh_video)) goto goto_next_file; // exit_player(MSGTR_Exit_error); // couldn't read header?
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1010
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1011 mp_msg(MSGT_CPLAYER,MSGL_INFO,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n",
1660
0ed5a9568d0f file_format -> demuxer->file_format
arpi
parents: 1654
diff changeset
1012 demuxer->file_format,sh_video->format, sh_video->disp_w,sh_video->disp_h,
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1013 sh_video->fps,sh_video->frametime
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1014 );
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1015
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1016 if(!sh_video->fps && !force_fps){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1017 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_FPSnotspecified);
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1018 goto goto_next_file; // exit_player(MSGTR_Exit_error);
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1019 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1020
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1021 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1022
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1023 fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1024
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1025 if(!sh_video){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1026 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_NoVideoStream);
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1027 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
1028 }
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1029
4087
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1030 #ifdef USE_DVDREAD
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1031 current_module="dvd lang->id";
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1032 if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang);
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1033 if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang);
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1034
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1035 current_module="spudec";
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1036 vo_spudec=spudec_new_scaled(stream->priv?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL,
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1037 sh_video->disp_w, sh_video->disp_h);
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1038 if (vo_spudec!=NULL)
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1039 inited_flags|=INITED_SPUDEC;
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1040 #endif
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1041 current_module=NULL;
4052
505f206d80d1 corrections to adjust_subs_time function which now uses fps if needed
atlka
parents: 4045
diff changeset
1042
505f206d80d1 corrections to adjust_subs_time function which now uses fps if needed
atlka
parents: 4045
diff changeset
1043 #ifdef USE_SUB
4064
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1044 // 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
1045 // 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
1046 // check .sub
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1047 current_module="read_subtitles_file";
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1048 if(sub_name){
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1049 #if 0
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1050 int l=strlen(sub_name);
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1051 if ((l>4) && ((0==strcmp(&sub_name[l-4],".utf"))
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1052 ||(0==strcmp(&sub_name[l-4],".UTF"))))
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1053 sub_utf8=1;
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1054 #endif
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1055 subtitles=sub_read_file(sub_name, sh_video->fps);
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1056 if(!subtitles || sub_num == 0) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name);
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1057 }
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1058 if(!sub_name){
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1059 if(sub_auto && filename) { // auto load sub file ...
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1060 subtitles=sub_read_file( sub_filename( get_path("sub/"), filename ),
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1061 sh_video->fps );
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1062 }
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1063 #if 0
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1064 if(!subtitles) subtitles=sub_read_file(get_path("default.sub"),
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1065 sh_video->fps); // try default
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1066 #endif
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1067 }
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1068
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1069 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
1070 if(subtitles && stream_dump_type==4) dump_mpsub(subtitles, sh_video->fps);
4052
505f206d80d1 corrections to adjust_subs_time function which now uses fps if needed
atlka
parents: 4045
diff changeset
1071 #endif
4064
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1072
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1073 /* display clip info */
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1074 demux_info_print(demuxer);
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1075
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1076 //================== Init AUDIO (codec) ==========================
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1077
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1078 current_module="init_audio_codec";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1079
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1080 if(sh_audio){
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1081 // Go through the codec.conf and find the best codec...
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1082 sh_audio->codec=NULL;
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1083 if(audio_family!=-1) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceAudioFmt,audio_family);
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1084 while(1){
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1085 sh_audio->codec=find_codec(sh_audio->format,NULL,sh_audio->codec,1);
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1086 if(!sh_audio->codec){
1299
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
1087 if(audio_family!=-1) {
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
1088 sh_audio->codec=NULL; /* re-search */
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1089 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantFindAfmtFallback);
1299
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
1090 audio_family=-1;
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
1091 continue;
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
1092 }
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1093 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantFindAudioCodec,sh_audio->format);
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1094 mp_msg(MSGT_CPLAYER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf"));
1792
89f616b1c2ae nosound fixed. again. :(
arpi
parents: 1790
diff changeset
1095 sh_audio=d_audio->sh=NULL;
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1096 break;
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1097 }
1286
543a94b241a2 Replaced LGBs video codec forcing change with mine for audio and video codecs, which is IMHO more convenient cause codecs are selected by name instead of number, one unclearity is left to me, that's why audio_format is used once before codecs selection for MPEG_PS files, that's why I left -afm in for that one.
atmos4
parents: 1285
diff changeset
1098 if(audio_codec && strcmp(sh_audio->codec->name,audio_codec)) continue;
1299
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
1099 else if(audio_family!=-1 && sh_audio->codec->driver!=audio_family) continue;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1100 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s audio codec: [%s] drv:%d (%s)\n",audio_codec?"Forcing":"Detected",sh_audio->codec->name,sh_audio->codec->driver,sh_audio->codec->info);
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1101 break;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1102 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1103 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1104
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1105 if(sh_audio){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1106 mp_msg(MSGT_CPLAYER,MSGL_V,"Initializing audio codec...\n");
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1107 if(!init_audio(sh_audio)){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1108 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CouldntInitAudioCodec);
1792
89f616b1c2ae nosound fixed. again. :(
arpi
parents: 1790
diff changeset
1109 sh_audio=d_audio->sh=NULL;
1889
dbfa0c00568b fix, bug
pontscho
parents: 1888
diff changeset
1110 #ifdef HAVE_NEW_GUI
dbfa0c00568b fix, bug
pontscho
parents: 1888
diff changeset
1111 if ( use_gui ) mplShMem->AudioType=0;
dbfa0c00568b fix, bug
pontscho
parents: 1888
diff changeset
1112 #endif
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1113 } else {
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1114 mp_msg(MSGT_CPLAYER,MSGL_INFO,"AUDIO: srate=%d chans=%d bps=%d sfmt=0x%X ratio: %d->%d\n",sh_audio->samplerate,sh_audio->channels,sh_audio->samplesize,
758
5a92a5601666 better audio out buffering & sample_format added
arpi_esp
parents: 751
diff changeset
1115 sh_audio->sample_format,sh_audio->i_bps,sh_audio->o_bps);
1889
dbfa0c00568b fix, bug
pontscho
parents: 1888
diff changeset
1116 #ifdef HAVE_NEW_GUI
dbfa0c00568b fix, bug
pontscho
parents: 1888
diff changeset
1117 if ( use_gui ) mplShMem->AudioType=sh_audio->channels;
dbfa0c00568b fix, bug
pontscho
parents: 1888
diff changeset
1118 #endif
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1119 }
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1120 }
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1121
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1122 //================== Init VIDEO (codec & libvo) ==========================
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1123
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1124 current_module="init_video_codec";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1125
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1126 // Go through the codec.conf and find the best codec...
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1127 sh_video->codec=NULL;
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1128 if(video_family!=-1) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceVideoFmt,video_family);
3712
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1129 { /* local vars */
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1130 short bestprio=-1;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1131 struct codecs_st *bestcodec=NULL;
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1132 while(1){
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1133 sh_video->codec=find_codec(sh_video->format,
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1134 sh_video->bih?((unsigned int*) &sh_video->bih->biCompression):NULL,sh_video->codec,0);
3712
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1135 if(!sh_video->codec/* && bestprio==-1*/){
1299
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
1136 if(video_family!=-1) {
3712
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1137 //sh_video->codec=NULL; /* re-search */
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1138 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_CantFindVfmtFallback);
1299
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
1139 video_family=-1;
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
1140 continue;
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
1141 }
3712
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1142 if(bestprio==-1 || !video_codec) {
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1143 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantFindVideoCodec,sh_video->format);
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1144 mp_msg(MSGT_CPLAYER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf"));
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1145 goto goto_next_file; // exit_player(MSGTR_Exit_error);
3712
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1146 }
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1147 } else {
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1148 // is next line needed anymore? - atmos ::
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1149 if(!allow_dshow && sh_video->codec->driver==VFM_DSHOW) continue; // skip DShow
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1150 else if(video_codec && strcmp(sh_video->codec->name,video_codec)) continue;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1151 else if(video_family!=-1 && sh_video->codec->driver!=video_family) continue;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1152 else if(video_family==-1 && !video_codec && sh_video->codec->priority) {
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1153 if(sh_video->codec->priority > bestprio) {
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1154 //printf("\n\n!!! setting bestprio from %d to %d for %s!!!\n\n", bestprio, sh_video->codec->priority, sh_video->codec->name);
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1155 bestprio=sh_video->codec->priority;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1156 bestcodec=sh_video->codec;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1157 }
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1158 continue;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1159 }
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1160 } /* sh_video->codec */
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1161 break;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1162 }
3712
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1163 if(bestprio!=-1) {
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1164 //printf("chose codec %s by priority.\n", bestcodec->name);
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1165 sh_video->codec=bestcodec;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1166 }
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1167
3712
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1168 } /* end local vars */
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1169
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3618
diff changeset
1170 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s video codec: [%s] drv:%d prio:%d (%s)\n",video_codec?"Forcing":"Detected",sh_video->codec->name,sh_video->codec->driver,sh_video->codec->priority!=-1?sh_video->codec->priority:0,sh_video->codec->info);
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1171
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1172 for(i=0;i<CODECS_MAX_OUTFMT;i++){
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1173 // int ret;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1174 out_fmt=sh_video->codec->outfmt[i];
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1175 if(out_fmt==(signed int)0xFFFFFFFF) continue;
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1176 #ifdef USE_LIBVO2
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1177 vo_flags=vo2_query_format(video_out);
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1178 #else
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1179 vo_flags=video_out->query_format(out_fmt);
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1180 #endif
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1181 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: query(%s) returned 0x%X\n",vo_format_name(out_fmt),vo_flags);
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1182 if(vo_flags) break;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1183 }
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1184 if(i>=CODECS_MAX_OUTFMT){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1185 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_VOincompCodec);
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1186 goto goto_next_file; // exit_player(MSGTR_Exit_error);
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1187 }
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1188 sh_video->outfmtidx=i;
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1189
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1190 if(flip==-1){
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1191 // autodetect flipping
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1192 flip=0;
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1193 if(sh_video->codec->outflags[i]&CODECS_FLAG_FLIP)
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1194 if(!(sh_video->codec->outflags[i]&CODECS_FLAG_NOFLIP))
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1195 flip=1;
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1196 }
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1197
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1198 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug1: out_fmt=%s\n",vo_format_name(out_fmt));
487
5dd417ed3a21 vo_debug printfs...
arpi_esp
parents: 482
diff changeset
1199
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1200 if(!init_video(sh_video)){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1201 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CouldntInitVideoCodec);
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1202 goto goto_next_file; // exit_player(MSGTR_Exit_error);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1203 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1204
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1205 if(auto_quality>0){
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1206 // Auto quality option enabled
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1207 output_quality=get_video_quality_max(sh_video);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1208 if(auto_quality>output_quality) auto_quality=output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1209 else output_quality=auto_quality;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1210 mp_msg(MSGT_CPLAYER,MSGL_V,"AutoQ: setting quality to %d\n",output_quality);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1211 set_video_quality(sh_video,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1212 }
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1213
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1214 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1215
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1216 current_module="init_libvo";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1217
2034
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1218 #if 0 /* was X11_FULLSCREEN hack -> moved to libvo/vo_xv.c where it belongs ::atmos */
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1219 if(fullscreen){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1220 if(vo_init()){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1221 //if(verbose) printf("X11 running at %dx%d depth: %d\n",vo_screenwidth,vo_screenheight,vo_depthonscreen);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1222 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1223 if(!screen_size_xy) screen_size_xy=vo_screenwidth; // scale with asp.ratio
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1224 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1225 #endif
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1226
2034
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1227 // Set default VGA 1:1 aspect as fallback ::atmos
3139
45d8fe54f1ea Fix -noaspect.
atmos4
parents: 3107
diff changeset
1228 if(movie_aspect>-1.0) sh_video->aspect = movie_aspect; // cmdline overrides autodetect
2042
c34a29902845 aspect ratio prescaling fixed for 0.0/1.0 cases
arpi
parents: 2036
diff changeset
1229 // if(!sh_video->aspect) sh_video->aspect=1.0;
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1230 screen_size_x = opt_screen_size_x;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1231 screen_size_y = opt_screen_size_y;
2034
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1232 if(screen_size_xy||screen_size_x||screen_size_y){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1233 if(screen_size_xy>0){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1234 if(screen_size_xy<=8){
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1235 screen_size_x=screen_size_xy*sh_video->disp_w;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1236 screen_size_y=screen_size_xy*sh_video->disp_h;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1237 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1238 screen_size_x=screen_size_xy;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1239 screen_size_y=screen_size_xy*sh_video->disp_h/sh_video->disp_w;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1240 }
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
1241 } else if(!vidmode){
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
1242 if(!screen_size_x) screen_size_x=SCREEN_SIZE_X;
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
1243 if(!screen_size_y) screen_size_y=SCREEN_SIZE_Y;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1244 if(screen_size_x<=8) screen_size_x*=sh_video->disp_w;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1245 if(screen_size_y<=8) screen_size_y*=sh_video->disp_h;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1246 }
2034
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1247 } else {
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1248 // check source format aspect, calculate prescale ::atmos
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1249 screen_size_x=sh_video->disp_w;
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1250 screen_size_y=sh_video->disp_h;
2042
c34a29902845 aspect ratio prescaling fixed for 0.0/1.0 cases
arpi
parents: 2036
diff changeset
1251 if(sh_video->aspect>0.01){
2034
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1252 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Movie-Aspect is %.2f:1 - prescaling to correct movie aspect.\n",
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1253 sh_video->aspect);
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1254 screen_size_x=(int)((float)sh_video->disp_h*sh_video->aspect);
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1255 screen_size_x+=screen_size_x%2; // round
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1256 if(screen_size_x<sh_video->disp_w){
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1257 screen_size_x=sh_video->disp_w;
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1258 screen_size_y=(int)((float)sh_video->disp_w*(1.0/sh_video->aspect));
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1259 screen_size_y+=screen_size_y%2; // round
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1260 }
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1261 } else {
2042
c34a29902845 aspect ratio prescaling fixed for 0.0/1.0 cases
arpi
parents: 2036
diff changeset
1262 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Movie-Aspect is undefined - no prescaling applied.\n");
2034
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1263 }
2f1974590f88 New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 2020
diff changeset
1264 }
208
ae0f909ccc7c Adds code to deal with vidmode selection. -- mgraffam
mgraffam
parents: 190
diff changeset
1265
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1266 #ifndef USE_LIBVO2
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1267 { const vo_info_t *info = video_out->get_info();
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1268 mp_msg(MSGT_CPLAYER,MSGL_INFO,"VO: [%s] %dx%d => %dx%d %s %s%s%s%s\n",info->short_name,
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1269 sh_video->disp_w,sh_video->disp_h,
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1270 screen_size_x,screen_size_y,
1183
6fbcfe7f7f10 vo/ao_subdevice implemented
al3x
parents: 1177
diff changeset
1271 vo_format_name(out_fmt),
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1272 fullscreen?"fs ":"",
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1273 vidmode?"vm ":"",
766
479f753a66ae Added -flip passing to init.
atmosfear
parents: 758
diff changeset
1274 softzoom?"zoom ":"",
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1275 (flip==1)?"flip ":""
766
479f753a66ae Added -flip passing to init.
atmosfear
parents: 758
diff changeset
1276 // fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3)
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1277 );
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1278 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Description: %s\n",info->name);
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1279 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Author: %s\n", info->author);
1237
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1280 if(strlen(info->comment) > 0)
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1281 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Comment: %s\n", info->comment);
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1282 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1283 #endif
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1284
1753
pontscho
parents: 1745
diff changeset
1285 #ifdef HAVE_NEW_GUI
pontscho
parents: 1745
diff changeset
1286 if ( use_gui )
pontscho
parents: 1745
diff changeset
1287 {
1952
b55163894e30 compile bug fixed.
pontscho
parents: 1889
diff changeset
1288 mplResizeToMovieSize( sh_video->disp_w,sh_video->disp_h );
3558
1dbf58c3d50c aspect ratio bug fix for gui
pontscho
parents: 3543
diff changeset
1289 moviewidth=sh_video->disp_w;
1dbf58c3d50c aspect ratio bug fix for gui
pontscho
parents: 3543
diff changeset
1290 movieheight=sh_video->disp_h;
2447
3248aabc6d1d add vcd,dvd,etcsymbol handling
pontscho
parents: 2436
diff changeset
1291 mplShMem->StreamType=stream->type;
2854
fd44ecf77f8d move bug meg fileload bug fixed asszem.
pontscho
parents: 2824
diff changeset
1292 mplSetFileName( filename );
1753
pontscho
parents: 1745
diff changeset
1293 }
pontscho
parents: 1745
diff changeset
1294 #endif
pontscho
parents: 1745
diff changeset
1295
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1296 mp_msg(MSGT_CPLAYER,MSGL_V,"video_out->init(%dx%d->%dx%d,flags=%d,'%s',0x%X)\n",
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1297 sh_video->disp_w,sh_video->disp_h,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1298 screen_size_x,screen_size_y,
766
479f753a66ae Added -flip passing to init.
atmosfear
parents: 758
diff changeset
1299 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
1300 title,out_fmt);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1301
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1302 #ifdef USE_LIBVO2
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1303 if(!vo2_start(video_out,
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1304 sh_video->disp_w,sh_video->disp_h,out_fmt,0,
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1305 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3) )){
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1306 #else
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1307 if(video_out->init(sh_video->disp_w,sh_video->disp_h,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1308 screen_size_x,screen_size_y,
766
479f753a66ae Added -flip passing to init.
atmosfear
parents: 758
diff changeset
1309 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
1310 title,out_fmt)){
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1311 #endif
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1312 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CannotInitVO);
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1313 goto goto_next_file; // exit_player(MSGTR_Exit_error);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1314 }
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
1315 inited_flags|=INITED_VO;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1316 mp_msg(MSGT_CPLAYER,MSGL_V,"INFO: Video OUT driver init OK!\n");
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1317
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1318 fflush(stdout);
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1319
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1320 //================== MAIN: ==========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1321 {
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1322
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
1323 //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
1324 //float v_frame=0; // Video
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1325 float time_frame=0; // Timer
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1326 int force_redraw=0;
1400
2bf9c561b01d stage2 step 1
arpi
parents: 1382
diff changeset
1327 //float num_frames=0; // number of frames played
1382
9e8781a3eefc grab.mpg fixed
arpi
parents: 1375
diff changeset
1328 int grab_frames=0;
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
1329 char osd_text_buffer[64];
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1330 int drop_frame=0;
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1331 int drop_frame_cnt=0;
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1332 int too_slow_frame_cnt=0;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1333 int too_fast_frame_cnt=0;
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1334 // 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
1335 float AV_delay=0; // average of A-V timestamp differences
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1336 double cvideo_base_vtime;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1337 double cvideo_base_vframe;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1338 double vdecode_time;
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1339 unsigned int lastframeout_ts;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1340 float time_frame_corr_avg=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1341
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1342 //================ SETUP AUDIO ==========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1343 current_module="setup_audio";
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1344
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1345 if(sh_audio){
1237
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1346
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1347 const ao_info_t *info=audio_out->info;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1348 mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %iHz %s %s\n",
1237
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1349 info->short_name,
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1350 force_srate?force_srate:sh_audio->samplerate,
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1351 sh_audio->channels>1?"Stereo":"Mono",
1456
8c57a5a3c645 printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents: 1449
diff changeset
1352 audio_out_format_name(sh_audio->sample_format)
8c57a5a3c645 printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents: 1449
diff changeset
1353 );
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1354 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Description: %s\nAO: Author: %s\n",
1237
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1355 info->name,
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1356 info->author
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1357 );
1456
8c57a5a3c645 printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents: 1449
diff changeset
1358 if(strlen(info->comment) > 0)
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1359 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Comment: %s\n", info->comment);
969
a2a296d46bff new option: -srate
arpi_esp
parents: 967
diff changeset
1360 if(!audio_out->init(force_srate?force_srate:sh_audio->samplerate,
a2a296d46bff new option: -srate
arpi_esp
parents: 967
diff changeset
1361 sh_audio->channels,sh_audio->sample_format,0)){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1362 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO);
1792
89f616b1c2ae nosound fixed. again. :(
arpi
parents: 1790
diff changeset
1363 sh_audio=d_audio->sh=NULL;
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
1364 } else {
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
1365 inited_flags|=INITED_AO;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1366 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1367
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1368 // printf("Audio buffer size: %d bytes, delay: %5.3fs\n",audio_buffer_size,audio_buffer_delay);
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1369
758
5a92a5601666 better audio out buffering & sample_format added
arpi_esp
parents: 751
diff changeset
1370 // fixup audio buffer size:
782
14bac9d91e22 audio buffering fixed
arpi_esp
parents: 780
diff changeset
1371 // if(outburst<MAX_OUTBURST){
14bac9d91e22 audio buffering fixed
arpi_esp
parents: 780
diff changeset
1372 // sh_audio->a_buffer_size=sh_audio->audio_out_minsize+outburst;
14bac9d91e22 audio buffering fixed
arpi_esp
parents: 780
diff changeset
1373 // printf("Audio out buffer size reduced to %d bytes\n",sh_audio->a_buffer_size);
14bac9d91e22 audio buffering fixed
arpi_esp
parents: 780
diff changeset
1374 // }
758
5a92a5601666 better audio out buffering & sample_format added
arpi_esp
parents: 751
diff changeset
1375
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1376 // sh_audio->timer=-(audio_buffer_delay);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1377 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1378
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1379 sh_video->timer=0;
2000
5fd3f344fc89 -delay fixed
arpi
parents: 1983
diff changeset
1380 if(sh_audio) sh_audio->timer=-audio_delay;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1381
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1382 if(!sh_audio){
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1962
diff changeset
1383 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_NoSound);
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1384 if(verbose) mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused audio chunks\n",d_audio->packs);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1385 ds_free_packs(d_audio); // free buffered chunks
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1386 d_audio->id=-2; // do not read audio chunks
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
1387 if(audio_out) uninit_player(INITED_AO); // close device
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1388 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1389
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1390 current_module=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1391
1660
0ed5a9568d0f file_format -> demuxer->file_format
arpi
parents: 1654
diff changeset
1392 if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf!
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1393 if(force_fps){
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1394 sh_video->fps=force_fps;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1395 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
1396 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
1397 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1398
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1399 //==================== START PLAYING =======================
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1400
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1401 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_StartPlaying);fflush(stdout);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1402
3322
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1403 if(!use_stdin && !slave_mode){
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
1404 getch2_enable(); // prepare stdin for hotkeys...
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
1405 inited_flags|=INITED_GETCH2;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
1406 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1407
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1408 InitTimer();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1409
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
1410 total_time_usage_start=GetTimer();
3934
e8e7ca8995a1 codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents: 3843
diff changeset
1411 audio_time_usage=0; video_time_usage=0; vout_time_usage=0;
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
1412
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1413 while(!eof){
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1414 // unsigned int aq_total_time=GetTimer();
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1415 float aq_sleep_time=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1416
1125
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
1417 if(play_n_frames>=0){
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
1418 --play_n_frames;
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1419 if(play_n_frames<0) exit_player(MSGTR_Exit_frames);
1125
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
1420 }
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
1421
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1422 vo_pts=sh_video->timer*90000.0;
3201
039a973b3dda Newest DXR3 patch (improved 1.0rc2) by David Holm.
atmos4
parents: 3194
diff changeset
1423 vo_fps=sh_video->fps;
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1424
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1425 /*========================== PLAY AUDIO ============================*/
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1426 while(sh_audio){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1427 unsigned int t;
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1428 int playsize;
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1429
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1430 ao_data.pts=sh_audio->timer*90000.0;
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1431 playsize=audio_out->get_space();
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1432
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1433 if(!playsize) break; // buffer is full, do not block here!!!
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1434
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1435 if(playsize>MAX_OUTBURST) playsize=MAX_OUTBURST; // we shouldn't exceed it!
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1436 //if(playsize>outburst) playsize=outburst;
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
1437
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
1438 // Update buffer if needed
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1439 current_module="decode_audio"; // Enter AUDIO decoder module
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1440 t=GetTimer();
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1441 while(sh_audio->a_buffer_len<playsize && !d_audio->eof){
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1442 int ret=decode_audio(sh_audio,&sh_audio->a_buffer[sh_audio->a_buffer_len],
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1443 playsize-sh_audio->a_buffer_len,sh_audio->a_buffer_size-sh_audio->a_buffer_len);
296
c3d7a28a0d1a audio init moved to dec_audio.c
arpi_esp
parents: 291
diff changeset
1444 if(ret>0) sh_audio->a_buffer_len+=ret; else break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1445 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1446 current_module=NULL; // Leave AUDIO decoder module
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
1447 t=GetTimer()-t;audio_time_usage+=t*0.000001;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1448
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1449 if(playsize>sh_audio->a_buffer_len) playsize=sh_audio->a_buffer_len;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1450
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1451 playsize=audio_out->play(sh_audio->a_buffer,playsize,0);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1452
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1453 if(playsize>0){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1454 sh_audio->a_buffer_len-=playsize;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1455 memcpy(sh_audio->a_buffer,&sh_audio->a_buffer[playsize],sh_audio->a_buffer_len);
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1456 sh_audio->timer+=playsize/(float)(sh_audio->o_bps);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1457 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1458
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1459 break;
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1460 } // if(sh_audio)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1461
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1462 /*========================== UPDATE TIMERS ============================*/
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1463 #if 0
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1464 if(alsa){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1465 // Use system timer for sync, not audio card/driver
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1466 time_frame-=GetRelativeTime();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1467 if(time_frame<-0.1 || time_frame>0.1){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1468 time_frame=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1469 } else {
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1470 while(time_frame>0.022){
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1471 usec_sleep(time_frame-0.022);
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1472 time_frame-=GetRelativeTime();
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1473 }
103
506d7560279c timer fixes
arpi_esp
parents: 92
diff changeset
1474 while(time_frame>0.007){
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1475 usec_sleep(1000); // sleeps 1 clock tick (10ms)!
103
506d7560279c timer fixes
arpi_esp
parents: 92
diff changeset
1476 time_frame-=GetRelativeTime();
506d7560279c timer fixes
arpi_esp
parents: 92
diff changeset
1477 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1478 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1479 }
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1480 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1481
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1482 /*========================== PLAY VIDEO ============================*/
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1483
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1484 cvideo_base_vframe=sh_video->timer;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1485 cvideo_base_vtime=video_time_usage;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1486
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1487 if(1)
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1488 while(1){
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1489
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1490 float frame_time=0;
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1491 int blit_frame=0;
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1492
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1493 //-------------------- Decode a frame: -----------------------
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1494 vdecode_time=video_time_usage;
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1495 { unsigned char* start=NULL;
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1496 int in_size;
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1497 // get it!
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1498 current_module="video_read_frame";
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1499 in_size=video_read_frame(sh_video,&frame_time,&start,force_fps);
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1500 if(in_size<0){ eof=1; break; }
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1501 if(in_size>max_framesize) max_framesize=in_size; // stats
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1502 // decode:
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1503 current_module="decode_video";
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1504 // printf("Decode! %p %d \n",start,in_size);
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1505 blit_frame=decode_video(video_out,sh_video,start,in_size,drop_frame);
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1506 }
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1507 vdecode_time=video_time_usage-vdecode_time;
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1508 //------------------------ frame decoded. --------------------
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1509
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1510 //------------------------ add OSD to frame contents ---------
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1511 #ifndef USE_LIBVO2
1768
63db543aae94 set current_module for OSD
arpi
parents: 1765
diff changeset
1512 current_module="draw_osd";
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1513 video_out->draw_osd();
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1514 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1515
1768
63db543aae94 set current_module for OSD
arpi
parents: 1765
diff changeset
1516 current_module="av_sync";
63db543aae94 set current_module for OSD
arpi
parents: 1765
diff changeset
1517
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1518 sh_video->timer+=frame_time;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1519 time_frame+=frame_time; // for nosound
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1520
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1521 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"*** ftime=%5.3f ***\n",frame_time);
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1522
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1523 if(drop_frame){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1524
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1525 if(sh_audio && !d_audio->eof){
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1526 float delay=audio_out->get_delay();
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1527 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"delay=%f\n",delay);
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1528 time_frame=sh_video->timer;
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1529 time_frame-=sh_audio->timer-delay;
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1530 if(time_frame>-2*frame_time) {
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1531 drop_frame=0; // stop dropping frames
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1532 mp_msg(MSGT_AVSYNC,MSGL_DBG2,"\nstop frame drop %.2f\n", time_frame);
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1533 }else{
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1534 ++drop_frame_cnt;
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1535 if (verbose > 0 && drop_frame_cnt%10 == 0)
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1536 mp_msg(MSGT_AVSYNC,MSGL_DBG2,"\nstill dropping, %.2f\n", time_frame);
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1537 }
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1538 }
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1539 #ifdef HAVE_NEW_GUI
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
1540 if(use_gui) EventHandling();
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1541 #endif
1729
d6c99f70449e fix hprogressbar
pontscho
parents: 1727
diff changeset
1542 video_out->check_events(); // check events AST
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1543 } else {
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1544 // It's time to sleep...
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1545 current_module="sleep";
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1546
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1547 time_frame-=GetRelativeTime(); // reset timer
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1548
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1549 if(sh_audio && !d_audio->eof){
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1550 float delay=audio_out->get_delay();
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1551 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
1552
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1553 if(!dapsync){
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1554
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1555 /* Arpi's AV-sync */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1556
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1557 time_frame=sh_video->timer;
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1558 time_frame-=sh_audio->timer-delay;
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1559
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1560 // we are out of time... drop next frame!
940
108ac8795d19 -fps 1 fixed
arpi_esp
parents: 939
diff changeset
1561 if(time_frame<-2*frame_time){
1478
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
1562 static int drop_message=0;
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1563 drop_frame=frame_dropping; // tricky!
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1564 ++drop_frame_cnt;
1478
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
1565 if(drop_frame_cnt>50 && AV_delay>0.5 && !drop_message){
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
1566 drop_message=1;
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1567 mp_msg(MSGT_AVSYNC,MSGL_WARN,MSGTR_SystemTooSlow);
1478
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
1568 }
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1569 mp_msg(MSGT_AVSYNC,MSGL_DBG2,"\nframe drop %d, %.2f\n", drop_frame, time_frame);
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1570 }
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1571
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1572 } else {
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1573
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1574 /* DaP's AV-sync */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1575
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1576 float SH_AV_delay;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1577 /* SH_AV_delay = sh_video->timer - (sh_audio->timer - (float)((float)delay + sh_audio->a_buffer_len) / (float)sh_audio->o_bps); */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1578 SH_AV_delay = sh_video->timer - (sh_audio->timer - (float)((float)delay) / (float)sh_audio->o_bps);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1579 // printf ("audio slp req: %.3f TF: %.3f delta: %.3f (v: %.3f a: %.3f) | ", i, time_frame,
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1580 // i - time_frame, sh_video->timer, sh_audio->timer - (float)((float)delay / (float)sh_audio->o_bps));
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1581 if(SH_AV_delay<-2*frame_time){
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1582 static int drop_message=0;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1583 drop_frame=frame_dropping; // tricky!
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1584 ++drop_frame_cnt;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1585 if(drop_frame_cnt>50 && AV_delay>0.5 && !drop_message){
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1586 drop_message=1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1587 mp_msg(MSGT_AVSYNC,MSGL_WARN,MSGTR_SystemTooSlow);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1588 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1589 printf ("A-V SYNC: FRAMEDROP (SH_AV_delay=%.3f)!\n", SH_AV_delay);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1590 mp_msg(MSGT_AVSYNC,MSGL_DBG2,"\nframe drop %d, %.2f\n", drop_frame, time_frame);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1591 /* go into unlimited-TF cycle */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1592 time_frame = SH_AV_delay;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1593 } else {
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1594 #define SL_CORR_AVG_LEN 125
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1595 /* don't adjust under framedropping */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1596 time_frame_corr_avg = (time_frame_corr_avg * (SL_CORR_AVG_LEN - 1) +
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1597 (SH_AV_delay - time_frame)) / SL_CORR_AVG_LEN;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1598 #define UNEXP_CORR_MAX 0.1 /* limit of unexpected correction between two frames (percentage) */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1599 #define UNEXP_CORR_WARN 1.0 /* warn limit of A-V lag (percentage) */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1600 time_frame += time_frame_corr_avg;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1601 // printf ("{%.3f - %.3f}\n", i - time_frame, frame_time + frame_time_corr_avg);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1602 if (SH_AV_delay - time_frame < (frame_time + time_frame_corr_avg) * UNEXP_CORR_MAX &&
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1603 SH_AV_delay - time_frame > (frame_time + time_frame_corr_avg) * -UNEXP_CORR_MAX)
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1604 time_frame = SH_AV_delay;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1605 else {
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1606 if (SH_AV_delay - time_frame > (frame_time + time_frame_corr_avg) * UNEXP_CORR_WARN ||
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1607 SH_AV_delay - time_frame < (frame_time + time_frame_corr_avg) * -UNEXP_CORR_WARN)
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1608 printf ("WARNING: A-V SYNC LAG TOO LARGE: %.3f {%.3f - %.3f} (too little UNEXP_CORR_MAX?)\n",
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1609 SH_AV_delay - time_frame, SH_AV_delay, time_frame);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1610 time_frame += (frame_time + time_frame_corr_avg) * ((SH_AV_delay > time_frame) ?
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1611 UNEXP_CORR_MAX : -UNEXP_CORR_MAX);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1612 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1613 } /* /start dropframe */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1614
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1615 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1616
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1617 } else {
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1618 // NOSOUND:
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
1619 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
1620 time_frame=0;
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
1621
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1622 }
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1623
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1624 // 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
1625
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1626 aq_sleep_time+=time_frame;
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1627
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1628 #ifdef HAVE_NEW_GUI
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1629 if(use_gui){
1802
82e77faa7341 async reply fix ?
pontscho
parents: 1797
diff changeset
1630 EventHandling();
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1631 }
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1632 #endif
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1633
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1634 if(!(vo_flags&256)){ // flag 256 means: libvo driver does its timing (dvb card)
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1635
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
1636 #ifdef HAVE_RTC
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1637 if(rtc_fd>=0){
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1638 // -------- RTC -----------
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1639 while (time_frame > 0.000) {
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1640 unsigned long long rtc_ts;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1641 if (read (rtc_fd, &rtc_ts, sizeof(rtc_ts)) <= 0)
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1642 perror ("read (rtc_fd)");
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1643 time_frame-=GetRelativeTime();
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1644 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1645 } else
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1646 #endif
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1647 {
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1648 // -------- USLEEP + SOFTSLEEP -----------
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1649 float min=softsleep?0.021:0.005;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1650 while(time_frame>min){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1651 if(time_frame<=0.020)
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1652 usec_sleep(0); // sleeps 1 clock tick (10ms)!
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1653 else
2757
b8b92c4afa22 fixed usleep() - 10l?
arpi
parents: 2705
diff changeset
1654 usec_sleep(1000000*(time_frame-0.020));
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1655 time_frame-=GetRelativeTime();
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1656 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1657 if(softsleep){
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1658 if(time_frame<0) printf("Warning! softsleep underflow!\n");
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1659 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
1660 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1661 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1662
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
1663 }
117
b21b7c2fa180 common vo->flip_page() call
arpi_esp
parents: 112
diff changeset
1664
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1665 current_module="flip_page";
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1666 #ifdef USE_LIBVO2
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1667 if(blit_frame) vo2_flip(video_out,0);
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1668 #else
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1669 video_out->check_events();
1962
a0bd07b10667 fixed VO time usage (now including page-flip)
arpi
parents: 1953
diff changeset
1670 if(blit_frame){
a0bd07b10667 fixed VO time usage (now including page-flip)
arpi
parents: 1953
diff changeset
1671 unsigned int t2=GetTimer();
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1672
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1673 float j;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1674 #define FRAME_LAG_WARN 0.2
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1675 j = ((float)t2 - lastframeout_ts) / 1000000;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1676 lastframeout_ts = GetTimer();
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1677 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
1678 too_fast_frame_cnt++;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1679 /* printf ("PANIC: too fast frame (%.3f)!\n", j); */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1680 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
1681 too_slow_frame_cnt++;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1682 /* printf ("PANIC: too slow frame (%.3f)!\n", j); */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1683
1962
a0bd07b10667 fixed VO time usage (now including page-flip)
arpi
parents: 1953
diff changeset
1684 video_out->flip_page();
a0bd07b10667 fixed VO time usage (now including page-flip)
arpi
parents: 1953
diff changeset
1685 t2=GetTimer()-t2;vout_time_usage+=t2*0.000001f;
a0bd07b10667 fixed VO time usage (now including page-flip)
arpi
parents: 1953
diff changeset
1686 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1687 #endif
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1688 // usec_sleep(50000); // test only!
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1689
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1690 }
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1691
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1692 current_module=NULL;
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1693
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1694 if(eof) break;
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1695 if(force_redraw){
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1696 --force_redraw;
577
feeb61dd92ea Fixed broken pause function.
atmosfear
parents: 564
diff changeset
1697 if(!force_redraw) osd_function=OSD_PLAY;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1698 continue;
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1699 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1700
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1701 // printf("A:%6.1f V:%6.1f A-V:%7.3f frame=%5.2f \r",d_audio->pts,d_video->pts,d_audio->pts-d_video->pts,sh_audio->timer);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1702 // fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1703
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1704 #if 1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1705 /*================ A-V TIMESTAMP CORRECTION: =========================*/
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1706 if(sh_audio){
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1707 float a_pts=0;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1708 float v_pts=0;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1709
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1710 // unplayed bytes in our and soundcard/dma buffer:
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
1711 float delay=audio_out->get_delay()+(float)sh_audio->a_buffer_len/(float)sh_audio->o_bps;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1712
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1713 if(pts_from_bps){
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1714 #if 1
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1715 unsigned int samples=(sh_audio->audio.dwSampleSize)?
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1716 ((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) :
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1717 (d_audio->pack_no); // <- used for VBR audio
3302
e75454b489df using audio.dwStart too... (for baittest.avi)
arpi
parents: 3274
diff changeset
1718 samples+=sh_audio->audio.dwStart; // offset
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1719 a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate;
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1720 #else
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1478
diff changeset
1721 if(sh_audio->audio.dwSampleSize)
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1478
diff changeset
1722 a_pts=(ds_tell(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->wf->nAvgBytesPerSec;
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1478
diff changeset
1723 else // VBR:
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1478
diff changeset
1724 a_pts=d_audio->pack_no*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate;
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1725 #endif
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1726 // v_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1727 // printf("V_PTS: PTS: %8.3f BPS: %8.3f \n",d_video->pts,v_pts);
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1728 delay_corrected=1;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1729 } else {
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1730 // 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
1731 a_pts=d_audio->pts;
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1732 if(!delay_corrected) if(a_pts) delay_corrected=1;
1478
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
1733 //printf("*** %5.3f ***\n",a_pts);
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1734 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
1456
8c57a5a3c645 printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents: 1449
diff changeset
1735 // v_pts=d_video->pts-frame_time;
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1736 // v_pts=d_video->pts;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1737 }
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1738 v_pts=d_video->pts;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1739
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1740 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
1741
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1742 if(delay_corrected){
1478
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
1743 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
1744 AV_delay=(a_pts-delay-audio_delay)-v_pts;
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
1745 x=AV_delay*0.1f;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1746 if(x<-max_pts_correction) x=-max_pts_correction; else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1747 if(x> max_pts_correction) x= max_pts_correction;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1748 if(default_max_pts_correction>=0)
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1749 max_pts_correction=default_max_pts_correction;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1750 else
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1751 max_pts_correction=sh_video->frametime*0.10; // +-10% of time
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1752 sh_audio->timer+=x; c_total+=x;
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
1753 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
1754 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
1755 (int)sh_video->num_frames,(int)sh_video->num_frames_decoded,
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1756 (sh_video->timer>0.5)?(int)(100.0*video_time_usage/(double)sh_video->timer):0,
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1757 (sh_video->timer>0.5)?(int)(100.0*vout_time_usage/(double)sh_video->timer):0,
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1758 (sh_video->timer>0.5)?(100.0*audio_time_usage/(double)sh_video->timer):0
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1759 ,drop_frame_cnt
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1760 ,output_quality
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
1761 ,cache_fill_status
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1762 );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1763 fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1764 }
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1765
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1766 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1767 // No audio:
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
1768
1448
e795527de16a -quiet option patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents: 1439
diff changeset
1769 if(!quiet)
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
1770 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
1771 (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
1772 (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
1773 (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
1774 (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
1775 ,drop_frame_cnt
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
1776 ,output_quality
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
1777 ,cache_fill_status
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1778 );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1779
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1780 fflush(stdout);
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
1781
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1782 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1783 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1784
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1785 /*Output quality adjustments:*/
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1786 if(auto_quality>0){
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1787 #if 0
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1788 /*If we took a long time decoding this frame, downgrade the quality.*/
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1789 if(output_quality>0&&
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1790 (video_time_usage-cvideo_base_vtime)*sh_video->timer>=
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1791 (0.95*sh_video->timer-(vout_time_usage+audio_time_usage))*
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1792 (sh_video->timer-cvideo_base_vframe-frame_correction)){
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1793 output_quality>>=1;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1794 mp_msg(MSGT_AUTOQ,MSGL_DBG2,"Downgrading quality to %i.\n",output_quality);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1795 set_video_quality(sh_video,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1796 } else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1797 /*If we had plenty of extra time, upgrade the quality.*/
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1798 if(output_quality<auto_quality&&
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1799 vdecode_time<0.5*frame_time&&
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1800 (video_time_usage-cvideo_base_vtime)*sh_video->timer<
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1801 (0.67*sh_video->timer-(vout_time_usage+audio_time_usage))*
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1802 (sh_video->timer-cvideo_base_vframe-frame_correction)){
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1803 output_quality++;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1804 mp_msg(MSGT_AUTOQ,MSGL_DBG2,"Upgrading quality to %i.\n",output_quality);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1805 set_video_quality(sh_video,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1806 }
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1807 #else
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
1808 // float total=0.000001f * (GetTimer()-aq_total_time);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1809 // if(output_quality<auto_quality && aq_sleep_time>0.05f*total)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1810 if(output_quality<auto_quality && aq_sleep_time>0)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1811 ++output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1812 else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1813 // if(output_quality>0 && aq_sleep_time<-0.05f*total)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1814 if(output_quality>1 && aq_sleep_time<0)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1815 --output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1816 else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1817 if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1818 output_quality=0;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1819 // 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
1820 set_video_quality(sh_video,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1821 #endif
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1822 }
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1823
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1824 #ifdef USE_OSD
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1825 if(osd_visible){
1504
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
1826 if (!--osd_visible){ vo_osd_progbar_type=-1; // disable
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
1827 if (osd_function != OSD_PAUSE)
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
1828 osd_function = OSD_PLAY;
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
1829 }
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1830 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1831 #endif
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1832
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1833 if(osd_function==OSD_PAUSE){
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1834 #ifdef HAVE_NEW_GUI
1817
35d88a433502 fixed interaction between commandlien and fileselector
arpi
parents: 1816
diff changeset
1835 int gui_pause_flag=0; // gany!
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1836 #endif
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1837 mp_msg(MSGT_CPLAYER,MSGL_STATUS,"\n------ PAUSED -------\r");fflush(stdout);
1793
ba11d77c587a gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents: 1792
diff changeset
1838 #ifdef HAVE_NEW_GUI
ba11d77c587a gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents: 1792
diff changeset
1839 if(use_gui) mplShMem->Playing=2;
ba11d77c587a gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents: 1792
diff changeset
1840 #endif
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1841 if (audio_out && sh_audio)
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
1842 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
1843
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1844 if(slave_mode) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1845 fd_set set;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1846 struct timeval timeout;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1847 while (1) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1848 usec_sleep(1000);
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1849 FD_ZERO (&set);
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1850 FD_SET (STDIN_FILENO, &set);
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1851 timeout.tv_sec = 0;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1852 timeout.tv_usec = 1000;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1853 if(1==select(FD_SETSIZE, &set, NULL, NULL, &timeout)) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1854 break;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1855 }
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1856 }
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1857 } else {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1858
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1859 while(
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1860 #ifdef HAVE_LIRC
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1861 lirc_mp_getinput()<=0 &&
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1862 #endif
1467
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
1863 (use_stdin || getch2(20)<=0) && mplayer_get_key()<=0){
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1864 #ifndef USE_LIBVO2
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1865 video_out->check_events();
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1866 #endif
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1867 #ifdef HAVE_NEW_GUI
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1868 if(use_gui){
1802
82e77faa7341 async reply fix ?
pontscho
parents: 1797
diff changeset
1869 EventHandling();
1817
35d88a433502 fixed interaction between commandlien and fileselector
arpi
parents: 1816
diff changeset
1870 if(mplShMem->Playing!=2 || (rel_seek_secs || abs_seek_pos))
35d88a433502 fixed interaction between commandlien and fileselector
arpi
parents: 1816
diff changeset
1871 { gui_pause_flag=1; break; } // end of pause or seek
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1872 }
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1873 #endif
1467
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
1874 if(use_stdin) usec_sleep(1000); // do not eat the CPU
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1875 }
3322
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1876 }
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1877 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
1878 if (audio_out && sh_audio)
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
1879 audio_out->resume(); // resume audio
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1880 (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
1881 #ifdef HAVE_NEW_GUI
1817
35d88a433502 fixed interaction between commandlien and fileselector
arpi
parents: 1816
diff changeset
1882 if(use_gui && !gui_pause_flag) mplShMem->Playing=1; // play from keyboard
1793
ba11d77c587a gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents: 1792
diff changeset
1883 #endif
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1884 }
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1885
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1886
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1887 if(!force_redraw) break;
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1888 } // while(sh_video->timer<sh_audio->timer || force_redraw)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1889
2436
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
1890 // skip some seconds... added by fly
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
1891
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
1892 if(step_sec>0) {
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
1893 osd_function=OSD_FFW;
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
1894 rel_seek_secs+=step_sec;
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
1895 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1896
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1897 //================= Keyboard events, SEEKing ====================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1898
3322
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1899 /* slave mode */
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1900 if(slave_mode) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1901 char buffer[1024];
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1902 fd_set set;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1903 struct timeval timeout;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1904 int arg;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1905
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1906 FD_ZERO (&set);
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1907 FD_SET (STDIN_FILENO, &set);
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1908 timeout.tv_sec = 0;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1909 timeout.tv_usec = 1000;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1910
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1911 if(1 == select (FD_SETSIZE, &set, NULL, NULL, &timeout)) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1912 fgets(buffer, 1024, stdin);
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1913 if(!strcmp("play\n", buffer)) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1914 osd_function=OSD_PLAY;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1915 } else if(!strcmp("stop\n", buffer)) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1916 osd_function=OSD_PAUSE;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1917 } else if(!strncmp("seek ", buffer, 5)) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1918 sscanf(buffer+5, "%d", &arg);
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1919 rel_seek_secs = arg-d_video->pts;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1920 } else if(!strncmp("skip ", buffer, 5)) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1921 sscanf(buffer+5, "%d", &arg);
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1922 rel_seek_secs = arg;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1923 } else if(!strcmp("quit\n", buffer)) {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1924 exit_player(MSGTR_Exit_quit);
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1925 }
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1926 } else {
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1927 osd_function=OSD_PLAY;
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1928 }
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1929 } else
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1930
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
1931 /* interactive mode */
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1932 { int c;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1933 while(
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1934 #ifdef HAVE_LIRC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1935 (c=lirc_mp_getinput())>0 ||
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1936 #endif
1467
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
1937 (!use_stdin && (c=getch2(0))>0) || (c=mplayer_get_key())>0) switch(c){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1938 // seek 10 sec
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1939 case KEY_RIGHT:
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1940 osd_function=OSD_FFW;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1941 rel_seek_secs+=10;break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1942 case KEY_LEFT:
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1943 osd_function=OSD_REW;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1944 rel_seek_secs-=10;break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1945 // seek 1 min
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1946 case KEY_UP:
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1947 osd_function=OSD_FFW;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1948 rel_seek_secs+=60;break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1949 case KEY_DOWN:
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1950 osd_function=OSD_REW;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1951 rel_seek_secs-=60;break;
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
1952 // seek 10 min
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
1953 case KEY_PAGE_UP:
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
1954 rel_seek_secs+=600;break;
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
1955 case KEY_PAGE_DOWN:
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
1956 rel_seek_secs-=600;break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1957 // delay correction:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1958 case '+':
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1959 audio_delay+=0.1; // increase audio buffer delay
3783
de6b00131e95 show a-v delay in osd (based on subdelay osd patch)
arpi
parents: 3754
diff changeset
1960 osd_show_av_delay = 9; // show the A-V delay in OSD
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1961 if(sh_audio) sh_audio->timer-=0.1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1962 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1963 case '-':
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1964 audio_delay-=0.1; // decrease audio buffer delay
3783
de6b00131e95 show a-v delay in osd (based on subdelay osd patch)
arpi
parents: 3754
diff changeset
1965 osd_show_av_delay = 9; // show the A-V delay in OSD
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1966 if(sh_audio) sh_audio->timer+=0.1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1967 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1968 // quit
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1969 case KEY_ESC: // ESC
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1970 case 'q':
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1971 exit_player(MSGTR_Exit_quit);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1972 case KEY_ENTER: // ESC
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1973 eof=1; // force jump to next file : quit if no next file
2647
679d3b21bedb -playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
arpi
parents: 2567
diff changeset
1974 break;
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
1975 case 'g': grab_frames=2;break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1976 // pause
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1977 case 'p':
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1978 case ' ':
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1979 osd_function=OSD_PAUSE;
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1980 break;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
1981 case KEY_HOME:
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
1982 {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
1983 play_tree_iter_t* i = play_tree_iter_new_copy(playtree_iter);
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1984 if(play_tree_iter_up_step(i,1,0) == PLAY_TREE_ITER_ENTRY)
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1985 eof = PT_UP_NEXT;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
1986 play_tree_iter_free(i);
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
1987 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
1988 break;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
1989 case KEY_END:
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
1990 {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
1991 play_tree_iter_t* i = play_tree_iter_new_copy(playtree_iter);
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1992 if(play_tree_iter_up_step(i,-1,0) == PLAY_TREE_ITER_ENTRY)
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1993 eof = PT_UP_PREV;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1994 play_tree_iter_free(i);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1995 }
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1996 break;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1997 case '>':
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1998 {
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1999 play_tree_iter_t* i = play_tree_iter_new_copy(playtree_iter);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2000 if(play_tree_iter_step(i,1,0) == PLAY_TREE_ITER_ENTRY)
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2001 eof = PT_NEXT_ENTRY;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2002 play_tree_iter_free(i);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2003 }
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2004 break;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2005 case '<':
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2006 {
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2007 play_tree_iter_t* i = play_tree_iter_new_copy(playtree_iter);
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2008 if(play_tree_iter_step(i,-1,0) == PLAY_TREE_ITER_ENTRY)
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2009 eof = PT_PREV_ENTRY;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2010 play_tree_iter_free(i);
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2011 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2012 break;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2013 case KEY_INS:
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2014 if(playtree_iter->num_files > 1 && playtree_iter->file < playtree_iter->num_files)
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2015 eof = PT_NEXT_SRC;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2016 break;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2017 case KEY_DEL:
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2018 if(playtree_iter->num_files > 1 && playtree_iter->file > 1)
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2019 eof = PT_PREV_SRC;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2020 break;
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2021 case 'o': // toggle OSD
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2022 osd_level=(osd_level+1)%3;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2023 break;
939
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
2024 case 'z':
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
2025 sub_delay -= 0.1;
3234
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
2026 osd_show_sub_delay = 9; // show the subdelay in OSD
939
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
2027 break;
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
2028 case 'x':
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
2029 sub_delay += 0.1;
3234
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
2030 osd_show_sub_delay = 9; // show the subdelay in OSD
939
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
2031 break;
1626
5f5505e4bb2d removed ugly switch/goto hack
arpi
parents: 1604
diff changeset
2032 case '9':
5f5505e4bb2d removed ugly switch/goto hack
arpi
parents: 1604
diff changeset
2033 case '0':
459
9dfad88a8107 add mixer support
pontscho
parents: 458
diff changeset
2034 case '*':
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2035 case '/': {
1626
5f5505e4bb2d removed ugly switch/goto hack
arpi
parents: 1604
diff changeset
2036 if(c=='*' || c=='0'){
1881
d75b24bda7ce Applied fix for mixercontrol w/alsa ossemu by Christian Ohm.
atmos4
parents: 1863
diff changeset
2037 mixer_incvolume();
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2038 } else {
1881
d75b24bda7ce Applied fix for mixercontrol w/alsa ossemu by Christian Ohm.
atmos4
parents: 1863
diff changeset
2039 mixer_decvolume();
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2040 }
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2041
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2042 #ifdef USE_OSD
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2043 if(osd_level){
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2044 osd_visible=sh_video->fps; // 1 sec
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2045 vo_osd_progbar_type=OSD_VOLUME;
1881
d75b24bda7ce Applied fix for mixercontrol w/alsa ossemu by Christian Ohm.
atmos4
parents: 1863
diff changeset
2046 vo_osd_progbar_value=(mixer_getbothvolume()*256.0)/100.0;
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2047 //printf("volume: %d\n",vo_osd_progbar_value);
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2048 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2049 #endif
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2050 }
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2051 break;
459
9dfad88a8107 add mixer support
pontscho
parents: 458
diff changeset
2052 case 'm':
510
2951d138ddaf add sub autoread & remove 'c' key
pontscho
parents: 500
diff changeset
2053 mixer_usemaster=!mixer_usemaster;
459
9dfad88a8107 add mixer support
pontscho
parents: 458
diff changeset
2054 break;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2055
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2056 #if 0 // change to 1 for absolute seeking tests
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2057 case '1':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2058 case '2':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2059 case '3':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2060 case '4':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2061 case '5':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2062 case '6':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2063 case '7':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2064 case '8':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2065 rel_seek_secs=0.99*(float)(c-'1')/7.0;
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2066 abs_seek_pos=3;
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2067 printf("ABS seek to %5.3f \n",rel_seek_secs);
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2068 break;
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2069 #else
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2070 // Contrast:
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2071 case '1':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2072 case '2':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2073 if(c=='2'){
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
2074 if ( ++v_cont > 100 ) v_cont = 100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2075 } else {
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
2076 if ( --v_cont < 0 ) v_cont = 0;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2077 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2078 if(set_video_colors(sh_video,"Contrast",v_cont)){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2079 #ifdef USE_OSD
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2080 if(osd_level){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2081 osd_visible=sh_video->fps; // 1 sec
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2082 vo_osd_progbar_type=OSD_CONTRAST;
1726
38871427a131 corrections to OSD progbar position calculations
atlka
parents: 1724
diff changeset
2083 vo_osd_progbar_value=((v_cont)<<8)/100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2084 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2085 #endif
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2086 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2087 break;
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2088
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2089 // Brightness:
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2090 case '3':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2091 case '4':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2092 if(c=='4'){
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
2093 if ( ++v_bright > 100 ) v_bright = 100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2094 } else {
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
2095 if ( --v_bright < 0 ) v_bright = 0;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2096 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2097 if(set_video_colors(sh_video,"Brightness",v_bright)){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2098 #ifdef USE_OSD
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2099 if(osd_level){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2100 osd_visible=sh_video->fps; // 1 sec
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2101 vo_osd_progbar_type=OSD_BRIGHTNESS;
1726
38871427a131 corrections to OSD progbar position calculations
atlka
parents: 1724
diff changeset
2102 vo_osd_progbar_value=((v_bright)<<8)/100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2103 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2104 #endif
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2105 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2106 break;
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2107
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2108 // Hue:
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2109 case '5':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2110 case '6':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2111 if(c=='6'){
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
2112 if ( ++v_hue > 100 ) v_hue = 100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2113 } else {
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
2114 if ( --v_hue < 0 ) v_hue = 0;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2115 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2116 if(set_video_colors(sh_video,"Hue",v_hue)){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2117 #ifdef USE_OSD
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2118 if(osd_level){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2119 osd_visible=sh_video->fps; // 1 sec
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2120 vo_osd_progbar_type=OSD_HUE;
1726
38871427a131 corrections to OSD progbar position calculations
atlka
parents: 1724
diff changeset
2121 vo_osd_progbar_value=((v_hue)<<8)/100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2122 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2123 #endif
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2124 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2125 break;
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2126
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2127 // Saturation:
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2128 case '7':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2129 case '8':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2130 if(c=='8'){
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
2131 if ( ++v_saturation > 100 ) v_saturation = 100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2132 } else {
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
2133 if ( --v_saturation < 0 ) v_saturation = 0;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2134 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2135 if(set_video_colors(sh_video,"Saturation",v_saturation)){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2136 #ifdef USE_OSD
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2137 if(osd_level){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2138 osd_visible=sh_video->fps; // 1 sec
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2139 vo_osd_progbar_type=OSD_SATURATION;
1726
38871427a131 corrections to OSD progbar position calculations
atlka
parents: 1724
diff changeset
2140 vo_osd_progbar_value=((v_saturation)<<8)/100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2141 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2142 #endif
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2143 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2144 break;
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2145 #endif
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
2146
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
2147 case 'd':
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
2148 frame_dropping=(frame_dropping+1)%3;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
2149 mp_msg(MSGT_CPLAYER,MSGL_V,"== drop: %d == \n",frame_dropping);
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
2150 break;
2941
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2151
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2152 #ifdef USE_TV
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2153 case 'h':
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2154 if (tv_param_on == 1)
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2155 tv_step_channel(tv_handler, TV_CHANNEL_HIGHER);
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2156 break;
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2157 case 'l':
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2158 if (tv_param_on == 1)
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2159 tv_step_channel(tv_handler, TV_CHANNEL_LOWER);
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2160 break;
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2161 case 'n':
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2162 if (tv_param_on == 1)
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2163 tv_step_norm(tv_handler);
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2164 break;
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2165 case 'b':
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2166 if (tv_param_on == 1)
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2167 tv_step_chanlist(tv_handler);
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2168 break;
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
2169 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2170 }
1406
bf9fcd656ee9 small cosmetics fix
arpi
parents: 1405
diff changeset
2171 } // keyboard event handler
bf9fcd656ee9 small cosmetics fix
arpi
parents: 1405
diff changeset
2172
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
2173 if (seek_to_sec) {
937
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2174 int a,b; float d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2175
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2176 if (sscanf(seek_to_sec, "%d:%d:%f", &a,&b,&d)==3)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2177 rel_seek_secs += 3600*a +60*b +d ;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2178 else if (sscanf(seek_to_sec, "%d:%f", &a, &d)==2)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2179 rel_seek_secs += 60*a +d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2180 else if (sscanf(seek_to_sec, "%f", &d)==1)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2181 rel_seek_secs += d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2182
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2183 seek_to_sec = NULL;
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
2184 }
937
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2185
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
2186 /* Looping. */
3540
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2187 if(eof==1 && loop_times>=0) {
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2188
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2189 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
2190
3540
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2191 if(loop_times>1) loop_times--; else
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2192 if(loop_times==1) loop_times=-1;
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2193
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
2194 eof=0;
3540
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
2195 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
2196
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
2197 }
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
2198
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2199 if(rel_seek_secs || abs_seek_pos){
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
2200 current_module="seek";
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2201 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
2202 // success:
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2203 /* FIXME there should be real seeking for vobsub */
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2204 if (vo_vobsub)
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2205 vobsub_reset(vo_vobsub);
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
2206
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
2207 if(sh_audio){
1459
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
2208 if(verbose){
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
2209 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
2210 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
2211 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
2212 }
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
2213 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
2214 } else {
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
2215 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
2216 }
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
2217 fflush(stdout);
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
2218
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
2219 if(sh_audio){
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
2220 current_module="seek_audio_reset";
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
2221 audio_out->reset(); // stop audio, throwing away buffered data
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2222 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2223
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2224 #ifdef USE_OSD
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
2225 // Set OSD:
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
2226 if(osd_level){
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
2227 int len=((demuxer->movi_end-demuxer->movi_start)>>8);
1727
9da2b587b029 changes according to OSD calculations
atlka
parents: 1726
diff changeset
2228 if (len>0){
9da2b587b029 changes according to OSD calculations
atlka
parents: 1726
diff changeset
2229 osd_visible=sh_video->fps; // 1 sec
9da2b587b029 changes according to OSD calculations
atlka
parents: 1726
diff changeset
2230 vo_osd_progbar_type=0;
9da2b587b029 changes according to OSD calculations
atlka
parents: 1726
diff changeset
2231 vo_osd_progbar_value=(demuxer->filepos-demuxer->movi_start)/len;
9da2b587b029 changes according to OSD calculations
atlka
parents: 1726
diff changeset
2232 }
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
2233 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2234 #endif
1405
8ecf18884ad8 seeking code moved out from mplayer.c -> seek.c
arpi
parents: 1402
diff changeset
2235
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
2236 c_total=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2237 max_pts_correction=0.1;
1504
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
2238 osd_visible=sh_video->fps; // to rewert to PLAY pointer after 1 sec
3823
a88100f9e7c0 don't reset cpu usage counters at seek
arpi
parents: 3783
diff changeset
2239 // audio_time_usage=0; video_time_usage=0; vout_time_usage=0;
1459
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
2240 drop_frame_cnt=0;
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2241 too_slow_frame_cnt=0;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2242 too_fast_frame_cnt=0;
3744
d358f4a74690 dvd seeking -> subtitle disappearing bugs fixed
arpi
parents: 3742
diff changeset
2243
d358f4a74690 dvd seeking -> subtitle disappearing bugs fixed
arpi
parents: 3742
diff changeset
2244 #ifdef USE_DVDREAD
d358f4a74690 dvd seeking -> subtitle disappearing bugs fixed
arpi
parents: 3742
diff changeset
2245 if(vo_spudec) spudec_reset(vo_spudec);
d358f4a74690 dvd seeking -> subtitle disappearing bugs fixed
arpi
parents: 3742
diff changeset
2246 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2247 }
1405
8ecf18884ad8 seeking code moved out from mplayer.c -> seek.c
arpi
parents: 1402
diff changeset
2248 rel_seek_secs=0;
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
2249 abs_seek_pos=0;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
2250 current_module=NULL;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
2251 }
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
2252
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2253 #ifdef HAVE_NEW_GUI
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2254 if(use_gui){
1735
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2255 if(demuxer->file_format==DEMUXER_TYPE_AVI && sh_video->video.dwLength>2){
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2256 // get pos from frame number / total frames
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2257 mplShMem->Position=(float)d_video->pack_no*100.0f/sh_video->video.dwLength;
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2258 } else {
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2259 // get pos from file position / filesize
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2260 int len=((demuxer->movi_end-demuxer->movi_start));
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2261 int pos=(demuxer->file_format==DEMUXER_TYPE_AVI)?demuxer->filepos:d_video->pos;
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2262 mplShMem->Position=(len<=0)?0:((float)(pos-demuxer->movi_start) / len * 100.0f);
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
2263 }
1729
d6c99f70449e fix hprogressbar
pontscho
parents: 1727
diff changeset
2264 mplShMem->TimeSec=d_video->pts;
1772
591398376329 stop/pause/seek gui
arpi
parents: 1771
diff changeset
2265 if(mplShMem->Playing==0) break; // STOP
591398376329 stop/pause/seek gui
arpi
parents: 1771
diff changeset
2266 if(mplShMem->Playing==2) osd_function=OSD_PAUSE;
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2267 if ( mplShMem->VolumeChanged )
1848
8ce1c088d05d fix osd volume bar handling in gui
pontscho
parents: 1844
diff changeset
2268 {
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2269 mixer_setvolume( mplShMem->Volume,mplShMem->Volume );
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2270 mplShMem->VolumeChanged=0;
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2271 #ifdef USE_OSD
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2272 if ( osd_level )
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2273 {
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2274 osd_visible=sh_video->fps; // 1 sec
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2275 vo_osd_progbar_type=OSD_VOLUME;
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2276 vo_osd_progbar_value=( ( mplShMem->Volume ) * 256.0 ) / 100.0;
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2277 }
1848
8ce1c088d05d fix osd volume bar handling in gui
pontscho
parents: 1844
diff changeset
2278 #endif
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2279 }
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1848
diff changeset
2280 mplShMem->Volume=(float)mixer_getbothvolume();
3054
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2281 #ifdef USE_DVDREAD
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
2282 if ( mplShMem->DVDChanged ) goto goto_next_file;
3054
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2283 if ( stream->type == STREAMTYPE_DVD )
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2284 {
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2285 dvd_priv_t * dvdp = stream->priv;
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2286 mplShMem->DVD.current_chapter=dvdp->cur_cell + 1;
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2287 }
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
2288 #endif
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2289 }
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2290 #endif
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2291
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2292
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2293 //================= Update OSD ====================
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2294 #ifdef USE_OSD
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1420
diff changeset
2295 if(osd_level>=2){
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2296 int pts=d_video->pts;
595
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
2297 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
2298 vo_osd_text=osd_text_buffer;
3234
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
2299 if (osd_show_sub_delay) {
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
2300 sprintf(vo_osd_text, "Sub delay: %d ms",(int)(sub_delay*1000));
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
2301 osd_show_sub_delay--;
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
2302 } else
3783
de6b00131e95 show a-v delay in osd (based on subdelay osd patch)
arpi
parents: 3754
diff changeset
2303 if (osd_show_av_delay) {
de6b00131e95 show a-v delay in osd (based on subdelay osd patch)
arpi
parents: 3754
diff changeset
2304 sprintf(vo_osd_text, "A-V delay: %d ms",(int)(audio_delay*1000));
de6b00131e95 show a-v delay in osd (based on subdelay osd patch)
arpi
parents: 3754
diff changeset
2305 osd_show_av_delay--;
de6b00131e95 show a-v delay in osd (based on subdelay osd patch)
arpi
parents: 3754
diff changeset
2306 } else
3234
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
2307 sprintf(vo_osd_text,"%c %02d:%02d:%02d",osd_function,pts/3600,(pts/60)%60,pts%60);
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2308 } else {
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2309 vo_osd_text=NULL;
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2310 }
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2311 // 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
2312 // vo_osd_text=osd_text_buffer;
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2313 #endif
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
2314
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2315 #ifdef USE_SUB
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
2316 // find sub
1204
646ac6d78952 sub at key=0 fixed
arpi_esp
parents: 1190
diff changeset
2317 if(subtitles && d_video->pts>0){
1762
914bdbe33cf8 -dumpsub works for avi, then dumps .sub file
arpi
parents: 1753
diff changeset
2318 float pts=d_video->pts;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
2319 if(sub_fps==0) sub_fps=sh_video->fps;
482
1a2c4f3e7a10 sub control optimized
arpi_esp
parents: 470
diff changeset
2320 current_module="find_sub";
3274
ac7ded58b6df mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3257
diff changeset
2321 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
2322 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
2323 sub_last_pts = pts;
ac7ded58b6df mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3257
diff changeset
2324 }
482
1a2c4f3e7a10 sub control optimized
arpi_esp
parents: 470
diff changeset
2325 current_module=NULL;
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
2326 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2327 #endif
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2328
3180
d53f70e3c794 spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents: 3166
diff changeset
2329
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2330 // VobSub subtitles
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2331 if(vo_vobsub){
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2332 current_module="vobsub";
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2333 vobsub_process(vo_vobsub,d_video->pts);
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2334 current_module=NULL;
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2335 }
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
2336
3180
d53f70e3c794 spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents: 3166
diff changeset
2337 #ifdef USE_DVDREAD
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2338 // DVD sub:
4160
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2339 if(vo_flags & 0x08){
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2340 static vo_mpegpes_t packet;
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2341 static vo_mpegpes_t *pkg=&packet;
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2342 packet.timestamp=sh_video->timer*90000.0;
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2343 packet.id=0x20; /* Subpic */
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2344 while((packet.size=ds_get_packet_sub(d_dvdsub,&packet.data))>0){
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2345 mp_msg(MSGT_CPLAYER,MSGL_V,"\rDVD sub: len=%d v_pts=%5.3f s_pts=%5.3f \n",packet.size,d_video->pts,d_dvdsub->pts);
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2346 video_out->draw_frame(&pkg);
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2347 }
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4156
diff changeset
2348 }else if(vo_spudec){
3034
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
2349 unsigned char* packet=NULL;
3843
38e84c14280d some spudec cleanup
arpi
parents: 3842
diff changeset
2350 int len;
3034
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
2351 current_module="spudec";
3843
38e84c14280d some spudec cleanup
arpi
parents: 3842
diff changeset
2352 while((len=ds_get_packet_sub(d_dvdsub,&packet))>0){
38e84c14280d some spudec cleanup
arpi
parents: 3842
diff changeset
2353 mp_msg(MSGT_CPLAYER,MSGL_V,"\rDVD sub: len=%d v_pts=%5.3f s_pts=%5.3f \n",len,d_video->pts,d_dvdsub->pts);
3842
32e488a4fc40 dvdsub pts fix, based on patch by Kim Minh Kaplan
arpi
parents: 3825
diff changeset
2354 spudec_assemble(vo_spudec,packet,len,100*d_dvdsub->pts);
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2355 }
3842
32e488a4fc40 dvdsub pts fix, based on patch by Kim Minh Kaplan
arpi
parents: 3825
diff changeset
2356 spudec_heartbeat(vo_spudec,100*d_video->pts);
3034
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
2357 current_module=NULL;
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2358 }
3180
d53f70e3c794 spudec_new has a dvd_priv_t as an argument, which is defined in
pl
parents: 3166
diff changeset
2359 #endif
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2360
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1420
diff changeset
2361 } // while(!eof)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2362
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
2363 mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d \n",eof);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2364
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2365 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2366
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
2367 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
2368
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2369 if(eof == PT_NEXT_ENTRY || eof == PT_PREV_ENTRY) {
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2370 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
2371 uninit_player(INITED_ALL-(INITED_GUI+INITED_LIRC));
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2372 eof = 1;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2373 } else {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2374 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
2375 playtree_iter = NULL;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2376 }
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2377 } 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
2378 eof = eof == PT_UP_NEXT ? 1 : -1;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2379 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
2380 uninit_player(INITED_ALL-(INITED_GUI+INITED_LIRC));
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2381 eof = 1;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2382 } else {
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2383 play_tree_iter_free(playtree_iter);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2384 playtree_iter = NULL;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2385 }
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2386 }else { // NEXT PREV SRC
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2387 uninit_player(INITED_ALL-(INITED_GUI+INITED_LIRC));
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2388 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
2389 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2390
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2391 goto_next_file_src: // When we have multiple src for file
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2392
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2393 if(eof == 0) eof = 1;
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2394
1797
d1aabeb7274f fix after stop redraw. vagy nem.
pontscho
parents: 1796
diff changeset
2395 #ifdef HAVE_NEW_GUI
d1aabeb7274f fix after stop redraw. vagy nem.
pontscho
parents: 1796
diff changeset
2396 if(use_gui)
d1aabeb7274f fix after stop redraw. vagy nem.
pontscho
parents: 1796
diff changeset
2397 {
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
2398 #ifdef USE_DVDREAD
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
2399 if ( !mplShMem->DVDChanged )
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
2400 #endif
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
2401 mplStop();
1797
d1aabeb7274f fix after stop redraw. vagy nem.
pontscho
parents: 1796
diff changeset
2402 }
d1aabeb7274f fix after stop redraw. vagy nem.
pontscho
parents: 1796
diff changeset
2403 #endif
d1aabeb7274f fix after stop redraw. vagy nem.
pontscho
parents: 1796
diff changeset
2404
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2405 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
2406 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
2407 if(filename == NULL) {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2408 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
2409 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
2410 playtree_iter = NULL;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2411 };
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2412 } else
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2413 break;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2414 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2415
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2416 if(use_gui || playtree_iter != NULL
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
2417 #if defined( HAVE_NEW_GUI ) && defined( USE_DVDREAD )
3723
c8a267dc9941 --enable_gui && nogui && DVD sig11 fixed - .so 10l
arpi
parents: 3712
diff changeset
2418 || (mplShMem && mplShMem->DVDChanged)
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
2419 #endif
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
2420 ){
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2421
1654
9d85b84e367e dec_video uninit
arpi
parents: 1651
diff changeset
2422 current_module="uninit_vcodec";
9d85b84e367e dec_video uninit
arpi
parents: 1651
diff changeset
2423 if(sh_video) uninit_video(sh_video);
9d85b84e367e dec_video uninit
arpi
parents: 1651
diff changeset
2424
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2425 current_module="free_demuxer";
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2426 if(demuxer) free_demuxer(demuxer);
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2427
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2428 current_module="free_stream";
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2429 if(stream) free_stream(stream);
3543
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
2430
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
2431 current_module="sub_free";
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
2432 if ( subtitles )
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
2433 {
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
2434 sub_free( subtitles );
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
2435 sub_name=NULL;
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
2436 vo_sub=NULL;
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
2437 }
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
2438
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2439 video_out=NULL;
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2440 audio_out=NULL;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2441 eof = 0;
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2442 goto play_next_file;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2443 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2444
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
2445 exit_player(MSGTR_Exit_eof);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2446
109
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
2447 return 1;
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
2448 }