Mercurial > mplayer.hg
annotate mplayer.c @ 34355:316f6edb49de
Avoid double conversion from utf16/ucs2 to utf8 for text subtitles.
There is code that auto-detects utf16 encoding of the subtitle stream
and forces the reading functions to convert it to native utf8.
The bug happens when using enca to (correctly) guess that the input
file has ucs2 encoding and tries to convert the input stream to utf8, again.
In my case iconv did not accept the input and discarded the subtitles
completely.
author | iive |
---|---|
date | Wed, 14 Dec 2011 00:17:49 +0000 |
parents | ce8b1d7d54fe |
children | fede902a408c |
rev | line source |
---|---|
30429
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
1 /* |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
2 * This file is part of MPlayer. |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
3 * |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
7 * (at your option) any later version. |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
8 * |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
12 * GNU General Public License for more details. |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
13 * |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
17 */ |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30378
diff
changeset
|
18 |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
19 #include "config.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
20 |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
21 #include <errno.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
22 #include <fcntl.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
23 #include <limits.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
24 #include <signal.h> |
1430 | 25 #include <stdio.h> |
26 #include <stdlib.h> | |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
27 #include <string.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
28 #include <time.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
29 #include <unistd.h> |
32724
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
30 #include <assert.h> |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
31 #include <sys/stat.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
32 #include <sys/time.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
33 #include <sys/types.h> |
12360 | 34 |
27727
48c1ae64255b
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents:
27635
diff
changeset
|
35 #if defined(__MINGW32__) || defined(__CYGWIN__) |
12358
133e0ebde74d
Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
faust3
parents:
12332
diff
changeset
|
36 #define _UWIN 1 /*disable Non-underscored versions of non-ANSI functions as otherwise int eof would conflict with eof()*/ |
133e0ebde74d
Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
faust3
parents:
12332
diff
changeset
|
37 #include <windows.h> |
133e0ebde74d
Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
faust3
parents:
12332
diff
changeset
|
38 #endif |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
39 |
9831 | 40 #ifndef __MINGW32__ |
41 #include <sys/ioctl.h> | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
42 #include <sys/wait.h> |
9831 | 43 #else |
33363 | 44 #define SIGHUP 1 /* hangup */ |
45 #define SIGQUIT 3 /* quit */ | |
46 #define SIGKILL 9 /* kill (cannot be caught or ignored) */ | |
47 #define SIGBUS 10 /* bus error */ | |
48 #define SIGPIPE 13 /* broken pipe */ | |
9831 | 49 #endif |
50 | |
3015 | 51 #ifdef HAVE_RTC |
14381
dc7b86065e3c
RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents:
14296
diff
changeset
|
52 #ifdef __linux__ |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
53 #include <linux/rtc.h> |
14381
dc7b86065e3c
RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents:
14296
diff
changeset
|
54 #else |
dc7b86065e3c
RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents:
14296
diff
changeset
|
55 #include <rtc.h> |
dc7b86065e3c
RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents:
14296
diff
changeset
|
56 #define RTC_IRQP_SET RTCIO_IRQP_SET |
dc7b86065e3c
RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents:
14296
diff
changeset
|
57 #define RTC_PIE_ON RTCIO_PIE_ON |
16490
f17b3c152fd6
Add comments to a few #endif statements in order to make clear which
diego
parents:
16489
diff
changeset
|
58 #endif /* __linux__ */ |
f17b3c152fd6
Add comments to a few #endif statements in order to make clear which
diego
parents:
16489
diff
changeset
|
59 #endif /* HAVE_RTC */ |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
60 |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
61 /* |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
62 * In Mac OS X the SDL-lib is built upon Cocoa. The easiest way to |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
63 * make it all work is to use the builtin SDL-bootstrap code, which |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
64 * will be done automatically by replacing our main() if we include SDL.h. |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
65 */ |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
66 #if defined(__APPLE__) && defined(CONFIG_SDL) |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
67 #ifdef CONFIG_SDL_SDL_H |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
68 #include <SDL/SDL.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
69 #else |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
70 #include <SDL.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
71 #endif |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
72 #endif |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
73 |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
74 #include "gui/interface.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
75 #include "input/input.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
76 #include "libao2/audio_out.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
77 #include "libavutil/avstring.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
78 #include "libavutil/intreadwrite.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
79 #include "libmenu/menu.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
80 #include "libmpcodecs/dec_audio.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
81 #include "libmpcodecs/dec_video.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
82 #include "libmpcodecs/mp_image.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
83 #include "libmpcodecs/vd.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
84 #include "libmpcodecs/vf.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
85 #include "libmpdemux/demuxer.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
86 #include "libmpdemux/stheader.h" |
32466
9e627a1793b1
Move font_load.[ch], font_load_ft.c and osd_font.h from libvo to sub.
cigaes
parents:
32461
diff
changeset
|
87 #include "sub/font_load.h" |
32467 | 88 #include "sub/sub.h" |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
89 #include "libvo/video_out.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
90 #include "stream/cache2.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
91 #include "stream/stream.h" |
31877
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31839
diff
changeset
|
92 #include "stream/stream_bd.h" |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
93 #include "stream/stream_dvdnav.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
94 #include "stream/stream_radio.h" |
19271
64d82a45a05d
introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents:
19227
diff
changeset
|
95 #include "stream/tv.h" |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
96 #include "access_mpcontext.h" |
32461 | 97 #include "sub/ass_mp.h" |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
98 #include "cfg-mplayer-def.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
99 #include "codec-cfg.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
100 #include "command.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
101 #include "edl.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
102 #include "help_mp.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
103 #include "m_config.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
104 #include "m_option.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
105 #include "m_property.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
106 #include "m_struct.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
107 #include "metadata.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
108 #include "mixer.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
109 #include "mp_core.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
110 #include "mp_fifo.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
111 #include "mp_msg.h" |
32889
db45f9bd690d
10l: forgot mp_strings.h header include with mp_asprintf prototype.
cboesch
parents:
32886
diff
changeset
|
112 #include "mp_strings.h" |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
113 #include "mpcommon.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
114 #include "mplayer.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
115 #include "osdep/getch2.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
116 #include "osdep/timer.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
117 #include "parser-cfg.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
118 #include "parser-mpcmd.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
119 #include "path.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
120 #include "playtree.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
121 #include "playtreeparser.h" |
32456 | 122 #include "sub/spudec.h" |
32454
69d3be4d52a2
Create a new directory, "sub", for subtitles and OSD related code.
cigaes
parents:
32438
diff
changeset
|
123 #include "sub/subreader.h" |
32459
1a605463f62b
Move vobsub.[ch] and unrar_exec.[ch] to the sub directory.
cigaes
parents:
32456
diff
changeset
|
124 #include "sub/vobsub.h" |
32460 | 125 #include "sub/eosd.h" |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
126 #include "osdep/getch2.h" |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
127 #include "osdep/timer.h" |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
128 |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
129 #include "udp_sync.h" |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
130 |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
131 #ifdef CONFIG_X11 |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
132 #include "libvo/x11_common.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
133 #endif |
29432 | 134 #ifdef CONFIG_DVBIN |
19271
64d82a45a05d
introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents:
19227
diff
changeset
|
135 #include "stream/dvbin.h" |
29432 | 136 #endif |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
137 #ifdef CONFIG_DVDREAD |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
138 #include "stream/stream_dvd.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
139 #endif |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
140 |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
141 int slave_mode; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
142 int player_idle_mode; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
143 int quiet; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
144 int enable_mouse_movements; |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
145 float start_volume = -1; |
33363 | 146 double start_pts = MP_NOPTS_VALUE; |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
147 char *heartbeat_cmd; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
148 static int max_framesize; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
149 |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
150 int noconsolecontrols; |
1 | 151 //**************************************************************************// |
152 | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
153 // Not all functions in mplayer.c take the context as an argument yet |
22993 | 154 static MPContext mpctx_s = { |
33363 | 155 .osd_function = OSD_PLAY, |
156 .begin_skip = MP_NOPTS_VALUE, | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
157 .play_tree_step = 1, |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
158 .global_sub_pos = -1, |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
159 .set_of_sub_pos = -1, |
33363 | 160 .file_format = DEMUXER_TYPE_UNKNOWN, |
161 .loop_times = -1, | |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27359
diff
changeset
|
162 #ifdef CONFIG_DVBIN |
33363 | 163 .last_dvb_step = 1, |
22281 | 164 #endif |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
165 }; |
1 | 166 |
22993 | 167 static MPContext *mpctx = &mpctx_s; |
168 | |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
169 int fixed_vo; |
7677
33562a65e9e8
_EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents:
7628
diff
changeset
|
170 |
2557 | 171 // benchmark: |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
172 double video_time_usage; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
173 double vout_time_usage; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
174 static double audio_time_usage; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
175 static int total_time_usage_start; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
176 static int total_frame_cnt; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
177 static int drop_frame_cnt; // total number of dropped frames |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
178 int benchmark; |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
179 |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
180 // options: |
30176
6fb92182aff3
At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents:
30175
diff
changeset
|
181 #define DEFAULT_STARTUP_DECODE_RETRY 8 |
33363 | 182 int auto_quality; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
183 static int output_quality; |
1439 | 184 |
33363 | 185 float playback_speed = 1.0; |
7605
c3bbe602aff3
new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents:
7604
diff
changeset
|
186 |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
187 int use_gui; |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
188 |
27343 | 189 #ifdef CONFIG_GUI |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
190 int enqueue; |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
191 #endif |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
192 |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
193 static int list_properties; |
17914
f9cb6fc1608a
Add an option to list the properties: -list-properties
albeu
parents:
17911
diff
changeset
|
194 |
33363 | 195 int osd_level = 1; |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18286
diff
changeset
|
196 // if nonzero, hide current OSD contents when GetTimerMS() reaches this |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18286
diff
changeset
|
197 unsigned int osd_visible; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
198 int osd_duration = 1000; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
199 int osd_fractions; // determines how fractions of seconds are displayed |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
200 // on OSD |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
201 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
202 int term_osd = 1; |
33363 | 203 static char *term_osd_esc = "\x1b[A\r\x1b[K"; |
204 static char *playing_msg; | |
2557 | 205 // seek: |
22312 | 206 static double seek_to_sec; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
207 static off_t seek_to_byte; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
208 static off_t step_sec; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
209 static int loop_seek; |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
210 |
19973
02a18c52a42a
after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents:
19946
diff
changeset
|
211 static m_time_size_t end_at = { .type = END_AT_NONE, .pos = 0 }; |
02a18c52a42a
after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents:
19946
diff
changeset
|
212 |
7576
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
213 // A/V sync: |
33363 | 214 int autosync; // 30 might be a good default value. |
7576
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
215 |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
216 // may be changed by GUI: (FIXME!) |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
217 float rel_seek_secs; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
218 int abs_seek_pos; |
2557 | 219 |
220 // codecs: | |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
221 char **audio_codec_list; // override audio codec |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
222 char **video_codec_list; // override video codec |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
223 char **audio_fm_list; // override audio codec family |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
224 char **video_fm_list; // 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
|
225 |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
226 // streaming: |
33363 | 227 int audio_id = -1; |
228 int video_id = -1; | |
229 int dvdsub_id = -1; | |
29855
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
230 // this dvdsub_id was selected via slang |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
231 // use this to allow dvdnav to follow -slang across stream resets, |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
232 // in particular the subtitle ID for a language changes |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
233 int dvdsub_lang_id; |
33363 | 234 int vobsub_id = -1; |
235 char *audio_lang; | |
236 char *dvdsub_lang; | |
237 char *filename; | |
238 int file_filter = 1; | |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
239 |
2353 | 240 // cache2: |
33363 | 241 int stream_cache_size = -1; |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
242 #ifdef CONFIG_STREAM_CACHE |
33363 | 243 float stream_cache_min_percent = 20.0; |
244 float stream_cache_seek_min_percent = 50.0; | |
2353 | 245 #endif |
246 | |
2557 | 247 // dump: |
32438
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32415
diff
changeset
|
248 char *stream_dump_name = "stream.dump"; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
249 int stream_dump_type; |
33390 | 250 uint64_t stream_dump_count; |
251 unsigned stream_dump_start_time; | |
252 unsigned stream_dump_last_print_time; | |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
253 int capture_dump; |
2557 | 254 |
255 // A-V sync: | |
33363 | 256 static float default_max_pts_correction = -1; |
257 static float max_pts_correction; //default_max_pts_correction; | |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
258 static float c_total; |
33363 | 259 float audio_delay; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
260 static int ignore_start; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
261 |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
262 static int softsleep; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
263 |
33363 | 264 double force_fps; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
265 static int force_srate; |
33503
d54614382edc
Actually use the AF_FORMAT_UNKNOWN define instead of having it in a comment.
reimar
parents:
33495
diff
changeset
|
266 static int audio_output_format = AF_FORMAT_UNKNOWN; |
33363 | 267 int frame_dropping; // option 0=no drop 1= drop vo 2= drop decode |
268 static int play_n_frames = -1; | |
269 static int play_n_frames_mf = -1; | |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
270 |
1 | 271 // screen info: |
33363 | 272 char **video_driver_list; |
273 char **audio_driver_list; | |
5075 | 274 |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
275 // sub: |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
276 char *font_name; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
277 char *sub_font_name; |
33363 | 278 float font_factor = 0.75; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
279 char **sub_name; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
280 char **sub_paths; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
281 float sub_delay; |
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
282 float sub_fps; |
33363 | 283 int sub_auto = 1; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
284 char *vobsub_name; |
33363 | 285 int subcc_enabled; |
8361
2202c00001e3
overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
arpi
parents:
8360
diff
changeset
|
286 int suboverlap_enabled = 1; |
21140 | 287 |
33363 | 288 char *current_module; // for debugging |
6781 | 289 |
27345
b597fd2924b4
Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents:
27343
diff
changeset
|
290 #ifdef CONFIG_MENU |
33363 | 291 static const vf_info_t *const libmenu_vfs[] = { |
292 &vf_info_menu, | |
293 NULL | |
8198 | 294 }; |
33363 | 295 static vf_instance_t *vf_menu; |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
296 int use_menu; |
33363 | 297 static char *menu_cfg; |
298 static char *menu_root = "main"; | |
8198 | 299 #endif |
300 | |
5055 | 301 #ifdef HAVE_RTC |
19756 | 302 static int nortc = 1; |
33363 | 303 static char *rtc_device; |
5055 | 304 #endif |
305 | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
306 edl_record_ptr edl_records; ///< EDL entries memory area |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
307 edl_record_ptr next_edl_record; ///< only for traversing edl_records |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
308 short edl_decision; ///< 1 when an EDL operation has been made. |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
309 short edl_needs_reset; ///< 1 if we need to reset EDL next pointer |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
310 short edl_backward; ///< 1 if we need to skip to the beginning of the next EDL record |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
311 FILE *edl_fd; ///< fd to write to when in -edlout mode. |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
312 // Number of seconds to add to the seek when jumping out |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
313 // of EDL scene in backward direction. This is needed to |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
314 // have some time after the seek to decide what to do next |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
315 // (next seek, pause,...), otherwise after the seek it will |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
316 // enter the same scene again and skip forward immediately |
31580
b6c2b541e1a6
Implement edl-backward-delay to avoid jumping right over an
reynaldo
parents:
31515
diff
changeset
|
317 float edl_backward_delay = 2; |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
318 int edl_start_pts; ///< Automatically add/sub this from EDL start/stop pos |
20251
2971196cd8c6
Disable loading of file-specific configuration file from the same
rtogni
parents:
20207
diff
changeset
|
319 int use_filedir_conf; |
29862
fbb1f57a313e
Added -name, -title and -use-filename-title options and implementation in X11 vos
ptt
parents:
29857
diff
changeset
|
320 int use_filename_title; |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
321 |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
322 static unsigned int initialized_flags; |
31514
c6195b5575cc
cosmetics: Move volstep global var to the top where all other global vars live.
diego
parents:
31513
diff
changeset
|
323 |
33287 | 324 int volstep = 3; ///< step size of mixer changes |
31514
c6195b5575cc
cosmetics: Move volstep global var to the top where all other global vars live.
diego
parents:
31513
diff
changeset
|
325 |
31801 | 326 #ifdef CONFIG_CRASH_DEBUG |
327 static char *prog_path; | |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
328 static int crash_debug; |
31801 | 329 #endif |
330 | |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
331 /* This header requires all the global variable declarations. */ |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
332 #include "cfg-mplayer.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31514
diff
changeset
|
333 |
25765
304fc0bbefe1
audio_out / video_out structs should be treated as const
reimar
parents:
25658
diff
changeset
|
334 const void *mpctx_get_video_out(MPContext *mpctx) |
22284 | 335 { |
336 return mpctx->video_out; | |
337 } | |
338 | |
28259
f313c0ff6882
Add missing const qualifier to mpctx_get_audio_out function declaration.
diego
parents:
28185
diff
changeset
|
339 const void *mpctx_get_audio_out(MPContext *mpctx) |
22286 | 340 { |
22411
cf4c052b6d60
Fix copy-paste bug (must have broken something in the GUI)
uau
parents:
22365
diff
changeset
|
341 return mpctx->audio_out; |
22286 | 342 } |
343 | |
25364 | 344 void *mpctx_get_demuxer(MPContext *mpctx) |
345 { | |
346 return mpctx->demuxer; | |
347 } | |
348 | |
22284 | 349 void *mpctx_get_playtree_iter(MPContext *mpctx) |
350 { | |
351 return mpctx->playtree_iter; | |
352 } | |
353 | |
22286 | 354 void *mpctx_get_mixer(MPContext *mpctx) |
355 { | |
356 return &mpctx->mixer; | |
357 } | |
358 | |
22290 | 359 int mpctx_get_global_sub_size(MPContext *mpctx) |
22286 | 360 { |
361 return mpctx->global_sub_size; | |
362 } | |
363 | |
25026
afead6ecb8ba
Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents:
24982
diff
changeset
|
364 int mpctx_get_osd_function(MPContext *mpctx) |
afead6ecb8ba
Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents:
24982
diff
changeset
|
365 { |
afead6ecb8ba
Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents:
24982
diff
changeset
|
366 return mpctx->osd_function; |
afead6ecb8ba
Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents:
24982
diff
changeset
|
367 } |
afead6ecb8ba
Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents:
24982
diff
changeset
|
368 |
33363 | 369 static int is_valid_metadata_type(metadata_t type) |
370 { | |
371 switch (type) { | |
372 /* check for valid video stream */ | |
373 case META_VIDEO_CODEC: | |
374 case META_VIDEO_BITRATE: | |
375 case META_VIDEO_RESOLUTION: | |
376 if (!mpctx->sh_video) | |
377 return 0; | |
378 break; | |
379 | |
380 /* check for valid audio stream */ | |
381 case META_AUDIO_CODEC: | |
382 case META_AUDIO_BITRATE: | |
383 case META_AUDIO_SAMPLES: | |
384 if (!mpctx->sh_audio) | |
385 return 0; | |
386 break; | |
387 | |
388 /* check for valid demuxer */ | |
389 case META_INFO_TITLE: | |
390 case META_INFO_ARTIST: | |
391 case META_INFO_ALBUM: | |
392 case META_INFO_YEAR: | |
393 case META_INFO_COMMENT: | |
394 case META_INFO_TRACK: | |
395 case META_INFO_GENRE: | |
396 if (!mpctx->demuxer) | |
397 return 0; | |
398 break; | |
399 | |
400 default: | |
401 break; | |
402 } | |
403 | |
404 return 1; | |
405 } | |
406 | |
407 static char *get_demuxer_info(char *tag) | |
408 { | |
409 char **info = mpctx->demuxer->info; | |
410 int n; | |
411 | |
412 if (!info || !tag) | |
413 return NULL; | |
414 | |
415 for (n = 0; info[2 * n] != NULL; n++) | |
416 if (!strcasecmp(info[2 * n], tag)) | |
417 break; | |
418 | |
419 return info[2 * n + 1] ? strdup(info[2 * n + 1]) : NULL; | |
19532
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
420 } |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
421 |
33363 | 422 char *get_metadata(metadata_t type) |
423 { | |
424 sh_audio_t *const sh_audio = mpctx->sh_audio; | |
425 sh_video_t *const sh_video = mpctx->sh_video; | |
426 | |
427 if (!is_valid_metadata_type(type)) | |
428 return NULL; | |
429 | |
430 switch (type) { | |
431 case META_NAME: | |
432 return strdup(mp_basename(filename)); | |
433 | |
434 case META_VIDEO_CODEC: | |
435 if (sh_video->format == 0x10000001) | |
436 return strdup("mpeg1"); | |
437 else if (sh_video->format == 0x10000002) | |
438 return strdup("mpeg2"); | |
439 else if (sh_video->format == 0x10000004) | |
440 return strdup("mpeg4"); | |
441 else if (sh_video->format == 0x10000005) | |
442 return strdup("h264"); | |
443 else if (sh_video->format >= 0x20202020) | |
444 return mp_asprintf("%.4s", (char *)&sh_video->format); | |
445 return mp_asprintf("0x%08X", sh_video->format); | |
446 | |
447 case META_VIDEO_BITRATE: | |
448 return mp_asprintf("%d kbps", (int)(sh_video->i_bps * 8 / 1024)); | |
449 | |
450 case META_VIDEO_RESOLUTION: | |
451 return mp_asprintf("%d x %d", sh_video->disp_w, sh_video->disp_h); | |
452 | |
453 case META_AUDIO_CODEC: | |
454 if (sh_audio->codec && sh_audio->codec->name) | |
455 return strdup(sh_audio->codec->name); | |
456 break; | |
457 | |
458 case META_AUDIO_BITRATE: | |
459 return mp_asprintf("%d kbps", (int)(sh_audio->i_bps * 8 / 1000)); | |
460 | |
461 case META_AUDIO_SAMPLES: | |
462 return mp_asprintf("%d Hz, %d ch.", sh_audio->samplerate, sh_audio->channels); | |
463 | |
464 /* check for valid demuxer */ | |
465 case META_INFO_TITLE: | |
466 return get_demuxer_info("Title"); | |
467 | |
468 case META_INFO_ARTIST: | |
469 return get_demuxer_info("Artist"); | |
470 | |
471 case META_INFO_ALBUM: | |
472 return get_demuxer_info("Album"); | |
473 | |
474 case META_INFO_YEAR: | |
475 return get_demuxer_info("Year"); | |
476 | |
477 case META_INFO_COMMENT: | |
478 return get_demuxer_info("Comment"); | |
479 | |
480 case META_INFO_TRACK: | |
481 return get_demuxer_info("Track"); | |
482 | |
483 case META_INFO_GENRE: | |
484 return get_demuxer_info("Genre"); | |
485 | |
486 default: | |
487 break; | |
488 } | |
489 | |
19532
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
490 return NULL; |
19529
9a59c33bee29
new option for libmenu that allow display of properties and metadata of currently played stream
ben
parents:
19521
diff
changeset
|
491 } |
9a59c33bee29
new option for libmenu that allow display of properties and metadata of currently played stream
ben
parents:
19521
diff
changeset
|
492 |
31277
5d5bda998a2f
Move code printing -identify output for a file to a separate function.
reimar
parents:
31262
diff
changeset
|
493 static void print_file_properties(const MPContext *mpctx, const char *filename) |
5d5bda998a2f
Move code printing -identify output for a file to a separate function.
reimar
parents:
31262
diff
changeset
|
494 { |
33363 | 495 double video_start_pts = MP_NOPTS_VALUE; |
496 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FILENAME=%s\n", | |
497 filename_recode(filename)); | |
498 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DEMUXER=%s\n", mpctx->demuxer->desc->name); | |
499 if (mpctx->sh_video) { | |
500 /* Assume FOURCC if all bytes >= 0x20 (' ') */ | |
501 if (mpctx->sh_video->format >= 0x20202020) | |
502 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_FORMAT=%.4s\n", (char *)&mpctx->sh_video->format); | |
503 else | |
504 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_FORMAT=0x%08X\n", mpctx->sh_video->format); | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
505 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_BITRATE=%d\n", mpctx->sh_video->i_bps * 8); |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
506 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_WIDTH=%d\n", mpctx->sh_video->disp_w); |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
507 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_HEIGHT=%d\n", mpctx->sh_video->disp_h); |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
508 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_FPS=%5.3f\n", mpctx->sh_video->fps); |
33363 | 509 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ASPECT=%1.4f\n", mpctx->sh_video->aspect); |
510 video_start_pts = ds_get_next_pts(mpctx->d_video); | |
511 } | |
512 if (mpctx->sh_audio) { | |
513 /* Assume FOURCC if all bytes >= 0x20 (' ') */ | |
514 if (mpctx->sh_audio->format >= 0x20202020) | |
515 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_FORMAT=%.4s\n", (char *)&mpctx->sh_audio->format); | |
516 else | |
517 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_FORMAT=%d\n", mpctx->sh_audio->format); | |
518 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_BITRATE=%d\n", mpctx->sh_audio->i_bps * 8); | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
519 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_RATE=%d\n", mpctx->sh_audio->samplerate); |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
520 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_NCH=%d\n", mpctx->sh_audio->channels); |
33363 | 521 start_pts = ds_get_next_pts(mpctx->d_audio); |
522 } | |
523 if (video_start_pts != MP_NOPTS_VALUE) { | |
524 if (start_pts == MP_NOPTS_VALUE || !mpctx->sh_audio || | |
525 (mpctx->sh_video && video_start_pts < start_pts)) | |
526 start_pts = video_start_pts; | |
527 } | |
528 if (start_pts != MP_NOPTS_VALUE) | |
529 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_START_TIME=%.2f\n", start_pts); | |
31277
5d5bda998a2f
Move code printing -identify output for a file to a separate function.
reimar
parents:
31262
diff
changeset
|
530 else |
33363 | 531 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_START_TIME=unknown\n"); |
532 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_LENGTH=%.2f\n", demuxer_get_time_length(mpctx->demuxer)); | |
533 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SEEKABLE=%d\n", | |
534 mpctx->stream->seek && (!mpctx->demuxer || mpctx->demuxer->seekable)); | |
535 if (mpctx->demuxer) { | |
536 if (mpctx->demuxer->num_chapters == 0) | |
537 stream_control(mpctx->demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS, &mpctx->demuxer->num_chapters); | |
538 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTERS=%d\n", mpctx->demuxer->num_chapters); | |
539 } | |
31277
5d5bda998a2f
Move code printing -identify output for a file to a separate function.
reimar
parents:
31262
diff
changeset
|
540 } |
5d5bda998a2f
Move code printing -identify output for a file to a separate function.
reimar
parents:
31262
diff
changeset
|
541 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
542 #ifdef CONFIG_DVDNAV |
33363 | 543 static void mp_dvdnav_context_free(MPContext *ctx) |
544 { | |
545 if (ctx->nav_smpi) | |
546 free_mp_image(ctx->nav_smpi); | |
25824 | 547 ctx->nav_smpi = NULL; |
32511
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32467
diff
changeset
|
548 free(ctx->nav_buffer); |
33363 | 549 ctx->nav_buffer = NULL; |
550 ctx->nav_start = NULL; | |
25824 | 551 ctx->nav_in_size = 0; |
552 } | |
33363 | 553 |
8198 | 554 #endif |
33363 | 555 |
556 void uninit_player(unsigned int mask) | |
557 { | |
558 mask &= initialized_flags; | |
559 | |
560 mp_msg(MSGT_CPLAYER, MSGL_DBG2, "\n*** uninit(0x%X)\n", mask); | |
561 | |
562 if (mask & INITIALIZED_ACODEC) { | |
563 initialized_flags &= ~INITIALIZED_ACODEC; | |
564 current_module = "uninit_acodec"; | |
565 if (mpctx->sh_audio) | |
566 uninit_audio(mpctx->sh_audio); | |
567 #ifdef CONFIG_GUI | |
568 if (use_gui) | |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33725
diff
changeset
|
569 gui(GUI_SET_AFILTER, NULL); |
33363 | 570 #endif |
571 mpctx->sh_audio = NULL; | |
572 mpctx->mixer.afilter = NULL; | |
8023 | 573 } |
33363 | 574 |
575 if (mask & INITIALIZED_VCODEC) { | |
576 initialized_flags &= ~INITIALIZED_VCODEC; | |
577 current_module = "uninit_vcodec"; | |
578 if (mpctx->sh_video) | |
579 uninit_video(mpctx->sh_video); | |
580 mpctx->sh_video = NULL; | |
581 #ifdef CONFIG_MENU | |
582 vf_menu = NULL; | |
25824 | 583 #endif |
33363 | 584 } |
585 | |
586 if (mask & INITIALIZED_DEMUXER) { | |
587 initialized_flags &= ~INITIALIZED_DEMUXER; | |
588 current_module = "free_demuxer"; | |
589 if (mpctx->demuxer) { | |
590 mpctx->stream = mpctx->demuxer->stream; | |
591 free_demuxer(mpctx->demuxer); | |
592 } | |
593 mpctx->demuxer = NULL; | |
31839
5edb6679ccad
100l, do not free vo_spudec if e.g. just the audio is reinitialized.
reimar
parents:
31837
diff
changeset
|
594 } |
33363 | 595 |
596 // kill the cache process: | |
597 if (mask & INITIALIZED_STREAM) { | |
598 initialized_flags &= ~INITIALIZED_STREAM; | |
599 current_module = "uninit_stream"; | |
600 if (mpctx->stream) | |
601 free_stream(mpctx->stream); | |
602 mpctx->stream = NULL; | |
603 } | |
604 | |
605 if (mask & INITIALIZED_VO) { | |
606 initialized_flags &= ~INITIALIZED_VO; | |
607 current_module = "uninit_vo"; | |
608 mpctx->video_out->uninit(); | |
609 mpctx->video_out = NULL; | |
610 #ifdef CONFIG_DVDNAV | |
611 mp_dvdnav_context_free(mpctx); | |
33276
e7f4c0ae303d
Move freeing of subtitle data to uninit_player so it not only happens
reimar
parents:
33257
diff
changeset
|
612 #endif |
33363 | 613 if (vo_spudec) { |
614 current_module = "uninit_spudec"; | |
615 spudec_free(vo_spudec); | |
616 vo_spudec = NULL; | |
617 } | |
33276
e7f4c0ae303d
Move freeing of subtitle data to uninit_player so it not only happens
reimar
parents:
33257
diff
changeset
|
618 } |
33363 | 619 |
620 // Must be after libvo uninit, as few vo drivers (svgalib) have tty code. | |
621 if (mask & INITIALIZED_GETCH2) { | |
622 initialized_flags &= ~INITIALIZED_GETCH2; | |
623 current_module = "uninit_getch2"; | |
624 mp_msg(MSGT_CPLAYER, MSGL_DBG2, "\n[[[uninit getch2]]]\n"); | |
625 // restore terminal: | |
626 getch2_disable(); | |
627 } | |
628 | |
629 if (mask & INITIALIZED_SUBS) { | |
630 initialized_flags &= ~INITIALIZED_SUBS; | |
631 if (mpctx->set_of_sub_size > 0) { | |
632 int i; | |
633 current_module = "sub_free"; | |
634 for (i = 0; i < mpctx->set_of_sub_size; ++i) { | |
635 sub_free(mpctx->set_of_subtitles[i]); | |
33276
e7f4c0ae303d
Move freeing of subtitle data to uninit_player so it not only happens
reimar
parents:
33257
diff
changeset
|
636 #ifdef CONFIG_ASS |
33363 | 637 if (mpctx->set_of_ass_tracks[i]) |
638 ass_free_track(mpctx->set_of_ass_tracks[i]); | |
33276
e7f4c0ae303d
Move freeing of subtitle data to uninit_player so it not only happens
reimar
parents:
33257
diff
changeset
|
639 #endif |
33363 | 640 } |
641 mpctx->set_of_sub_size = 0; | |
642 } | |
643 vo_sub_last = vo_sub = NULL; | |
644 subdata = NULL; | |
645 #ifdef CONFIG_ASS | |
646 ass_track = NULL; | |
647 if (ass_library) | |
648 ass_clear_fonts(ass_library); | |
649 #endif | |
650 } | |
651 | |
652 if (mask & INITIALIZED_VOBSUB) { | |
653 initialized_flags &= ~INITIALIZED_VOBSUB; | |
654 current_module = "uninit_vobsub"; | |
655 if (vo_vobsub) | |
656 vobsub_close(vo_vobsub); | |
657 vo_vobsub = NULL; | |
658 } | |
659 | |
660 if (mask & INITIALIZED_AO) { | |
661 initialized_flags &= ~INITIALIZED_AO; | |
662 current_module = "uninit_ao"; | |
663 if (mpctx->edl_muted) | |
664 mixer_mute(&mpctx->mixer); | |
665 if (mpctx->audio_out) | |
666 mpctx->audio_out->uninit(mpctx->eof ? 0 : 1); | |
667 mpctx->audio_out = NULL; | |
668 } | |
1856 | 669 |
27343 | 670 #ifdef CONFIG_GUI |
33363 | 671 if (mask & INITIALIZED_GUI) { |
672 initialized_flags &= ~INITIALIZED_GUI; | |
673 current_module = "uninit_gui"; | |
674 guiDone(); | |
675 } | |
1856 | 676 #endif |
677 | |
33363 | 678 if (mask & INITIALIZED_INPUT) { |
679 initialized_flags &= ~INITIALIZED_INPUT; | |
680 current_module = "uninit_input"; | |
681 mp_input_uninit(); | |
27345
b597fd2924b4
Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents:
27343
diff
changeset
|
682 #ifdef CONFIG_MENU |
33363 | 683 if (use_menu) |
684 menu_uninit(); | |
25433 | 685 #endif |
33363 | 686 } |
687 | |
688 current_module = NULL; | |
1856 | 689 } |
690 | |
30518
654cad7ea876
Rename exit_reason_t enum to exit_reason and do not typedef it.
diego
parents:
30506
diff
changeset
|
691 void exit_player_with_rc(enum exit_reason how, int rc) |
654cad7ea876
Rename exit_reason_t enum to exit_reason and do not typedef it.
diego
parents:
30506
diff
changeset
|
692 { |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
693 #ifdef CONFIG_NETWORKING |
33363 | 694 if (udp_master) |
695 send_udp(udp_ip, udp_port, "bye"); | |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
696 #endif /* CONFIG_NETWORKING */ |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
697 |
33363 | 698 if (mpctx->user_muted && !mpctx->edl_muted) |
699 mixer_mute(&mpctx->mixer); | |
700 uninit_player(INITIALIZED_ALL); | |
27727
48c1ae64255b
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents:
27635
diff
changeset
|
701 #if defined(__MINGW32__) || defined(__CYGWIN__) |
33363 | 702 timeEndPeriod(1); |
26689
4cf30c0ca561
Request a timer resolution of 1 ms on Windows, the default of
reimar
parents:
26479
diff
changeset
|
703 #endif |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27370
diff
changeset
|
704 #ifdef CONFIG_X11 |
27343 | 705 #ifdef CONFIG_GUI |
33363 | 706 if (!use_gui) |
6016 | 707 #endif |
33363 | 708 vo_uninit(); // Close the X11 connection (if any is open). |
6015 | 709 #endif |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
710 |
27393 | 711 #ifdef CONFIG_FREETYPE |
33363 | 712 current_module = "uninit_font"; |
713 if (sub_font && sub_font != vo_font) | |
714 free_font_desc(sub_font); | |
715 sub_font = NULL; | |
716 if (vo_font) | |
717 free_font_desc(vo_font); | |
718 vo_font = NULL; | |
719 done_freetype(); | |
13956
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
720 #endif |
33363 | 721 free_osd_list(); |
13956
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
722 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
723 #ifdef CONFIG_ASS |
33363 | 724 ass_library_done(ass_library); |
725 ass_library = NULL; | |
20477 | 726 #endif |
727 | |
33363 | 728 current_module = "exit_player"; |
729 | |
730 if (mpctx->playtree_iter) | |
731 play_tree_iter_free(mpctx->playtree_iter); | |
732 mpctx->playtree_iter = NULL; | |
733 if (mpctx->playtree) | |
734 play_tree_free(mpctx->playtree, 1); | |
735 mpctx->playtree = NULL; | |
736 | |
737 free(edl_records); // free mem allocated for EDL | |
738 edl_records = NULL; | |
739 switch (how) { | |
740 case EXIT_QUIT: | |
741 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_ExitingHow, MSGTR_Exit_quit); | |
742 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_EXIT=QUIT\n"); | |
743 break; | |
744 case EXIT_EOF: | |
745 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_ExitingHow, MSGTR_Exit_eof); | |
746 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_EXIT=EOF\n"); | |
747 break; | |
748 case EXIT_ERROR: | |
749 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_ExitingHow, MSGTR_Exit_error); | |
750 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_EXIT=ERROR\n"); | |
751 break; | |
752 default: | |
753 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_EXIT=NONE\n"); | |
754 } | |
755 mp_msg(MSGT_CPLAYER, MSGL_DBG2, "max framesize was %d bytes\n", max_framesize); | |
756 | |
757 // must be last since e.g. mp_msg uses option values | |
758 // that will be freed by this. | |
759 if (mconfig) | |
760 m_config_free(mconfig); | |
761 mconfig = NULL; | |
762 | |
763 exit(rc); | |
8644
0bfd73828e33
This patch fixes so that the exit code (or return code if you like) is set
arpi
parents:
8635
diff
changeset
|
764 } |
0bfd73828e33
This patch fixes so that the exit code (or return code if you like) is set
arpi
parents:
8635
diff
changeset
|
765 |
30518
654cad7ea876
Rename exit_reason_t enum to exit_reason and do not typedef it.
diego
parents:
30506
diff
changeset
|
766 void exit_player(enum exit_reason how) |
654cad7ea876
Rename exit_reason_t enum to exit_reason and do not typedef it.
diego
parents:
30506
diff
changeset
|
767 { |
33363 | 768 exit_player_with_rc(how, 1); |
1156 | 769 } |
770 | |
13391 | 771 #ifndef __MINGW32__ |
33363 | 772 static void child_sighandler(int x) |
773 { | |
774 pid_t pid; | |
33490 | 775 do { |
776 pid = waitpid(-1, NULL, WNOHANG); | |
777 } while (pid > 0); | |
13391 | 778 } |
33363 | 779 |
13794 | 780 #endif |
33363 | 781 |
782 static void exit_sighandler(int x) | |
783 { | |
784 static int sig_count; | |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27393
diff
changeset
|
785 #ifdef CONFIG_CRASH_DEBUG |
33363 | 786 if (!crash_debug || x != SIGTRAP) |
787 #endif | |
788 ++sig_count; | |
789 if (initialized_flags == 0 && sig_count > 1) | |
790 exit(1); | |
791 if (sig_count == 5) { | |
792 /* We're crashing bad and can't uninit cleanly :( | |
793 * by popular request, we make one last (dirty) | |
794 * effort to restore the user's | |
795 * terminal. */ | |
796 getch2_disable(); | |
797 exit(1); | |
798 } | |
799 if (sig_count == 6) | |
800 exit(1); | |
801 if (sig_count > 6) { | |
802 // can't stop :( | |
803 #ifndef __MINGW32__ | |
804 kill(getpid(), SIGKILL); | |
805 #endif | |
806 } | |
807 mp_msg(MSGT_CPLAYER, MSGL_FATAL, "\n" MSGTR_IntBySignal, x, | |
808 current_module ? current_module : "unknown" | |
809 ); | |
810 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SIGNAL=%d\n", x); | |
811 if (sig_count <= 1) | |
812 switch (x) { | |
813 case SIGINT: | |
814 case SIGPIPE: | |
815 case SIGQUIT: | |
816 case SIGTERM: | |
817 case SIGKILL: | |
818 async_quit_request = 1; | |
819 return; // killed from keyboard (^C) or killed [-9] | |
820 case SIGILL: | |
821 #if CONFIG_RUNTIME_CPUDETECT | |
822 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGILL_RTCpuSel); | |
823 #else | |
824 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGILL); | |
825 #endif | |
826 case SIGFPE: | |
827 case SIGSEGV: | |
828 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGSEGV_SIGFPE); | |
829 default: | |
830 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGCRASH); | |
831 #ifdef CONFIG_CRASH_DEBUG | |
832 if (crash_debug) { | |
833 int gdb_pid; | |
834 mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forking...\n"); | |
835 gdb_pid = fork(); | |
836 mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forked...\n"); | |
837 if (gdb_pid == 0) { // We are the child | |
838 char spid[20]; | |
839 snprintf(spid, sizeof(spid), "%i", getppid()); | |
840 getch2_disable(); // allow terminal to work properly with gdb | |
841 if (execlp("gdb", "gdb", prog_path, spid, "-ex", "bt", NULL) == -1) | |
842 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't start gdb\n"); | |
843 } else if (gdb_pid < 0) | |
844 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't fork\n"); | |
845 else { | |
846 waitpid(gdb_pid, NULL, 0); | |
847 } | |
848 if (x == SIGTRAP) | |
849 return; | |
850 } | |
851 #endif | |
13794 | 852 } |
33363 | 853 getch2_disable(); |
854 exit(1); | |
1156 | 855 } |
856 | |
33363 | 857 static void parse_cfgfiles(m_config_t *conf) |
723 | 858 { |
33363 | 859 char *conffile; |
860 int conffile_fd; | |
861 if (!disable_system_conf && | |
34172 | 862 m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mplayer.conf", 1) < 0) |
33363 | 863 exit_player(EXIT_NONE); |
864 if ((conffile = get_path("")) == NULL) { | |
865 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_NoHomeDir); | |
866 } else { | |
9831 | 867 #ifdef __MINGW32__ |
33363 | 868 mkdir(conffile); |
9831 | 869 #else |
33363 | 870 mkdir(conffile, 0777); |
9831 | 871 #endif |
33363 | 872 free(conffile); |
873 if ((conffile = get_path("config")) == NULL) { | |
874 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_GetpathProblem); | |
875 } else { | |
876 if ((conffile_fd = open(conffile, O_CREAT | O_EXCL | O_WRONLY, 0666)) != -1) { | |
877 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CreatingCfgFile, conffile); | |
878 write(conffile_fd, default_config, strlen(default_config)); | |
879 close(conffile_fd); | |
880 } | |
881 if (!disable_user_conf && | |
34172 | 882 m_config_parse_config_file(conf, conffile, 1) < 0) |
33363 | 883 exit_player(EXIT_NONE); |
884 free(conffile); | |
885 } | |
178 | 886 } |
1 | 887 } |
888 | |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
889 #define PROFILE_CFG_PROTOCOL "protocol." |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
890 |
33363 | 891 static void load_per_protocol_config(m_config_t *conf, const char *const file) |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
892 { |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
893 char *str; |
33363 | 894 char protocol[strlen(PROFILE_CFG_PROTOCOL) + strlen(file) + 1]; |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
895 m_profile_t *p; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
896 |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
897 /* does filename actually uses a protocol ? */ |
33363 | 898 str = strstr(file, "://"); |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
899 if (!str) |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
900 return; |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
901 |
33363 | 902 sprintf(protocol, "%s%s", PROFILE_CFG_PROTOCOL, file); |
903 protocol[strlen(PROFILE_CFG_PROTOCOL) + strlen(file) - strlen(str)] = '\0'; | |
904 p = m_config_get_profile(conf, protocol); | |
905 if (p) { | |
906 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingProtocolProfile, protocol); | |
907 m_config_set_profile(conf, p); | |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
908 } |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
909 } |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
910 |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
911 #define PROFILE_CFG_EXTENSION "extension." |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
912 |
33363 | 913 static void load_per_extension_config(m_config_t *conf, const char *const file) |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
914 { |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
915 char *str; |
33363 | 916 char extension[strlen(PROFILE_CFG_EXTENSION) + 8]; |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
917 m_profile_t *p; |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
918 |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
919 /* does filename actually have an extension ? */ |
33363 | 920 str = strrchr(filename, '.'); |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
921 if (!str) |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
922 return; |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
923 |
33363 | 924 sprintf(extension, PROFILE_CFG_EXTENSION); |
925 strncat(extension, ++str, 7); | |
926 p = m_config_get_profile(conf, extension); | |
927 if (p) { | |
928 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingExtensionProfile, extension); | |
929 m_config_set_profile(conf, p); | |
25635
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
930 } |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
931 } |
25f6dca4df74
add support for per protocol and per extension playback profile loading
ben
parents:
25625
diff
changeset
|
932 |
25641 | 933 #define PROFILE_CFG_VO "vo." |
934 #define PROFILE_CFG_AO "ao." | |
935 | |
33363 | 936 static void load_per_output_config(m_config_t *conf, char *cfg, char *out) |
25641 | 937 { |
33363 | 938 char profile[strlen(cfg) + strlen(out) + 1]; |
25641 | 939 m_profile_t *p; |
940 | |
33363 | 941 sprintf(profile, "%s%s", cfg, out); |
942 p = m_config_get_profile(conf, profile); | |
943 if (p) { | |
944 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingExtensionProfile, profile); | |
945 m_config_set_profile(conf, p); | |
25641 | 946 } |
947 } | |
948 | |
29561
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
949 /** |
33287 | 950 * @brief Tries to load a config file. |
29561
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
951 * @return 0 if file was not found, 1 otherwise |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
952 */ |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
953 static int try_load_config(m_config_t *conf, const char *file) |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
954 { |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
955 struct stat st; |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
956 if (stat(file, &st)) |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
957 return 0; |
33363 | 958 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingConfig, file); |
34172 | 959 m_config_parse_config_file(conf, file, 0); |
29561
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
960 return 1; |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
961 } |
82ff5f35918a
Factor out code to try and load a config file only if it exists.
reimar
parents:
29432
diff
changeset
|
962 |
33363 | 963 static void load_per_file_config(m_config_t *conf, const char *const file) |
8614
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
964 { |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
965 char *confpath; |
29594
331320b4557b
Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents:
29592
diff
changeset
|
966 char cfg[PATH_MAX]; |
32588 | 967 const char *name; |
8614
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
968 |
29594
331320b4557b
Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents:
29592
diff
changeset
|
969 if (strlen(file) > PATH_MAX - 14) { |
331320b4557b
Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents:
29592
diff
changeset
|
970 mp_msg(MSGT_CPLAYER, MSGL_WARN, "Filename is too long, can not load file or directory specific config files\n"); |
331320b4557b
Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents:
29592
diff
changeset
|
971 return; |
331320b4557b
Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents:
29592
diff
changeset
|
972 } |
33363 | 973 sprintf(cfg, "%s.conf", file); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
974 |
32588 | 975 name = mp_basename(cfg); |
29592
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
976 if (use_filedir_conf) { |
29594
331320b4557b
Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents:
29592
diff
changeset
|
977 char dircfg[PATH_MAX]; |
29592
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
978 strcpy(dircfg, cfg); |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
979 strcpy(dircfg + (name - cfg), "mplayer.conf"); |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
980 try_load_config(conf, dircfg); |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
981 |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
982 if (try_load_config(conf, cfg)) |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
983 return; |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
984 } |
ccdfb20713eb
Add support for directory-specific mplayer.conf configuration file.
reimar
parents:
29571
diff
changeset
|
985 |
33363 | 986 if ((confpath = get_path(name)) != NULL) { |
987 try_load_config(conf, confpath); | |
988 | |
989 free(confpath); | |
8614
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
990 } |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
991 } |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
992 |
34114
113156bc1137
Ensure that filename related config will always be loaded.
ib
parents:
34113
diff
changeset
|
993 static int load_profile_config(m_config_t *conf, const char *const file) |
113156bc1137
Ensure that filename related config will always be loaded.
ib
parents:
34113
diff
changeset
|
994 { |
113156bc1137
Ensure that filename related config will always be loaded.
ib
parents:
34113
diff
changeset
|
995 if (file) { |
113156bc1137
Ensure that filename related config will always be loaded.
ib
parents:
34113
diff
changeset
|
996 load_per_protocol_config(conf, file); |
113156bc1137
Ensure that filename related config will always be loaded.
ib
parents:
34113
diff
changeset
|
997 load_per_extension_config(conf, file); |
113156bc1137
Ensure that filename related config will always be loaded.
ib
parents:
34113
diff
changeset
|
998 load_per_file_config(conf, file); |
113156bc1137
Ensure that filename related config will always be loaded.
ib
parents:
34113
diff
changeset
|
999 } |
113156bc1137
Ensure that filename related config will always be loaded.
ib
parents:
34113
diff
changeset
|
1000 |
113156bc1137
Ensure that filename related config will always be loaded.
ib
parents:
34113
diff
changeset
|
1001 return file != NULL; |
113156bc1137
Ensure that filename related config will always be loaded.
ib
parents:
34113
diff
changeset
|
1002 } |
113156bc1137
Ensure that filename related config will always be loaded.
ib
parents:
34113
diff
changeset
|
1003 |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1004 /* When libmpdemux performs a blocking operation (network connection or |
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1005 * cache filling) if the operation fails we use this function to check |
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1006 * if it was interrupted by the user. |
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1007 * The function returns a new value for eof. */ |
33363 | 1008 static int libmpdemux_was_interrupted(int eof) |
1009 { | |
1010 mp_cmd_t *cmd; | |
1011 if ((cmd = mp_input_get_cmd(0, 0, 0)) != NULL) { | |
1012 switch (cmd->id) { | |
1013 case MP_CMD_QUIT: | |
1014 run_command(mpctx, cmd); | |
1015 case MP_CMD_PLAY_TREE_STEP: | |
1016 eof = (cmd->args[0].v.i > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY; | |
1017 mpctx->play_tree_step = (cmd->args[0].v.i == 0) ? 1 : cmd->args[0].v.i; | |
1018 break; | |
1019 case MP_CMD_PLAY_TREE_UP_STEP: | |
1020 eof = (cmd->args[0].v.i > 0) ? PT_UP_NEXT : PT_UP_PREV; | |
1021 break; | |
1022 case MP_CMD_PLAY_ALT_SRC_STEP: | |
1023 eof = (cmd->args[0].v.i > 0) ? PT_NEXT_SRC : PT_PREV_SRC; | |
1024 break; | |
1025 } | |
1026 mp_cmd_free(cmd); | |
1027 } | |
1028 return eof; | |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
1029 } |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
1030 |
33363 | 1031 static int playtree_add_playlist(play_tree_t *entry) |
8925
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1032 { |
33363 | 1033 play_tree_add_bpf(entry, filename); |
9301
7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents:
9291
diff
changeset
|
1034 |
27343 | 1035 #ifdef CONFIG_GUI |
33363 | 1036 if (use_gui) { |
1037 if (entry) { | |
33752 | 1038 guiPlaylistAdd(entry, mconfig); |
33363 | 1039 play_tree_free_list(entry, 1); |
1040 } | |
1041 } else | |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
1042 #endif |
33363 | 1043 { |
1044 if (!entry) { | |
1045 entry = mpctx->playtree_iter->tree; | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1046 if (play_tree_iter_step(mpctx->playtree_iter, 1, 0) != PLAY_TREE_ITER_ENTRY) |
33363 | 1047 return PT_NEXT_ENTRY; |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1048 // Loop with a single file |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1049 if (mpctx->playtree_iter->tree == entry && |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1050 play_tree_iter_up_step(mpctx->playtree_iter, 1, 0) != PLAY_TREE_ITER_ENTRY) |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1051 return PT_NEXT_ENTRY; |
33363 | 1052 play_tree_remove(entry, 1, 1); |
1053 return PT_NEXT_SRC; | |
1054 } | |
1055 play_tree_insert_entry(mpctx->playtree_iter->tree, entry); | |
1056 play_tree_set_params_from(entry, mpctx->playtree_iter->tree); | |
1057 entry = mpctx->playtree_iter->tree; | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1058 if (play_tree_iter_step(mpctx->playtree_iter, 1, 0) != PLAY_TREE_ITER_ENTRY) |
33363 | 1059 return PT_NEXT_ENTRY; |
1060 play_tree_remove(entry, 1, 1); | |
8925
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1061 } |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1062 return PT_NEXT_SRC; |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1063 } |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1064 |
25264
42aa06653705
When auto loading subs, log warning instead of error for load failure.
ulion
parents:
25251
diff
changeset
|
1065 void add_subtitles(char *filename, float fps, int noerr) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1066 { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1067 sub_data *subd; |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1068 #ifdef CONFIG_ASS |
31792
55dacfca4a43
Rename libass types to match upstream libass >= 0.9.7
greg
parents:
31762
diff
changeset
|
1069 ASS_Track *asst = 0; |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1070 #endif |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1071 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1072 if (filename == NULL || mpctx->set_of_sub_size >= MAX_SUBTITLE_FILES) |
33363 | 1073 return; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1074 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1075 subd = sub_read_file(filename, fps); |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1076 #ifdef CONFIG_ASS |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1077 if (ass_enabled) |
27393 | 1078 #ifdef CONFIG_ICONV |
30473
7446f58b6899
Add support for loading ASS subtitles through the stream layer and thus e.g.
reimar
parents:
30429
diff
changeset
|
1079 asst = ass_read_stream(ass_library, filename, sub_cp); |
20477 | 1080 #else |
30473
7446f58b6899
Add support for loading ASS subtitles through the stream layer and thus e.g.
reimar
parents:
30429
diff
changeset
|
1081 asst = ass_read_stream(ass_library, filename, 0); |
20477 | 1082 #endif |
19468 | 1083 if (ass_enabled && subd && !asst) |
20477 | 1084 asst = ass_read_subdata(ass_library, subd, fps); |
19401
c0c3a2f8bb32
Add subdata to ass_track conversion for external subtitles.
eugeni
parents:
19380
diff
changeset
|
1085 |
25264
42aa06653705
When auto loading subs, log warning instead of error for load failure.
ulion
parents:
25251
diff
changeset
|
1086 if (!asst && !subd) |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1087 #else |
33363 | 1088 if (!subd) |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1089 #endif |
25264
42aa06653705
When auto loading subs, log warning instead of error for load failure.
ulion
parents:
25251
diff
changeset
|
1090 mp_msg(MSGT_CPLAYER, noerr ? MSGL_WARN : MSGL_ERR, MSGTR_CantLoadSub, |
33363 | 1091 filename_recode(filename)); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1092 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1093 #ifdef CONFIG_ASS |
33363 | 1094 if (!asst && !subd) |
1095 return; | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1096 mpctx->set_of_ass_tracks[mpctx->set_of_sub_size] = asst; |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1097 #else |
33363 | 1098 if (!subd) |
1099 return; | |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
1100 #endif |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1101 mpctx->set_of_subtitles[mpctx->set_of_sub_size] = subd; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1102 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FILE_SUB_ID=%d\n", mpctx->set_of_sub_size); |
22002
ebd2d5efb11b
filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents:
21930
diff
changeset
|
1103 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FILE_SUB_FILENAME=%s\n", |
33363 | 1104 filename_recode(filename)); |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1105 ++mpctx->set_of_sub_size; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1106 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AddedSubtitleFile, mpctx->set_of_sub_size, |
33363 | 1107 filename_recode(filename)); |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1108 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1109 |
33363 | 1110 static int add_vob_subtitle(const char *vobname, const char *const ifo, int force, void *spu) |
32724
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1111 { |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1112 if (!vobname) |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1113 return 0; |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1114 |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1115 assert(!vo_vobsub); |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1116 |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1117 vo_vobsub = vobsub_open(vobname, ifo, force, spu); |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1118 |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1119 if (!vo_vobsub && force) |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1120 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantLoadSub, |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1121 filename_recode(vobname)); |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1122 |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1123 return !!vo_vobsub; |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1124 } |
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
1125 |
13501
a5004eb92a79
fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents:
13500
diff
changeset
|
1126 // FIXME: if/when the GUI calls this, global sub numbering gets (potentially) broken. |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17553
diff
changeset
|
1127 void update_set_of_subtitles(void) |
33363 | 1128 { |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1129 // subdata was changed, set_of_sub... have to be updated. |
33363 | 1130 sub_data **const set_of_subtitles = mpctx->set_of_subtitles; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1131 int i; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1132 if (mpctx->set_of_sub_size > 0 && subdata == NULL) { // *subdata was deleted |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1133 for (i = mpctx->set_of_sub_pos + 1; i < mpctx->set_of_sub_size; ++i) |
33363 | 1134 set_of_subtitles[i - 1] = set_of_subtitles[i]; |
1135 set_of_subtitles[mpctx->set_of_sub_size - 1] = NULL; | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1136 --mpctx->set_of_sub_size; |
33363 | 1137 if (mpctx->set_of_sub_size > 0) |
1138 subdata = set_of_subtitles[mpctx->set_of_sub_pos = 0]; | |
1139 } else if (mpctx->set_of_sub_size > 0 && subdata != NULL) { // *subdata was changed | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1140 set_of_subtitles[mpctx->set_of_sub_pos] = subdata; |
33363 | 1141 } else if (mpctx->set_of_sub_size <= 0 && subdata != NULL) { // *subdata was added |
1142 set_of_subtitles[mpctx->set_of_sub_pos = mpctx->set_of_sub_size] = subdata; | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1143 ++mpctx->set_of_sub_size; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1144 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1145 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1146 |
13710 | 1147 /** |
33287 | 1148 * @brief Append a formatted string. |
1149 * @param buf buffer to print into | |
1150 * @param pos position of terminating 0 in buf | |
1151 * @param len maximum number of characters in buf, not including terminating 0 | |
1152 * @param format printf format string | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1153 */ |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1154 static void saddf(char *buf, unsigned *pos, int len, const char *format, ...) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1155 { |
33363 | 1156 va_list va; |
1157 va_start(va, format); | |
1158 *pos += vsnprintf(&buf[*pos], len - *pos, format, va); | |
1159 va_end(va); | |
1160 if (*pos >= len) { | |
1161 buf[len] = 0; | |
1162 *pos = len; | |
1163 } | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1164 } |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1165 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1166 /** |
33287 | 1167 * @brief Append time in the hh:mm:ss.f format. |
1168 * @param buf buffer to print into | |
1169 * @param pos position of terminating 0 in buf | |
1170 * @param len maximum number of characters in buf, not including terminating 0 | |
1171 * @param time time value to convert/append | |
16654 | 1172 */ |
33363 | 1173 static void sadd_hhmmssf(char *buf, unsigned *pos, int len, float time) |
1174 { | |
1175 int64_t tenths = 10 * time; | |
1176 int f1 = tenths % 10; | |
1177 int ss = (tenths / 10) % 60; | |
1178 int mm = (tenths / 600) % 60; | |
1179 int hh = tenths / 36000; | |
1180 if (time <= 0) { | |
1181 saddf(buf, pos, len, "unknown"); | |
1182 return; | |
1183 } | |
1184 if (hh > 0) | |
1185 saddf(buf, pos, len, "%2d:", hh); | |
1186 if (hh > 0 || mm > 0) | |
1187 saddf(buf, pos, len, "%02d:", mm); | |
1188 saddf(buf, pos, len, "%02d.%1d", ss, f1); | |
16654 | 1189 } |
1190 | |
1191 /** | |
33287 | 1192 * @brief Print the status line. |
1193 * @param a_pos audio position | |
1194 * @param a_v A-V desynchronization | |
1195 * @param corr amount out A-V synchronization | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1196 */ |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1197 static void print_status(float a_pos, float a_v, float corr) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1198 { |
33363 | 1199 sh_video_t *const sh_video = mpctx->sh_video; |
1200 int width; | |
1201 char *line; | |
1202 unsigned pos = 0; | |
1203 get_screen_size(); | |
1204 if (screen_width > 0) | |
1205 width = screen_width; | |
1206 else | |
1207 width = 80; | |
27727
48c1ae64255b
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents:
27635
diff
changeset
|
1208 #if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__OS2__) |
33363 | 1209 /* Windows command line is broken (MinGW's rxvt works, but we |
1210 * should not depend on that). */ | |
1211 width--; | |
13928 | 1212 #endif |
33363 | 1213 line = malloc(width + 1); // one additional char for the terminating null |
1214 | |
1215 // Audio time | |
1216 if (mpctx->sh_audio) { | |
1217 saddf(line, &pos, width, "A:%6.1f ", a_pos); | |
1218 if (!sh_video) { | |
1219 float len = demuxer_get_time_length(mpctx->demuxer); | |
1220 saddf(line, &pos, width, "("); | |
1221 sadd_hhmmssf(line, &pos, width, a_pos); | |
1222 saddf(line, &pos, width, ") of %.1f (", len); | |
1223 sadd_hhmmssf(line, &pos, width, len); | |
1224 saddf(line, &pos, width, ") "); | |
1225 } | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1226 } |
33363 | 1227 |
1228 // Video time | |
1229 if (sh_video) | |
1230 saddf(line, &pos, width, "V:%6.1f ", sh_video->pts); | |
1231 | |
1232 // A-V sync | |
1233 if (mpctx->sh_audio && sh_video) | |
1234 saddf(line, &pos, width, "A-V:%7.3f ct:%7.3f ", a_v, corr); | |
1235 | |
1236 // Video stats | |
1237 if (sh_video) | |
1238 saddf(line, &pos, width, "%3d/%3d ", | |
1239 (int)sh_video->num_frames, | |
1240 (int)sh_video->num_frames_decoded); | |
1241 | |
1242 // CPU usage | |
1243 if (sh_video) { | |
1244 if (sh_video->timer > 0.5) | |
1245 saddf(line, &pos, width, "%2d%% %2d%% %4.1f%% ", | |
1246 (int)(100.0 * video_time_usage * playback_speed / (double)sh_video->timer), | |
1247 (int)(100.0 * vout_time_usage * playback_speed / (double)sh_video->timer), | |
1248 (100.0 * audio_time_usage * playback_speed / (double)sh_video->timer)); | |
1249 else | |
1250 saddf(line, &pos, width, "??%% ??%% ??,?%% "); | |
1251 } else if (mpctx->sh_audio) { | |
1252 if (mpctx->delay > 0.5) | |
1253 saddf(line, &pos, width, "%4.1f%% ", | |
1254 100.0 * audio_time_usage / (double)mpctx->delay); | |
1255 else | |
1256 saddf(line, &pos, width, "??,?%% "); | |
1257 } | |
1258 | |
1259 // VO stats | |
1260 if (sh_video) | |
1261 saddf(line, &pos, width, "%d %d ", drop_frame_cnt, output_quality); | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1262 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1263 #ifdef CONFIG_STREAM_CACHE |
33363 | 1264 // cache stats |
1265 if (stream_cache_size > 0) | |
1266 saddf(line, &pos, width, "%d%% ", cache_fill_status(mpctx->stream)); | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1267 #endif |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1268 |
33363 | 1269 // other |
1270 if (playback_speed != 1) | |
1271 saddf(line, &pos, width, "%4.2fx ", playback_speed); | |
1272 | |
1273 // end | |
1274 if (erase_to_end_of_line) { | |
1275 line[pos] = 0; | |
1276 mp_msg(MSGT_STATUSLINE, MSGL_STATUS, "%s%s\r", line, erase_to_end_of_line); | |
1277 } else { | |
1278 memset(&line[pos], ' ', width - pos); | |
1279 line[width] = 0; | |
1280 mp_msg(MSGT_STATUSLINE, MSGL_STATUS, "%s\r", line); | |
1281 } | |
1282 free(line); | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1283 } |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1284 |
33390 | 1285 static void stream_dump_progress_start(void) |
1286 { | |
1287 stream_dump_start_time = stream_dump_last_print_time = GetTimerMS(); | |
1288 } | |
1289 | |
1290 static void stream_dump_progress(uint64_t len, stream_t *stream) | |
1291 { | |
1292 unsigned t = GetTimerMS(); | |
1293 uint64_t start = stream->start_pos; | |
1294 uint64_t end = stream->end_pos; | |
1295 uint64_t pos = stream->pos; | |
1296 | |
1297 stream_dump_count += len; | |
1298 if (t - stream_dump_last_print_time - 1000 > UINT_MAX / 2) | |
1299 return; | |
1300 stream_dump_last_print_time = t; | |
1301 /* TODO: pretty print sizes; ETA */ | |
1302 if (end > start && pos >= start && pos <= end) { | |
1303 mp_msg(MSGT_STATUSLINE, MSGL_STATUS, MSGTR_DumpBytesWrittenPercent, | |
1304 stream_dump_count, 100.0 * (pos - start) / (end - start)); | |
1305 } else { | |
1306 mp_msg(MSGT_STATUSLINE, MSGL_STATUS, MSGTR_DumpBytesWritten, | |
1307 stream_dump_count); | |
1308 } | |
1309 } | |
1310 | |
1311 static void stream_dump_progress_end(void) | |
1312 { | |
1313 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_DumpBytesWrittenTo, | |
1314 stream_dump_count, stream_dump_name); | |
1315 } | |
1316 | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1317 /** |
33287 | 1318 * @brief Build a chain of audio filters that converts the input format. |
13710 | 1319 * to the ao's format, taking into account the current playback_speed. |
33287 | 1320 * @param sh_audio describes the requested input format of the chain. |
1321 * @param ao_data describes the requested output format of the chain. | |
13710 | 1322 */ |
32561
17bb5a38ae2e
build_afilter_chain is not safe to use directly, thus make it
reimar
parents:
32543
diff
changeset
|
1323 static int build_afilter_chain(sh_audio_t *sh_audio, ao_data_t *ao_data) |
13710 | 1324 { |
33363 | 1325 int new_srate; |
1326 int result; | |
1327 if (!sh_audio) { | |
27343 | 1328 #ifdef CONFIG_GUI |
33363 | 1329 if (use_gui) |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33725
diff
changeset
|
1330 gui(GUI_SET_AFILTER, NULL); |
14254 | 1331 #endif |
33363 | 1332 mpctx->mixer.afilter = NULL; |
1333 return 0; | |
24896 | 1334 } |
33363 | 1335 if (af_control_any_rev(sh_audio->afilter, |
1336 AF_CONTROL_PLAYBACK_SPEED | AF_CONTROL_SET, | |
1337 &playback_speed)) { | |
1338 new_srate = sh_audio->samplerate; | |
1339 } else { | |
1340 new_srate = sh_audio->samplerate * playback_speed; | |
1341 if (new_srate != ao_data->samplerate) { | |
1342 // limits are taken from libaf/af_resample.c | |
1343 if (new_srate < 8000) | |
1344 new_srate = 8000; | |
1345 if (new_srate > 192000) | |
1346 new_srate = 192000; | |
1347 playback_speed = (float)new_srate / (float)sh_audio->samplerate; | |
1348 } | |
1349 } | |
1350 result = init_audio_filters(sh_audio, new_srate, | |
1351 &ao_data->samplerate, &ao_data->channels, &ao_data->format); | |
1352 mpctx->mixer.afilter = sh_audio->afilter; | |
27343 | 1353 #ifdef CONFIG_GUI |
33363 | 1354 if (use_gui) |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33725
diff
changeset
|
1355 gui(GUI_SET_AFILTER, sh_audio->afilter); |
14254 | 1356 #endif |
33363 | 1357 return result; |
13710 | 1358 } |
8800 | 1359 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1360 typedef struct mp_osd_msg mp_osd_msg_t; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1361 struct mp_osd_msg { |
33363 | 1362 mp_osd_msg_t *prev; ///< Previous message on the stack |
33287 | 1363 char msg[128]; ///< Message text |
33363 | 1364 int id, level, started; |
1365 unsigned time; ///< Display duration in ms | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1366 }; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1367 |
33363 | 1368 static mp_osd_msg_t *osd_msg_stack; ///< OSD message stack |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1369 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1370 /** |
33287 | 1371 * @brief Add a message on the OSD message stack. |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1372 * |
33287 | 1373 * If a message with the same id is already present in the stack |
1374 * it is pulled on top of the stack, otherwise a new message is created. | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1375 */ |
33363 | 1376 void set_osd_msg(int id, int level, int time, const char *fmt, ...) |
1377 { | |
1378 mp_osd_msg_t *msg, *last = NULL; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1379 va_list va; |
17929
6fe95ee39422
Fix osd_show_msg alignment and make sure msg strings
albeu
parents:
17928
diff
changeset
|
1380 int r; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1381 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1382 // look if the id is already in the stack |
33363 | 1383 for (msg = osd_msg_stack; msg && msg->id != id; |
1384 last = msg, msg = msg->prev) ; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1385 // not found: alloc it |
33363 | 1386 if (!msg) { |
1387 msg = calloc(1, sizeof(mp_osd_msg_t)); | |
1388 msg->prev = osd_msg_stack; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1389 osd_msg_stack = msg; |
33363 | 1390 } else if (last) { // found, but it's not on top of the stack |
1391 last->prev = msg->prev; | |
1392 msg->prev = osd_msg_stack; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1393 osd_msg_stack = msg; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1394 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1395 // write the msg |
33363 | 1396 va_start(va, fmt); |
28378 | 1397 r = vsnprintf(msg->msg, 128, fmt, va); |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1398 va_end(va); |
33363 | 1399 if (r >= 128) |
1400 msg->msg[127] = 0; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1401 // set id and time |
33363 | 1402 msg->id = id; |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1403 msg->level = level; |
33363 | 1404 msg->time = time; |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1405 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1406 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1407 /** |
33287 | 1408 * @brief Remove a message from the OSD stack. |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1409 * |
33287 | 1410 * This function can be used to get rid of a message right away. |
17057
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1411 */ |
33363 | 1412 void rm_osd_msg(int id) |
1413 { | |
1414 mp_osd_msg_t *msg, *last = NULL; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1415 |
17057
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1416 // Search for the msg |
33363 | 1417 for (msg = osd_msg_stack; msg && msg->id != id; |
1418 last = msg, msg = msg->prev) ; | |
1419 if (!msg) | |
1420 return; | |
17057
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1421 |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1422 // Detach it from the stack and free it |
33363 | 1423 if (last) |
17057
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1424 last->prev = msg->prev; |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1425 else |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1426 osd_msg_stack = msg->prev; |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1427 free(msg); |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1428 } |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1429 |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1430 /** |
33287 | 1431 * @brief Remove all messages from the OSD stack. |
17938 | 1432 */ |
33363 | 1433 static void clear_osd_msgs(void) |
1434 { | |
1435 mp_osd_msg_t *msg = osd_msg_stack, *prev = NULL; | |
1436 while (msg) { | |
17938 | 1437 prev = msg->prev; |
1438 free(msg); | |
1439 msg = prev; | |
1440 } | |
1441 osd_msg_stack = NULL; | |
1442 } | |
1443 | |
1444 /** | |
33287 | 1445 * @brief Get the current message from the OSD stack. |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1446 * |
33287 | 1447 * This function decrements the message timer and destroys the old ones. |
1448 * The message that should be displayed is returned (if any). | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1449 */ |
33363 | 1450 static mp_osd_msg_t *get_osd_msg(void) |
1451 { | |
1452 mp_osd_msg_t *msg, *prev, *last = NULL; | |
33257
40b298f9dc77
Remove some useless static and global zero initializations.
cboesch
parents:
33256
diff
changeset
|
1453 static unsigned last_update; |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1454 unsigned now = GetTimerMS(); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1455 unsigned diff; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1456 char hidden_dec_done = 0; |
24091 | 1457 |
1458 if (osd_visible) { | |
33363 | 1459 // 36000000 means max timed visibility is 1 hour into the future, if |
1460 // the difference is greater assume it's wrapped around from below 0 | |
1461 if (osd_visible - now > 36000000) { | |
1462 osd_visible = 0; | |
1463 vo_osd_progbar_type = -1; // disable | |
1464 vo_osd_changed(OSDTYPE_PROGBAR); | |
1465 if (mpctx->osd_function != OSD_PAUSE) | |
1466 mpctx->osd_function = OSD_PLAY; | |
1467 } | |
24091 | 1468 } |
1469 | |
33363 | 1470 if (!last_update) |
1471 last_update = now; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1472 diff = now >= last_update ? now - last_update : 0; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1473 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1474 last_update = now; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1475 |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1476 // Look for the first message in the stack with high enough level. |
33363 | 1477 for (msg = osd_msg_stack; msg; last = msg, msg = prev) { |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1478 prev = msg->prev; |
33363 | 1479 if (msg->level > osd_level && hidden_dec_done) |
1480 continue; | |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1481 // The message has a high enough level or it is the first hidden one |
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1482 // in both cases we decrement the timer or kill it. |
33363 | 1483 if (!msg->started || msg->time > diff) { |
1484 if (msg->started) | |
1485 msg->time -= diff; | |
1486 else | |
1487 msg->started = 1; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1488 // display it |
33363 | 1489 if (msg->level <= osd_level) |
1490 return msg; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1491 hidden_dec_done = 1; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1492 continue; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1493 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1494 // kill the message |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1495 free(msg); |
33363 | 1496 if (last) { |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1497 last->prev = prev; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1498 msg = last; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1499 } else { |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1500 osd_msg_stack = prev; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1501 msg = NULL; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1502 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1503 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1504 // Nothing found |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1505 return NULL; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1506 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1507 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1508 /** |
33287 | 1509 * @brief Display the OSD bar. |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1510 * |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1511 * Display the OSD bar or fall back on a simple message. |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1512 */ |
33363 | 1513 void set_osd_bar(int type, const char *name, double min, double max, double val) |
1514 { | |
1515 if (osd_level < 1) | |
1516 return; | |
1517 | |
1518 if (mpctx->sh_video) { | |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18286
diff
changeset
|
1519 osd_visible = (GetTimerMS() + 1000) | 1; |
33363 | 1520 vo_osd_progbar_type = type; |
1521 vo_osd_progbar_value = 256 * (val - min) / (max - min); | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1522 vo_osd_changed(OSDTYPE_PROGBAR); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1523 return; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1524 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1525 |
33363 | 1526 set_osd_msg(OSD_MSG_BAR, 1, osd_duration, "%s: %d %%", |
1527 name, ROUND(100 * (val - min) / (max - min))); | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1528 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1529 |
29670
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1530 /** |
33287 | 1531 * @brief Display text subtitles on the OSD. |
29670
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1532 */ |
33363 | 1533 void set_osd_subtitle(subtitle *subs) |
1534 { | |
29670
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1535 int i; |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1536 vo_sub = subs; |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1537 vo_osd_changed(OSDTYPE_SUBTITLE); |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1538 if (!mpctx->sh_video) { |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1539 // reverse order, since newest set_osd_msg is displayed first |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1540 for (i = SUB_MAX_TEXT - 1; i >= 0; i--) { |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1541 if (!subs || i >= subs->lines || !subs->text[i]) |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1542 rm_osd_msg(OSD_MSG_SUB_BASE + i); |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1543 else { |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1544 // HACK: currently display time for each sub line except the last is set to 2 seconds. |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1545 int display_time = i == subs->lines - 1 ? 180000 : 2000; |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1546 set_osd_msg(OSD_MSG_SUB_BASE + i, 1, display_time, "%s", subs->text[i]); |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1547 } |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1548 } |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1549 } |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
1550 } |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1551 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1552 /** |
33287 | 1553 * @brief Update the OSD message line. |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1554 * |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1555 * This function displays the current message on the vo OSD or on the term. |
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1556 * If the stack is empty and the OSD level is high enough the timer |
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1557 * is displayed (only on the vo OSD). |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1558 */ |
33363 | 1559 static void update_osd_msg(void) |
1560 { | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1561 mp_osd_msg_t *msg; |
28378 | 1562 static char osd_text[128] = ""; |
1563 static char osd_text_timer[128]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1564 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1565 // we need some mem for vo_osd_text |
33363 | 1566 vo_osd_text = (unsigned char *)osd_text; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1567 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1568 // Look if we have a msg |
33363 | 1569 if ((msg = get_osd_msg())) { |
1570 if (strcmp(osd_text, msg->msg)) { | |
1571 strncpy((char *)osd_text, msg->msg, 127); | |
1572 if (mpctx->sh_video) | |
1573 vo_osd_changed(OSDTYPE_OSD); | |
1574 else if (term_osd) | |
1575 mp_msg(MSGT_CPLAYER, MSGL_STATUS, "%s%s\n", term_osd_esc, msg->msg); | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1576 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1577 return; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1578 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1579 |
33363 | 1580 if (mpctx->sh_video) { |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1581 // fallback on the timer |
33363 | 1582 if (osd_level >= 2) { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1583 int len = demuxer_get_time_length(mpctx->demuxer); |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1584 int percentage = -1; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1585 char percentage_text[10]; |
32793 | 1586 char fractions_text[4]; |
34312
d2a41814c879
Fix OSD time and e.g. frame number displayed with osd_fractions
reimar
parents:
34262
diff
changeset
|
1587 double pts = demuxer_get_current_time(mpctx->demuxer); |
d2a41814c879
Fix OSD time and e.g. frame number displayed with osd_fractions
reimar
parents:
34262
diff
changeset
|
1588 int pts_seconds = pts; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1589 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1590 if (mpctx->osd_show_percentage) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1591 percentage = demuxer_get_percent_pos(mpctx->demuxer); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1592 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1593 if (percentage >= 0) |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1594 snprintf(percentage_text, 9, " (%d%%)", percentage); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1595 else |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1596 percentage_text[0] = 0; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1597 |
33363 | 1598 if (osd_fractions == 1) { |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1599 // print fractions as sub-second timestamp |
32793 | 1600 snprintf(fractions_text, sizeof(fractions_text), ".%02d", |
34312
d2a41814c879
Fix OSD time and e.g. frame number displayed with osd_fractions
reimar
parents:
34262
diff
changeset
|
1601 (int)((pts - pts_seconds) * 100) % 100); |
33363 | 1602 } else if (osd_fractions == 2) { |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1603 // print fractions by estimating the frame count within the |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1604 // second |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1605 |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1606 // rounding or cutting off numbers after the decimal point |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1607 // causes problems because of float's precision and movies, |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1608 // whose first frame is not exactly at timestamp 0. Therefore, |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1609 // we add 0.2 and cut off at the decimal point, which proved |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1610 // as good heuristic |
32793 | 1611 snprintf(fractions_text, sizeof(fractions_text), ".%02d", |
34312
d2a41814c879
Fix OSD time and e.g. frame number displayed with osd_fractions
reimar
parents:
34262
diff
changeset
|
1612 (int)((pts - pts_seconds) * |
33363 | 1613 mpctx->sh_video->fps + 0.2)); |
32793 | 1614 } else { |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1615 // do not print fractions |
32793 | 1616 fractions_text[0] = 0; |
1617 } | |
1618 | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1619 if (osd_level == 3) |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1620 snprintf(osd_text_timer, 63, |
32793 | 1621 "%c %02d:%02d:%02d%s / %02d:%02d:%02d%s", |
34312
d2a41814c879
Fix OSD time and e.g. frame number displayed with osd_fractions
reimar
parents:
34262
diff
changeset
|
1622 mpctx->osd_function, pts_seconds / 3600, (pts_seconds / 60) % 60, pts_seconds % 60, |
33363 | 1623 fractions_text, len / 3600, (len / 60) % 60, len % 60, |
32793 | 1624 percentage_text); |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1625 else |
32793 | 1626 snprintf(osd_text_timer, 63, "%c %02d:%02d:%02d%s%s", |
34312
d2a41814c879
Fix OSD time and e.g. frame number displayed with osd_fractions
reimar
parents:
34262
diff
changeset
|
1627 mpctx->osd_function, pts_seconds / 3600, (pts_seconds / 60) % 60, |
d2a41814c879
Fix OSD time and e.g. frame number displayed with osd_fractions
reimar
parents:
34262
diff
changeset
|
1628 pts_seconds % 60, fractions_text, percentage_text); |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1629 } else |
33363 | 1630 osd_text_timer[0] = 0; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1631 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1632 // always decrement the percentage timer |
33363 | 1633 if (mpctx->osd_show_percentage) |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1634 mpctx->osd_show_percentage--; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1635 |
33363 | 1636 if (strcmp(osd_text, osd_text_timer)) { |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1637 strncpy(osd_text, osd_text_timer, 63); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1638 vo_osd_changed(OSDTYPE_OSD); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1639 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1640 return; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1641 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
1642 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1643 // Clear the term osd line |
33363 | 1644 if (term_osd && osd_text[0]) { |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1645 osd_text[0] = 0; |
33363 | 1646 printf("%s\n", term_osd_esc); |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1647 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1648 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1649 |
33363 | 1650 void reinit_audio_chain(void) |
1651 { | |
29801
7ac1f37f8aa5
Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents:
29800
diff
changeset
|
1652 if (!mpctx->sh_audio) |
7ac1f37f8aa5
Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents:
29800
diff
changeset
|
1653 return; |
31671
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
1654 if (!(initialized_flags & INITIALIZED_ACODEC)) { |
33363 | 1655 current_module = "init_audio_codec"; |
1656 mp_msg(MSGT_CPLAYER, MSGL_INFO, "==========================================================================\n"); | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
1657 if (!init_best_audio_codec(mpctx->sh_audio, audio_codec_list, audio_fm_list)) |
31673 | 1658 goto init_error; |
33363 | 1659 initialized_flags |= INITIALIZED_ACODEC; |
1660 mp_msg(MSGT_CPLAYER, MSGL_INFO, "==========================================================================\n"); | |
31671
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
1661 } |
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
1662 |
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
1663 if (!(initialized_flags & INITIALIZED_AO)) { |
33363 | 1664 current_module = "af_preinit"; |
1665 ao_data.samplerate = force_srate; | |
1666 ao_data.channels = 0; | |
1667 ao_data.format = audio_output_format; | |
31673 | 1668 // first init to detect best values |
33363 | 1669 if (!init_audio_filters(mpctx->sh_audio, // preliminary init |
1670 // input: | |
1671 mpctx->sh_audio->samplerate, | |
1672 // output: | |
1673 &ao_data.samplerate, &ao_data.channels, &ao_data.format)) { | |
1674 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_AudioFilterChainPreinitError); | |
31673 | 1675 exit_player(EXIT_ERROR); |
1676 } | |
33363 | 1677 current_module = "ao2_init"; |
31673 | 1678 mpctx->audio_out = init_best_audio_out(audio_driver_list, |
1679 0, // plugin flag | |
1680 ao_data.samplerate, | |
1681 ao_data.channels, | |
1682 ao_data.format, 0); | |
33363 | 1683 if (!mpctx->audio_out) { |
1684 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CannotInitAO); | |
31673 | 1685 goto init_error; |
1686 } | |
33363 | 1687 initialized_flags |= INITIALIZED_AO; |
1688 mp_msg(MSGT_CPLAYER, MSGL_INFO, "AO: [%s] %dHz %dch %s (%d bytes per sample)\n", | |
31673 | 1689 mpctx->audio_out->info->short_name, |
1690 ao_data.samplerate, ao_data.channels, | |
1691 af_fmt2str_short(ao_data.format), | |
33363 | 1692 af_fmt2bits(ao_data.format) / 8); |
1693 mp_msg(MSGT_CPLAYER, MSGL_V, "AO: Description: %s\nAO: Author: %s\n", | |
31673 | 1694 mpctx->audio_out->info->name, mpctx->audio_out->info->author); |
33363 | 1695 if (strlen(mpctx->audio_out->info->comment) > 0) |
1696 mp_msg(MSGT_CPLAYER, MSGL_V, "AO: Comment: %s\n", mpctx->audio_out->info->comment); | |
31671
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
1697 } |
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
1698 |
18679
e52e101e9e59
moved audio codec/filters/out to a separate function that is called both at init() and to switch audio stream
nicodvb
parents:
18406
diff
changeset
|
1699 // init audio filters: |
33363 | 1700 current_module = "af_init"; |
1701 if (!build_afilter_chain(mpctx->sh_audio, &ao_data)) { | |
1702 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_NoMatchingFilter); | |
29801
7ac1f37f8aa5
Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents:
29800
diff
changeset
|
1703 goto init_error; |
18679
e52e101e9e59
moved audio codec/filters/out to a separate function that is called both at init() and to switch audio stream
nicodvb
parents:
18406
diff
changeset
|
1704 } |
29801
7ac1f37f8aa5
Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents:
29800
diff
changeset
|
1705 mpctx->mixer.audio_out = mpctx->audio_out; |
33363 | 1706 mpctx->mixer.volstep = volstep; |
29801
7ac1f37f8aa5
Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents:
29800
diff
changeset
|
1707 return; |
29794
df1826dcdb2d
Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents:
29785
diff
changeset
|
1708 |
df1826dcdb2d
Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents:
29785
diff
changeset
|
1709 init_error: |
33363 | 1710 uninit_player(INITIALIZED_ACODEC | INITIALIZED_AO); // close codec and possibly AO |
1711 mpctx->sh_audio = mpctx->d_audio->sh = NULL; // -> nosound | |
29794
df1826dcdb2d
Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents:
29785
diff
changeset
|
1712 mpctx->d_audio->id = -2; |
18679
e52e101e9e59
moved audio codec/filters/out to a separate function that is called both at init() and to switch audio stream
nicodvb
parents:
18406
diff
changeset
|
1713 } |
e52e101e9e59
moved audio codec/filters/out to a separate function that is called both at init() and to switch audio stream
nicodvb
parents:
18406
diff
changeset
|
1714 |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1715 // Return pts value corresponding to the end point of audio written to the |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1716 // ao so far. |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1717 static double written_audio_pts(sh_audio_t *sh_audio, demux_stream_t *d_audio) |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1718 { |
24913 | 1719 double buffered_output; |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1720 // first calculate the end pts of audio that has been output by decoder |
32863
674117ab7ce7
Move MPlayer's audio pts calculation code into mp_common.c and reuse it in
reimar
parents:
32814
diff
changeset
|
1721 double a_pts = calc_a_pts(sh_audio, d_audio); |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1722 // Now a_pts hopefully holds the pts for end of audio from decoder. |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1723 // Substract data in buffers between decoder and audio out. |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1724 |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1725 // Decoded but not filtered |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1726 a_pts -= sh_audio->a_buffer_len / (double)sh_audio->o_bps; |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1727 |
24900 | 1728 // Data buffered in audio filters, measured in bytes of "missing" output |
24913 | 1729 buffered_output = af_calc_delay(sh_audio->afilter); |
24900 | 1730 |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1731 // Data that was ready for ao but was buffered because ao didn't fully |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1732 // accept everything to internal buffers yet |
24900 | 1733 buffered_output += sh_audio->a_out_buffer_len; |
1734 | |
1735 // Filters divide audio length by playback_speed, so multiply by it | |
1736 // to get the length in original units without speedup or slowdown | |
1737 a_pts -= buffered_output * playback_speed / ao_data.bps; | |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1738 |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1739 return a_pts; |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1740 } |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1741 |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1742 // Return pts value corresponding to currently playing audio. |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1743 double playing_audio_pts(sh_audio_t *sh_audio, demux_stream_t *d_audio, |
33363 | 1744 const ao_functions_t *audio_out) |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1745 { |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1746 return written_audio_pts(sh_audio, d_audio) - playback_speed * |
33363 | 1747 audio_out->get_delay(); |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1748 } |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1749 |
33495 | 1750 static int is_at_end(MPContext *mpctx, m_time_size_t *end_at, double pts) |
1751 { | |
1752 switch (end_at->type) { | |
1753 case END_AT_TIME: return end_at->pos <= pts; | |
1754 case END_AT_SIZE: return end_at->pos <= stream_tell(mpctx->stream); | |
1755 } | |
1756 return 0; | |
1757 } | |
1758 | |
33363 | 1759 static int check_framedrop(double frame_time) |
1760 { | |
1761 // check for frame-drop: | |
1762 current_module = "check_framedrop"; | |
1763 if (mpctx->sh_audio && !mpctx->d_audio->eof) { | |
1764 static int dropped_frames; | |
1765 float delay = playback_speed * mpctx->audio_out->get_delay(); | |
1766 float d = delay - mpctx->delay; | |
1767 ++total_frame_cnt; | |
1768 // we should avoid dropping too many frames in sequence unless we | |
1769 // are too late. and we allow 100ms A-V delay here: | |
1770 if (d < -dropped_frames * frame_time - 0.100 && | |
1771 mpctx->osd_function != OSD_PAUSE) { | |
1772 ++drop_frame_cnt; | |
1773 ++dropped_frames; | |
1774 return frame_dropping; | |
1775 } else | |
1776 dropped_frames = 0; | |
1777 } | |
1778 return 0; | |
26228
089dc00275b6
Experimental support for -framedrop with -correct-pts.
reimar
parents:
26159
diff
changeset
|
1779 } |
089dc00275b6
Experimental support for -framedrop with -correct-pts.
reimar
parents:
26159
diff
changeset
|
1780 |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1781 static int generate_video_frame(sh_video_t *sh_video, demux_stream_t *d_video) |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1782 { |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1783 unsigned char *start; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1784 int in_size; |
33363 | 1785 int hit_eof = 0; |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1786 double pts; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1787 |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1788 while (1) { |
33363 | 1789 int drop_frame = check_framedrop(sh_video->frametime); |
1790 void *decoded_frame; | |
1791 current_module = "decode video"; | |
1792 // XXX Time used in this call is not counted in any performance | |
1793 // timer now, OSD is not updated correctly for filter-added frames | |
1794 if (vf_output_queued_frame(sh_video->vfilter)) | |
1795 break; | |
1796 current_module = "video_read_frame"; | |
1797 in_size = ds_get_packet_pts(d_video, &start, &pts); | |
1798 if (in_size < 0) { | |
1799 // try to extract last frames in case of decoder lag | |
1800 in_size = 0; | |
1801 pts = MP_NOPTS_VALUE; | |
1802 hit_eof = 1; | |
1803 } | |
1804 if (in_size > max_framesize) | |
1805 max_framesize = in_size; | |
1806 current_module = "decode video"; | |
1807 decoded_frame = decode_video(sh_video, start, in_size, drop_frame, pts, NULL); | |
1808 if (decoded_frame) { | |
1809 update_subtitles(sh_video, sh_video->pts, mpctx->d_sub, 0); | |
1810 update_teletext(sh_video, mpctx->demuxer, 0); | |
1811 update_osd_msg(); | |
1812 current_module = "filter video"; | |
1813 if (filter_video(sh_video, decoded_frame, sh_video->pts)) | |
1814 break; | |
1815 } else if (drop_frame) | |
1816 return -1; | |
1817 if (hit_eof) | |
1818 return 0; | |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1819 } |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1820 return 1; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1821 } |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1822 |
20887 | 1823 #ifdef HAVE_RTC |
33363 | 1824 int rtc_fd = -1; |
20887 | 1825 #endif |
1826 | |
1827 static float timing_sleep(float time_frame) | |
1828 { | |
1829 #ifdef HAVE_RTC | |
33363 | 1830 if (rtc_fd >= 0) { |
1831 // -------- RTC ----------- | |
1832 current_module = "sleep_rtc"; | |
20887 | 1833 while (time_frame > 0.000) { |
33363 | 1834 unsigned long rtc_ts; |
1835 if (read(rtc_fd, &rtc_ts, sizeof(rtc_ts)) <= 0) | |
1836 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_LinuxRTCReadError, strerror(errno)); | |
1837 time_frame -= GetRelativeTime(); | |
1838 } | |
20887 | 1839 } else |
1840 #endif | |
1841 { | |
33363 | 1842 // assume kernel HZ=100 for softsleep, works with larger HZ but with |
1843 // unnecessarily high CPU usage | |
1844 float margin = softsleep ? 0.011 : 0; | |
1845 current_module = "sleep_timer"; | |
1846 while (time_frame > margin) { | |
1847 usec_sleep(1000000 * (time_frame - margin)); | |
1848 time_frame -= GetRelativeTime(); | |
1849 } | |
1850 if (softsleep) { | |
1851 current_module = "sleep_soft"; | |
1852 if (time_frame < 0) | |
1853 mp_msg(MSGT_AVSYNC, MSGL_WARN, MSGTR_SoftsleepUnderflow); | |
1854 while (time_frame > 0) | |
1855 time_frame -= GetRelativeTime(); // burn the CPU | |
1856 } | |
20887 | 1857 } |
1858 return time_frame; | |
1859 } | |
1860 | |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31607
diff
changeset
|
1861 static int select_subtitle(MPContext *mpctx) |
31201
203789464176
misc cosmetics: K&R style nits, #include placement, indentation
diego
parents:
31148
diff
changeset
|
1862 { |
33363 | 1863 // find the best sub to use |
1864 int id; | |
1865 int found = 0; | |
1866 mpctx->global_sub_pos = -1; // no subs by default | |
1867 if (vobsub_id >= 0) { | |
1868 // if user asks for a vobsub id, use that first. | |
1869 id = vobsub_id; | |
1870 found = mp_property_do("sub_vob", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK; | |
1871 } | |
1872 | |
1873 if (!found && dvdsub_id >= 0) { | |
1874 // if user asks for a dvd sub id, use that next. | |
1875 id = dvdsub_id; | |
1876 found = mp_property_do("sub_demux", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK; | |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31607
diff
changeset
|
1877 } |
33363 | 1878 |
1879 if (!found) { | |
1880 // if there are text subs to use, use those. (autosubs come last here) | |
1881 id = 0; | |
1882 found = mp_property_do("sub_file", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK; | |
1883 } | |
1884 | |
1885 if (!found && dvdsub_id == -1) { | |
1886 // finally select subs by language and container hints | |
1887 if (dvdsub_id == -1 && dvdsub_lang) | |
1888 dvdsub_id = demuxer_sub_track_by_lang(mpctx->demuxer, dvdsub_lang); | |
1889 if (dvdsub_id == -1) | |
1890 dvdsub_id = demuxer_default_sub_track(mpctx->demuxer); | |
1891 if (dvdsub_id >= 0) { | |
1892 id = dvdsub_id; | |
1893 found = mp_property_do("sub_demux", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK; | |
1894 } | |
1895 } | |
1896 return found; | |
29854
00ebdb6cb87f
Factor out code that decides which subtitle to play.
reimar
parents:
29804
diff
changeset
|
1897 } |
00ebdb6cb87f
Factor out code that decides which subtitle to play.
reimar
parents:
29804
diff
changeset
|
1898 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
1899 #ifdef CONFIG_DVDNAV |
25824 | 1900 #ifndef FF_B_TYPE |
1901 #define FF_B_TYPE 3 | |
1902 #endif | |
33287 | 1903 /** |
1904 * @brief Store decoded video image. | |
1905 */ | |
33363 | 1906 static mp_image_t *mp_dvdnav_copy_mpi(mp_image_t *to_mpi, |
1907 mp_image_t *from_mpi) | |
1908 { | |
25824 | 1909 mp_image_t *mpi; |
1910 | |
33287 | 1911 // do not store B-frames |
25824 | 1912 if (from_mpi->pict_type == FF_B_TYPE) |
1913 return to_mpi; | |
1914 | |
1915 if (to_mpi && | |
1916 to_mpi->w == from_mpi->w && | |
1917 to_mpi->h == from_mpi->h && | |
1918 to_mpi->imgfmt == from_mpi->imgfmt) | |
1919 mpi = to_mpi; | |
1920 else { | |
1921 if (to_mpi) | |
1922 free_mp_image(to_mpi); | |
1923 if (from_mpi->w == 0 || from_mpi->h == 0) | |
1924 return NULL; | |
33363 | 1925 mpi = alloc_mpi(from_mpi->w, from_mpi->h, from_mpi->imgfmt); |
25824 | 1926 } |
1927 | |
33363 | 1928 copy_mpi(mpi, from_mpi); |
25824 | 1929 return mpi; |
1930 } | |
1931 | |
33363 | 1932 static void mp_dvdnav_reset_stream(MPContext *ctx) |
1933 { | |
25824 | 1934 if (ctx->sh_video) { |
33287 | 1935 // clear video pts |
33363 | 1936 ctx->d_video->pts = 0.0f; |
1937 ctx->sh_video->pts = 0.0f; | |
1938 ctx->sh_video->i_pts = 0.0f; | |
25824 | 1939 ctx->sh_video->last_pts = 0.0f; |
33363 | 1940 ctx->sh_video->num_buffered_pts = 0; |
1941 ctx->sh_video->num_frames = 0; | |
25824 | 1942 ctx->sh_video->num_frames_decoded = 0; |
1943 ctx->sh_video->timer = 0.0f; | |
1944 ctx->sh_video->stream_delay = 0.0f; | |
33363 | 1945 ctx->sh_video->timer = 0; |
25824 | 1946 ctx->demuxer->stream_pts = MP_NOPTS_VALUE; |
1947 } | |
1948 | |
1949 if (ctx->sh_audio) { | |
33287 | 1950 // free audio packets and reset |
25824 | 1951 ds_free_packs(ctx->d_audio); |
1952 audio_delay -= ctx->sh_audio->stream_delay; | |
33363 | 1953 ctx->delay = -audio_delay; |
25824 | 1954 ctx->audio_out->reset(); |
1955 resync_audio_stream(ctx->sh_audio); | |
1956 } | |
1957 | |
1958 audio_delay = 0.0f; | |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31607
diff
changeset
|
1959 mpctx->sub_counts[SUB_SOURCE_DEMUX] = mp_dvdnav_number_of_subs(mpctx->stream); |
29855
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
1960 if (dvdsub_lang && dvdsub_id == dvdsub_lang_id) { |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
1961 dvdsub_lang_id = mp_dvdnav_sid_from_lang(ctx->stream, dvdsub_lang); |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
1962 if (dvdsub_lang_id != dvdsub_id) { |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
1963 dvdsub_id = dvdsub_lang_id; |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
1964 select_subtitle(ctx); |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
1965 } |
5e279f7d7e5d
Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents:
29854
diff
changeset
|
1966 } |
25824 | 1967 |
33287 | 1968 // clear all EOF related flags |
25824 | 1969 ctx->d_video->eof = ctx->d_audio->eof = ctx->stream->eof = 0; |
1970 } | |
1971 | |
33287 | 1972 /** |
1973 * @brief Restore last decoded DVDNAV (still frame). | |
1974 */ | |
25824 | 1975 static mp_image_t *mp_dvdnav_restore_smpi(int *in_size, |
1976 unsigned char **start, | |
1977 mp_image_t *decoded_frame) | |
1978 { | |
1979 if (mpctx->stream->type != STREAMTYPE_DVDNAV) | |
1980 return decoded_frame; | |
1981 | |
33510 | 1982 // a change occurred in dvdnav stream |
33363 | 1983 if (mp_dvdnav_cell_has_changed(mpctx->stream, 0)) { |
25824 | 1984 mp_dvdnav_read_wait(mpctx->stream, 1, 1); |
1985 mp_dvdnav_context_free(mpctx); | |
1986 mp_dvdnav_reset_stream(mpctx); | |
1987 mp_dvdnav_read_wait(mpctx->stream, 0, 1); | |
33363 | 1988 mp_dvdnav_cell_has_changed(mpctx->stream, 1); |
25824 | 1989 } |
1990 | |
1991 if (*in_size < 0) { | |
1992 float len; | |
1993 | |
33287 | 1994 // display still frame, if any |
25824 | 1995 if (mpctx->nav_smpi && !mpctx->nav_buffer) |
1996 decoded_frame = mpctx->nav_smpi; | |
1997 | |
33287 | 1998 // increment video frame: continue playing after still frame |
25824 | 1999 len = demuxer_get_time_length(mpctx->demuxer); |
2000 if (mpctx->sh_video->pts >= len && | |
2001 mpctx->sh_video->pts > 0.0 && len > 0.0) { | |
2002 mp_dvdnav_skip_still(mpctx->stream); | |
2003 mp_dvdnav_skip_wait(mpctx->stream); | |
2004 } | |
2005 mpctx->sh_video->pts += 1 / mpctx->sh_video->fps; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
2006 |
25824 | 2007 if (mpctx->nav_buffer) { |
33363 | 2008 *start = mpctx->nav_start; |
25824 | 2009 *in_size = mpctx->nav_in_size; |
2010 if (mpctx->nav_start) | |
33363 | 2011 memcpy(*start, mpctx->nav_buffer, mpctx->nav_in_size); |
25824 | 2012 } |
2013 } | |
2014 | |
2015 return decoded_frame; | |
2016 } | |
2017 | |
33287 | 2018 /** |
2019 * @brief Save last decoded DVDNAV (still frame). | |
2020 */ | |
25824 | 2021 static void mp_dvdnav_save_smpi(int in_size, |
2022 unsigned char *start, | |
2023 mp_image_t *decoded_frame) | |
2024 { | |
2025 if (mpctx->stream->type != STREAMTYPE_DVDNAV) | |
2026 return; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
2027 |
32511
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32467
diff
changeset
|
2028 free(mpctx->nav_buffer); |
33511
d30b183c3fdc
Make mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer.
reimar
parents:
33510
diff
changeset
|
2029 mpctx->nav_buffer = NULL; |
d30b183c3fdc
Make mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer.
reimar
parents:
33510
diff
changeset
|
2030 mpctx->nav_start = NULL; |
d30b183c3fdc
Make mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer.
reimar
parents:
33510
diff
changeset
|
2031 mpctx->nav_in_size = -1; |
d30b183c3fdc
Make mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer.
reimar
parents:
33510
diff
changeset
|
2032 |
d30b183c3fdc
Make mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer.
reimar
parents:
33510
diff
changeset
|
2033 if (in_size > 0) |
33875 | 2034 mpctx->nav_buffer = malloc(in_size); |
33511
d30b183c3fdc
Make mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer.
reimar
parents:
33510
diff
changeset
|
2035 if (mpctx->nav_buffer) { |
33875 | 2036 mpctx->nav_start = start; |
33511
d30b183c3fdc
Make mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer.
reimar
parents:
33510
diff
changeset
|
2037 mpctx->nav_in_size = in_size; |
33363 | 2038 memcpy(mpctx->nav_buffer, start, in_size); |
33511
d30b183c3fdc
Make mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer.
reimar
parents:
33510
diff
changeset
|
2039 } |
25824 | 2040 |
2041 if (decoded_frame && mpctx->nav_smpi != decoded_frame) | |
33363 | 2042 mpctx->nav_smpi = mp_dvdnav_copy_mpi(mpctx->nav_smpi, decoded_frame); |
25824 | 2043 } |
33363 | 2044 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2045 #endif /* CONFIG_DVDNAV */ |
25824 | 2046 |
20887 | 2047 static void adjust_sync_and_print_status(int between_frames, float timing_error) |
2048 { | |
33363 | 2049 current_module = "av_sync"; |
2050 | |
2051 if (mpctx->sh_audio) { | |
2052 double a_pts, v_pts; | |
2053 | |
2054 if (autosync) | |
2055 /* | |
2056 * If autosync is enabled, the value for delay must be calculated | |
2057 * a bit differently. It is set only to the difference between | |
2058 * the audio and video timers. Any attempt to include the real | |
2059 * or corrected delay causes the pts_correction code below to | |
2060 * try to correct for the changes in delay which autosync is | |
2061 * trying to measure. This keeps the two from competing, but still | |
2062 * allows the code to correct for PTS drift *only*. (Using a delay | |
2063 * value here, even a "corrected" one, would be incompatible with | |
2064 * autosync mode.) | |
2065 */ | |
2066 a_pts = written_audio_pts(mpctx->sh_audio, mpctx->d_audio) - mpctx->delay; | |
2067 else | |
2068 a_pts = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out); | |
2069 | |
2070 v_pts = mpctx->sh_video->pts; | |
2071 | |
2072 { | |
2073 static int drop_message; | |
2074 double AV_delay = a_pts - audio_delay - v_pts; | |
2075 double x; | |
2076 // not a good idea to do A-V correction with with bogus values | |
2077 if (a_pts == MP_NOPTS_VALUE || v_pts == MP_NOPTS_VALUE) | |
2078 AV_delay = 0; | |
2079 if (AV_delay > 0.5 && drop_frame_cnt > 50 && drop_message == 0) { | |
2080 ++drop_message; | |
2081 mp_msg(MSGT_AVSYNC, MSGL_WARN, MSGTR_SystemTooSlow); | |
2082 } | |
2083 if (autosync) | |
2084 x = AV_delay * 0.1f; | |
2085 else | |
2086 /* Do not correct target time for the next frame if this frame | |
2087 * was late not because of wrong target time but because the | |
2088 * target time could not be met */ | |
2089 x = (AV_delay + timing_error * playback_speed) * 0.1f; | |
2090 if (x < -max_pts_correction) | |
2091 x = -max_pts_correction; | |
2092 else if (x > max_pts_correction) | |
2093 x = max_pts_correction; | |
2094 if (default_max_pts_correction >= 0) | |
2095 max_pts_correction = default_max_pts_correction; | |
2096 else | |
2097 max_pts_correction = mpctx->sh_video->frametime * 0.10; // +-10% of time | |
2098 if (!between_frames) { | |
2099 mpctx->delay += x; | |
2100 c_total += x; | |
2101 } | |
2102 if (!quiet) | |
2103 print_status(a_pts - audio_delay, AV_delay, c_total); | |
2104 } | |
20887 | 2105 } else { |
33363 | 2106 // No audio: |
2107 | |
2108 if (!quiet) | |
2109 print_status(0, 0, 0); | |
20887 | 2110 } |
2111 } | |
2112 | |
20986 | 2113 static int fill_audio_out_buffers(void) |
20889
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2114 { |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2115 unsigned int t; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2116 double tt; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2117 int playsize; |
33363 | 2118 int playflags = 0; |
2119 int audio_eof = 0; | |
20890
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
2120 int bytes_to_write; |
31671
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
2121 int format_change = 0; |
33363 | 2122 sh_audio_t *const sh_audio = mpctx->sh_audio; |
2123 | |
2124 current_module = "play_audio"; | |
20889
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2125 |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2126 while (1) { |
33363 | 2127 int sleep_time; |
2128 // all the current uses of ao_data.pts seem to be in aos that handle | |
2129 // sync completely wrong; there should be no need to use ao_data.pts | |
2130 // in get_space() | |
2131 ao_data.pts = ((mpctx->sh_video ? mpctx->sh_video->timer : 0) + mpctx->delay) * 90000.0; | |
2132 bytes_to_write = mpctx->audio_out->get_space(); | |
2133 if (mpctx->sh_video || bytes_to_write >= ao_data.outburst) | |
2134 break; | |
2135 | |
2136 // handle audio-only case: | |
2137 // this is where mplayer sleeps during audio-only playback | |
2138 // to avoid 100% CPU use | |
2139 sleep_time = (ao_data.outburst - bytes_to_write) * 1000 / ao_data.bps; | |
2140 if (sleep_time < 10) | |
2141 sleep_time = 10; // limit to 100 wakeups per second | |
2142 usec_sleep(sleep_time * 1000); | |
20890
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
2143 } |
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
2144 |
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
2145 while (bytes_to_write) { |
33363 | 2146 int res; |
2147 playsize = bytes_to_write; | |
2148 if (playsize > MAX_OUTBURST) | |
2149 playsize = MAX_OUTBURST; | |
2150 bytes_to_write -= playsize; | |
2151 | |
2152 // Fill buffer if needed: | |
2153 current_module = "decode_audio"; | |
2154 t = GetTimer(); | |
2155 if (!format_change) { | |
2156 res = mp_decode_audio(sh_audio, playsize); | |
2157 format_change = res == -2; | |
2158 } | |
2159 if (!format_change && res < 0) // EOF or error | |
2160 if (mpctx->d_audio->eof) { | |
2161 audio_eof = 1; | |
2162 if (sh_audio->a_out_buffer_len == 0) | |
2163 return 0; | |
2164 } | |
2165 t = GetTimer() - t; | |
2166 tt = t * 0.000001f; | |
2167 audio_time_usage += tt; | |
2168 if (playsize > sh_audio->a_out_buffer_len) { | |
2169 playsize = sh_audio->a_out_buffer_len; | |
2170 if (audio_eof || format_change) | |
2171 playflags |= AOPLAY_FINAL_CHUNK; | |
2172 } | |
2173 if (!playsize) | |
2174 break; | |
2175 | |
2176 // play audio: | |
2177 current_module = "play_audio"; | |
2178 | |
2179 // Is this pts value actually useful for the aos that access it? | |
2180 // They're obviously badly broken in the way they handle av sync; | |
2181 // would not having access to this make them more broken? | |
2182 ao_data.pts = ((mpctx->sh_video ? mpctx->sh_video->timer : 0) + mpctx->delay) * 90000.0; | |
2183 playsize = mpctx->audio_out->play(sh_audio->a_out_buffer, playsize, playflags); | |
2184 | |
2185 if (playsize > 0) { | |
2186 sh_audio->a_out_buffer_len -= playsize; | |
2187 memmove(sh_audio->a_out_buffer, &sh_audio->a_out_buffer[playsize], | |
2188 sh_audio->a_out_buffer_len); | |
2189 mpctx->delay += playback_speed * playsize / (double)ao_data.bps; | |
2190 } else if ((format_change || audio_eof) && mpctx->audio_out->get_delay() < .04) { | |
2191 // Sanity check to avoid hanging in case current ao doesn't output | |
2192 // partial chunks and doesn't check for AOPLAY_FINAL_CHUNK | |
2193 mp_msg(MSGT_CPLAYER, MSGL_WARN, "Audio output truncated at end.\n"); | |
2194 sh_audio->a_out_buffer_len = 0; | |
2195 } | |
20889
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2196 } |
31671
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
2197 if (format_change) { |
33363 | 2198 uninit_player(INITIALIZED_AO); |
2199 reinit_audio_chain(); | |
31671
4541f1921482
Add support for parameter changes (e.g. channel count) during playback.
reimar
parents:
31670
diff
changeset
|
2200 } |
20889
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2201 return 1; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
2202 } |
20887 | 2203 |
33155
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2204 static void handle_udp_master(double time) |
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2205 { |
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2206 #ifdef CONFIG_NETWORKING |
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2207 if (udp_master) { |
33363 | 2208 char current_time[256]; |
2209 snprintf(current_time, sizeof(current_time), "%f", time); | |
2210 send_udp(udp_ip, udp_port, current_time); | |
33155
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2211 } |
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2212 #endif /* CONFIG_NETWORKING */ |
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2213 } |
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2214 |
20986 | 2215 static int sleep_until_update(float *time_frame, float *aq_sleep_time) |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2216 { |
20904 | 2217 int frame_time_remaining = 0; |
33363 | 2218 current_module = "calc_sleep_time"; |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2219 |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2220 #ifdef CONFIG_NETWORKING |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2221 if (udp_slave) { |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2222 int udp_master_exited = udp_slave_sync(mpctx); |
33486
e46989c7f47e
Change -udp-slave code to temporarily fall back to normal
reimar
parents:
33481
diff
changeset
|
2223 if (udp_master_exited > 0) { |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2224 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_MasterQuit); |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2225 exit_player(EXIT_QUIT); |
33486
e46989c7f47e
Change -udp-slave code to temporarily fall back to normal
reimar
parents:
33481
diff
changeset
|
2226 } else if (udp_master_exited == 0) |
e46989c7f47e
Change -udp-slave code to temporarily fall back to normal
reimar
parents:
33481
diff
changeset
|
2227 return 0; |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2228 } |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2229 #endif /* CONFIG_NETWORKING */ |
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2230 |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2231 *time_frame -= GetRelativeTime(); // reset timer |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2232 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2233 if (mpctx->sh_audio && !mpctx->d_audio->eof) { |
33363 | 2234 float delay = mpctx->audio_out->get_delay(); |
2235 mp_dbg(MSGT_AVSYNC, MSGL_DBG2, "delay=%f\n", delay); | |
2236 | |
2237 if (autosync) { | |
2238 /* | |
2239 * Adjust this raw delay value by calculating the expected | |
2240 * delay for this frame and generating a new value which is | |
2241 * weighted between the two. The higher autosync is, the | |
2242 * closer to the delay value gets to that which "-nosound" | |
2243 * would have used, and the longer it will take for A/V | |
2244 * sync to settle at the right value (but it eventually will.) | |
2245 * This settling time is very short for values below 100. | |
2246 */ | |
2247 float predicted = mpctx->delay / playback_speed + *time_frame; | |
2248 float difference = delay - predicted; | |
2249 delay = predicted + difference / (float)autosync; | |
2250 } | |
2251 | |
2252 *time_frame = delay - mpctx->delay / playback_speed; | |
2253 | |
2254 // delay = amount of audio buffered in soundcard/driver | |
2255 if (delay > 0.25) | |
2256 delay = 0.25; | |
2257 else if (delay < 0.10) | |
2258 delay = 0.10; | |
2259 if (*time_frame > delay * 0.6) { | |
2260 // sleep time too big - may cause audio drops (buffer underrun) | |
2261 frame_time_remaining = 1; | |
2262 *time_frame = delay * 0.5; | |
2263 } | |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2264 } else { |
33363 | 2265 // If we're lagging more than 200 ms behind the right playback rate, |
2266 // don't try to "catch up". | |
2267 // If benchmark is set always output frames as fast as possible | |
2268 // without sleeping. | |
2269 if (*time_frame < -0.2 || benchmark) | |
2270 *time_frame = 0; | |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2271 } |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2272 |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2273 *aq_sleep_time += *time_frame; |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2274 |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2275 //============================== SLEEP: =================================== |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2276 |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2277 // flag 256 means: libvo driver does its timing (dvb card) |
33363 | 2278 if (*time_frame > 0.001 && !(vo_flags & 256)) |
2279 *time_frame = timing_sleep(*time_frame); | |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2280 |
33155
16e5b7f9ddb8
Send udp master updates also when paused and let slave use normal timing
reimar
parents:
33154
diff
changeset
|
2281 handle_udp_master(mpctx->sh_video->pts); |
31982
184969a3a437
Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
31977
diff
changeset
|
2282 |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2283 return frame_time_remaining; |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2284 } |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2285 |
33363 | 2286 int reinit_video_chain(void) |
2287 { | |
2288 sh_video_t *const sh_video = mpctx->sh_video; | |
2289 double ar = -1.0; | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2290 //================== Init VIDEO (codec & libvo) ========================== |
33363 | 2291 if (!fixed_vo || !(initialized_flags & INITIALIZED_VO)) { |
2292 current_module = "preinit_libvo"; | |
2293 | |
2294 //shouldn't we set dvideo->id=-2 when we fail? | |
2295 vo_config_count = 0; | |
2296 //if((mpctx->video_out->preinit(vo_subdevice))!=0){ | |
2297 if (!(mpctx->video_out = init_best_video_out(video_driver_list))) { | |
2298 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_ErrorInitializingVODevice); | |
2299 goto err_out; | |
2300 } | |
2301 initialized_flags |= INITIALIZED_VO; | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2302 } |
33363 | 2303 |
2304 if (stream_control(mpctx->demuxer->stream, STREAM_CTRL_GET_ASPECT_RATIO, &ar) != STREAM_UNSUPPORTED) | |
2305 mpctx->sh_video->stream_aspect = ar; | |
2306 current_module = "init_video_filters"; | |
2307 { | |
2308 char *vf_arg[] = { "_oldargs_", (char *)mpctx->video_out, NULL }; | |
2309 sh_video->vfilter = vf_open_filter(NULL, "vo", vf_arg); | |
2310 } | |
27345
b597fd2924b4
Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents:
27343
diff
changeset
|
2311 #ifdef CONFIG_MENU |
33363 | 2312 if (use_menu) { |
2313 char *vf_arg[] = { "_oldargs_", menu_root, NULL }; | |
2314 vf_menu = vf_open_plugin(libmenu_vfs, sh_video->vfilter, "menu", vf_arg); | |
2315 if (!vf_menu) { | |
2316 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantOpenLibmenuFilterWithThisRootMenu, menu_root); | |
2317 use_menu = 0; | |
2318 } | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2319 } |
33363 | 2320 if (vf_menu) |
2321 sh_video->vfilter = vf_menu; | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2322 #endif |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2323 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2324 #ifdef CONFIG_ASS |
33363 | 2325 if (ass_enabled) { |
2326 int i; | |
2327 int insert = 1; | |
2328 if (vf_settings) | |
2329 for (i = 0; vf_settings[i].name; ++i) | |
2330 if (strcmp(vf_settings[i].name, "ass") == 0) { | |
2331 insert = 0; | |
2332 break; | |
2333 } | |
2334 if (insert) { | |
2335 char *vf_arg[] = { "auto", "1", NULL }; | |
2336 vf_instance_t *vf_ass = vf_open_filter(sh_video->vfilter, "ass", vf_arg); | |
2337 if (vf_ass) | |
2338 sh_video->vfilter = vf_ass; | |
2339 else | |
2340 mp_msg(MSGT_CPLAYER, MSGL_ERR, "ASS: cannot add video filter\n"); | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2341 } |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2342 } |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2343 #endif |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2344 |
33363 | 2345 sh_video->vfilter = append_filters(sh_video->vfilter); |
2346 eosd_init(sh_video->vfilter); | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2347 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2348 #ifdef CONFIG_ASS |
33363 | 2349 if (ass_enabled) |
2350 eosd_ass_init(ass_library); | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2351 #endif |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2352 |
33363 | 2353 current_module = "init_video_codec"; |
2354 | |
2355 mp_msg(MSGT_CPLAYER, MSGL_INFO, "==========================================================================\n"); | |
2356 init_best_video_codec(sh_video, video_codec_list, video_fm_list); | |
2357 mp_msg(MSGT_CPLAYER, MSGL_INFO, "==========================================================================\n"); | |
2358 | |
2359 if (!sh_video->initialized) { | |
2360 if (!fixed_vo) | |
2361 uninit_player(INITIALIZED_VO); | |
2362 goto err_out; | |
2363 } | |
2364 | |
2365 initialized_flags |= INITIALIZED_VCODEC; | |
2366 | |
2367 if (sh_video->codec) | |
2368 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_CODEC=%s\n", sh_video->codec->name); | |
2369 | |
2370 sh_video->last_pts = MP_NOPTS_VALUE; | |
2371 sh_video->num_buffered_pts = 0; | |
2372 sh_video->next_frame_time = 0; | |
2373 | |
2374 if (auto_quality > 0) { | |
2375 // Auto quality option enabled | |
2376 output_quality = get_video_quality_max(sh_video); | |
2377 if (auto_quality > output_quality) | |
2378 auto_quality = output_quality; | |
2379 else | |
2380 output_quality = auto_quality; | |
2381 mp_msg(MSGT_CPLAYER, MSGL_V, "AutoQ: setting quality to %d.\n", output_quality); | |
2382 set_video_quality(sh_video, output_quality); | |
2383 } | |
2384 | |
2385 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============ | |
2386 | |
2387 current_module = "init_vo"; | |
2388 | |
2389 return 1; | |
21031
e45bb0ee5558
Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents:
21030
diff
changeset
|
2390 |
e45bb0ee5558
Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents:
21030
diff
changeset
|
2391 err_out: |
33363 | 2392 mpctx->sh_video = mpctx->d_video->sh = NULL; |
2393 return 0; | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
2394 } |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
2395 |
21077 | 2396 static double update_video(int *blit_frame) |
2397 { | |
33363 | 2398 sh_video_t *const sh_video = mpctx->sh_video; |
21077 | 2399 //-------------------- Decode a frame: ----------------------- |
2400 double frame_time; | |
2401 *blit_frame = 0; // Don't blit if we hit EOF | |
2402 if (!correct_pts) { | |
33363 | 2403 unsigned char *start = NULL; |
2404 void *decoded_frame = NULL; | |
2405 int drop_frame = 0; | |
2406 int in_size; | |
2407 int full_frame; | |
2408 | |
2409 do { | |
2410 current_module = "video_read_frame"; | |
2411 frame_time = sh_video->next_frame_time; | |
2412 in_size = video_read_frame(sh_video, &sh_video->next_frame_time, | |
2413 &start, force_fps); | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2414 #ifdef CONFIG_DVDNAV |
33363 | 2415 // wait, still frame or EOF |
2416 if (mpctx->stream->type == STREAMTYPE_DVDNAV && in_size < 0) { | |
2417 if (mp_dvdnav_is_eof(mpctx->stream)) | |
2418 return -1; | |
2419 if (mpctx->d_video) | |
2420 mpctx->d_video->eof = 0; | |
2421 if (mpctx->d_audio) | |
2422 mpctx->d_audio->eof = 0; | |
2423 mpctx->stream->eof = 0; | |
2424 } else | |
2425 #endif | |
2426 if (in_size < 0) | |
31201
203789464176
misc cosmetics: K&R style nits, #include placement, indentation
diego
parents:
31148
diff
changeset
|
2427 return -1; |
33363 | 2428 if (in_size > max_framesize) |
2429 max_framesize = in_size; // stats | |
2430 drop_frame = check_framedrop(frame_time); | |
2431 current_module = "decode_video"; | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2432 #ifdef CONFIG_DVDNAV |
33363 | 2433 full_frame = 1; |
2434 decoded_frame = mp_dvdnav_restore_smpi(&in_size, &start, decoded_frame); | |
2435 // still frame has been reached, no need to decode | |
2436 if (in_size > 0 && !decoded_frame) | |
25824 | 2437 #endif |
33363 | 2438 decoded_frame = decode_video(sh_video, start, in_size, drop_frame, |
2439 sh_video->pts, &full_frame); | |
2440 | |
2441 if (full_frame) { | |
2442 sh_video->timer += frame_time; | |
2443 if (mpctx->sh_audio) | |
2444 mpctx->delay -= frame_time; | |
2445 // video_read_frame can change fps (e.g. for ASF video) | |
2446 vo_fps = sh_video->fps; | |
2447 update_subtitles(sh_video, sh_video->pts, mpctx->d_sub, 0); | |
2448 update_teletext(sh_video, mpctx->demuxer, 0); | |
2449 update_osd_msg(); | |
2450 } | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2451 #ifdef CONFIG_DVDNAV |
33363 | 2452 // save back last still frame for future display |
2453 mp_dvdnav_save_smpi(in_size, start, decoded_frame); | |
25824 | 2454 #endif |
33363 | 2455 } while (!full_frame); |
2456 | |
2457 current_module = "filter_video"; | |
2458 *blit_frame = (decoded_frame && filter_video(sh_video, decoded_frame, | |
2459 sh_video->pts)); | |
2460 } else { | |
2461 int res = generate_video_frame(sh_video, mpctx->d_video); | |
2462 if (!res) | |
2463 return -1; | |
2464 ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, | |
2465 VFCTRL_GET_PTS, &sh_video->pts); | |
2466 if (sh_video->pts == MP_NOPTS_VALUE) { | |
2467 mp_msg(MSGT_CPLAYER, MSGL_ERR, "pts after filters MISSING\n"); | |
2468 sh_video->pts = sh_video->last_pts; | |
2469 } | |
2470 if (sh_video->last_pts == MP_NOPTS_VALUE) | |
2471 sh_video->last_pts = sh_video->pts; | |
2472 else if (sh_video->last_pts > sh_video->pts) { | |
2473 // make a guess whether this is some kind of discontinuity | |
33552 | 2474 // we should jump along with or some wrong timestamps we |
33363 | 2475 // should replace instead |
31245
a3adde0a5b83
If an invalid pts value is detected, try to to make up some if it seems
reimar
parents:
31243
diff
changeset
|
2476 if (sh_video->pts < sh_video->last_pts - 20 * sh_video->frametime) |
33363 | 2477 sh_video->last_pts = sh_video->pts; |
2478 else | |
2479 sh_video->pts = sh_video->last_pts + sh_video->frametime; | |
2480 mp_msg(MSGT_CPLAYER, MSGL_V, "pts value < previous\n"); | |
2481 } | |
2482 frame_time = sh_video->pts - sh_video->last_pts; | |
2483 if (!frame_time) | |
2484 frame_time = sh_video->frametime; | |
2485 sh_video->last_pts = sh_video->pts; | |
2486 sh_video->timer += frame_time; | |
2487 if (mpctx->sh_audio) | |
2488 mpctx->delay -= frame_time; | |
2489 *blit_frame = res > 0; | |
21077 | 2490 } |
2491 return frame_time; | |
2492 } | |
2493 | |
25606 | 2494 static void pause_loop(void) |
21082 | 2495 { |
33363 | 2496 mp_cmd_t *cmd; |
32732
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2497 #ifdef CONFIG_STREAM_CACHE |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2498 int old_cache_fill = stream_cache_size > 0 ? cache_fill_status(mpctx->stream) : 0; |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2499 #endif |
21082 | 2500 if (!quiet) { |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2501 if (term_osd && !mpctx->sh_video) { |
32730
736b22f11e00
Change MSGTR_Paused definition to allow simplifying some code.
reimar
parents:
32724
diff
changeset
|
2502 set_osd_msg(OSD_MSG_PAUSE, 1, 0, MSGTR_Paused); |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2503 update_osd_msg(); |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2504 } else |
33363 | 2505 mp_msg(MSGT_CPLAYER, MSGL_STATUS, "\n"MSGTR_Paused "\r"); |
21082 | 2506 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_PAUSED\n"); |
2507 } | |
27343 | 2508 #ifdef CONFIG_GUI |
21082 | 2509 if (use_gui) |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33725
diff
changeset
|
2510 gui(GUI_SET_STATE, (void *)GUI_PAUSE); |
21082 | 2511 #endif |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2512 if (mpctx->video_out && mpctx->sh_video && vo_config_count) |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2513 mpctx->video_out->control(VOCTRL_PAUSE, NULL); |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2514 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2515 if (mpctx->audio_out && mpctx->sh_audio) |
33363 | 2516 mpctx->audio_out->pause(); // pause audio, keep data if possible |
2517 | |
2518 while ((cmd = mp_input_get_cmd(20, 1, 1)) == NULL || cmd->pausing == 4) { | |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2519 if (cmd) { |
33363 | 2520 cmd = mp_input_get_cmd(0, 1, 0); |
2521 run_command(mpctx, cmd); | |
2522 mp_cmd_free(cmd); | |
2523 continue; | |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2524 } |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2525 if (mpctx->sh_video && mpctx->video_out && vo_config_count) |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2526 mpctx->video_out->check_events(); |
27343 | 2527 #ifdef CONFIG_GUI |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2528 if (use_gui) { |
33732 | 2529 gui(GUI_HANDLE_EVENTS, 0); |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33725
diff
changeset
|
2530 gui(GUI_REDRAW, 0); |
33615
1f9a31d4f114
Replace all playback integer constants by their symbolic constants.
ib
parents:
33614
diff
changeset
|
2531 if (guiInfo.Playing != GUI_PAUSE || (rel_seek_secs || abs_seek_pos)) |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2532 break; |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2533 } |
21082 | 2534 #endif |
27345
b597fd2924b4
Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents:
27343
diff
changeset
|
2535 #ifdef CONFIG_MENU |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2536 if (vf_menu) |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2537 vf_menu_pause_update(vf_menu); |
21082 | 2538 #endif |
32732
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2539 #ifdef CONFIG_STREAM_CACHE |
32735
c8b9c17890cb
Cosmetics: move if and following { onto same line.
reimar
parents:
32732
diff
changeset
|
2540 if (!quiet && stream_cache_size > 0) { |
32732
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2541 int new_cache_fill = cache_fill_status(mpctx->stream); |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2542 if (new_cache_fill != old_cache_fill) { |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2543 if (term_osd && !mpctx->sh_video) { |
33363 | 2544 set_osd_msg(OSD_MSG_PAUSE, 1, 0, MSGTR_Paused " %d%%", |
32732
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2545 new_cache_fill); |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2546 update_osd_msg(); |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2547 } else |
33363 | 2548 mp_msg(MSGT_CPLAYER, MSGL_STATUS, MSGTR_Paused " %d%%\r", |
32732
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2549 new_cache_fill); |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2550 old_cache_fill = new_cache_fill; |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2551 } |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2552 } |
67e0128e2f1a
Update PAUSED status line with cache fill status if it changed.
reimar
parents:
32731
diff
changeset
|
2553 #endif |
33181 | 2554 if (mpctx->sh_video) |
2555 handle_udp_master(mpctx->sh_video->pts); | |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2556 usec_sleep(20000); |
21082 | 2557 } |
2558 if (cmd && cmd->id == MP_CMD_PAUSE) { | |
33363 | 2559 cmd = mp_input_get_cmd(0, 1, 0); |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2560 mp_cmd_free(cmd); |
21082 | 2561 } |
33363 | 2562 mpctx->osd_function = OSD_PLAY; |
29937 | 2563 if (mpctx->audio_out && mpctx->sh_audio) { |
29856
3a6ae46759de
Do not call resume on unpausing if we have already reached eof while
reimar
parents:
29855
diff
changeset
|
2564 if (mpctx->eof) // do not play remaining audio if we e.g. switch to the next file |
33363 | 2565 mpctx->audio_out->reset(); |
29856
3a6ae46759de
Do not call resume on unpausing if we have already reached eof while
reimar
parents:
29855
diff
changeset
|
2566 else |
33363 | 2567 mpctx->audio_out->resume(); // resume audio |
29937 | 2568 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2569 if (mpctx->video_out && mpctx->sh_video && vo_config_count) |
33363 | 2570 mpctx->video_out->control(VOCTRL_RESUME, NULL); // resume video |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2571 (void)GetRelativeTime(); // ignore time that passed during pause |
27343 | 2572 #ifdef CONFIG_GUI |
21082 | 2573 if (use_gui) { |
33614 | 2574 if (guiInfo.Playing == GUI_STOP) |
29857
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2575 mpctx->eof = 1; |
d2853289006d
Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents:
29856
diff
changeset
|
2576 else |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33725
diff
changeset
|
2577 gui(GUI_SET_STATE, (void *)GUI_PLAY); |
21082 | 2578 } |
2579 #endif | |
2580 } | |
2581 | |
31956
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2582 static void edl_loadfile(void) |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2583 { |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2584 if (edl_filename) { |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2585 if (edl_records) { |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2586 free_edl(edl_records); |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2587 edl_needs_reset = 1; |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2588 } |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2589 next_edl_record = edl_records = edl_parse_file(); |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2590 } |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2591 } |
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
2592 |
22298 | 2593 // Execute EDL command for the current position if one exists |
2594 static void edl_update(MPContext *mpctx) | |
2595 { | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
2596 if (!edl_records) |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2597 return; |
22298 | 2598 |
2599 if (!mpctx->sh_video) { | |
33363 | 2600 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlNOsh_video); |
2601 free_edl(edl_records); | |
2602 next_edl_record = NULL; | |
2603 edl_records = NULL; | |
2604 return; | |
22298 | 2605 } |
2606 | |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2607 // This indicates that we need to reset next EDL record according |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2608 // to new PTS due to seek or other condition |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2609 if (edl_needs_reset) { |
33363 | 2610 edl_needs_reset = 0; |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2611 mpctx->edl_muted = 0; |
33363 | 2612 next_edl_record = edl_records; |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2613 |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2614 // Find next record, also skip immediately if we are already |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2615 // inside any record |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2616 while (next_edl_record) { |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2617 if (next_edl_record->start_sec > mpctx->sh_video->pts) |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2618 break; |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2619 if (next_edl_record->stop_sec >= mpctx->sh_video->pts) { |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2620 if (edl_backward) { |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2621 mpctx->osd_function = OSD_REW; |
33363 | 2622 edl_decision = 1; |
2623 abs_seek_pos = 0; | |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2624 rel_seek_secs = -(mpctx->sh_video->pts - |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2625 next_edl_record->start_sec + |
31580
b6c2b541e1a6
Implement edl-backward-delay to avoid jumping right over an
reynaldo
parents:
31515
diff
changeset
|
2626 edl_backward_delay); |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2627 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: pts [%f], " |
33363 | 2628 "offset [%f], start [%f], stop [%f], length [%f]\n", |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2629 mpctx->sh_video->pts, rel_seek_secs, |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2630 next_edl_record->start_sec, next_edl_record->stop_sec, |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2631 next_edl_record->length_sec); |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2632 return; |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2633 } |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2634 break; |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2635 } |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2636 |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2637 if (next_edl_record->action == EDL_MUTE) |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2638 mpctx->edl_muted = !mpctx->edl_muted; |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2639 |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2640 next_edl_record = next_edl_record->next; |
33363 | 2641 } |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2642 if ((mpctx->user_muted | mpctx->edl_muted) != mpctx->mixer.muted) |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2643 mixer_mute(&mpctx->mixer); |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2644 } |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2645 |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2646 if (next_edl_record && |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2647 mpctx->sh_video->pts >= next_edl_record->start_sec) { |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2648 if (next_edl_record->action == EDL_SKIP) { |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2649 mpctx->osd_function = OSD_FFW; |
33363 | 2650 edl_decision = 1; |
2651 abs_seek_pos = 0; | |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2652 rel_seek_secs = next_edl_record->stop_sec - mpctx->sh_video->pts; |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2653 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: pts [%f], offset [%f], " |
33363 | 2654 "start [%f], stop [%f], length [%f]\n", |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2655 mpctx->sh_video->pts, rel_seek_secs, |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2656 next_edl_record->start_sec, next_edl_record->stop_sec, |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2657 next_edl_record->length_sec); |
33363 | 2658 } else if (next_edl_record->action == EDL_MUTE) { |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2659 mpctx->edl_muted = !mpctx->edl_muted; |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2660 if ((mpctx->user_muted | mpctx->edl_muted) != mpctx->mixer.muted) |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2661 mixer_mute(&mpctx->mixer); |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2662 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_MUTE: [%f]\n", |
33363 | 2663 next_edl_record->start_sec); |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2664 } |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2665 next_edl_record = next_edl_record->next; |
22298 | 2666 } |
2667 } | |
2668 | |
25883
baf32110d3fc
Use defines to give names to the different seek flags.
reimar
parents:
25852
diff
changeset
|
2669 // style & SEEK_ABSOLUTE == 0 means seek relative to current position, == 1 means absolute |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
2670 // style & SEEK_FACTOR == 0 means amount in seconds, == 2 means fraction of file length |
22300 | 2671 // return -1 if seek failed (non-seekable stream?), 0 otherwise |
2672 static int seek(MPContext *mpctx, double amount, int style) | |
2673 { | |
2674 current_module = "seek"; | |
2675 if (demux_seek(mpctx->demuxer, amount, audio_delay, style) == 0) | |
33363 | 2676 return -1; |
22300 | 2677 |
30176
6fb92182aff3
At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents:
30175
diff
changeset
|
2678 mpctx->startup_decode_retry = DEFAULT_STARTUP_DECODE_RETRY; |
22300 | 2679 if (mpctx->sh_video) { |
33363 | 2680 current_module = "seek_video_reset"; |
2681 if (vo_config_count) | |
2682 mpctx->video_out->control(VOCTRL_RESET, NULL); | |
2683 mpctx->num_buffered_frames = 0; | |
2684 mpctx->delay = 0; | |
2685 mpctx->time_frame = 0; | |
2686 // Not all demuxers set d_video->pts during seek, so this value | |
2687 // (which is used by at least vobsub and edl code below) may | |
2688 // be completely wrong (probably 0). | |
2689 mpctx->sh_video->pts = mpctx->d_video->pts; | |
2690 update_subtitles(mpctx->sh_video, mpctx->sh_video->pts, mpctx->d_sub, 1); | |
2691 update_teletext(mpctx->sh_video, mpctx->demuxer, 1); | |
22300 | 2692 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
2693 |
22300 | 2694 if (mpctx->sh_audio) { |
33363 | 2695 current_module = "seek_audio_reset"; |
2696 mpctx->audio_out->reset(); // stop audio, throwing away buffered data | |
2697 if (!mpctx->sh_video) | |
2698 update_subtitles(NULL, mpctx->sh_audio->pts, mpctx->d_sub, 1); | |
22300 | 2699 } |
2700 | |
25416 | 2701 if (vo_vobsub && mpctx->sh_video) { |
33363 | 2702 current_module = "seek_vobsub_reset"; |
2703 vobsub_seek(vo_vobsub, mpctx->sh_video->pts); | |
22300 | 2704 } |
2705 | |
31700 | 2706 #ifdef CONFIG_ASS |
31227
ee7beb1a3a6e
backport ass_flush_events() from upstream libass and make use of it
aurel
parents:
31201
diff
changeset
|
2707 if (ass_enabled && mpctx->d_sub->sh && ((sh_sub_t *)mpctx->d_sub->sh)->ass_track) |
ee7beb1a3a6e
backport ass_flush_events() from upstream libass and make use of it
aurel
parents:
31201
diff
changeset
|
2708 ass_flush_events(((sh_sub_t *)mpctx->d_sub->sh)->ass_track); |
ee7beb1a3a6e
backport ass_flush_events() from upstream libass and make use of it
aurel
parents:
31201
diff
changeset
|
2709 #endif |
ee7beb1a3a6e
backport ass_flush_events() from upstream libass and make use of it
aurel
parents:
31201
diff
changeset
|
2710 |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2711 if (edl_records) { |
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2712 edl_needs_reset = 1; |
33363 | 2713 edl_backward = amount < 0; |
31459
1cf0f471ceee
Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents:
31368
diff
changeset
|
2714 } |
22300 | 2715 |
2716 c_total = 0; | |
2717 max_pts_correction = 0.1; | |
33363 | 2718 audio_time_usage = 0; |
2719 video_time_usage = 0; | |
2720 vout_time_usage = 0; | |
2721 drop_frame_cnt = 0; | |
22300 | 2722 |
2723 current_module = NULL; | |
2724 return 0; | |
2725 } | |
2726 | |
26963
8825552ee585
Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents:
26877
diff
changeset
|
2727 /* This preprocessor directive is a hack to generate a mplayer-nomain.o object |
8825552ee585
Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents:
26877
diff
changeset
|
2728 * file for some tools to link against. */ |
8825552ee585
Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents:
26877
diff
changeset
|
2729 #ifndef DISABLE_MAIN |
33363 | 2730 int main(int argc, char *argv[]) |
2731 { | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
2732 int opt_exit = 0; // Flag indicating whether MPlayer should exit without playing anything. |
34114
113156bc1137
Ensure that filename related config will always be loaded.
ib
parents:
34113
diff
changeset
|
2733 int profile_config_loaded; |
33363 | 2734 int i; |
2735 | |
2736 common_preinit(); | |
2737 | |
2738 // Create the config context and register the options | |
2739 mconfig = m_config_new(); | |
2740 m_config_register_options(mconfig, mplayer_opts); | |
2741 m_config_register_options(mconfig, common_opts); | |
2742 mp_input_register_options(mconfig); | |
2743 | |
2744 // Preparse the command line | |
2745 m_config_preparse_command_line(mconfig, argc, argv); | |
21930
6af0d674aa53
print_version() and others get executed before the command line has been parsed so -really-quiet does not silence them even though it should according to the verbosity level set by it, this simple change/hack fixes it
michael
parents:
21888
diff
changeset
|
2746 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
2747 #ifdef CONFIG_TV |
33363 | 2748 stream_tv_defaults.immediate = 1; |
7068
6c2d746b17bf
10l, fix compiling without tv. patch by Andreas Hess <jaska@gmx.net>
arpi
parents:
7058
diff
changeset
|
2749 #endif |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5520
diff
changeset
|
2750 |
33363 | 2751 if (argc > 1 && argv[1] && |
2752 (!strcmp(argv[1], "-gui") || !strcmp(argv[1], "-nogui"))) { | |
2753 use_gui = !strcmp(argv[1], "-gui"); | |
33466 | 2754 } else if (argv[0] && strstr(mp_basename(argv[0]), GMPlayer)) { |
33363 | 2755 use_gui = 1; |
2756 } | |
1639 | 2757 |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
2758 parse_cfgfiles(mconfig); |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
2759 |
27343 | 2760 #ifdef CONFIG_GUI |
33363 | 2761 if (use_gui) { |
2762 initialized_flags |= INITIALIZED_GUI; | |
2763 cfg_read(); | |
33307 | 2764 } |
7019 | 2765 #endif |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
2766 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2767 mpctx->playtree = m_config_parse_mp_command_line(mconfig, argc, argv); |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
2768 if (mpctx->playtree == NULL) { |
33363 | 2769 opt_exit = 1; |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
2770 } else { |
33363 | 2771 mpctx->playtree = play_tree_cleanup(mpctx->playtree); |
2772 if (mpctx->playtree) { | |
2773 mpctx->playtree_iter = play_tree_iter_new(mpctx->playtree, mconfig); | |
2774 if (mpctx->playtree_iter) { | |
2775 if (play_tree_iter_step(mpctx->playtree_iter, 0, 0) != PLAY_TREE_ITER_ENTRY) { | |
2776 play_tree_iter_free(mpctx->playtree_iter); | |
2777 mpctx->playtree_iter = NULL; | |
2778 } | |
2779 filename = play_tree_iter_get_file(mpctx->playtree_iter, 1); | |
2780 } | |
2781 } | |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2782 } |
33363 | 2783 |
2784 print_version("MPlayer"); | |
32415
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2785 #if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_GUI) |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2786 void *runningmplayer = FindWindow("MPlayer GUI for Windows", "MPlayer for Windows"); |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2787 if (runningmplayer && filename && use_gui) { |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2788 COPYDATASTRUCT csData; |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2789 char file[MAX_PATH]; |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2790 char *filepart = filename; |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2791 if (GetFullPathName(filename, MAX_PATH, file, &filepart)) { |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2792 csData.dwData = 0; |
33363 | 2793 csData.cbData = strlen(file) * 2; |
32415
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2794 csData.lpData = file; |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2795 SendMessage(runningmplayer, WM_COPYDATA, (WPARAM)runningmplayer, (LPARAM)&csData); |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2796 } |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2797 } |
d1f6c6cf8905
Move gui-specific code out of common_init, it certainly does
reimar
parents:
32383
diff
changeset
|
2798 #endif |
32383
f6e78eef2e1b
Avoid duplicating common init code between MPlayer and mencoder.
reimar
parents:
32382
diff
changeset
|
2799 if (!common_init()) |
f6e78eef2e1b
Avoid duplicating common init code between MPlayer and mencoder.
reimar
parents:
32382
diff
changeset
|
2800 exit_player_with_rc(EXIT_NONE, 0); |
30855 | 2801 |
27343 | 2802 #ifndef CONFIG_GUI |
33363 | 2803 if (use_gui) { |
2804 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_NoGui); | |
2805 use_gui = 0; | |
1709 | 2806 } |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2807 #else |
27727
48c1ae64255b
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents:
27635
diff
changeset
|
2808 #if !defined(__MINGW32__) && !defined(__CYGWIN__) |
33363 | 2809 if (use_gui && !vo_init()) { |
2810 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_GuiNeedsX); | |
2811 use_gui = 0; | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2812 } |
18945
337d4324c766
No point in checking for X for windows gui, in addition the hackish
reimar
parents:
18939
diff
changeset
|
2813 #endif |
33363 | 2814 if (use_gui && mpctx->playtree_iter) { |
2815 char cwd[PATH_MAX + 2]; | |
34056
792c1e241416
Correct comment on playtree and playtree_iter in connection with the GUI.
ib
parents:
34052
diff
changeset
|
2816 // Free playtree_iter as it's not used in connection with the GUI. |
33363 | 2817 play_tree_iter_free(mpctx->playtree_iter); |
2818 mpctx->playtree_iter = NULL; | |
2819 | |
2820 if (getcwd(cwd, PATH_MAX) != (char *)NULL) { | |
2821 strcat(cwd, "/"); | |
2822 // Prefix relative paths with current working directory | |
2823 play_tree_add_bpf(mpctx->playtree, cwd); | |
2824 } | |
2825 // Import initital playtree into GUI. | |
33752 | 2826 guiPlaylistInitialize(mpctx->playtree, mconfig, enqueue); |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
2827 } |
27343 | 2828 #endif /* CONFIG_GUI */ |
1709 | 2829 |
33363 | 2830 if (video_driver_list && strcmp(video_driver_list[0], "help") == 0) { |
2831 list_video_out(); | |
2832 opt_exit = 1; | |
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
|
2833 } |
5072 | 2834 |
33363 | 2835 if (audio_driver_list && strcmp(audio_driver_list[0], "help") == 0) { |
2836 list_audio_out(); | |
2837 opt_exit = 1; | |
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
|
2838 } |
1639 | 2839 |
33363 | 2840 if (audio_codec_list && strcmp(audio_codec_list[0], "help") == 0) { |
2841 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioCodecs); | |
2842 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_CODECS\n"); | |
2843 list_codecs(1); | |
2844 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); | |
2845 opt_exit = 1; | |
1983 | 2846 } |
33363 | 2847 if (video_codec_list && strcmp(video_codec_list[0], "help") == 0) { |
2848 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoCodecs); | |
2849 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_CODECS\n"); | |
2850 list_codecs(0); | |
2851 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); | |
2852 opt_exit = 1; | |
1983 | 2853 } |
33363 | 2854 if (video_fm_list && strcmp(video_fm_list[0], "help") == 0) { |
2855 vfm_help(); | |
2856 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); | |
2857 opt_exit = 1; | |
7191
1eadce15446c
-afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents:
7180
diff
changeset
|
2858 } |
33363 | 2859 if (audio_fm_list && strcmp(audio_fm_list[0], "help") == 0) { |
2860 afm_help(); | |
2861 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); | |
2862 opt_exit = 1; | |
7191
1eadce15446c
-afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents:
7180
diff
changeset
|
2863 } |
33363 | 2864 if (af_cfg.list && strcmp(af_cfg.list[0], "help") == 0) { |
2865 af_help(); | |
2866 printf("\n"); | |
2867 opt_exit = 1; | |
13269
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
13228
diff
changeset
|
2868 } |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27370
diff
changeset
|
2869 #ifdef CONFIG_X11 |
33363 | 2870 if (vo_fstype_list && strcmp(vo_fstype_list[0], "help") == 0) { |
2871 fstype_help(); | |
2872 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); | |
2873 opt_exit = 1; | |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9315
diff
changeset
|
2874 } |
9336 | 2875 #endif |
33363 | 2876 if ((demuxer_name && strcmp(demuxer_name, "help") == 0) || |
2877 (audio_demuxer_name && strcmp(audio_demuxer_name, "help") == 0) || | |
2878 (sub_demuxer_name && strcmp(sub_demuxer_name, "help") == 0)) { | |
2879 demuxer_help(); | |
2880 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n"); | |
2881 opt_exit = 1; | |
16175 | 2882 } |
33363 | 2883 if (list_properties) { |
2884 property_print_help(); | |
2885 opt_exit = 1; | |
17914
f9cb6fc1608a
Add an option to list the properties: -list-properties
albeu
parents:
17911
diff
changeset
|
2886 } |
1983 | 2887 |
33363 | 2888 if (opt_exit) |
2889 exit_player(EXIT_NONE); | |
16345
feb16d0117c8
allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents:
16323
diff
changeset
|
2890 |
33887 | 2891 if (!filename && !player_idle_mode && !use_gui) { |
33888 | 2892 // no file/vcd/dvd -> show HELP: |
2893 mp_msg(MSGT_CPLAYER, MSGL_INFO, help_text); | |
2894 exit_player_with_rc(EXIT_NONE, 0); | |
1690 | 2895 } |
2896 | |
21342
dc98645820b7
Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents:
21219
diff
changeset
|
2897 /* Display what configure line was used */ |
dc98645820b7
Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents:
21219
diff
changeset
|
2898 mp_msg(MSGT_CPLAYER, MSGL_V, "Configuration: " CONFIGURATION "\n"); |
dc98645820b7
Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents:
21219
diff
changeset
|
2899 |
1690 | 2900 // Many users forget to include command line in bugreports... |
33363 | 2901 if (mp_msg_test(MSGT_CPLAYER, MSGL_V)) { |
33827
277ec491a8a7
Do not translate console messages of verbosity level MSGL_V and above.
diego
parents:
33752
diff
changeset
|
2902 mp_msg(MSGT_CPLAYER, MSGL_INFO, "CommandLine:"); |
33363 | 2903 for (i = 1; i < argc; i++) |
2904 mp_msg(MSGT_CPLAYER, MSGL_INFO, " '%s'", argv[i]); | |
2905 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n"); | |
1690 | 2906 } |
2907 | |
1639 | 2908 //------ load global data first ------ |
955 | 2909 |
3015 | 2910 #ifdef HAVE_RTC |
33363 | 2911 if (!nortc) { |
2912 // seteuid(0); /* Can't hurt to try to get root here */ | |
2913 if ((rtc_fd = open(rtc_device ? rtc_device : "/dev/rtc", O_RDONLY)) < 0) | |
2914 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_RTCDeviceNotOpenable, | |
2915 rtc_device ? rtc_device : "/dev/rtc", strerror(errno)); | |
2916 else { | |
2917 unsigned long irqp = 1024; /* 512 seemed OK. 128 is jerky. */ | |
2918 | |
2919 if (ioctl(rtc_fd, RTC_IRQP_SET, irqp) < 0) { | |
2920 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_LinuxRTCInitErrorIrqpSet, irqp, strerror(errno)); | |
2921 mp_msg(MSGT_CPLAYER, MSGL_HINT, MSGTR_IncreaseRTCMaxUserFreq, irqp); | |
2922 close(rtc_fd); | |
2923 rtc_fd = -1; | |
2924 } else if (ioctl(rtc_fd, RTC_PIE_ON, 0) < 0) { | |
2925 /* variable only by the root */ | |
2926 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_LinuxRTCInitErrorPieOn, strerror(errno)); | |
2927 close(rtc_fd); | |
2928 rtc_fd = -1; | |
2929 } else | |
33827
277ec491a8a7
Do not translate console messages of verbosity level MSGL_V and above.
diego
parents:
33752
diff
changeset
|
2930 mp_msg(MSGT_CPLAYER, MSGL_V, "Using Linux hardware RTC timing (%ldHz).\n", irqp); |
33363 | 2931 } |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2932 } |
27343 | 2933 #ifdef CONFIG_GUI |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
2934 // breaks DGA and SVGAlib and VESA drivers: --A'rpi |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
2935 // and now ? -- Pontscho |
33363 | 2936 if (use_gui) |
2937 setuid(getuid()); // strongly test, please check this. | |
4176
116abdd0aed1
small gtk bug fix (-display bug, baze gabu, miattad fogok elkarhozni:), and remove gui dependencie in mencoder
pontscho
parents:
4160
diff
changeset
|
2938 #endif |
33363 | 2939 if (rtc_fd < 0) |
16490
f17b3c152fd6
Add comments to a few #endif statements in order to make clear which
diego
parents:
16489
diff
changeset
|
2940 #endif /* HAVE_RTC */ |
33363 | 2941 mp_msg(MSGT_CPLAYER, MSGL_V, "Using %s timing\n", |
2942 softsleep ? "software" : timer_name); | |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2943 |
27359
d788e177a35e
Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;
diego
parents:
27345
diff
changeset
|
2944 #ifdef HAVE_TERMCAP |
33363 | 2945 if (!use_gui) |
2946 load_termcap(NULL); // load key-codes | |
1639 | 2947 #endif |
2948 | |
1816 | 2949 // ========== Init keyboard FIFO (connection to libvo) ============ |
1694 | 2950 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
2951 // Init input system |
33363 | 2952 current_module = "init_input"; |
2953 mp_input_init(); | |
2954 mp_input_add_key_fd(-1, 0, mplayer_get_key, NULL); | |
2955 if (slave_mode) | |
2956 mp_input_add_cmd_fd(0, USE_SELECT, MP_INPUT_SLAVE_CMD_FUNC, NULL); | |
2957 else if (!noconsolecontrols) | |
2958 mp_input_add_event_fd(0, getch2); | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
2959 // Set the libstream interrupt callback |
33363 | 2960 stream_set_interrupt_callback(mp_input_check_interrupt); |
9831 | 2961 |
27345
b597fd2924b4
Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents:
27343
diff
changeset
|
2962 #ifdef CONFIG_MENU |
33363 | 2963 if (use_menu) { |
2964 if (menu_cfg && menu_init(mpctx, menu_cfg)) | |
33827
277ec491a8a7
Do not translate console messages of verbosity level MSGL_V and above.
diego
parents:
33752
diff
changeset
|
2965 mp_msg(MSGT_CPLAYER, MSGL_V, "Menu initialized: %s\n", menu_cfg); |
33363 | 2966 else { |
2967 menu_cfg = get_path("menu.conf"); | |
2968 if (menu_init(mpctx, menu_cfg)) | |
33827
277ec491a8a7
Do not translate console messages of verbosity level MSGL_V and above.
diego
parents:
33752
diff
changeset
|
2969 mp_msg(MSGT_CPLAYER, MSGL_V, "Menu initialized: %s\n", menu_cfg); |
33363 | 2970 else { |
2971 if (menu_init(mpctx, MPLAYER_CONFDIR "/menu.conf")) | |
33827
277ec491a8a7
Do not translate console messages of verbosity level MSGL_V and above.
diego
parents:
33752
diff
changeset
|
2972 mp_msg(MSGT_CPLAYER, MSGL_V, "Menu initialized: %s\n", MPLAYER_CONFDIR "/menu.conf"); |
33363 | 2973 else { |
33827
277ec491a8a7
Do not translate console messages of verbosity level MSGL_V and above.
diego
parents:
33752
diff
changeset
|
2974 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Menu init failed.\n"); |
33363 | 2975 use_menu = 0; |
2976 } | |
2977 } | |
2978 } | |
2979 } | |
8198 | 2980 #endif |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
2981 |
33363 | 2982 initialized_flags |= INITIALIZED_INPUT; |
2983 current_module = NULL; | |
2984 | |
2985 // Catch signals | |
13391 | 2986 #ifndef __MINGW32__ |
33363 | 2987 signal(SIGCHLD, child_sighandler); |
13391 | 2988 #endif |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2989 |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27393
diff
changeset
|
2990 #ifdef CONFIG_CRASH_DEBUG |
33363 | 2991 prog_path = argv[0]; |
13794 | 2992 #endif |
33363 | 2993 //========= Catch terminate signals: ================ |
2994 // terminate requests: | |
2995 signal(SIGTERM, exit_sighandler); // kill | |
2996 signal(SIGHUP, exit_sighandler); // kill -HUP / xterm closed | |
2997 | |
2998 signal(SIGINT, exit_sighandler); // Interrupt from keyboard | |
2999 | |
3000 signal(SIGQUIT, exit_sighandler); // Quit from keyboard | |
3001 signal(SIGPIPE, exit_sighandler); // Some window managers cause this | |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27393
diff
changeset
|
3002 #ifdef CONFIG_SIGHANDLER |
33363 | 3003 // fatal errors: |
3004 signal(SIGBUS, exit_sighandler); // bus error | |
34119 | 3005 #ifndef __WINE__ // hack: the Wine executable will crash else |
33363 | 3006 signal(SIGSEGV, exit_sighandler); // segfault |
34115 | 3007 #endif |
33363 | 3008 signal(SIGILL, exit_sighandler); // illegal instruction |
3009 signal(SIGFPE, exit_sighandler); // floating point exc. | |
3010 signal(SIGABRT, exit_sighandler); // abort() | |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27393
diff
changeset
|
3011 #ifdef CONFIG_CRASH_DEBUG |
33363 | 3012 if (crash_debug) |
3013 signal(SIGTRAP, exit_sighandler); | |
13794 | 3014 #endif |
5367
658ea5d7316a
Allow to disable crasj sighandler to enable creation of coredump files.
atmos4
parents:
5326
diff
changeset
|
3015 #endif |
1639 | 3016 |
27343 | 3017 #ifdef CONFIG_GUI |
33363 | 3018 if (use_gui) { |
3019 guiInit(); | |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33725
diff
changeset
|
3020 gui(GUI_SET_CONTEXT, mpctx); |
33887 | 3021 gui(GUI_SET_STATE, (void *)(filename ? GUI_PLAY : GUI_STOP)); |
33363 | 3022 } |
4963 | 3023 #endif |
3024 | |
5983 | 3025 // ******************* Now, let's see the per-file stuff ******************** |
3026 | |
1639 | 3027 play_next_file: |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
3028 |
33363 | 3029 // init global sub numbers |
3030 mpctx->global_sub_size = 0; | |
3031 memset(mpctx->sub_counts, 0, sizeof(mpctx->sub_counts)); | |
3032 | |
34114
113156bc1137
Ensure that filename related config will always be loaded.
ib
parents:
34113
diff
changeset
|
3033 profile_config_loaded = load_profile_config(mconfig, filename); |
33363 | 3034 |
3035 if (video_driver_list) | |
3036 load_per_output_config(mconfig, PROFILE_CFG_VO, video_driver_list[0]); | |
3037 if (audio_driver_list) | |
3038 load_per_output_config(mconfig, PROFILE_CFG_AO, audio_driver_list[0]); | |
25641 | 3039 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3040 // We must enable getch2 here to be able to interrupt network connection |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3041 // or cache filling |
33363 | 3042 if (!noconsolecontrols && !slave_mode) { |
3043 if (initialized_flags & INITIALIZED_GETCH2) | |
3044 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_Getch2InitializedTwice); | |
3045 else | |
3046 getch2_enable(); // prepare stdin for hotkeys... | |
3047 initialized_flags |= INITIALIZED_GETCH2; | |
3048 mp_msg(MSGT_CPLAYER, MSGL_DBG2, "\n[[[init getch2]]]\n"); | |
3049 } | |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
3050 |
5983 | 3051 // =================== GUI idle loop (STOP state) =========================== |
27343 | 3052 #ifdef CONFIG_GUI |
33363 | 3053 if (use_gui) { |
3054 mpctx->file_format = DEMUXER_TYPE_UNKNOWN; | |
33615
1f9a31d4f114
Replace all playback integer constants by their symbolic constants.
ib
parents:
33614
diff
changeset
|
3055 while (guiInfo.Playing != GUI_PLAY) { |
33363 | 3056 mp_cmd_t *cmd; |
3057 usec_sleep(20000); | |
33732 | 3058 gui(GUI_HANDLE_EVENTS, 0); |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33725
diff
changeset
|
3059 gui(GUI_REDRAW, 0); |
33363 | 3060 if ((cmd = mp_input_get_cmd(0, 0, 0)) != NULL) { |
34339 | 3061 if (cmd->id == MP_CMD_GUI) |
3062 gui(GUI_RUN_MESSAGE, cmd->args[0].v.s); | |
3063 else | |
34340 | 3064 gui(GUI_RUN_COMMAND, (void *)cmd->id); |
33363 | 3065 mp_cmd_free(cmd); |
3066 } | |
3067 } | |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33725
diff
changeset
|
3068 gui(GUI_PREPARE, 0); |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
3069 } |
27343 | 3070 #endif /* CONFIG_GUI */ |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3071 |
33363 | 3072 while (player_idle_mode && !filename) { |
3073 play_tree_t *entry = NULL; | |
3074 mp_cmd_t *cmd; | |
3075 if (mpctx->video_out && vo_config_count) | |
3076 mpctx->video_out->control(VOCTRL_PAUSE, NULL); | |
3077 while (!(cmd = mp_input_get_cmd(0, 1, 0))) { // wait for command | |
3078 if (mpctx->video_out && vo_config_count) | |
3079 mpctx->video_out->check_events(); | |
3080 usec_sleep(20000); | |
3081 } | |
3082 switch (cmd->id) { | |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3083 case MP_CMD_LOADFILE: |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3084 // prepare a tree entry with the new filename |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3085 entry = play_tree_new(); |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3086 play_tree_add_file(entry, cmd->args[0].v.s); |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
3087 // The entry is added to the main playtree after the switch(). |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3088 break; |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3089 case MP_CMD_LOADLIST: |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3090 entry = parse_playlist_file(cmd->args[0].v.s); |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3091 break; |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3092 case MP_CMD_QUIT: |
33363 | 3093 exit_player_with_rc(EXIT_QUIT, (cmd->nargs > 0) ? cmd->args[0].v.i : 0); |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3094 break; |
31670
05a6d70df204
Allow fullscreen switching during -idle. Useful in combination
reimar
parents:
31612
diff
changeset
|
3095 case MP_CMD_VO_FULLSCREEN: |
26264 | 3096 case MP_CMD_GET_PROPERTY: |
3097 case MP_CMD_SET_PROPERTY: | |
3098 case MP_CMD_STEP_PROPERTY: | |
3099 run_command(mpctx, cmd); | |
3100 break; | |
33363 | 3101 } |
3102 | |
3103 mp_cmd_free(cmd); | |
3104 | |
3105 if (entry) { // user entered a command that gave a valid entry | |
3106 if (mpctx->playtree) // the playtree is always a node with one child. let's clear it | |
3107 play_tree_free_list(mpctx->playtree->child, 1); | |
3108 else | |
3109 mpctx->playtree = play_tree_new(); // .. or make a brand new playtree | |
3110 | |
3111 if (!mpctx->playtree) | |
3112 continue; // couldn't make playtree! wait for next command | |
3113 | |
3114 play_tree_set_child(mpctx->playtree, entry); | |
3115 | |
3116 /* Make iterator start at the top the of tree. */ | |
3117 mpctx->playtree_iter = play_tree_iter_new(mpctx->playtree, mconfig); | |
3118 if (!mpctx->playtree_iter) | |
3119 continue; | |
3120 | |
3121 // find the first real item in the tree | |
3122 if (play_tree_iter_step(mpctx->playtree_iter, 0, 0) != PLAY_TREE_ITER_ENTRY) { | |
3123 // no items! | |
3124 play_tree_iter_free(mpctx->playtree_iter); | |
3125 mpctx->playtree_iter = NULL; | |
3126 continue; // wait for next command | |
3127 } | |
3128 filename = play_tree_iter_get_file(mpctx->playtree_iter, 1); | |
3129 } | |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
3130 } |
34114
113156bc1137
Ensure that filename related config will always be loaded.
ib
parents:
34113
diff
changeset
|
3131 |
113156bc1137
Ensure that filename related config will always be loaded.
ib
parents:
34113
diff
changeset
|
3132 if (!profile_config_loaded) load_profile_config(mconfig, filename); |
5983 | 3133 //--------------------------------------------------------------------------- |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
3134 |
30618
c061152a5d84
Send VOCTRL_PAUSE/VOCTRL_RESUME events also when pausing for idle mode.
reimar
parents:
30616
diff
changeset
|
3135 if (mpctx->video_out && vo_config_count) |
c061152a5d84
Send VOCTRL_PAUSE/VOCTRL_RESUME events also when pausing for idle mode.
reimar
parents:
30616
diff
changeset
|
3136 mpctx->video_out->control(VOCTRL_RESUME, NULL); |
c061152a5d84
Send VOCTRL_PAUSE/VOCTRL_RESUME events also when pausing for idle mode.
reimar
parents:
30616
diff
changeset
|
3137 |
33363 | 3138 if (filename) { |
3139 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_Playing, | |
3140 filename_recode(filename)); | |
3141 if (use_filename_title && vo_wintitle == NULL) | |
32543
18338ee51c9d
Export mp_basename in a function instead of duplicate macros in various places
cboesch
parents:
32537
diff
changeset
|
3142 vo_wintitle = strdup(mp_basename(filename)); |
29862
fbb1f57a313e
Added -name, -title and -use-filename-title options and implementation in X11 vos
ptt
parents:
29857
diff
changeset
|
3143 } |
1650
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
3144 |
31956
a6c25d94e60e
Add new slave mode command for loading EDL file on demand.
reynaldo
parents:
31945
diff
changeset
|
3145 edl_loadfile(); |
31963 | 3146 |
3147 if (edl_output_filename) { | |
3148 if (edl_fd) | |
3149 fclose(edl_fd); | |
31970 | 3150 if ((edl_fd = fopen(edl_output_filename, "w")) == NULL) { |
31963 | 3151 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlCantOpenForWrite, |
31970 | 3152 filename_recode(edl_output_filename)); |
31963 | 3153 } |
17109
327be31a101d
Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents:
17106
diff
changeset
|
3154 } |
327be31a101d
Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents:
17106
diff
changeset
|
3155 |
5983 | 3156 //==================== Open VOB-Sub ============================ |
3157 | |
33363 | 3158 current_module = "vobsub"; |
32724
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32705
diff
changeset
|
3159 load_vob_subtitle(filename, spudec_ifo, &vo_spudec, add_vob_subtitle); |
33363 | 3160 if (vo_vobsub) { |
3161 initialized_flags |= INITIALIZED_VOBSUB; | |
3162 vobsub_set_from_lang(vo_vobsub, dvdsub_lang); | |
3163 mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx); | |
3164 | |
3165 // setup global sub numbering | |
3166 mpctx->sub_counts[SUB_SOURCE_VOBSUB] = vobsub_get_indexes_count(vo_vobsub); | |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
3167 } |
4770
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
3168 |
5151 | 3169 //============ Open & Sync STREAM --- fork cache2 ==================== |
3170 | |
33363 | 3171 mpctx->stream = NULL; |
3172 mpctx->demuxer = NULL; | |
3173 if (mpctx->d_audio) { | |
3174 //free_demuxer_stream(mpctx->d_audio); | |
3175 mpctx->d_audio = NULL; | |
3176 } | |
3177 if (mpctx->d_video) { | |
3178 //free_demuxer_stream(d_video); | |
3179 mpctx->d_video = NULL; | |
3180 } | |
3181 mpctx->sh_audio = NULL; | |
3182 mpctx->sh_video = NULL; | |
3183 | |
3184 current_module = "open_stream"; | |
3185 mpctx->stream = open_stream(filename, 0, &mpctx->file_format); | |
3186 if (!mpctx->stream) { // error... | |
3187 mpctx->eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY); | |
3188 goto goto_next_file; | |
3189 } | |
3190 initialized_flags |= INITIALIZED_STREAM; | |
5151 | 3191 |
27343 | 3192 #ifdef CONFIG_GUI |
33363 | 3193 if (use_gui) |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33725
diff
changeset
|
3194 gui(GUI_SET_STREAM, mpctx->stream); |
8423 | 3195 #endif |
3196 | |
33363 | 3197 if (mpctx->file_format == DEMUXER_TYPE_PLAYLIST) { |
3198 play_tree_t *entry; | |
3199 // Handle playlist | |
3200 current_module = "handle_playlist"; | |
3201 mp_msg(MSGT_CPLAYER, MSGL_V, "Parsing playlist %s...\n", | |
3202 filename_recode(filename)); | |
3203 entry = parse_playtree(mpctx->stream, 0); | |
3204 mpctx->eof = playtree_add_playlist(entry); | |
3205 goto goto_next_file; | |
3206 } | |
3207 mpctx->stream->start_pos += seek_to_byte; | |
3208 | |
3209 if (stream_dump_type == 5) { | |
3210 unsigned char buf[4096]; | |
3211 int len; | |
3212 FILE *f; | |
3213 current_module = "dumpstream"; | |
3214 stream_reset(mpctx->stream); | |
3215 stream_seek(mpctx->stream, mpctx->stream->start_pos); | |
3216 f = fopen(stream_dump_name, "wb"); | |
3217 if (!f) { | |
3218 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_CantOpenDumpfile); | |
3219 exit_player(EXIT_ERROR); | |
3220 } | |
3221 if (dvd_chapter > 1) { | |
3222 int chapter = dvd_chapter - 1; | |
3223 stream_control(mpctx->stream, STREAM_CTRL_SEEK_TO_CHAPTER, &chapter); | |
10225
785c945f6796
check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
10223
diff
changeset
|
3224 } |
33390 | 3225 stream_dump_progress_start(); |
33363 | 3226 while (!mpctx->stream->eof && !async_quit_request) { |
3227 len = stream_read(mpctx->stream, buf, 4096); | |
3228 if (len > 0) { | |
3229 if (fwrite(buf, len, 1, f) != 1) { | |
3230 mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_ErrorWritingFile, stream_dump_name); | |
3231 exit_player(EXIT_ERROR); | |
3232 } | |
3233 } | |
33390 | 3234 stream_dump_progress(len, mpctx->stream); |
33363 | 3235 if (dvd_last_chapter > 0) { |
3236 int chapter = -1; | |
3237 if (stream_control(mpctx->stream, STREAM_CTRL_GET_CURRENT_CHAPTER, | |
3238 &chapter) == STREAM_OK && chapter + 1 > dvd_last_chapter) | |
3239 break; | |
3240 } | |
3241 } | |
3242 if (fclose(f)) { | |
3243 mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_ErrorWritingFile, stream_dump_name); | |
3244 exit_player(EXIT_ERROR); | |
3245 } | |
33390 | 3246 stream_dump_progress_end(); |
33363 | 3247 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CoreDumped); |
3248 exit_player_with_rc(EXIT_EOF, 0); | |
3249 } | |
3250 | |
3251 if (mpctx->stream->type == STREAMTYPE_BD) { | |
3252 if (audio_lang && audio_id == -1) | |
3253 audio_id = bd_aid_from_lang(mpctx->stream, audio_lang); | |
3254 if (dvdsub_lang && dvdsub_id == -1) | |
3255 dvdsub_id = bd_sid_from_lang(mpctx->stream, dvdsub_lang); | |
3256 } | |
31877
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31839
diff
changeset
|
3257 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
3258 #ifdef CONFIG_DVDREAD |
33363 | 3259 if (mpctx->stream->type == STREAMTYPE_DVD) { |
3260 current_module = "dvd lang->id"; | |
3261 if (audio_lang && audio_id == -1) | |
3262 audio_id = dvd_aid_from_lang(mpctx->stream, audio_lang); | |
3263 if (dvdsub_lang && dvdsub_id == -1) | |
3264 dvdsub_id = dvd_sid_from_lang(mpctx->stream, dvdsub_lang); | |
3265 // setup global sub numbering | |
3266 mpctx->sub_counts[SUB_SOURCE_DEMUX] = dvd_number_of_subs(mpctx->stream); | |
3267 current_module = NULL; | |
3268 } | |
4274 | 3269 #endif |
3270 | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
3271 #ifdef CONFIG_DVDNAV |
33363 | 3272 if (mpctx->stream->type == STREAMTYPE_DVDNAV) { |
3273 current_module = "dvdnav lang->id"; | |
3274 if (audio_lang && audio_id == -1) | |
3275 audio_id = mp_dvdnav_aid_from_lang(mpctx->stream, audio_lang); | |
3276 dvdsub_lang_id = -3; | |
3277 if (dvdsub_lang && dvdsub_id == -1) | |
3278 dvdsub_lang_id = dvdsub_id = mp_dvdnav_sid_from_lang(mpctx->stream, dvdsub_lang); | |
3279 // setup global sub numbering | |
3280 mpctx->sub_counts[SUB_SOURCE_DEMUX] = mp_dvdnav_number_of_subs(mpctx->stream); | |
3281 current_module = NULL; | |
3282 } | |
21203
235a8e71ed6f
support for -slang and subtitles in dvdnav; patch by Attila Otvos (oattila chello hu) and me. No palette yet
nicodvb
parents:
21200
diff
changeset
|
3283 #endif |
235a8e71ed6f
support for -slang and subtitles in dvdnav; patch by Attila Otvos (oattila chello hu) and me. No palette yet
nicodvb
parents:
21200
diff
changeset
|
3284 |
5151 | 3285 // CACHE2: initial prefill: 20% later: 5% (should be set by -cacheopts) |
11352 | 3286 goto_enable_cache: |
33363 | 3287 if (stream_cache_size > 0) { |
3288 int res; | |
3289 current_module = "enable_cache"; | |
3290 res = stream_enable_cache(mpctx->stream, stream_cache_size * 1024, | |
3291 stream_cache_size * 1024 * (stream_cache_min_percent / 100.0), | |
3292 stream_cache_size * 1024 * (stream_cache_seek_min_percent / 100.0)); | |
3293 if (res == 0) | |
3294 if ((mpctx->eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY))) | |
3295 goto goto_next_file; | |
3296 } | |
1639 | 3297 |
5151 | 3298 //============ Open DEMUXERS --- DETECT file type ======================= |
33363 | 3299 current_module = "demux_open"; |
3300 | |
3301 mpctx->demuxer = demux_open(mpctx->stream, mpctx->file_format, audio_id, video_id, dvdsub_id, filename); | |
8937 | 3302 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3303 // HACK to get MOV Reference Files working |
33363 | 3304 if (mpctx->demuxer && mpctx->demuxer->type == DEMUXER_TYPE_PLAYLIST) { |
3305 unsigned char *playlist_entry; | |
3306 play_tree_t *list = NULL, *entry = NULL; | |
3307 | |
3308 current_module = "handle_demux_playlist"; | |
3309 while (ds_get_packet(mpctx->demuxer->video, &playlist_entry) > 0) { | |
3310 char *temp; | |
3311 const char *bname; | |
3312 | |
3313 mp_msg(MSGT_CPLAYER, MSGL_V, "Adding file %s to element entry.\n", | |
3314 filename_recode(playlist_entry)); | |
3315 | |
3316 bname = mp_basename(playlist_entry); | |
3317 if ((strlen(bname) > 10) && !strncmp(bname, "qt", 2) && !strncmp(bname + 3, "gateQT", 6)) | |
3318 continue; | |
3319 | |
3320 if (!strcmp(playlist_entry, filename)) // ignoring self-reference | |
3321 continue; | |
3322 | |
3323 entry = play_tree_new(); | |
3324 | |
3325 if (filename && !strcmp(mp_basename(playlist_entry), playlist_entry)) { // add reference path of current file | |
3326 temp = malloc((strlen(filename) - strlen(mp_basename(filename)) + strlen(playlist_entry) + 1)); | |
3327 if (temp) { | |
3328 strncpy(temp, filename, strlen(filename) - strlen(mp_basename(filename))); | |
3329 temp[strlen(filename) - strlen(mp_basename(filename))] = '\0'; | |
3330 strcat(temp, playlist_entry); | |
3331 if (!strcmp(temp, filename)) { | |
3332 free(temp); | |
3333 continue; | |
3334 } | |
3335 play_tree_add_file(entry, temp); | |
3336 mp_msg(MSGT_CPLAYER, MSGL_V, "Resolving reference to %s.\n", temp); | |
3337 free(temp); | |
3338 } | |
3339 } else | |
3340 play_tree_add_file(entry, playlist_entry); | |
3341 | |
3342 if (!list) | |
3343 list = entry; | |
3344 else | |
3345 play_tree_append_entry(list, entry); | |
3346 } | |
3347 free_demuxer(mpctx->demuxer); | |
3348 mpctx->demuxer = NULL; | |
3349 | |
3350 if (list) { | |
3351 entry = play_tree_new(); | |
3352 play_tree_set_child(entry, list); | |
3353 mpctx->eof = playtree_add_playlist(entry); | |
3354 goto goto_next_file; | |
3355 } | |
8937 | 3356 } |
33363 | 3357 |
3358 if (!mpctx->demuxer) | |
3359 goto goto_next_file; | |
3360 if (dvd_chapter > 1) { | |
3361 float pts; | |
3362 if (demuxer_seek_chapter(mpctx->demuxer, dvd_chapter - 1, 1, &pts, NULL, NULL) >= 0 && pts > -1.0) | |
3363 seek(mpctx, pts, SEEK_ABSOLUTE); | |
3364 } | |
3365 | |
3366 initialized_flags |= INITIALIZED_DEMUXER; | |
7058
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
7055
diff
changeset
|
3367 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
3368 #ifdef CONFIG_ASS |
33363 | 3369 if (ass_enabled && ass_library) { |
3370 for (i = 0; i < mpctx->demuxer->num_attachments; ++i) { | |
3371 demux_attachment_t *att = mpctx->demuxer->attachments + i; | |
3372 if (extract_embedded_fonts && | |
3373 att->name && att->type && att->data && att->data_size && | |
3374 (strcmp(att->type, "application/x-truetype-font") == 0 || | |
3375 strcmp(att->type, "application/x-font") == 0)) | |
3376 ass_add_font(ass_library, att->name, att->data, att->data_size); | |
3377 } | |
3378 } | |
25658
0d0c48ecba90
Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents:
25641
diff
changeset
|
3379 #endif |
0d0c48ecba90
Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents:
25641
diff
changeset
|
3380 |
33363 | 3381 current_module = "demux_open2"; |
3382 | |
3383 mpctx->d_audio = mpctx->demuxer->audio; | |
3384 mpctx->d_video = mpctx->demuxer->video; | |
3385 mpctx->d_sub = mpctx->demuxer->sub; | |
3386 | |
3387 if (ts_prog) { | |
3388 int tmp = ts_prog; | |
3389 mp_property_do("switch_program", M_PROPERTY_SET, &tmp, mpctx); | |
3390 } | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3391 // select audio stream |
33363 | 3392 select_audio(mpctx->demuxer, audio_id, audio_lang); |
26090
c585e2ad8ebf
Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents:
26087
diff
changeset
|
3393 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3394 // DUMP STREAMS: |
33363 | 3395 if ((stream_dump_type) && (stream_dump_type < 4)) { |
3396 FILE *f; | |
3397 demux_stream_t *ds = NULL; | |
3398 current_module = "dump"; | |
3399 // select stream to dump | |
3400 switch (stream_dump_type) { | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3401 case 1: ds = mpctx->d_audio; break; |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3402 case 2: ds = mpctx->d_video; break; |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3403 case 3: ds = mpctx->d_sub; break; |
33363 | 3404 } |
3405 if (!ds) { | |
3406 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_DumpSelectedStreamMissing); | |
3407 exit_player(EXIT_ERROR); | |
3408 } | |
3409 // disable other streams: | |
3410 if (mpctx->d_audio && mpctx->d_audio != ds) { | |
3411 ds_free_packs(mpctx->d_audio); | |
3412 mpctx->d_audio->id = -2; | |
3413 } | |
3414 if (mpctx->d_video && mpctx->d_video != ds) { | |
3415 ds_free_packs(mpctx->d_video); | |
3416 mpctx->d_video->id = -2; | |
3417 } | |
3418 if (mpctx->d_sub && mpctx->d_sub != ds) { | |
3419 ds_free_packs(mpctx->d_sub); | |
3420 mpctx->d_sub->id = -2; | |
3421 } | |
3422 // let's dump it! | |
3423 f = fopen(stream_dump_name, "wb"); | |
3424 if (!f) { | |
3425 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_CantOpenDumpfile); | |
3426 exit_player(EXIT_ERROR); | |
3427 } | |
33390 | 3428 stream_dump_progress_start(); |
33363 | 3429 while (!ds->eof) { |
3430 unsigned char *start; | |
3431 int in_size = ds_get_packet(ds, &start); | |
3432 if ((mpctx->demuxer->file_format == DEMUXER_TYPE_AVI || mpctx->demuxer->file_format == DEMUXER_TYPE_ASF || mpctx->demuxer->file_format == DEMUXER_TYPE_MOV) | |
3433 && stream_dump_type == 2) | |
3434 fwrite(&in_size, 1, 4, f); | |
33390 | 3435 if (in_size > 0) { |
33363 | 3436 fwrite(start, in_size, 1, f); |
33390 | 3437 stream_dump_progress(in_size, mpctx->stream); |
3438 } | |
33363 | 3439 if (dvd_last_chapter > 0) { |
3440 int cur_chapter = demuxer_get_current_chapter(mpctx->demuxer); | |
3441 if (cur_chapter != -1 && cur_chapter + 1 > dvd_last_chapter) | |
3442 break; | |
3443 } | |
3444 } | |
3445 fclose(f); | |
33390 | 3446 stream_dump_progress_end(); |
33363 | 3447 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CoreDumped); |
3448 exit_player_with_rc(EXIT_EOF, 0); | |
27953
e5918aa8557f
Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents:
27838
diff
changeset
|
3449 } |
33363 | 3450 |
3451 mpctx->sh_audio = mpctx->d_audio->sh; | |
3452 mpctx->sh_video = mpctx->d_video->sh; | |
3453 | |
3454 if (mpctx->sh_video) { | |
3455 current_module = "video_read_properties"; | |
3456 if (!video_read_properties(mpctx->sh_video)) { | |
3457 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CannotReadVideoProperties); | |
3458 mpctx->sh_video = mpctx->d_video->sh = NULL; | |
3459 } else { | |
3460 mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_FilefmtFourccSizeFpsFtime, | |
3461 mpctx->demuxer->file_format, mpctx->sh_video->format, mpctx->sh_video->disp_w, mpctx->sh_video->disp_h, | |
3462 mpctx->sh_video->fps, mpctx->sh_video->frametime | |
3463 ); | |
3464 | |
3465 /* need to set fps here for output encoders to pick it up in their init */ | |
3466 if (force_fps) { | |
3467 mpctx->sh_video->fps = force_fps; | |
3468 mpctx->sh_video->frametime = 1.0f / mpctx->sh_video->fps; | |
3469 } | |
3470 vo_fps = mpctx->sh_video->fps; | |
3471 | |
3472 if (!mpctx->sh_video->fps && !force_fps && !correct_pts) { | |
3473 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_FPSnotspecified); | |
3474 correct_pts = 1; | |
3475 } | |
3476 } | |
4598 | 3477 } |
33363 | 3478 |
3479 if (!mpctx->sh_video && !mpctx->sh_audio) { | |
3480 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoStreamFound); | |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27359
diff
changeset
|
3481 #ifdef CONFIG_DVBIN |
33363 | 3482 if (mpctx->stream->type == STREAMTYPE_DVB) { |
3483 int dir; | |
3484 int v = mpctx->last_dvb_step; | |
3485 if (v > 0) | |
3486 dir = DVB_CHANNEL_HIGHER; | |
3487 else | |
3488 dir = DVB_CHANNEL_LOWER; | |
3489 | |
3490 if (dvb_step_channel(mpctx->stream, dir)) | |
3491 mpctx->eof = mpctx->dvbin_reopen = 1; | |
3492 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
3493 #endif |
33363 | 3494 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
3495 } | |
778
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
3496 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3497 /* display clip info */ |
33363 | 3498 demux_info_print(mpctx->demuxer); |
5151 | 3499 |
3500 //================== Read SUBTITLES (DVD & TEXT) ========================== | |
33363 | 3501 if (vo_spudec == NULL && |
3502 (mpctx->stream->type == STREAMTYPE_DVD || mpctx->stream->type == STREAMTYPE_DVDNAV)) { | |
33577
c111d9e9cfb0
Move init_vo_spudec to mp_common.c and reuse it in mencoder.
reimar
parents:
33574
diff
changeset
|
3503 init_vo_spudec(mpctx->stream, mpctx->sh_video, mpctx->d_sub ? mpctx->d_sub->sh : NULL); |
33363 | 3504 } |
3505 | |
3506 if (1 || mpctx->sh_video) { | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3507 // after reading video params we should load subtitles because |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3508 // we know fps so now we can adjust subtitle time to ~6 seconds AST |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3509 // check .sub |
33363 | 3510 double fps = mpctx->sh_video ? mpctx->sh_video->fps : 25; |
3511 current_module = "read_subtitles_file"; | |
3512 load_subtitles(filename, fps, add_subtitles); | |
3513 if (mpctx->set_of_sub_size > 0) | |
3514 mpctx->sub_counts[SUB_SOURCE_SUBS] = mpctx->set_of_sub_size; | |
3515 // set even if we have no subs yet, they may be added later | |
3516 initialized_flags |= INITIALIZED_SUBS; | |
17935
d72e7330c548
Subtitles properties: move sub_select, sub_pos, sub_visibilty,
albeu
parents:
17932
diff
changeset
|
3517 } |
33363 | 3518 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3519 if (select_subtitle(mpctx) && subdata) { |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3520 switch (stream_dump_type) { |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3521 case 3: list_sub_file(subdata); break; |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3522 case 4: dump_mpsub(subdata, mpctx->sh_video->fps); break; |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3523 case 6: dump_srt(subdata, mpctx->sh_video->fps); break; |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3524 case 7: dump_microdvd(subdata, mpctx->sh_video->fps); break; |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3525 case 8: dump_jacosub(subdata, mpctx->sh_video->fps); break; |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3526 case 9: dump_sami(subdata, mpctx->sh_video->fps); break; |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3527 } |
33363 | 3528 } |
3529 | |
3530 print_file_properties(mpctx, filename); | |
3531 | |
3532 // Adjust EDL positions with start_pts | |
3533 if (edl_start_pts && start_pts) { | |
3534 edl_record_ptr edl = edl_records; | |
3535 while (edl) { | |
3536 edl->start_sec += start_pts; | |
3537 edl->stop_sec += start_pts; | |
3538 edl = edl->next; | |
3539 } | |
3540 } | |
3541 | |
3542 if (mpctx->sh_video) | |
3543 reinit_video_chain(); | |
3544 | |
3545 if (mpctx->sh_video) { | |
3546 if (vo_flags & 0x08 && vo_spudec) | |
3547 spudec_set_hw_spu(vo_spudec, mpctx->video_out); | |
6110 | 3548 |
27393 | 3549 #ifdef CONFIG_FREETYPE |
33363 | 3550 force_load_font = 1; |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
3551 #endif |
33363 | 3552 } else if (!mpctx->sh_audio) |
3553 goto goto_next_file; | |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
3554 |
1 | 3555 //================== MAIN: ========================== |
33363 | 3556 current_module = "main"; |
3557 | |
3558 if (playing_msg) { | |
3559 char *msg = property_expand_string(mpctx, playing_msg); | |
3560 mp_msg(MSGT_CPLAYER, MSGL_INFO, "%s", msg); | |
17911
52f95509cd05
Add the new property API and implement a couple properties.
albeu
parents:
17910
diff
changeset
|
3561 free(msg); |
52f95509cd05
Add the new property API and implement a couple properties.
albeu
parents:
17910
diff
changeset
|
3562 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
3563 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3564 // Disable the term OSD in verbose mode |
33363 | 3565 if (verbose) |
3566 term_osd = 0; | |
3567 | |
3568 { | |
3569 mpctx->num_buffered_frames = 0; | |
5929
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
3570 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3571 // Make sure old OSD does not stay around, |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3572 // e.g. with -fixed-vo and same-resolution files |
33363 | 3573 clear_osd_msgs(); |
3574 update_osd_msg(); | |
6028
bd016664dc18
UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents:
6016
diff
changeset
|
3575 |
1 | 3576 //================ SETUP AUDIO ========================== |
3577 | |
33363 | 3578 if (mpctx->sh_audio) { |
3579 reinit_audio_chain(); | |
3580 if (mpctx->sh_audio && mpctx->sh_audio->codec) | |
3581 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_CODEC=%s\n", mpctx->sh_audio->codec->name); | |
3582 } | |
3583 | |
3584 current_module = "av_init"; | |
3585 | |
3586 if (mpctx->sh_video) { | |
3587 mpctx->sh_video->timer = 0; | |
3588 if (!ignore_start) | |
3589 audio_delay += mpctx->sh_video->stream_delay; | |
3590 } | |
3591 if (mpctx->sh_audio) { | |
3592 if (start_volume >= 0) | |
3593 mixer_setvolume(&mpctx->mixer, start_volume, start_volume); | |
3594 if (!ignore_start) | |
3595 audio_delay -= mpctx->sh_audio->stream_delay; | |
3596 mpctx->delay = -audio_delay; | |
3597 } | |
3598 | |
3599 if (!mpctx->sh_audio) { | |
3600 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_NoSound); | |
3601 mp_msg(MSGT_CPLAYER, MSGL_V, "Freeing %d unused audio chunks.\n", mpctx->d_audio->packs); | |
3602 ds_free_packs(mpctx->d_audio); // free buffered chunks | |
3603 //mpctx->d_audio->id=-2; // do not read audio chunks | |
3604 //uninit_player(INITIALIZED_AO); // close device | |
3605 } | |
3606 if (!mpctx->sh_video) { | |
3607 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_Video_NoVideo); | |
3608 mp_msg(MSGT_CPLAYER, MSGL_V, "Freeing %d unused video chunks.\n", mpctx->d_video->packs); | |
3609 ds_free_packs(mpctx->d_video); | |
3610 mpctx->d_video->id = -2; | |
3611 //if(!fixed_vo) uninit_player(INITIALIZED_VO); | |
3612 } | |
3613 | |
3614 if (!mpctx->sh_video && !mpctx->sh_audio) | |
3615 goto goto_next_file; | |
6185
7e769ea2acc7
jump to next file (or exit) if can't decode audio && video
alex
parents:
6183
diff
changeset
|
3616 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3617 //if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf! |
33363 | 3618 if (force_fps && mpctx->sh_video) { |
3619 vo_fps = mpctx->sh_video->fps = force_fps; | |
3620 mpctx->sh_video->frametime = 1.0f / mpctx->sh_video->fps; | |
3621 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_FPSforced, mpctx->sh_video->fps, mpctx->sh_video->frametime); | |
3622 } | |
1 | 3623 |
27343 | 3624 #ifdef CONFIG_GUI |
33363 | 3625 if (use_gui) { |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33725
diff
changeset
|
3626 if (!gui(GUI_SET_VIDEO, mpctx->sh_video)) |
33363 | 3627 goto goto_next_file; |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33725
diff
changeset
|
3628 gui(GUI_SET_AUDIO, mpctx->sh_audio); |
33363 | 3629 } |
19946
ef94dfe93fe8
Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents:
19945
diff
changeset
|
3630 #endif |
ef94dfe93fe8
Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents:
19945
diff
changeset
|
3631 |
33363 | 3632 mp_input_set_section(NULL); |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3633 //TODO: add desired (stream-based) sections here |
33363 | 3634 if (mpctx->stream->type == STREAMTYPE_TV) |
3635 mp_input_set_section("tv"); | |
3636 if (mpctx->stream->type == STREAMTYPE_DVDNAV) | |
3637 mp_input_set_section("dvdnav"); | |
23477 | 3638 |
1639 | 3639 //==================== START PLAYING ======================= |
3640 | |
33363 | 3641 if (mpctx->loop_times > 1) |
3642 mpctx->loop_times--; | |
3643 else if (mpctx->loop_times == 1) | |
3644 mpctx->loop_times = -1; | |
3645 | |
3646 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_StartPlaying); | |
3647 | |
3648 total_time_usage_start = GetTimer(); | |
3649 audio_time_usage = 0; | |
3650 video_time_usage = 0; | |
3651 vout_time_usage = 0; | |
3652 total_frame_cnt = 0; | |
3653 drop_frame_cnt = 0; // fix for multifile fps benchmark | |
3654 play_n_frames = play_n_frames_mf; | |
3655 mpctx->startup_decode_retry = DEFAULT_STARTUP_DECODE_RETRY; | |
3656 | |
3657 if (play_n_frames == 0) { | |
3658 mpctx->eof = PT_NEXT_ENTRY; | |
3659 goto goto_next_file; | |
3660 } | |
3661 | |
3662 if (seek_to_sec) { | |
3663 seek(mpctx, seek_to_sec, SEEK_ABSOLUTE); | |
3664 end_at.pos += seek_to_sec; | |
3665 } | |
22338
434cd072b0d3
Seek to -ss position without first starting audio/video from the start.
uau
parents:
22313
diff
changeset
|
3666 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
3667 #ifdef CONFIG_DVDNAV |
33363 | 3668 mp_dvdnav_context_free(mpctx); |
3669 if (mpctx->stream->type == STREAMTYPE_DVDNAV) { | |
3670 mp_dvdnav_read_wait(mpctx->stream, 0, 1); | |
3671 mp_dvdnav_cell_has_changed(mpctx->stream, 1); | |
3672 } | |
25824 | 3673 #endif |
22338
434cd072b0d3
Seek to -ss position without first starting audio/video from the start.
uau
parents:
22313
diff
changeset
|
3674 |
33363 | 3675 while (!mpctx->eof) { |
3676 float aq_sleep_time = 0; | |
3677 | |
3678 if (dvd_last_chapter > 0) { | |
3679 int cur_chapter = demuxer_get_current_chapter(mpctx->demuxer); | |
3680 if (cur_chapter != -1 && cur_chapter + 1 > dvd_last_chapter) | |
3681 goto goto_next_file; | |
3682 } | |
3683 | |
3684 if (!mpctx->sh_audio && mpctx->d_audio->sh) { | |
3685 mpctx->sh_audio = mpctx->d_audio->sh; | |
3686 mpctx->sh_audio->ds = mpctx->d_audio; | |
3687 reinit_audio_chain(); | |
3688 } | |
1 | 3689 |
3690 /*========================== PLAY AUDIO ============================*/ | |
5610 | 3691 |
33363 | 3692 if (mpctx->sh_audio) |
3693 if (!fill_audio_out_buffers()) | |
3694 // at eof, all audio at least written to ao | |
3695 if (!mpctx->sh_video) | |
3696 mpctx->eof = PT_NEXT_ENTRY; | |
3697 | |
3698 if (!mpctx->sh_video) { | |
3699 // handle audio-only case: | |
3700 double a_pos = 0; | |
3701 // sh_audio can be NULL due to video stream switching | |
3702 // TODO: handle this better | |
33493
fd4a27bd4ed4
a_pos is also used by update_subtitles, so initialize it always.
reimar
parents:
33491
diff
changeset
|
3703 if (mpctx->sh_audio) |
33363 | 3704 a_pos = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out); |
3705 | |
3706 if (!quiet) | |
3707 print_status(a_pos, 0, 0); | |
3708 | |
33495 | 3709 if (is_at_end(mpctx, &end_at, a_pos)) |
33363 | 3710 mpctx->eof = PT_NEXT_ENTRY; |
3711 update_subtitles(NULL, a_pos, mpctx->d_sub, 0); | |
3712 update_osd_msg(); | |
3713 } else { | |
3714 int frame_time_remaining = 0; | |
3715 int blit_frame = 1; | |
3716 // skip timing after seek | |
3717 int skip_timing = mpctx->startup_decode_retry > 0; | |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
3718 |
1 | 3719 /*========================== PLAY VIDEO ============================*/ |
3720 | |
33363 | 3721 vo_pts = mpctx->sh_video->timer * 90000.0; |
3722 vo_fps = mpctx->sh_video->fps; | |
3723 | |
3724 if (!mpctx->num_buffered_frames) { | |
3725 double frame_time = update_video(&blit_frame); | |
3726 while (!blit_frame && mpctx->startup_decode_retry > 0) { | |
3727 double delay = mpctx->delay; | |
3728 // these initial decode failures are probably due to codec delay, | |
3729 // ignore them and also their probably nonsense durations | |
3730 update_video(&blit_frame); | |
3731 mpctx->delay = delay; | |
3732 mpctx->startup_decode_retry--; | |
3733 } | |
3734 mpctx->startup_decode_retry = 0; | |
3735 mp_dbg(MSGT_AVSYNC, MSGL_DBG2, "*** ftime=%5.3f ***\n", frame_time); | |
3736 if (mpctx->sh_video->vf_initialized < 0) { | |
3737 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NotInitializeVOPorVO); | |
3738 mpctx->eof = 1; | |
3739 goto goto_next_file; | |
3740 } | |
3741 if (frame_time < 0) { | |
3742 // if we have no more video, sleep some arbitrary time | |
3743 frame_time = 1.0 / 20.0; | |
3744 // only stop playing when audio is at end as well | |
3745 if (!mpctx->sh_audio || mpctx->d_audio->eof) | |
3746 mpctx->eof = 1; | |
3747 } else { | |
3748 // might return with !eof && !blit_frame if !correct_pts | |
3749 mpctx->num_buffered_frames += blit_frame; | |
3750 mpctx->time_frame += frame_time / playback_speed; // for nosound | |
3751 } | |
3752 } | |
5929
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
3753 |
5610 | 3754 // ========================================================================== |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
3755 |
5643 | 3756 // current_module="draw_osd"; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3757 // if(vo_config_count) mpctx->video_out->draw_osd(); |
1 | 3758 |
27343 | 3759 #ifdef CONFIG_GUI |
33363 | 3760 if (use_gui) |
33732 | 3761 gui(GUI_HANDLE_EVENTS, 0); |
5610 | 3762 #endif |
3763 | |
33363 | 3764 current_module = "vo_check_events"; |
3765 if (vo_config_count) | |
3766 mpctx->video_out->check_events(); | |
20894 | 3767 |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27370
diff
changeset
|
3768 #ifdef CONFIG_X11 |
33363 | 3769 if (stop_xscreensaver) { |
3770 current_module = "stop_xscreensaver"; | |
3771 xscreensaver_heartbeat(); | |
3772 } | |
20900
b0f2e9a16bb1
Move xscreensaver_heartbeat call next to vo check_events
uau
parents:
20899
diff
changeset
|
3773 #endif |
33363 | 3774 if (heartbeat_cmd) { |
3775 static unsigned last_heartbeat; | |
3776 unsigned now = GetTimerMS(); | |
3777 if (now - last_heartbeat > 30000) { | |
3778 last_heartbeat = now; | |
3779 system(heartbeat_cmd); | |
3780 } | |
3781 } | |
3782 | |
3783 if (!skip_timing) | |
3784 frame_time_remaining = sleep_until_update(&mpctx->time_frame, &aq_sleep_time); | |
5929
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
3785 |
5610 | 3786 //====================== FLIP PAGE (VIDEO BLT): ========================= |
3787 | |
33363 | 3788 if (!edl_needs_reset) { |
3789 current_module = "flip_page"; | |
3790 if (!frame_time_remaining && blit_frame) { | |
3791 unsigned int t2 = GetTimer(); | |
3792 | |
3793 if (vo_config_count) | |
3794 mpctx->video_out->flip_page(); | |
3795 mpctx->num_buffered_frames--; | |
3796 | |
3797 vout_time_usage += (GetTimer() - t2) * 0.000001; | |
3798 } | |
3799 } | |
5610 | 3800 //====================== A-V TIMESTAMP CORRECTION: ========================= |
3801 | |
33363 | 3802 adjust_sync_and_print_status(frame_time_remaining, mpctx->time_frame); |
5610 | 3803 |
3804 //============================ Auto QUALITY ============================ | |
1 | 3805 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3806 /*Output quality adjustments:*/ |
33363 | 3807 if (auto_quality > 0) { |
3808 current_module = "autoq"; | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3809 //float total=0.000001f * (GetTimer()-aq_total_time); |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3810 //if(output_quality<auto_quality && aq_sleep_time>0.05f*total) |
33363 | 3811 if (output_quality < auto_quality && aq_sleep_time > 0) |
3812 ++output_quality; | |
3813 else | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3814 //if(output_quality>0 && aq_sleep_time<-0.05f*total) |
33363 | 3815 if (output_quality > 1 && aq_sleep_time < 0) |
3816 --output_quality; | |
3817 else if (output_quality > 0 && aq_sleep_time < -0.050f) // 50ms | |
3818 output_quality = 0; | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3819 //printf("total: %8.6f sleep: %8.6f q: %d\n",(0.000001f*aq_total_time),aq_sleep_time,output_quality); |
33363 | 3820 set_video_quality(mpctx->sh_video, output_quality); |
3821 } | |
3822 | |
3823 if (play_n_frames >= 0 && !frame_time_remaining && blit_frame) { | |
3824 --play_n_frames; | |
3825 if (play_n_frames <= 0) | |
3826 mpctx->eof = PT_NEXT_ENTRY; | |
3827 } | |
3828 | |
33495 | 3829 if (!frame_time_remaining && is_at_end(mpctx, &end_at, |
3830 mpctx->sh_video->pts)) | |
33363 | 3831 mpctx->eof = PT_NEXT_ENTRY; |
3832 } // end if(mpctx->sh_video) | |
5610 | 3833 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
3834 #ifdef CONFIG_DVDNAV |
33363 | 3835 if (mpctx->stream->type == STREAMTYPE_DVDNAV) { |
3836 nav_highlight_t hl; | |
3837 mp_dvdnav_get_highlight(mpctx->stream, &hl); | |
3838 if (!vo_spudec || !spudec_apply_palette_crop(vo_spudec, hl.palette, hl.sx, hl.sy, hl.ex, hl.ey)) { | |
3839 osd_set_nav_box(hl.sx, hl.sy, hl.ex, hl.ey); | |
3840 vo_osd_changed(OSDTYPE_DVDNAV); | |
3841 } else { | |
3842 osd_set_nav_box(0, 0, 0, 0); | |
3843 vo_osd_changed(OSDTYPE_DVDNAV); | |
3844 vo_osd_changed(OSDTYPE_SPU); | |
3845 } | |
3846 | |
3847 if (mp_dvdnav_stream_has_changed(mpctx->stream)) { | |
3848 double ar = -1.0; | |
3849 if (mpctx->sh_video && | |
3850 stream_control(mpctx->demuxer->stream, | |
3851 STREAM_CTRL_GET_ASPECT_RATIO, &ar) | |
3852 != STREAM_UNSUPPORTED) | |
3853 mpctx->sh_video->stream_aspect = ar; | |
3854 } | |
3855 } | |
21193
a067e7e18b50
support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents:
21161
diff
changeset
|
3856 #endif |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29189
diff
changeset
|
3857 |
5610 | 3858 //============================ Handle PAUSE =============================== |
3859 | |
33363 | 3860 current_module = "pause"; |
3861 | |
3862 if (mpctx->osd_function == OSD_PAUSE) { | |
3863 mpctx->was_paused = 1; | |
3864 pause_loop(); | |
3865 } | |
371 | 3866 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3867 // handle -sstep |
33363 | 3868 if (step_sec > 0) { |
3869 mpctx->osd_function = OSD_FFW; | |
3870 rel_seek_secs += step_sec; | |
3871 } | |
3872 | |
3873 edl_update(mpctx); | |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
3874 |
1 | 3875 //================= Keyboard events, SEEKing ==================== |
3876 | |
33363 | 3877 current_module = "key_events"; |
3878 | |
3879 { | |
3880 mp_cmd_t *cmd; | |
3881 int brk_cmd = 0; | |
3882 while (!brk_cmd && (cmd = mp_input_get_cmd(0, 0, 0)) != NULL) { | |
3883 brk_cmd = run_command(mpctx, cmd); | |
3884 if (cmd->id == MP_CMD_EDL_LOADFILE) { | |
3885 free(edl_filename); | |
3886 edl_filename = strdup(cmd->args[0].v.s); | |
3887 if (edl_filename) | |
3888 edl_loadfile(); | |
3889 else | |
3890 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlOutOfMemFile, | |
3891 cmd->args[0].v.s); | |
3892 } | |
3893 mp_cmd_free(cmd); | |
3894 if (brk_cmd == 2) | |
3895 goto goto_enable_cache; | |
3896 } | |
3897 } | |
3898 mpctx->was_paused = 0; | |
3899 | |
3900 /* Looping. */ | |
3901 if (mpctx->eof == 1 && mpctx->loop_times >= 0) { | |
3902 mp_msg(MSGT_CPLAYER, MSGL_V, "loop_times = %d, eof = %d\n", mpctx->loop_times, mpctx->eof); | |
3903 | |
3904 if (mpctx->loop_times > 1) | |
3905 mpctx->loop_times--; | |
3906 else if (mpctx->loop_times == 1) | |
3907 mpctx->loop_times = -1; | |
3908 play_n_frames = play_n_frames_mf; | |
3909 mpctx->eof = 0; | |
3910 abs_seek_pos = SEEK_ABSOLUTE; | |
3911 rel_seek_secs = seek_to_sec; | |
3912 loop_seek = 1; | |
3913 } | |
3914 | |
3915 if (rel_seek_secs || abs_seek_pos) { | |
3916 if (seek(mpctx, rel_seek_secs, abs_seek_pos) >= 0) { | |
3917 // Set OSD: | |
3918 if (!loop_seek) { | |
3919 if (!edl_decision) | |
3920 set_osd_bar(0, "Position", 0, 100, demuxer_get_percent_pos(mpctx->demuxer)); | |
3921 } | |
3922 } | |
3923 | |
3924 rel_seek_secs = 0; | |
3925 abs_seek_pos = 0; | |
3926 loop_seek = 0; | |
3927 edl_decision = 0; | |
3928 } | |
1466 | 3929 |
27343 | 3930 #ifdef CONFIG_GUI |
33363 | 3931 if (use_gui) { |
33732 | 3932 gui(GUI_HANDLE_EVENTS, 0); |
33363 | 3933 if (mpctx->demuxer->file_format == DEMUXER_TYPE_AVI && mpctx->sh_video && mpctx->sh_video->video.dwLength > 2) { |
3934 // get pos from frame number / total frames | |
33555 | 3935 guiInfo.Position = (float)mpctx->d_video->pack_no * 100.0f / mpctx->sh_video->video.dwLength; |
33363 | 3936 } else { |
33555 | 3937 guiInfo.Position = demuxer_get_percent_pos(mpctx->demuxer); |
33363 | 3938 } |
3939 if (mpctx->sh_video) | |
33897 | 3940 guiInfo.ElapsedTime = mpctx->sh_video->pts; |
33363 | 3941 else if (mpctx->sh_audio) |
33897 | 3942 guiInfo.ElapsedTime = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out); |
3943 guiInfo.RunningTime = demuxer_get_time_length(mpctx->demuxer); | |
33731
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33725
diff
changeset
|
3944 gui(GUI_SET_MIXER, 0); |
81f71d910333
Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents:
33725
diff
changeset
|
3945 gui(GUI_REDRAW, 0); |
33615
1f9a31d4f114
Replace all playback integer constants by their symbolic constants.
ib
parents:
33614
diff
changeset
|
3946 if (guiInfo.Playing == GUI_STOP) |
33363 | 3947 break; // STOP |
33615
1f9a31d4f114
Replace all playback integer constants by their symbolic constants.
ib
parents:
33614
diff
changeset
|
3948 if (guiInfo.Playing == GUI_PAUSE) |
33363 | 3949 mpctx->osd_function = OSD_PAUSE; |
33890 | 3950 if (guiInfo.NewPlay) |
33363 | 3951 goto goto_next_file; |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27321
diff
changeset
|
3952 #ifdef CONFIG_DVDREAD |
33363 | 3953 if (mpctx->stream->type == STREAMTYPE_DVD) { |
3954 dvd_priv_t *dvdp = mpctx->stream->priv; | |
33876
4789b8eed97e
Get rid of a bunch of needless or redundant guiInfo members.
ib
parents:
33875
diff
changeset
|
3955 guiInfo.Chapter = dvd_chapter_from_cell(dvdp, guiInfo.Track - 1, dvdp->cur_cell) + 1; |
33363 | 3956 } |
3054 | 3957 #endif |
33363 | 3958 } |
27343 | 3959 #endif /* CONFIG_GUI */ |
33363 | 3960 } // while(!mpctx->eof) |
3961 | |
3962 mp_msg(MSGT_GLOBAL, MSGL_V, "EOF code: %d \n", mpctx->eof); | |
1 | 3963 |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27359
diff
changeset
|
3964 #ifdef CONFIG_DVBIN |
33363 | 3965 if (mpctx->dvbin_reopen) { |
3966 mpctx->eof = 0; | |
3967 uninit_player(INITIALIZED_ALL - (INITIALIZED_GUI | INITIALIZED_STREAM | INITIALIZED_INPUT | INITIALIZED_GETCH2 | (fixed_vo ? INITIALIZED_VO : 0))); | |
3968 cache_uninit(mpctx->stream); | |
3969 mpctx->dvbin_reopen = 0; | |
3970 goto goto_enable_cache; | |
3971 } | |
18286 | 3972 #endif |
33363 | 3973 } |
1639 | 3974 |
3618 | 3975 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
|
3976 |
33363 | 3977 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n"); |
3978 | |
3979 if (benchmark) { | |
3980 double tot = video_time_usage + vout_time_usage + audio_time_usage; | |
3981 double total_time_usage; | |
3982 total_time_usage_start = GetTimer() - total_time_usage_start; | |
3983 total_time_usage = (float)total_time_usage_start * 0.000001; | |
3984 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\nBENCHMARKs: VC:%8.3fs VO:%8.3fs A:%8.3fs Sys:%8.3fs = %8.3fs\n", | |
3985 video_time_usage, vout_time_usage, audio_time_usage, | |
3986 total_time_usage - tot, total_time_usage); | |
3987 if (total_time_usage > 0.0) | |
3988 mp_msg(MSGT_CPLAYER, MSGL_INFO, "BENCHMARK%%: VC:%8.4f%% VO:%8.4f%% A:%8.4f%% Sys:%8.4f%% = %8.4f%%\n", | |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3989 100.0 * video_time_usage / total_time_usage, |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3990 100.0 * vout_time_usage / total_time_usage, |
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
3991 100.0 * audio_time_usage / total_time_usage, |
33363 | 3992 100.0 * (total_time_usage - tot) / total_time_usage, |
3993 100.0); | |
3994 if (total_frame_cnt && frame_dropping) | |
3995 mp_msg(MSGT_CPLAYER, MSGL_INFO, "BENCHMARKn: disp: %d (%3.2f fps) drop: %d (%d%%) total: %d (%3.2f fps)\n", | |
3996 total_frame_cnt - drop_frame_cnt, | |
3997 (total_time_usage > 0.5) ? ((total_frame_cnt - drop_frame_cnt) / total_time_usage) : 0, | |
3998 drop_frame_cnt, | |
3999 100 * drop_frame_cnt / total_frame_cnt, | |
4000 total_frame_cnt, | |
4001 (total_time_usage > 0.5) ? (total_frame_cnt / total_time_usage) : 0); | |
4002 } | |
4221 | 4003 |
33491
52545582f44d
Various alignment cosmetics and brackets simplifications.
cboesch
parents:
33490
diff
changeset
|
4004 // time to uninit all, except global stuff: |
33363 | 4005 uninit_player(INITIALIZED_ALL - (INITIALIZED_GUI + INITIALIZED_INPUT + (fixed_vo ? INITIALIZED_VO : 0))); |
4006 | |
4007 if (mpctx->eof == PT_NEXT_ENTRY || mpctx->eof == PT_PREV_ENTRY) { | |
4008 mpctx->eof = mpctx->eof == PT_NEXT_ENTRY ? 1 : -1; | |
4009 if (play_tree_iter_step(mpctx->playtree_iter, mpctx->play_tree_step, 0) == PLAY_TREE_ITER_ENTRY) { | |
26159
7862aea6a387
cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents:
26130
diff
changeset
|
4010 mpctx->eof = 1; |
7862aea6a387
cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents:
26130
diff
changeset
|
4011 } else { |
7862aea6a387
cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents:
26130
diff
changeset
|
4012 play_tree_iter_free(mpctx->playtree_iter); |
7862aea6a387
cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents:
26130
diff
changeset
|
4013 mpctx->playtree_iter = NULL; |
7862aea6a387
cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents:
26130
diff
changeset
|
4014 } |
33363 | 4015 mpctx->play_tree_step = 1; |
4016 } else if (mpctx->eof == PT_UP_NEXT || mpctx->eof == PT_UP_PREV) { | |
4017 mpctx->eof = mpctx->eof == PT_UP_NEXT ? 1 : -1; | |
4018 if (mpctx->playtree_iter) { | |
4019 if (play_tree_iter_up_step(mpctx->playtree_iter, mpctx->eof, 0) == PLAY_TREE_ITER_ENTRY) { | |
4020 mpctx->eof = 1; | |
4021 } else { | |
4022 play_tree_iter_free(mpctx->playtree_iter); | |
4023 mpctx->playtree_iter = NULL; | |
4024 } | |
4025 } | |
4026 } else if (mpctx->eof == PT_STOP) { | |
4027 play_tree_iter_free(mpctx->playtree_iter); | |
4028 mpctx->playtree_iter = NULL; | |
4029 } else { // NEXT PREV SRC | |
4030 mpctx->eof = mpctx->eof == PT_PREV_SRC ? -1 : 1; | |
26159
7862aea6a387
cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents:
26130
diff
changeset
|
4031 } |
33363 | 4032 |
4033 if (mpctx->eof == 0) | |
4034 mpctx->eof = 1; | |
4035 | |
4036 while (mpctx->playtree_iter != NULL) { | |
4037 filename = play_tree_iter_get_file(mpctx->playtree_iter, mpctx->eof); | |
4038 if (filename == NULL) { | |
4039 if (play_tree_iter_step(mpctx->playtree_iter, mpctx->eof, 0) != PLAY_TREE_ITER_ENTRY) { | |
4040 play_tree_iter_free(mpctx->playtree_iter); | |
4041 mpctx->playtree_iter = NULL; | |
4042 } | |
4043 } else | |
4044 break; | |
4045 } | |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4046 |
27343 | 4047 #ifdef CONFIG_GUI |
33891 | 4048 if (use_gui) |
33890 | 4049 if (guiInfo.NewPlay != GUI_FILE_SAME) |
33891 | 4050 gui(GUI_END_FILE, 0); |
5910
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
4051 #endif |
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
4052 |
33481 | 4053 if ( |
4054 #ifdef CONFIG_GUI | |
33555 | 4055 (use_gui && guiInfo.Playing) || |
33481 | 4056 #endif |
33630 | 4057 mpctx->playtree_iter != NULL || player_idle_mode) { |
34113 | 4058 if (!mpctx->playtree_iter && !use_gui) |
33363 | 4059 filename = NULL; |
4060 mpctx->eof = 0; | |
4061 goto play_next_file; | |
4062 } | |
4063 | |
4064 exit_player_with_rc(EXIT_EOF, 0); | |
4065 return 1; | |
1639 | 4066 } |
4067 | |
26963
8825552ee585
Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents:
26877
diff
changeset
|
4068 #endif /* DISABLE_MAIN */ |