Mercurial > mplayer.hg
annotate libmpcodecs/vd.c @ 12081:e34700c872ac
vf_phase filter by Ville Saari (114263 at foo dot bar dot org)
author | rfelker |
---|---|
date | Mon, 29 Mar 2004 04:39:04 +0000 |
parents | c0c9522eff73 |
children | 4db6ca9c27b5 |
rev | line source |
---|---|
4878 | 1 #include <stdio.h> |
2 #include <stdlib.h> | |
3 #include <string.h> | |
4 | |
10095
51da0282b302
Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
9534
diff
changeset
|
5 #define USE_THEORA |
51da0282b302
Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
9534
diff
changeset
|
6 |
4878 | 7 #include "config.h" |
8 #include "mp_msg.h" | |
5075 | 9 #include "help_mp.h" |
4878 | 10 |
11 #ifdef HAVE_MALLOC_H | |
12 #include <malloc.h> | |
13 #endif | |
14 | |
15 #include "codec-cfg.h" | |
16 //#include "mp_image.h" | |
17 | |
5607 | 18 #include "img_format.h" |
4878 | 19 |
20 #include "stream.h" | |
21 #include "demuxer.h" | |
22 #include "stheader.h" | |
6057
31e465fda59c
various openbsd and general warning fixes - patch by Bj«Órn Sandell <biorn@dce.chalmers.se>
arpi
parents:
5925
diff
changeset
|
23 #include "dec_video.h" |
4878 | 24 |
25 #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
|
26 #include "vf.h" |
d0d029fda134
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
5483
diff
changeset
|
27 |
4878 | 28 //#include "vd_internal.h" |
29 | |
30 extern vd_functions_t mpcodecs_vd_null; | |
4885 | 31 extern vd_functions_t mpcodecs_vd_cinepak; |
4951 | 32 extern vd_functions_t mpcodecs_vd_ffmpeg; |
10095
51da0282b302
Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
9534
diff
changeset
|
33 extern vd_functions_t mpcodecs_vd_theora; |
4958 | 34 extern vd_functions_t mpcodecs_vd_dshow; |
8295 | 35 extern vd_functions_t mpcodecs_vd_dmo; |
4968 | 36 extern vd_functions_t mpcodecs_vd_vfw; |
37 extern vd_functions_t mpcodecs_vd_vfwex; | |
38 extern vd_functions_t mpcodecs_vd_odivx; | |
39 extern vd_functions_t mpcodecs_vd_divx4; | |
4969 | 40 extern vd_functions_t mpcodecs_vd_raw; |
10305
3e40b8f879c8
HM12 & NV12 "decoder" (specially interleaved YUV formats, used by Hauppauge's PVR cards)
arpi
parents:
10095
diff
changeset
|
41 extern vd_functions_t mpcodecs_vd_hmblck; |
4969 | 42 extern vd_functions_t mpcodecs_vd_xanim; |
4987 | 43 extern vd_functions_t mpcodecs_vd_fli; |
4989 | 44 extern vd_functions_t mpcodecs_vd_qtrle; |
45 extern vd_functions_t mpcodecs_vd_roqvideo; | |
46 extern vd_functions_t mpcodecs_vd_cyuv; | |
47 extern vd_functions_t mpcodecs_vd_nuv; | |
4998 | 48 extern vd_functions_t mpcodecs_vd_mpng; |
5029 | 49 extern vd_functions_t mpcodecs_vd_ijpg; |
7362 | 50 extern vd_functions_t mpcodecs_vd_mtga; |
9534
87e03d96a4cd
add support for sgi files to mencoder patch by (Todd Kirby <slapcat at pacbell dot net>)
michael
parents:
9502
diff
changeset
|
51 extern vd_functions_t mpcodecs_vd_sgi; |
4998 | 52 extern vd_functions_t mpcodecs_vd_libmpeg2; |
5476 | 53 extern vd_functions_t mpcodecs_vd_mpegpes; |
11386
229079491864
addition of special image formats for Zoran MJPEG, and vd_zrmjpeg.c
rik
parents:
11261
diff
changeset
|
54 extern vd_functions_t mpcodecs_vd_zrmjpeg; |
7180
28677d779205
-afm/-vfm migration from ID (int) to NAME (string) - simplifies code and makes dlopen()'ing possible
arpi
parents:
7124
diff
changeset
|
55 extern vd_functions_t mpcodecs_vd_realvid; |
6701
522713337297
Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
6506
diff
changeset
|
56 extern vd_functions_t mpcodecs_vd_xvid; |
6927 | 57 extern vd_functions_t mpcodecs_vd_libdv; |
7222
81f720e51821
added LCL decoder by Roberto Togni <r_togni@libero.it>, removed my old vd_zlib
alex
parents:
7220
diff
changeset
|
58 extern vd_functions_t mpcodecs_vd_lcl; |
7729 | 59 extern vd_functions_t mpcodecs_vd_lzo; |
8160 | 60 extern vd_functions_t mpcodecs_vd_qtvideo; |
4878 | 61 |
62 vd_functions_t* mpcodecs_vd_drivers[] = { | |
63 &mpcodecs_vd_null, | |
4884 | 64 &mpcodecs_vd_cinepak, |
4951 | 65 #ifdef USE_LIBAVCODEC |
66 &mpcodecs_vd_ffmpeg, | |
67 #endif | |
10095
51da0282b302
Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
9534
diff
changeset
|
68 #ifdef HAVE_OGGTHEORA |
51da0282b302
Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
9534
diff
changeset
|
69 &mpcodecs_vd_theora, |
51da0282b302
Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
9534
diff
changeset
|
70 #endif |
4968 | 71 #ifdef USE_WIN32DLL |
4958 | 72 #ifdef USE_DIRECTSHOW |
73 &mpcodecs_vd_dshow, | |
8295 | 74 &mpcodecs_vd_dmo, |
4958 | 75 #endif |
4968 | 76 &mpcodecs_vd_vfw, |
77 &mpcodecs_vd_vfwex, | |
78 #endif | |
79 #ifdef USE_DIVX | |
80 &mpcodecs_vd_odivx, | |
81 #ifdef NEW_DECORE | |
82 &mpcodecs_vd_divx4, | |
83 #endif | |
84 #endif | |
7729 | 85 &mpcodecs_vd_lzo, |
4969 | 86 &mpcodecs_vd_raw, |
10305
3e40b8f879c8
HM12 & NV12 "decoder" (specially interleaved YUV formats, used by Hauppauge's PVR cards)
arpi
parents:
10095
diff
changeset
|
87 &mpcodecs_vd_hmblck, |
4987 | 88 &mpcodecs_vd_fli, |
4989 | 89 &mpcodecs_vd_qtrle, |
90 &mpcodecs_vd_roqvideo, | |
91 &mpcodecs_vd_cyuv, | |
92 &mpcodecs_vd_nuv, | |
4969 | 93 #ifdef USE_XANIM |
94 &mpcodecs_vd_xanim, | |
95 #endif | |
4998 | 96 #ifdef HAVE_PNG |
97 &mpcodecs_vd_mpng, | |
98 #endif | |
5029 | 99 #ifdef HAVE_JPEG |
100 &mpcodecs_vd_ijpg, | |
101 #endif | |
7362 | 102 &mpcodecs_vd_mtga, |
9534
87e03d96a4cd
add support for sgi files to mencoder patch by (Todd Kirby <slapcat at pacbell dot net>)
michael
parents:
9502
diff
changeset
|
103 &mpcodecs_vd_sgi, |
8026
b465ba5897a3
usage of libmpeg2, liba52, mp3lib & svq1 can be disabled
arpi
parents:
7978
diff
changeset
|
104 #ifdef USE_LIBMPEG2 |
4998 | 105 &mpcodecs_vd_libmpeg2, |
8026
b465ba5897a3
usage of libmpeg2, liba52, mp3lib & svq1 can be disabled
arpi
parents:
7978
diff
changeset
|
106 #endif |
5476 | 107 &mpcodecs_vd_mpegpes, |
11386
229079491864
addition of special image formats for Zoran MJPEG, and vd_zrmjpeg.c
rik
parents:
11261
diff
changeset
|
108 #ifdef HAVE_ZR |
229079491864
addition of special image formats for Zoran MJPEG, and vd_zrmjpeg.c
rik
parents:
11261
diff
changeset
|
109 &mpcodecs_vd_zrmjpeg, |
229079491864
addition of special image formats for Zoran MJPEG, and vd_zrmjpeg.c
rik
parents:
11261
diff
changeset
|
110 #endif |
6343
d253cf4f43a9
realvideo support by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
6234
diff
changeset
|
111 #ifdef USE_REALCODECS |
7180
28677d779205
-afm/-vfm migration from ID (int) to NAME (string) - simplifies code and makes dlopen()'ing possible
arpi
parents:
7124
diff
changeset
|
112 &mpcodecs_vd_realvid, |
6343
d253cf4f43a9
realvideo support by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
6234
diff
changeset
|
113 #endif |
11436 | 114 #if defined(HAVE_XVID3) || defined(HAVE_XVID4) |
6701
522713337297
Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
6506
diff
changeset
|
115 &mpcodecs_vd_xvid, |
522713337297
Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
6506
diff
changeset
|
116 #endif |
6927 | 117 #ifdef HAVE_LIBDV095 |
7222
81f720e51821
added LCL decoder by Roberto Togni <r_togni@libero.it>, removed my old vd_zlib
alex
parents:
7220
diff
changeset
|
118 &mpcodecs_vd_libdv, |
6927 | 119 #endif |
7222
81f720e51821
added LCL decoder by Roberto Togni <r_togni@libero.it>, removed my old vd_zlib
alex
parents:
7220
diff
changeset
|
120 &mpcodecs_vd_lcl, |
9502
241bba8f60e8
MACOSX support patch, based on Dan Christiansens work
alex
parents:
9275
diff
changeset
|
121 #if defined(USE_QTX_CODECS) || defined(MACOSX) |
8160 | 122 &mpcodecs_vd_qtvideo, |
123 #endif | |
4878 | 124 NULL |
125 }; | |
126 | |
4971 | 127 #include "libvo/video_out.h" |
128 | |
5075 | 129 // libvo opts: |
130 int fullscreen=0; | |
131 int vidmode=0; | |
132 int softzoom=0; | |
133 int flip=-1; | |
134 int opt_screen_size_x=0; | |
135 int opt_screen_size_y=0; | |
7452
b062be2c1423
This patch allows you to use fractional values for specifying a zoom.
arpi
parents:
7362
diff
changeset
|
136 float screen_size_xy=0; |
5075 | 137 float movie_aspect=-1.0; |
138 int vo_flags=0; | |
5483 | 139 int vd_use_slices=1; |
5075 | 140 |
5180 | 141 extern vd_functions_t* mpvdec; // FIXME! |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
142 extern int divx_quality; |
5180 | 143 |
4878 | 144 int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int preferred_outfmt){ |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
145 int i,j; |
5075 | 146 unsigned int out_fmt=0; |
147 int screen_size_x=0;//SCREEN_SIZE_X; | |
148 int screen_size_y=0;//SCREEN_SIZE_Y; | |
5507
d0d029fda134
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
5483
diff
changeset
|
149 // vo_functions_t* video_out=sh->video_out; |
7978
ab15849ec648
10L ! Don't remove the scale filter if we don't added ourself
albeu
parents:
7971
diff
changeset
|
150 vf_instance_t* vf=sh->vfilter,*sc=NULL; |
9275
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
151 int palette=0; |
5075 | 152 |
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
|
153 if(!sh->disp_w || !sh->disp_h) |
6993 | 154 mp_msg(MSGT_DECVIDEO,MSGL_WARN, MSGTR_CodecDidNotSet); |
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
|
155 /* XXX: HACK, if sh->disp_* aren't set, |
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
|
156 * but we have w and h, set them :: atmos */ |
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
|
157 if(!sh->disp_w && w) |
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
|
158 sh->disp_w=w; |
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
|
159 if(!sh->disp_h && h) |
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
|
160 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
|
161 |
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
|
162 if(!sh->disp_w || !sh->disp_h) |
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
|
163 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
|
164 |
6993 | 165 mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_VoConfigRequest,w,h,vo_format_name(preferred_outfmt)); |
5075 | 166 |
5925
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
167 // if(!vf) return 1; // temp hack |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
168 |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
169 if(get_video_quality_max(sh)<=0 && divx_quality){ |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
170 // user wants postprocess but no pp filter yet: |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
171 sh->vfilter=vf=vf_open_filter(vf,"pp",NULL); |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
172 } |
5077 | 173 |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
174 // check if libvo and codec has common outfmt (no conversion): |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
175 csp_again: |
9275
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
176 |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
177 if(verbose>0){ |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
178 vf_instance_t* f=vf; |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
179 mp_msg(MSGT_DECVIDEO,MSGL_V,"Trying filter chain:"); |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
180 for(f = vf ; f ; f = f->next) |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
181 mp_msg(MSGT_DECVIDEO,MSGL_V," %s",f->info->name); |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
182 mp_msg(MSGT_DECVIDEO,MSGL_V,"\n"); |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
183 } |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
184 |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
185 j=-1; |
5075 | 186 for(i=0;i<CODECS_MAX_OUTFMT;i++){ |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
187 int flags; |
5075 | 188 out_fmt=sh->codec->outfmt[i]; |
9275
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
189 if(out_fmt==(unsigned int)0xFFFFFFFF) continue; |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
190 flags=vf->query_format(vf,out_fmt); |
7211 | 191 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: query(%s) returned 0x%X (i=%d) \n",vo_format_name(out_fmt),flags,i); |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
192 if((flags&2) || (flags && j<0)){ |
5180 | 193 // check (query) if codec really support this outfmt... |
7261
ec187e86b20b
pass outflags[] index via sh->outfmtidx to the vd->control() func (for VfW)
arpi
parents:
7222
diff
changeset
|
194 sh->outfmtidx=j; // pass index to the control() function this way |
7918 | 195 if(mpvdec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)==CONTROL_FALSE){ |
196 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: codec query_format(%s) returned FALSE\n",vo_format_name(out_fmt)); | |
5180 | 197 continue; |
7918 | 198 } |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
199 j=i; vo_flags=flags; if(flags&2) break; |
9275
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
200 } else |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
201 if(!palette && !(flags&3) && (out_fmt==IMGFMT_RGB8||out_fmt==IMGFMT_BGR8)){ |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
202 sh->outfmtidx=j; // pass index to the control() function this way |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
203 if(mpvdec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)!=CONTROL_FALSE) |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
204 palette=1; |
5180 | 205 } |
5075 | 206 } |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
207 if(j<0){ |
5075 | 208 // TODO: no match - we should use conversion... |
9275
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
209 if(strcmp(vf->info->name,"scale") && palette!=-1){ |
6993 | 210 mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_CouldNotFindColorspace); |
7978
ab15849ec648
10L ! Don't remove the scale filter if we don't added ourself
albeu
parents:
7971
diff
changeset
|
211 sc=vf=vf_open_filter(vf,"scale",NULL); |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
212 goto csp_again; |
9275
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
213 } else |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
214 if(palette==1){ |
11261 | 215 mp_msg(MSGT_DECVIDEO,MSGL_V,"vd: Trying -vf palette...\n"); |
9275
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
216 palette=-1; |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
217 vf=vf_open_filter(vf,"palette",NULL); |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
218 goto csp_again; |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
219 } else |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
220 { // sws failed, if the last filter (vf_vo) support MPEGPES try to append vf_lavc |
7971 | 221 vf_instance_t* vo, *vp = NULL, *ve; |
7978
ab15849ec648
10L ! Don't remove the scale filter if we don't added ourself
albeu
parents:
7971
diff
changeset
|
222 // Remove the scale filter if we added it ourself |
ab15849ec648
10L ! Don't remove the scale filter if we don't added ourself
albeu
parents:
7971
diff
changeset
|
223 if(vf == sc) { |
7971 | 224 ve = vf; |
225 vf = vf->next; | |
226 vf_uninit_filter(ve); | |
227 } | |
228 // Find the last filter (vf_vo) | |
229 for(vo = vf ; vo->next ; vo = vo->next) | |
230 vp = vo; | |
231 if(vo->query_format(vo,IMGFMT_MPEGPES) && (!vp || (vp && strcmp(vp->info->name,"lavc")))) { | |
232 ve = vf_open_filter(vo,"lavc",NULL); | |
233 if(vp) vp->next = ve; | |
234 else vf = ve; | |
235 goto csp_again; | |
236 } | |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
237 } |
5925
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
238 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_VOincompCodec); |
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
239 sh->vf_inited=-1; |
5075 | 240 return 0; // failed |
241 } | |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
242 out_fmt=sh->codec->outfmt[j]; |
7211 | 243 mp_msg(MSGT_CPLAYER,MSGL_INFO,"VDec: using %s as output csp (no %d)\n",vo_format_name(out_fmt),j); |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
244 sh->outfmtidx=j; |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
245 sh->vfilter=vf; |
5075 | 246 |
247 // autodetect flipping | |
248 if(flip==-1){ | |
249 flip=0; | |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
250 if(sh->codec->outflags[j]&CODECS_FLAG_FLIP) |
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
251 if(!(sh->codec->outflags[j]&CODECS_FLAG_NOFLIP)) |
5075 | 252 flip=1; |
253 } | |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
254 if(vo_flags&VFCAP_FLIPPED) flip^=1; |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
255 if(flip && !(vo_flags&VFCAP_FLIP)){ |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
256 // we need to flip, but no flipping filter avail. |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
257 sh->vfilter=vf=vf_open_filter(vf,"flip",NULL); |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
258 } |
5075 | 259 |
260 // time to do aspect ratio corrections... | |
261 | |
262 if(movie_aspect>-1.0) sh->aspect = movie_aspect; // cmdline overrides autodetect | |
263 // if(!sh->aspect) sh->aspect=1.0; | |
5903 | 264 |
265 if(opt_screen_size_x||opt_screen_size_y){ | |
266 screen_size_x = opt_screen_size_x; | |
267 screen_size_y = opt_screen_size_y; | |
268 if(!vidmode){ | |
5075 | 269 if(!screen_size_x) screen_size_x=SCREEN_SIZE_X; |
270 if(!screen_size_y) screen_size_y=SCREEN_SIZE_Y; | |
271 if(screen_size_x<=8) screen_size_x*=sh->disp_w; | |
272 if(screen_size_y<=8) screen_size_y*=sh->disp_h; | |
5903 | 273 } |
5075 | 274 } else { |
275 // check source format aspect, calculate prescale ::atmos | |
276 screen_size_x=sh->disp_w; | |
277 screen_size_y=sh->disp_h; | |
7661
90118ab3c95c
argh. gcc sux. someone please explain why float x=0; if(x>0) ... is true.
arpi
parents:
7452
diff
changeset
|
278 if(screen_size_xy>=0.001){ |
5903 | 279 if(screen_size_xy<=8){ |
280 // -xy means x+y scale | |
281 screen_size_x*=screen_size_xy; | |
282 screen_size_y*=screen_size_xy; | |
283 } else { | |
284 // -xy means forced width while keeping correct aspect | |
285 screen_size_x=screen_size_xy; | |
286 screen_size_y=screen_size_xy*sh->disp_h/sh->disp_w; | |
287 } | |
288 } | |
5075 | 289 if(sh->aspect>0.01){ |
5903 | 290 int w; |
6993 | 291 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MovieAspectIsSet,sh->aspect); |
5903 | 292 w=(int)((float)screen_size_y*sh->aspect); w+=w%2; // round |
293 // we don't like horizontal downscale || user forced width: | |
294 if(w<screen_size_x || screen_size_xy>8){ | |
295 screen_size_y=(int)((float)screen_size_x*(1.0/sh->aspect)); | |
5075 | 296 screen_size_y+=screen_size_y%2; // round |
5903 | 297 } else screen_size_x=w; // keep new width |
5075 | 298 } else { |
6993 | 299 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MovieAspectUndefined); |
5075 | 300 } |
301 } | |
302 | |
303 // Time to config libvo! | |
7124
eca7dbad0166
finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents:
6993
diff
changeset
|
304 mp_msg(MSGT_CPLAYER,MSGL_V,"VO Config (%dx%d->%dx%d,flags=%d,'%s',0x%X)\n", |
5075 | 305 sh->disp_w,sh->disp_h, |
306 screen_size_x,screen_size_y, | |
307 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3), | |
308 "MPlayer",out_fmt); | |
309 | |
5507
d0d029fda134
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
5483
diff
changeset
|
310 if(vf->config(vf,sh->disp_w,sh->disp_h, |
5075 | 311 screen_size_x,screen_size_y, |
312 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3), | |
5507
d0d029fda134
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
5483
diff
changeset
|
313 out_fmt)==0){ |
7124
eca7dbad0166
finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents:
6993
diff
changeset
|
314 // "MPlayer",out_fmt)){ |
5925
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
315 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_CannotInitVO); |
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
316 sh->vf_inited=-1; |
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
317 return 0; |
5075 | 318 } |
319 | |
5925
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
320 sh->vf_inited=1; |
4878 | 321 return 1; |
322 } | |
323 | |
324 // mp_imgtype: buffering type, see mp_image.h | |
325 // mp_imgflag: buffer requirements (read/write, preserve, stride limits), see mp_image.h | |
326 // returns NULL or allocated mp_image_t* | |
327 // Note: buffer allocation may be moved to mpcodecs_config_vo() later... | |
328 mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h){ | |
6234
af0b011c9440
setting mpi's w/h to disp_w/h. it fixes mpeg1 crash when height%16!=0
arpi
parents:
6138
diff
changeset
|
329 mp_image_t* mpi=vf_get_image(sh->vfilter,sh->codec->outfmt[sh->outfmtidx],mp_imgtype,mp_imgflag,w,h); |
af0b011c9440
setting mpi's w/h to disp_w/h. it fixes mpeg1 crash when height%16!=0
arpi
parents:
6138
diff
changeset
|
330 mpi->x=mpi->y=0; |
af0b011c9440
setting mpi's w/h to disp_w/h. it fixes mpeg1 crash when height%16!=0
arpi
parents:
6138
diff
changeset
|
331 mpi->w=sh->disp_w; |
af0b011c9440
setting mpi's w/h to disp_w/h. it fixes mpeg1 crash when height%16!=0
arpi
parents:
6138
diff
changeset
|
332 mpi->h=sh->disp_h; |
af0b011c9440
setting mpi's w/h to disp_w/h. it fixes mpeg1 crash when height%16!=0
arpi
parents:
6138
diff
changeset
|
333 return mpi; |
4878 | 334 } |
335 | |
7220
e3ecccc7e505
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
arpi
parents:
7211
diff
changeset
|
336 void mpcodecs_draw_slice(sh_video_t *sh, unsigned char** src, int* stride, int w,int h, int x, int y) { |
6709 | 337 struct vf_instance_s* vf = sh->vfilter; |
338 | |
339 if(vf->draw_slice) | |
340 vf->draw_slice(vf,src,stride,w,h,x,y); | |
341 } |