Mercurial > mplayer.hg
annotate libmpcodecs/vd.c @ 10788:c11c87536da4
some updates
author | alex |
---|---|
date | Mon, 01 Sep 2003 19:11:44 +0000 |
parents | 03b410c39759 |
children | 835822ce4bb1 |
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; |
4915
f6990fad0ab3
Qt RPZA decoder interface by Roberto Togni <rtogni@bresciaonline.it>
arpi
parents:
4899
diff
changeset
|
32 extern vd_functions_t mpcodecs_vd_qtrpza; |
4951 | 33 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
|
34 extern vd_functions_t mpcodecs_vd_theora; |
4958 | 35 extern vd_functions_t mpcodecs_vd_dshow; |
8295 | 36 extern vd_functions_t mpcodecs_vd_dmo; |
4968 | 37 extern vd_functions_t mpcodecs_vd_vfw; |
38 extern vd_functions_t mpcodecs_vd_vfwex; | |
39 extern vd_functions_t mpcodecs_vd_odivx; | |
40 extern vd_functions_t mpcodecs_vd_divx4; | |
4969 | 41 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
|
42 extern vd_functions_t mpcodecs_vd_hmblck; |
4969 | 43 extern vd_functions_t mpcodecs_vd_xanim; |
5193
abea2deab4d6
MPlayer now has a Microsoft RLE decoder to call its own...only supports
melanson
parents:
5180
diff
changeset
|
44 extern vd_functions_t mpcodecs_vd_msrle; |
4987 | 45 extern vd_functions_t mpcodecs_vd_msvidc; |
46 extern vd_functions_t mpcodecs_vd_fli; | |
4989 | 47 extern vd_functions_t mpcodecs_vd_qtrle; |
48 extern vd_functions_t mpcodecs_vd_qtsmc; | |
49 extern vd_functions_t mpcodecs_vd_roqvideo; | |
50 extern vd_functions_t mpcodecs_vd_cyuv; | |
51 extern vd_functions_t mpcodecs_vd_nuv; | |
4998 | 52 extern vd_functions_t mpcodecs_vd_mpng; |
5029 | 53 extern vd_functions_t mpcodecs_vd_ijpg; |
7362 | 54 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
|
55 extern vd_functions_t mpcodecs_vd_sgi; |
4998 | 56 extern vd_functions_t mpcodecs_vd_libmpeg2; |
5476 | 57 extern vd_functions_t mpcodecs_vd_mpegpes; |
7180
28677d779205
-afm/-vfm migration from ID (int) to NAME (string) - simplifies code and makes dlopen()'ing possible
arpi
parents:
7124
diff
changeset
|
58 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
|
59 extern vd_functions_t mpcodecs_vd_xvid; |
6927 | 60 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
|
61 extern vd_functions_t mpcodecs_vd_lcl; |
7729 | 62 extern vd_functions_t mpcodecs_vd_lzo; |
8160 | 63 extern vd_functions_t mpcodecs_vd_qtvideo; |
10712 | 64 extern vd_functions_t mpcodecs_vd_qt8bps; |
4878 | 65 |
66 vd_functions_t* mpcodecs_vd_drivers[] = { | |
67 &mpcodecs_vd_null, | |
4884 | 68 &mpcodecs_vd_cinepak, |
4915
f6990fad0ab3
Qt RPZA decoder interface by Roberto Togni <rtogni@bresciaonline.it>
arpi
parents:
4899
diff
changeset
|
69 &mpcodecs_vd_qtrpza, |
4951 | 70 #ifdef USE_LIBAVCODEC |
71 &mpcodecs_vd_ffmpeg, | |
72 #endif | |
10095
51da0282b302
Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
9534
diff
changeset
|
73 #ifdef HAVE_OGGTHEORA |
51da0282b302
Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
9534
diff
changeset
|
74 &mpcodecs_vd_theora, |
51da0282b302
Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
9534
diff
changeset
|
75 #endif |
4968 | 76 #ifdef USE_WIN32DLL |
4958 | 77 #ifdef USE_DIRECTSHOW |
78 &mpcodecs_vd_dshow, | |
8295 | 79 &mpcodecs_vd_dmo, |
4958 | 80 #endif |
4968 | 81 &mpcodecs_vd_vfw, |
82 &mpcodecs_vd_vfwex, | |
83 #endif | |
84 #ifdef USE_DIVX | |
85 &mpcodecs_vd_odivx, | |
86 #ifdef NEW_DECORE | |
87 &mpcodecs_vd_divx4, | |
88 #endif | |
89 #endif | |
7729 | 90 &mpcodecs_vd_lzo, |
4969 | 91 &mpcodecs_vd_raw, |
10305
3e40b8f879c8
HM12 & NV12 "decoder" (specially interleaved YUV formats, used by Hauppauge's PVR cards)
arpi
parents:
10095
diff
changeset
|
92 &mpcodecs_vd_hmblck, |
5193
abea2deab4d6
MPlayer now has a Microsoft RLE decoder to call its own...only supports
melanson
parents:
5180
diff
changeset
|
93 &mpcodecs_vd_msrle, |
4987 | 94 &mpcodecs_vd_msvidc, |
95 &mpcodecs_vd_fli, | |
4989 | 96 &mpcodecs_vd_qtrle, |
97 &mpcodecs_vd_qtsmc, | |
98 &mpcodecs_vd_roqvideo, | |
99 &mpcodecs_vd_cyuv, | |
100 &mpcodecs_vd_nuv, | |
4969 | 101 #ifdef USE_XANIM |
102 &mpcodecs_vd_xanim, | |
103 #endif | |
4998 | 104 #ifdef HAVE_PNG |
105 &mpcodecs_vd_mpng, | |
106 #endif | |
5029 | 107 #ifdef HAVE_JPEG |
108 &mpcodecs_vd_ijpg, | |
109 #endif | |
7362 | 110 &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
|
111 &mpcodecs_vd_sgi, |
8026
b465ba5897a3
usage of libmpeg2, liba52, mp3lib & svq1 can be disabled
arpi
parents:
7978
diff
changeset
|
112 #ifdef USE_LIBMPEG2 |
4998 | 113 &mpcodecs_vd_libmpeg2, |
8026
b465ba5897a3
usage of libmpeg2, liba52, mp3lib & svq1 can be disabled
arpi
parents:
7978
diff
changeset
|
114 #endif |
5476 | 115 &mpcodecs_vd_mpegpes, |
6343
d253cf4f43a9
realvideo support by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
6234
diff
changeset
|
116 #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
|
117 &mpcodecs_vd_realvid, |
6343
d253cf4f43a9
realvideo support by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
6234
diff
changeset
|
118 #endif |
6701
522713337297
Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
6506
diff
changeset
|
119 #ifdef HAVE_XVID |
522713337297
Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
6506
diff
changeset
|
120 &mpcodecs_vd_xvid, |
522713337297
Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
6506
diff
changeset
|
121 #endif |
6927 | 122 #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
|
123 &mpcodecs_vd_libdv, |
6927 | 124 #endif |
7222
81f720e51821
added LCL decoder by Roberto Togni <r_togni@libero.it>, removed my old vd_zlib
alex
parents:
7220
diff
changeset
|
125 &mpcodecs_vd_lcl, |
9502
241bba8f60e8
MACOSX support patch, based on Dan Christiansens work
alex
parents:
9275
diff
changeset
|
126 #if defined(USE_QTX_CODECS) || defined(MACOSX) |
8160 | 127 &mpcodecs_vd_qtvideo, |
128 #endif | |
10712 | 129 &mpcodecs_vd_qt8bps, |
4878 | 130 NULL |
131 }; | |
132 | |
4971 | 133 #include "libvo/video_out.h" |
134 | |
5075 | 135 // libvo opts: |
136 int fullscreen=0; | |
137 int vidmode=0; | |
138 int softzoom=0; | |
139 int flip=-1; | |
140 int opt_screen_size_x=0; | |
141 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
|
142 float screen_size_xy=0; |
5075 | 143 float movie_aspect=-1.0; |
144 int vo_flags=0; | |
5483 | 145 int vd_use_slices=1; |
5075 | 146 |
5180 | 147 extern vd_functions_t* mpvdec; // FIXME! |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
148 extern int divx_quality; |
5180 | 149 |
4878 | 150 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
|
151 int i,j; |
5075 | 152 unsigned int out_fmt=0; |
153 int screen_size_x=0;//SCREEN_SIZE_X; | |
154 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
|
155 // 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
|
156 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
|
157 int palette=0; |
5075 | 158 |
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
|
159 if(!sh->disp_w || !sh->disp_h) |
6993 | 160 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
|
161 /* 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
|
162 * 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
|
163 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
|
164 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
|
165 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
|
166 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
|
167 |
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
|
168 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
|
169 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
|
170 |
6993 | 171 mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_VoConfigRequest,w,h,vo_format_name(preferred_outfmt)); |
5075 | 172 |
5925
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
173 // if(!vf) return 1; // temp hack |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
174 |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
175 if(get_video_quality_max(sh)<=0 && divx_quality){ |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
176 // user wants postprocess but no pp filter yet: |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
177 sh->vfilter=vf=vf_open_filter(vf,"pp",NULL); |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
178 } |
5077 | 179 |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
180 // 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
|
181 csp_again: |
9275
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
182 |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
183 if(verbose>0){ |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
184 vf_instance_t* f=vf; |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
185 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
|
186 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
|
187 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
|
188 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
|
189 } |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
190 |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
191 j=-1; |
5075 | 192 for(i=0;i<CODECS_MAX_OUTFMT;i++){ |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
193 int flags; |
5075 | 194 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
|
195 if(out_fmt==(unsigned int)0xFFFFFFFF) continue; |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
196 flags=vf->query_format(vf,out_fmt); |
7211 | 197 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
|
198 if((flags&2) || (flags && j<0)){ |
5180 | 199 // 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
|
200 sh->outfmtidx=j; // pass index to the control() function this way |
7918 | 201 if(mpvdec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)==CONTROL_FALSE){ |
202 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: codec query_format(%s) returned FALSE\n",vo_format_name(out_fmt)); | |
5180 | 203 continue; |
7918 | 204 } |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
205 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
|
206 } else |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
207 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
|
208 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
|
209 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
|
210 palette=1; |
5180 | 211 } |
5075 | 212 } |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
213 if(j<0){ |
5075 | 214 // 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
|
215 if(strcmp(vf->info->name,"scale") && palette!=-1){ |
6993 | 216 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
|
217 sc=vf=vf_open_filter(vf,"scale",NULL); |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
218 goto csp_again; |
9275
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 if(palette==1){ |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
221 mp_msg(MSGT_DECVIDEO,MSGL_V,"vd: Trying -vop palette...\n"); |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
222 palette=-1; |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
223 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
|
224 goto csp_again; |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
225 } else |
d29f03d5763c
- append the 'palette' filter if the codec supports RGB8/BGR8 and no csp
arpi
parents:
8579
diff
changeset
|
226 { // sws failed, if the last filter (vf_vo) support MPEGPES try to append vf_lavc |
7971 | 227 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
|
228 // 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
|
229 if(vf == sc) { |
7971 | 230 ve = vf; |
231 vf = vf->next; | |
232 vf_uninit_filter(ve); | |
233 } | |
234 // Find the last filter (vf_vo) | |
235 for(vo = vf ; vo->next ; vo = vo->next) | |
236 vp = vo; | |
237 if(vo->query_format(vo,IMGFMT_MPEGPES) && (!vp || (vp && strcmp(vp->info->name,"lavc")))) { | |
238 ve = vf_open_filter(vo,"lavc",NULL); | |
239 if(vp) vp->next = ve; | |
240 else vf = ve; | |
241 goto csp_again; | |
242 } | |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
243 } |
5925
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
244 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
|
245 sh->vf_inited=-1; |
5075 | 246 return 0; // failed |
247 } | |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
248 out_fmt=sh->codec->outfmt[j]; |
7211 | 249 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
|
250 sh->outfmtidx=j; |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
251 sh->vfilter=vf; |
5075 | 252 |
253 // autodetect flipping | |
254 if(flip==-1){ | |
255 flip=0; | |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
256 if(sh->codec->outflags[j]&CODECS_FLAG_FLIP) |
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
257 if(!(sh->codec->outflags[j]&CODECS_FLAG_NOFLIP)) |
5075 | 258 flip=1; |
259 } | |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
260 if(vo_flags&VFCAP_FLIPPED) flip^=1; |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
261 if(flip && !(vo_flags&VFCAP_FLIP)){ |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
262 // we need to flip, but no flipping filter avail. |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
263 sh->vfilter=vf=vf_open_filter(vf,"flip",NULL); |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
264 } |
5075 | 265 |
266 // time to do aspect ratio corrections... | |
267 | |
268 if(movie_aspect>-1.0) sh->aspect = movie_aspect; // cmdline overrides autodetect | |
269 // if(!sh->aspect) sh->aspect=1.0; | |
5903 | 270 |
271 if(opt_screen_size_x||opt_screen_size_y){ | |
272 screen_size_x = opt_screen_size_x; | |
273 screen_size_y = opt_screen_size_y; | |
274 if(!vidmode){ | |
5075 | 275 if(!screen_size_x) screen_size_x=SCREEN_SIZE_X; |
276 if(!screen_size_y) screen_size_y=SCREEN_SIZE_Y; | |
277 if(screen_size_x<=8) screen_size_x*=sh->disp_w; | |
278 if(screen_size_y<=8) screen_size_y*=sh->disp_h; | |
5903 | 279 } |
5075 | 280 } else { |
281 // check source format aspect, calculate prescale ::atmos | |
282 screen_size_x=sh->disp_w; | |
283 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
|
284 if(screen_size_xy>=0.001){ |
5903 | 285 if(screen_size_xy<=8){ |
286 // -xy means x+y scale | |
287 screen_size_x*=screen_size_xy; | |
288 screen_size_y*=screen_size_xy; | |
289 } else { | |
290 // -xy means forced width while keeping correct aspect | |
291 screen_size_x=screen_size_xy; | |
292 screen_size_y=screen_size_xy*sh->disp_h/sh->disp_w; | |
293 } | |
294 } | |
5075 | 295 if(sh->aspect>0.01){ |
5903 | 296 int w; |
6993 | 297 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MovieAspectIsSet,sh->aspect); |
5903 | 298 w=(int)((float)screen_size_y*sh->aspect); w+=w%2; // round |
299 // we don't like horizontal downscale || user forced width: | |
300 if(w<screen_size_x || screen_size_xy>8){ | |
301 screen_size_y=(int)((float)screen_size_x*(1.0/sh->aspect)); | |
5075 | 302 screen_size_y+=screen_size_y%2; // round |
5903 | 303 } else screen_size_x=w; // keep new width |
5075 | 304 } else { |
6993 | 305 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MovieAspectUndefined); |
5075 | 306 } |
307 } | |
308 | |
309 // 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
|
310 mp_msg(MSGT_CPLAYER,MSGL_V,"VO Config (%dx%d->%dx%d,flags=%d,'%s',0x%X)\n", |
5075 | 311 sh->disp_w,sh->disp_h, |
312 screen_size_x,screen_size_y, | |
313 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3), | |
314 "MPlayer",out_fmt); | |
315 | |
5507
d0d029fda134
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
5483
diff
changeset
|
316 if(vf->config(vf,sh->disp_w,sh->disp_h, |
5075 | 317 screen_size_x,screen_size_y, |
318 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
|
319 out_fmt)==0){ |
7124
eca7dbad0166
finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents:
6993
diff
changeset
|
320 // "MPlayer",out_fmt)){ |
5925
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
321 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
|
322 sh->vf_inited=-1; |
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
323 return 0; |
5075 | 324 } |
325 | |
5925
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
326 sh->vf_inited=1; |
4878 | 327 return 1; |
328 } | |
329 | |
330 // mp_imgtype: buffering type, see mp_image.h | |
331 // mp_imgflag: buffer requirements (read/write, preserve, stride limits), see mp_image.h | |
332 // returns NULL or allocated mp_image_t* | |
333 // Note: buffer allocation may be moved to mpcodecs_config_vo() later... | |
334 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
|
335 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
|
336 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
|
337 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
|
338 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
|
339 return mpi; |
4878 | 340 } |
341 | |
7220
e3ecccc7e505
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
arpi
parents:
7211
diff
changeset
|
342 void mpcodecs_draw_slice(sh_video_t *sh, unsigned char** src, int* stride, int w,int h, int x, int y) { |
6709 | 343 struct vf_instance_s* vf = sh->vfilter; |
344 | |
345 if(vf->draw_slice) | |
346 vf->draw_slice(vf,src,stride,w,h,x,y); | |
347 } |