Mercurial > mplayer.hg
annotate libmpcodecs/vd.c @ 33259:04dc3e55cd90
Increase the maximum value of the DVB timeout to 240 seconds.
Some devices may need more time for the initial tune (e.g. firmware loading).
Let the user specify higher timeout value if there is need to.
The default remains 30 seconds.
author | iive |
---|---|
date | Sun, 01 May 2011 18:07:59 +0000 |
parents | dba2e7218893 |
children | 303bf4bab982 |
rev | line source |
---|---|
30421
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30349
diff
changeset
|
1 /* |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30349
diff
changeset
|
2 * This file is part of MPlayer. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30349
diff
changeset
|
3 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30349
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30349
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30349
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30349
diff
changeset
|
7 * (at your option) any later version. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30349
diff
changeset
|
8 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30349
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30349
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30349
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30349
diff
changeset
|
12 * GNU General Public License for more details. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30349
diff
changeset
|
13 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30349
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30349
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30349
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30349
diff
changeset
|
17 */ |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30349
diff
changeset
|
18 |
4878 | 19 #include <stdio.h> |
20 #include <stdlib.h> | |
21 #include <string.h> | |
22 | |
23 #include "config.h" | |
24 #include "mp_msg.h" | |
5075 | 25 #include "help_mp.h" |
4878 | 26 |
27 #include "codec-cfg.h" | |
28 | |
5607 | 29 #include "img_format.h" |
4878 | 30 |
22599
4faee1254928
Add explicit location for headers from the stream/ directory.
diego
parents:
21145
diff
changeset
|
31 #include "stream/stream.h" |
22601
ed8f90096c65
Add explicit location for headers from the libmpdemux/ directory.
diego
parents:
22599
diff
changeset
|
32 #include "libmpdemux/demuxer.h" |
ed8f90096c65
Add explicit location for headers from the libmpdemux/ directory.
diego
parents:
22599
diff
changeset
|
33 #include "libmpdemux/stheader.h" |
6057
31e465fda59c
various openbsd and general warning fixes - patch by Bj«Órn Sandell <biorn@dce.chalmers.se>
arpi
parents:
5925
diff
changeset
|
34 #include "dec_video.h" |
4878 | 35 |
36 #include "vd.h" | |
5507
d0d029fda134
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
5483
diff
changeset
|
37 #include "vf.h" |
d0d029fda134
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
5483
diff
changeset
|
38 |
30519 | 39 extern const vd_functions_t mpcodecs_vd_null; |
40 extern const vd_functions_t mpcodecs_vd_ffmpeg; | |
41 extern const vd_functions_t mpcodecs_vd_theora; | |
42 extern const vd_functions_t mpcodecs_vd_dshow; | |
43 extern const vd_functions_t mpcodecs_vd_dmo; | |
44 extern const vd_functions_t mpcodecs_vd_vfw; | |
45 extern const vd_functions_t mpcodecs_vd_vfwex; | |
46 extern const vd_functions_t mpcodecs_vd_raw; | |
47 extern const vd_functions_t mpcodecs_vd_hmblck; | |
48 extern const vd_functions_t mpcodecs_vd_xanim; | |
49 extern const vd_functions_t mpcodecs_vd_mpng; | |
50 extern const vd_functions_t mpcodecs_vd_ijpg; | |
51 extern const vd_functions_t mpcodecs_vd_mtga; | |
52 extern const vd_functions_t mpcodecs_vd_sgi; | |
53 extern const vd_functions_t mpcodecs_vd_libmpeg2; | |
54 extern const vd_functions_t mpcodecs_vd_mpegpes; | |
55 extern const vd_functions_t mpcodecs_vd_zrmjpeg; | |
56 extern const vd_functions_t mpcodecs_vd_realvid; | |
57 extern const vd_functions_t mpcodecs_vd_xvid; | |
58 extern const vd_functions_t mpcodecs_vd_libdv; | |
59 extern const vd_functions_t mpcodecs_vd_lzo; | |
60 extern const vd_functions_t mpcodecs_vd_qtvideo; | |
4878 | 61 |
25876
edfe8baed49f
copy note on new demuxers and codecs to the top of the array as well to be
ivo
parents:
25872
diff
changeset
|
62 /* Please do not add any new decoders here. If you want to implement a new |
25880
4df11ac927fc
clarify comments/docs about lav* being the preferred place to implement new
ivo
parents:
25876
diff
changeset
|
63 * decoder, add it to libavcodec, except for wrappers around external |
4df11ac927fc
clarify comments/docs about lav* being the preferred place to implement new
ivo
parents:
25876
diff
changeset
|
64 * libraries and decoders requiring binary support. */ |
25876
edfe8baed49f
copy note on new demuxers and codecs to the top of the array as well to be
ivo
parents:
25872
diff
changeset
|
65 |
28826 | 66 const vd_functions_t * const mpcodecs_vd_drivers[] = { |
31170 | 67 &mpcodecs_vd_null, |
32142
4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents:
31198
diff
changeset
|
68 #ifdef CONFIG_FFMPEG |
31170 | 69 &mpcodecs_vd_ffmpeg, |
4951 | 70 #endif |
27363
40057010b1fa
Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents:
27341
diff
changeset
|
71 #ifdef CONFIG_OGGTHEORA |
31170 | 72 &mpcodecs_vd_theora, |
10095
51da0282b302
Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
9534
diff
changeset
|
73 #endif |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26206
diff
changeset
|
74 #ifdef CONFIG_WIN32DLL |
31170 | 75 &mpcodecs_vd_dshow, |
76 &mpcodecs_vd_dmo, | |
77 &mpcodecs_vd_vfw, | |
78 &mpcodecs_vd_vfwex, | |
4968 | 79 #endif |
31170 | 80 &mpcodecs_vd_lzo, |
81 &mpcodecs_vd_raw, | |
82 &mpcodecs_vd_hmblck, | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26206
diff
changeset
|
83 #ifdef CONFIG_XANIM |
31170 | 84 &mpcodecs_vd_xanim, |
4969 | 85 #endif |
27385
2113bd9c6bd9
Rename preprocessor directives related to image libraries.
diego
parents:
27370
diff
changeset
|
86 #ifdef CONFIG_PNG |
31170 | 87 &mpcodecs_vd_mpng, |
4998 | 88 #endif |
27385
2113bd9c6bd9
Rename preprocessor directives related to image libraries.
diego
parents:
27370
diff
changeset
|
89 #ifdef CONFIG_JPEG |
31170 | 90 &mpcodecs_vd_ijpg, |
5029 | 91 #endif |
31170 | 92 &mpcodecs_vd_mtga, |
93 &mpcodecs_vd_sgi, | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26206
diff
changeset
|
94 #ifdef CONFIG_LIBMPEG2 |
31170 | 95 &mpcodecs_vd_libmpeg2, |
8026
b465ba5897a3
usage of libmpeg2, liba52, mp3lib & svq1 can be disabled
arpi
parents:
7978
diff
changeset
|
96 #endif |
31170 | 97 &mpcodecs_vd_mpegpes, |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27363
diff
changeset
|
98 #ifdef CONFIG_ZR |
31170 | 99 &mpcodecs_vd_zrmjpeg, |
11386
229079491864
addition of special image formats for Zoran MJPEG, and vd_zrmjpeg.c
rik
parents:
11261
diff
changeset
|
100 #endif |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26206
diff
changeset
|
101 #ifdef CONFIG_REALCODECS |
31170 | 102 &mpcodecs_vd_realvid, |
6343
d253cf4f43a9
realvideo support by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
6234
diff
changeset
|
103 #endif |
27363
40057010b1fa
Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents:
27341
diff
changeset
|
104 #ifdef CONFIG_XVID4 |
31170 | 105 &mpcodecs_vd_xvid, |
6701
522713337297
Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
6506
diff
changeset
|
106 #endif |
27363
40057010b1fa
Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents:
27341
diff
changeset
|
107 #ifdef CONFIG_LIBDV095 |
31170 | 108 &mpcodecs_vd_libdv, |
6927 | 109 #endif |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26206
diff
changeset
|
110 #ifdef CONFIG_QTX_CODECS |
31170 | 111 &mpcodecs_vd_qtvideo, |
8160 | 112 #endif |
25872
3eeaf9d4c65a
note on new demuxers and codecs, add them to lav* instead of libmp*
ivo
parents:
25597
diff
changeset
|
113 /* Please do not add any new decoders here. If you want to implement a new |
25880
4df11ac927fc
clarify comments/docs about lav* being the preferred place to implement new
ivo
parents:
25876
diff
changeset
|
114 * decoder, add it to libavcodec, except for wrappers around external |
4df11ac927fc
clarify comments/docs about lav* being the preferred place to implement new
ivo
parents:
25876
diff
changeset
|
115 * libraries and decoders requiring binary support. */ |
31170 | 116 NULL |
4878 | 117 }; |
118 | |
4971 | 119 #include "libvo/video_out.h" |
120 | |
5075 | 121 // libvo opts: |
31170 | 122 int fullscreen = 0; |
123 int vidmode = 0; | |
124 int softzoom = 0; | |
125 int flip = -1; | |
126 int opt_screen_size_x = 0; | |
127 int opt_screen_size_y = 0; | |
128 float screen_size_xy = 0; | |
129 float movie_aspect = -1.0; | |
130 int vo_flags = 0; | |
33032
dba2e7218893
Disable the combination of slices and multithreaded decode by default, it
reimar
parents:
32142
diff
changeset
|
131 int vd_use_slices = -1; |
5075 | 132 |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
133 /** global variables for gamma, brightness, contrast, saturation and hue |
23077 | 134 modified by mplayer.c and gui/mplayer/gtk/eq.c: |
13341
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
135 ranges -100 - 100 |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
136 1000 if the vo default should be used |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
137 */ |
13341
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
138 int vo_gamma_gamma = 1000; |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
139 int vo_gamma_brightness = 1000; |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
140 int vo_gamma_contrast = 1000; |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
141 int vo_gamma_saturation = 1000; |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
142 int vo_gamma_hue = 1000; |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
143 |
31170 | 144 extern const vd_functions_t *mpvdec; // FIXME! |
5180 | 145 |
27751
d120b2951b37
Move SCREEN_SIZE_X/Y definition to libmpcodecs/vd.c where it is used.
diego
parents:
27385
diff
changeset
|
146 #define SCREEN_SIZE_X 1 |
d120b2951b37
Move SCREEN_SIZE_X/Y definition to libmpcodecs/vd.c where it is used.
diego
parents:
27385
diff
changeset
|
147 #define SCREEN_SIZE_Y 1 |
d120b2951b37
Move SCREEN_SIZE_X/Y definition to libmpcodecs/vd.c where it is used.
diego
parents:
27385
diff
changeset
|
148 |
31170 | 149 int mpcodecs_config_vo(sh_video_t *sh, int w, int h, |
150 unsigned int preferred_outfmt) | |
151 { | |
152 int i, j; | |
153 unsigned int out_fmt = 0; | |
154 int screen_size_x = 0; //SCREEN_SIZE_X; | |
155 int screen_size_y = 0; //SCREEN_SIZE_Y; | |
156 vf_instance_t *vf = sh->vfilter, *sc = NULL; | |
157 int palette = 0; | |
158 int vocfg_flags = 0; | |
5075 | 159 |
31170 | 160 if (w) |
161 sh->disp_w = w; | |
162 if (h) | |
163 sh->disp_h = h; | |
8579
8f6e84a2a431
do not config video out system if input dimensions are invalid (triggered a segfault in vop_expand due to missing dimension checks, which bug was reported by gabucino)
alex
parents:
8295
diff
changeset
|
164 |
31170 | 165 if (!sh->disp_w || !sh->disp_h) |
166 return 0; | |
5365
b87743434e1f
Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents:
5315
diff
changeset
|
167 |
29700
cd5b4ddc9546
Reduce console output verbosity: Move colorspace information to verbose mode.
diego
parents:
29263
diff
changeset
|
168 mp_msg(MSGT_DECVIDEO, MSGL_V, |
31170 | 169 "VDec: vo config request - %d x %d (preferred colorspace: %s)\n", w, |
170 h, vo_format_name(preferred_outfmt)); | |
5075 | 171 |
5925
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
172 // if(!vf) return 1; // temp hack |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
173 |
31170 | 174 if (get_video_quality_max(sh) <= 0 && divx_quality) { |
175 // user wants postprocess but no pp filter yet: | |
176 sh->vfilter = vf = vf_open_filter(vf, "pp", NULL); | |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
177 } |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
178 // check if libvo and codec has common outfmt (no conversion): |
31170 | 179 csp_again: |
9275
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
180 |
31170 | 181 if (mp_msg_test(MSGT_DECVIDEO, MSGL_V)) { |
182 vf_instance_t *f = vf; | |
183 mp_msg(MSGT_DECVIDEO, MSGL_V, "Trying filter chain:"); | |
184 for (f = vf; f; f = f->next) | |
185 mp_msg(MSGT_DECVIDEO, MSGL_V, " %s", f->info->name); | |
186 mp_msg(MSGT_DECVIDEO, MSGL_V, "\n"); | |
9275
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
187 } |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
188 |
31170 | 189 j = -1; |
190 for (i = 0; i < CODECS_MAX_OUTFMT; i++) { | |
191 int flags; | |
192 out_fmt = sh->codec->outfmt[i]; | |
193 if (out_fmt == (unsigned int) 0xFFFFFFFF) | |
194 continue; | |
195 flags = vf->query_format(vf, out_fmt); | |
196 mp_msg(MSGT_CPLAYER, MSGL_DBG2, | |
197 "vo_debug: query(%s) returned 0x%X (i=%d) \n", | |
198 vo_format_name(out_fmt), flags, i); | |
199 if ((flags & VFCAP_CSP_SUPPORTED_BY_HW) | |
200 || (flags & VFCAP_CSP_SUPPORTED && j < 0)) { | |
201 // check (query) if codec really support this outfmt... | |
202 sh->outfmtidx = j; // pass index to the control() function this way | |
203 if (mpvdec->control(sh, VDCTRL_QUERY_FORMAT, &out_fmt) == | |
204 CONTROL_FALSE) { | |
205 mp_msg(MSGT_CPLAYER, MSGL_DBG2, | |
206 "vo_debug: codec query_format(%s) returned FALSE\n", | |
207 vo_format_name(out_fmt)); | |
208 continue; | |
209 } | |
210 j = i; | |
211 vo_flags = flags; | |
212 if (flags & VFCAP_CSP_SUPPORTED_BY_HW) | |
213 break; | |
214 } else if (!palette | |
215 && !(flags & | |
216 (VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_CSP_SUPPORTED)) | |
217 && (out_fmt == IMGFMT_RGB8 || out_fmt == IMGFMT_BGR8)) { | |
218 sh->outfmtidx = j; // pass index to the control() function this way | |
219 if (mpvdec->control(sh, VDCTRL_QUERY_FORMAT, &out_fmt) != | |
220 CONTROL_FALSE) | |
221 palette = 1; | |
222 } | |
5075 | 223 } |
31170 | 224 if (j < 0) { |
225 // TODO: no match - we should use conversion... | |
226 if (strcmp(vf->info->name, "scale") && palette != -1) { | |
227 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_CouldNotFindColorspace); | |
228 sc = vf = vf_open_filter(vf, "scale", NULL); | |
229 goto csp_again; | |
230 } else if (palette == 1) { | |
231 mp_msg(MSGT_DECVIDEO, MSGL_V, "vd: Trying -vf palette...\n"); | |
232 palette = -1; | |
233 vf = vf_open_filter(vf, "palette", NULL); | |
234 goto csp_again; | |
235 } else { // sws failed, if the last filter (vf_vo) support MPEGPES try to append vf_lavc | |
236 vf_instance_t *vo, *vp = NULL, *ve, *vpp = NULL; | |
31198
f9719a497f8e
cosmetics: Remove some commented-out #includes, fix a comment grammar error.
diego
parents:
31170
diff
changeset
|
237 // Remove the scale filter if we added it ourselves |
31170 | 238 if (vf == sc) { |
239 ve = vf; | |
240 vf = vf->next; | |
241 vf_uninit_filter(ve); | |
242 } | |
243 // Find the last filter (vf_vo) | |
244 for (vo = vf; vo->next; vo = vo->next) { | |
245 vpp = vp; | |
246 vp = vo; | |
247 } | |
248 if (vo->query_format(vo, IMGFMT_MPEGPES) | |
249 && (!vp || (vp && strcmp(vp->info->name, "lavc")))) { | |
250 ve = vf_open_filter(vo, "lavc", NULL); | |
251 if (vp) | |
252 vp->next = ve; | |
253 else | |
254 vf = ve; | |
255 goto csp_again; | |
256 } | |
257 if (vp && !strcmp(vp->info->name, "lavc")) { | |
258 if (vpp) | |
259 vpp->next = vo; | |
260 else | |
261 vf = vo; | |
262 vf_uninit_filter(vp); | |
263 } | |
264 } | |
265 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_VOincompCodec); | |
266 sh->vf_initialized = -1; | |
267 return 0; // failed | |
5075 | 268 } |
31170 | 269 out_fmt = sh->codec->outfmt[j]; |
29700
cd5b4ddc9546
Reduce console output verbosity: Move colorspace information to verbose mode.
diego
parents:
29263
diff
changeset
|
270 mp_msg(MSGT_CPLAYER, MSGL_V, "VDec: using %s as output csp (no %d)\n", |
cd5b4ddc9546
Reduce console output verbosity: Move colorspace information to verbose mode.
diego
parents:
29263
diff
changeset
|
271 vo_format_name(out_fmt), j); |
31170 | 272 sh->outfmtidx = j; |
273 sh->vfilter = vf; | |
5075 | 274 |
275 // autodetect flipping | |
31170 | 276 if (flip == -1) { |
277 flip = 0; | |
278 if (sh->codec->outflags[j] & CODECS_FLAG_FLIP) | |
279 if (!(sh->codec->outflags[j] & CODECS_FLAG_NOFLIP)) | |
280 flip = 1; | |
5075 | 281 } |
31170 | 282 if (vo_flags & VFCAP_FLIPPED) |
283 flip ^= 1; | |
284 if (flip && !(vo_flags & VFCAP_FLIP)) { | |
285 // we need to flip, but no flipping filter avail. | |
286 vf_add_before_vo(&vf, "flip", NULL); | |
287 sh->vfilter = vf; | |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
288 } |
5075 | 289 // time to do aspect ratio corrections... |
290 | |
31170 | 291 if (movie_aspect > -1.0) |
292 sh->aspect = movie_aspect; // cmdline overrides autodetect | |
293 else if (sh->stream_aspect != 0.0) | |
294 sh->aspect = sh->stream_aspect; | |
5075 | 295 // if(!sh->aspect) sh->aspect=1.0; |
5903 | 296 |
31170 | 297 if (opt_screen_size_x || opt_screen_size_y) { |
298 screen_size_x = opt_screen_size_x; | |
299 screen_size_y = opt_screen_size_y; | |
300 if (!vidmode) { | |
301 if (!screen_size_x) | |
302 screen_size_x = SCREEN_SIZE_X; | |
303 if (!screen_size_y) | |
304 screen_size_y = SCREEN_SIZE_Y; | |
305 if (screen_size_x <= 8) | |
306 screen_size_x *= sh->disp_w; | |
307 if (screen_size_y <= 8) | |
308 screen_size_y *= sh->disp_h; | |
309 } | |
310 } else { | |
311 // check source format aspect, calculate prescale ::atmos | |
312 screen_size_x = sh->disp_w; | |
313 screen_size_y = sh->disp_h; | |
314 if (screen_size_xy >= 0.001) { | |
315 if (screen_size_xy <= 8) { | |
316 // -xy means x+y scale | |
317 screen_size_x *= screen_size_xy; | |
318 screen_size_y *= screen_size_xy; | |
319 } else { | |
320 // -xy means forced width while keeping correct aspect | |
321 screen_size_x = screen_size_xy; | |
322 screen_size_y = screen_size_xy * sh->disp_h / sh->disp_w; | |
323 } | |
324 } | |
325 if (sh->aspect > 0.01) { | |
326 int w; | |
327 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_MovieAspectIsSet, | |
328 sh->aspect); | |
329 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ASPECT=%1.4f\n", | |
330 sh->aspect); | |
331 w = (int) ((float) screen_size_y * sh->aspect); | |
332 w += w % 2; // round | |
333 // we don't like horizontal downscale || user forced width: | |
334 if (w < screen_size_x || screen_size_xy > 8) { | |
335 screen_size_y = | |
336 (int) ((float) screen_size_x * (1.0 / sh->aspect)); | |
337 screen_size_y += screen_size_y % 2; // round | |
338 } else | |
339 screen_size_x = w; // keep new width | |
340 } else { | |
341 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_MovieAspectUndefined); | |
342 } | |
5903 | 343 } |
5075 | 344 |
31170 | 345 vocfg_flags = (fullscreen ? VOFLAG_FULLSCREEN : 0) |
346 | (vidmode ? VOFLAG_MODESWITCHING : 0) | |
347 | (softzoom ? VOFLAG_SWSCALE : 0) | |
348 | (flip ? VOFLAG_FLIPPING : 0); | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
14878
diff
changeset
|
349 |
5075 | 350 // Time to config libvo! |
31170 | 351 mp_msg(MSGT_CPLAYER, MSGL_V, |
352 "VO Config (%dx%d->%dx%d,flags=%d,'%s',0x%X)\n", sh->disp_w, | |
353 sh->disp_h, screen_size_x, screen_size_y, vocfg_flags, "MPlayer", | |
354 out_fmt); | |
5075 | 355 |
14073 | 356 vf->w = sh->disp_w; |
357 vf->h = sh->disp_h; | |
31170 | 358 if (vf_config_wrapper |
359 (vf, sh->disp_w, sh->disp_h, screen_size_x, screen_size_y, vocfg_flags, | |
360 out_fmt) == 0) { | |
7124
eca7dbad0166
finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents:
6993
diff
changeset
|
361 // "MPlayer",out_fmt)){ |
31170 | 362 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_CannotInitVO); |
363 sh->vf_initialized = -1; | |
364 return 0; | |
5075 | 365 } |
366 | |
31170 | 367 sh->vf_initialized = 1; |
13341
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
368 |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
369 if (vo_gamma_gamma != 1000) |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
370 set_video_colors(sh, "gamma", vo_gamma_gamma); |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
371 if (vo_gamma_brightness != 1000) |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
372 set_video_colors(sh, "brightness", vo_gamma_brightness); |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
373 if (vo_gamma_contrast != 1000) |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
374 set_video_colors(sh, "contrast", vo_gamma_contrast); |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
375 if (vo_gamma_saturation != 1000) |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
376 set_video_colors(sh, "saturation", vo_gamma_saturation); |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
377 if (vo_gamma_hue != 1000) |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
378 set_video_colors(sh, "hue", vo_gamma_hue); |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
12827
diff
changeset
|
379 |
4878 | 380 return 1; |
381 } | |
382 | |
383 // mp_imgtype: buffering type, see mp_image.h | |
384 // mp_imgflag: buffer requirements (read/write, preserve, stride limits), see mp_image.h | |
385 // returns NULL or allocated mp_image_t* | |
386 // Note: buffer allocation may be moved to mpcodecs_config_vo() later... | |
31170 | 387 mp_image_t *mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, |
388 int w, int h) | |
389 { | |
390 mp_image_t *mpi = | |
391 vf_get_image(sh->vfilter, sh->codec->outfmt[sh->outfmtidx], mp_imgtype, | |
392 mp_imgflag, w, h); | |
393 if (mpi) | |
394 mpi->x = mpi->y = 0; | |
395 return mpi; | |
4878 | 396 } |
397 | |
31170 | 398 void mpcodecs_draw_slice(sh_video_t *sh, unsigned char **src, int *stride, |
399 int w, int h, int x, int y) | |
400 { | |
401 struct vf_instance *vf = sh->vfilter; | |
6709 | 402 |
31170 | 403 if (vf->draw_slice) |
404 vf->draw_slice(vf, src, stride, w, h, x, y); | |
6709 | 405 } |