annotate libmpcodecs/vf_scale.c @ 10902:3641db21faab

fix black screen on linux, patch by Jindrich Makovicka
author faust3
date Sun, 21 Sep 2003 10:36:03 +0000
parents 7f34ec540e0f
children f33f908ae085
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
1 #include <stdio.h>
545c13161589 swscale filter
arpi
parents:
diff changeset
2 #include <stdlib.h>
545c13161589 swscale filter
arpi
parents:
diff changeset
3 #include <string.h>
545c13161589 swscale filter
arpi
parents:
diff changeset
4 #include <inttypes.h>
545c13161589 swscale filter
arpi
parents:
diff changeset
5
545c13161589 swscale filter
arpi
parents:
diff changeset
6 #include "../config.h"
545c13161589 swscale filter
arpi
parents:
diff changeset
7 #include "../mp_msg.h"
9975
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
8 #include "../cpudetect.h"
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
9
5607
1972c3475d93 mp_image.h and img_format.h moved to libmpcodecs
arpi
parents: 5565
diff changeset
10 #include "img_format.h"
1972c3475d93 mp_image.h and img_format.h moved to libmpcodecs
arpi
parents: 5565
diff changeset
11 #include "mp_image.h"
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
12 #include "vf.h"
545c13161589 swscale filter
arpi
parents:
diff changeset
13
545c13161589 swscale filter
arpi
parents:
diff changeset
14 #include "../libvo/fastmemcpy.h"
545c13161589 swscale filter
arpi
parents:
diff changeset
15 #include "../postproc/swscale.h"
10233
35f52ad860a0 vf_scale.h & related cleanup & some small warning fix by dominik
michael
parents: 10140
diff changeset
16 #include "vf_scale.h"
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
17
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
18 #include "m_option.h"
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
19 #include "m_struct.h"
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
20
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
21 static struct vf_priv_s {
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
22 int w,h;
6542
7af3fcd76d2d support dropping some chroma src lines for a bit extra speed
michael
parents: 6536
diff changeset
23 int v_chr_drop;
6637
f47f12ba3b88 more scaling algos
michael
parents: 6542
diff changeset
24 int param;
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
25 unsigned int fmt;
9494
543ab3909b78 sws_ prefix, more seperation between internal & external swscaler API
michael
parents: 9491
diff changeset
26 struct SwsContext *ctx;
7783
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
27 unsigned char* palette;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
28 } vf_priv_dflt = {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
29 -1,-1,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
30 0,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
31 0,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
32 0,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
33 NULL,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
34 NULL
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
35 };
545c13161589 swscale filter
arpi
parents:
diff changeset
36
6060
61f39b98ba4d keep aspect ratio - based on Fredrik Kuivinen's idea
arpi
parents: 6003
diff changeset
37 extern int opt_screen_size_x;
61f39b98ba4d keep aspect ratio - based on Fredrik Kuivinen's idea
arpi
parents: 6003
diff changeset
38 extern int opt_screen_size_y;
61f39b98ba4d keep aspect ratio - based on Fredrik Kuivinen's idea
arpi
parents: 6003
diff changeset
39
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
40 //===========================================================================//
545c13161589 swscale filter
arpi
parents:
diff changeset
41
9985
3d8b145a5470 moving getFilter stuff back (vf_scale.c -> swscale.c)
michael
parents: 9975
diff changeset
42 void sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, SwsFilter **dstFilterParam);
3d8b145a5470 moving getFilter stuff back (vf_scale.c -> swscale.c)
michael
parents: 9975
diff changeset
43
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
44 static unsigned int outfmt_list[]={
7403
7d6d73150c6c out formats reordered, quality order
arpi
parents: 7368
diff changeset
45 // RGB:
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
46 IMGFMT_BGR32,
7403
7d6d73150c6c out formats reordered, quality order
arpi
parents: 7368
diff changeset
47 IMGFMT_RGB32,
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
48 IMGFMT_BGR24,
7403
7d6d73150c6c out formats reordered, quality order
arpi
parents: 7368
diff changeset
49 IMGFMT_RGB24,
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
50 IMGFMT_BGR16,
7403
7d6d73150c6c out formats reordered, quality order
arpi
parents: 7368
diff changeset
51 IMGFMT_RGB16,
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
52 IMGFMT_BGR15,
7403
7d6d73150c6c out formats reordered, quality order
arpi
parents: 7368
diff changeset
53 IMGFMT_RGB15,
6637
f47f12ba3b88 more scaling algos
michael
parents: 6542
diff changeset
54 IMGFMT_BGR8,
7403
7d6d73150c6c out formats reordered, quality order
arpi
parents: 7368
diff changeset
55 IMGFMT_RGB8,
6637
f47f12ba3b88 more scaling algos
michael
parents: 6542
diff changeset
56 IMGFMT_BGR4,
7403
7d6d73150c6c out formats reordered, quality order
arpi
parents: 7368
diff changeset
57 IMGFMT_RGB4,
9171
898e5270a46e fixing rgb4 & bgr4 (2 pixels per byte)
michael
parents: 9071
diff changeset
58 IMGFMT_BG4B,
898e5270a46e fixing rgb4 & bgr4 (2 pixels per byte)
michael
parents: 9071
diff changeset
59 IMGFMT_RG4B,
6637
f47f12ba3b88 more scaling algos
michael
parents: 6542
diff changeset
60 IMGFMT_BGR1,
f47f12ba3b88 more scaling algos
michael
parents: 6542
diff changeset
61 IMGFMT_RGB1,
7403
7d6d73150c6c out formats reordered, quality order
arpi
parents: 7368
diff changeset
62 // YUV:
7d6d73150c6c out formats reordered, quality order
arpi
parents: 7368
diff changeset
63 IMGFMT_444P,
7d6d73150c6c out formats reordered, quality order
arpi
parents: 7368
diff changeset
64 IMGFMT_422P,
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
65 IMGFMT_YV12,
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
66 IMGFMT_I420,
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
67 IMGFMT_IYUV,
6533
52f8bde27fea yvu9 & y8
michael
parents: 6188
diff changeset
68 IMGFMT_YVU9,
6536
87942adf9c1c IF09 added
arpi
parents: 6533
diff changeset
69 IMGFMT_IF09,
6863
713182435a76 planar yuv 444 422 411 support
michael
parents: 6750
diff changeset
70 IMGFMT_411P,
7403
7d6d73150c6c out formats reordered, quality order
arpi
parents: 7368
diff changeset
71 IMGFMT_Y800,
7d6d73150c6c out formats reordered, quality order
arpi
parents: 7368
diff changeset
72 IMGFMT_Y8,
7720
c6aa14b47d03 yuy2 output support
michael
parents: 7403
diff changeset
73 IMGFMT_YUY2,
6188
39a9515c633a warning fixes, patch by Ulrich Hecht <uli@suse.de>
arpi
parents: 6138
diff changeset
74 0
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
75 };
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
76
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
77 static unsigned int find_best_out(vf_instance_t *vf){
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
78 unsigned int best=0;
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
79 unsigned int* p=outfmt_list;
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
80 // find the best outfmt:
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
81 while(*p){
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
82 int ret=vf_next_query_format(vf,*p);
9276
9fd44bc91631 move some verbose msg to dbg2
arpi
parents: 9171
diff changeset
83 mp_msg(MSGT_VFILTER,MSGL_DBG2,"scale: query(%s) -> %d\n",vo_format_name(*p),ret&3);
6708
8058078f1248 support for external pp by divx4. some fixes/cosmetics?
alex
parents: 6637
diff changeset
84 if(ret&VFCAP_CSP_SUPPORTED_BY_HW){ best=*p; break;} // no conversion -> bingo!
8058078f1248 support for external pp by divx4. some fixes/cosmetics?
alex
parents: 6637
diff changeset
85 if(ret&VFCAP_CSP_SUPPORTED && !best) best=*p; // best with conversion
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
86 ++p;
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
87 }
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
88 return best;
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
89 }
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
90
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
91 static int config(struct vf_instance_s* vf,
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
92 int width, int height, int d_width, int d_height,
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
93 unsigned int flags, unsigned int outfmt){
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
94 unsigned int best=find_best_out(vf);
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
95 int vo_flags;
6542
7af3fcd76d2d support dropping some chroma src lines for a bit extra speed
michael
parents: 6536
diff changeset
96 int int_sws_flags=0;
7af3fcd76d2d support dropping some chroma src lines for a bit extra speed
michael
parents: 6536
diff changeset
97 SwsFilter *srcFilter, *dstFilter;
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
98
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
99 if(!best){
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6126
diff changeset
100 mp_msg(MSGT_VFILTER,MSGL_WARN,"SwScale: no supported outfmt found :(\n");
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
101 return 0;
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
102 }
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
103
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
104 vo_flags=vf->next->query_format(vf->next,best);
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
105
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
106 // scaling to dwidth*d_height, if all these TRUE:
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
107 // - option -zoom
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
108 // - no other sw/hw up/down scaling avail.
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
109 // - we're after postproc
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
110 // - user didn't set w:h
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
111 if(!(vo_flags&VFCAP_POSTPROC) && (flags&4) &&
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
112 vf->priv->w<0 && vf->priv->h<0){ // -zoom
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
113 int x=(vo_flags&VFCAP_SWSCALE) ? 0 : 1;
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
114 if(d_width<width || d_height<height){
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
115 // downscale!
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
116 if(vo_flags&VFCAP_HWSCALE_DOWN) x=0;
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
117 } else {
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
118 // upscale:
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
119 if(vo_flags&VFCAP_HWSCALE_UP) x=0;
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
120 }
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
121 if(x){
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
122 // user wants sw scaling! (-zoom)
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
123 vf->priv->w=d_width;
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
124 vf->priv->h=d_height;
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
125 }
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
126 }
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
127
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
128 // calculate the missing parameters:
6746
0e2b14e606ac Round height or width to valid values when doing automatic calculation.
kmkaplan
parents: 6708
diff changeset
129 switch(best) {
0e2b14e606ac Round height or width to valid values when doing automatic calculation.
kmkaplan
parents: 6708
diff changeset
130 case IMGFMT_YUY2: /* YUY2 needs w rounded to 2 */
0e2b14e606ac Round height or width to valid values when doing automatic calculation.
kmkaplan
parents: 6708
diff changeset
131 if(vf->priv->w==-3) vf->priv->w=(vf->priv->h*width/height+1)&~1; else
0e2b14e606ac Round height or width to valid values when doing automatic calculation.
kmkaplan
parents: 6708
diff changeset
132 if(vf->priv->w==-2) vf->priv->w=(vf->priv->h*d_width/d_height+1)&~1;
6750
6484f8f9f111 Put back the ordering of the if as requested by Arpi.
kmkaplan
parents: 6746
diff changeset
133 if(vf->priv->w<0) vf->priv->w=width; else
6484f8f9f111 Put back the ordering of the if as requested by Arpi.
kmkaplan
parents: 6746
diff changeset
134 if(vf->priv->w==0) vf->priv->w=d_width;
6746
0e2b14e606ac Round height or width to valid values when doing automatic calculation.
kmkaplan
parents: 6708
diff changeset
135 if(vf->priv->h==-3) vf->priv->h=vf->priv->w*height/width; else
0e2b14e606ac Round height or width to valid values when doing automatic calculation.
kmkaplan
parents: 6708
diff changeset
136 if(vf->priv->h==-2) vf->priv->h=vf->priv->w*d_height/d_width;
0e2b14e606ac Round height or width to valid values when doing automatic calculation.
kmkaplan
parents: 6708
diff changeset
137 break;
0e2b14e606ac Round height or width to valid values when doing automatic calculation.
kmkaplan
parents: 6708
diff changeset
138 case IMGFMT_YV12: /* YV12 needs w & h rounded to 2 */
0e2b14e606ac Round height or width to valid values when doing automatic calculation.
kmkaplan
parents: 6708
diff changeset
139 if(vf->priv->w==-3) vf->priv->w=(vf->priv->h*width/height+1)&~1; else
0e2b14e606ac Round height or width to valid values when doing automatic calculation.
kmkaplan
parents: 6708
diff changeset
140 if(vf->priv->w==-2) vf->priv->w=(vf->priv->h*d_width/d_height+1)&~1;
6750
6484f8f9f111 Put back the ordering of the if as requested by Arpi.
kmkaplan
parents: 6746
diff changeset
141 if(vf->priv->w<0) vf->priv->w=width; else
6484f8f9f111 Put back the ordering of the if as requested by Arpi.
kmkaplan
parents: 6746
diff changeset
142 if(vf->priv->w==0) vf->priv->w=d_width;
6746
0e2b14e606ac Round height or width to valid values when doing automatic calculation.
kmkaplan
parents: 6708
diff changeset
143 if(vf->priv->h==-3) vf->priv->h=(vf->priv->w*height/width+1)&~1; else
7044
c9ee9c799f4a typo fix, patch by (Eric Lammerts <eric at lammerts dot org>)
michael
parents: 6876
diff changeset
144 if(vf->priv->h==-2) vf->priv->h=(vf->priv->w*d_height/d_width+1)&~1;
6746
0e2b14e606ac Round height or width to valid values when doing automatic calculation.
kmkaplan
parents: 6708
diff changeset
145 break;
0e2b14e606ac Round height or width to valid values when doing automatic calculation.
kmkaplan
parents: 6708
diff changeset
146 default:
6126
35eb2b9c7d9c new special w/h values: -2 and -3. based on proposal by Bohdan Horst <nexus@hoth.amu.edu.pl>
arpi
parents: 6060
diff changeset
147 if(vf->priv->w==-3) vf->priv->w=vf->priv->h*width/height; else
35eb2b9c7d9c new special w/h values: -2 and -3. based on proposal by Bohdan Horst <nexus@hoth.amu.edu.pl>
arpi
parents: 6060
diff changeset
148 if(vf->priv->w==-2) vf->priv->w=vf->priv->h*d_width/d_height;
6750
6484f8f9f111 Put back the ordering of the if as requested by Arpi.
kmkaplan
parents: 6746
diff changeset
149 if(vf->priv->w<0) vf->priv->w=width; else
6484f8f9f111 Put back the ordering of the if as requested by Arpi.
kmkaplan
parents: 6746
diff changeset
150 if(vf->priv->w==0) vf->priv->w=d_width;
6746
0e2b14e606ac Round height or width to valid values when doing automatic calculation.
kmkaplan
parents: 6708
diff changeset
151 if(vf->priv->h==-3) vf->priv->h=vf->priv->w*height/width; else
0e2b14e606ac Round height or width to valid values when doing automatic calculation.
kmkaplan
parents: 6708
diff changeset
152 if(vf->priv->h==-2) vf->priv->h=vf->priv->w*d_height/d_width;
0e2b14e606ac Round height or width to valid values when doing automatic calculation.
kmkaplan
parents: 6708
diff changeset
153 break;
0e2b14e606ac Round height or width to valid values when doing automatic calculation.
kmkaplan
parents: 6708
diff changeset
154 }
6126
35eb2b9c7d9c new special w/h values: -2 and -3. based on proposal by Bohdan Horst <nexus@hoth.amu.edu.pl>
arpi
parents: 6060
diff changeset
155
6003
28f800545e63 w/h=0 means d_w/h instead of original
arpi
parents: 5712
diff changeset
156 if(vf->priv->h<0) vf->priv->h=height; else
28f800545e63 w/h=0 means d_w/h instead of original
arpi
parents: 5712
diff changeset
157 if(vf->priv->h==0) vf->priv->h=d_height;
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
158
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6126
diff changeset
159 mp_msg(MSGT_VFILTER,MSGL_DBG2,"SwScale: scaling %dx%d %s to %dx%d %s \n",
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
160 width,height,vo_format_name(outfmt),
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
161 vf->priv->w,vf->priv->h,vo_format_name(best));
5526
30679378f814 free old context, really use query_format
arpi
parents: 5525
diff changeset
162
30679378f814 free old context, really use query_format
arpi
parents: 5525
diff changeset
163 // free old ctx:
9494
543ab3909b78 sws_ prefix, more seperation between internal & external swscaler API
michael
parents: 9491
diff changeset
164 if(vf->priv->ctx) sws_freeContext(vf->priv->ctx);
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
165
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
166 // new swscaler:
9494
543ab3909b78 sws_ prefix, more seperation between internal & external swscaler API
michael
parents: 9491
diff changeset
167 sws_getFlagsAndFilterFromCmdLine(&int_sws_flags, &srcFilter, &dstFilter);
6542
7af3fcd76d2d support dropping some chroma src lines for a bit extra speed
michael
parents: 6536
diff changeset
168 int_sws_flags|= vf->priv->v_chr_drop << SWS_SRC_V_CHR_DROP_SHIFT;
6637
f47f12ba3b88 more scaling algos
michael
parents: 6542
diff changeset
169 int_sws_flags|= vf->priv->param << SWS_PARAM_SHIFT;
9494
543ab3909b78 sws_ prefix, more seperation between internal & external swscaler API
michael
parents: 9491
diff changeset
170 vf->priv->ctx=sws_getContext(width,height,
9697
5025150738eb 10000l (YUV vs. YVU swscale fix/cleanup)
michael
parents: 9598
diff changeset
171 outfmt,
5712
6c6e55db908f swscaler yv12 vs i420 workaround
arpi
parents: 5607
diff changeset
172 vf->priv->w,vf->priv->h,
9697
5025150738eb 10000l (YUV vs. YVU swscale fix/cleanup)
michael
parents: 9598
diff changeset
173 best,
9975
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
174 int_sws_flags | get_sws_cpuflags(), srcFilter, dstFilter);
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
175 if(!vf->priv->ctx){
545c13161589 swscale filter
arpi
parents:
diff changeset
176 // error...
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6126
diff changeset
177 mp_msg(MSGT_VFILTER,MSGL_WARN,"Couldn't init SwScaler for this setup\n");
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
178 return 0;
545c13161589 swscale filter
arpi
parents:
diff changeset
179 }
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
180 vf->priv->fmt=best;
6060
61f39b98ba4d keep aspect ratio - based on Fredrik Kuivinen's idea
arpi
parents: 6003
diff changeset
181
7783
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
182 if(vf->priv->palette){
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
183 free(vf->priv->palette);
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
184 vf->priv->palette=NULL;
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
185 }
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
186 switch(best){
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
187 case IMGFMT_BGR8: {
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
188 /* set 332 palette for 8 bpp */
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
189 int i;
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
190 vf->priv->palette=malloc(4*256);
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
191 for(i=0; i<256; i++){
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
192 vf->priv->palette[4*i+0]=4*(i&3)*21;
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
193 vf->priv->palette[4*i+1]=4*((i>>2)&7)*9;
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
194 vf->priv->palette[4*i+2]=4*((i>>5)&7)*9;
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
195 }
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
196 break; }
9171
898e5270a46e fixing rgb4 & bgr4 (2 pixels per byte)
michael
parents: 9071
diff changeset
197 case IMGFMT_BGR4:
898e5270a46e fixing rgb4 & bgr4 (2 pixels per byte)
michael
parents: 9071
diff changeset
198 case IMGFMT_BG4B: {
7783
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
199 int i;
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
200 vf->priv->palette=malloc(4*16);
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
201 for(i=0; i<16; i++){
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
202 vf->priv->palette[4*i+0]=4*(i&1)*63;
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
203 vf->priv->palette[4*i+1]=4*((i>>1)&3)*21;
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
204 vf->priv->palette[4*i+2]=4*((i>>3)&1)*63;
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
205 }
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
206 break; }
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
207 }
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
208
6060
61f39b98ba4d keep aspect ratio - based on Fredrik Kuivinen's idea
arpi
parents: 6003
diff changeset
209 if(!opt_screen_size_x && !opt_screen_size_y){
10002
b2b070bf934e generate meaningful d_width & d_height when scaling, rather than useless nonsense.
rfelker
parents: 9985
diff changeset
210 // Compute new d_width and d_height, preserving aspect
b2b070bf934e generate meaningful d_width & d_height when scaling, rather than useless nonsense.
rfelker
parents: 9985
diff changeset
211 // while ensuring that both are >= output size in pixels.
b2b070bf934e generate meaningful d_width & d_height when scaling, rather than useless nonsense.
rfelker
parents: 9985
diff changeset
212 if (vf->priv->h * d_width > vf->priv->w * d_height) {
b2b070bf934e generate meaningful d_width & d_height when scaling, rather than useless nonsense.
rfelker
parents: 9985
diff changeset
213 d_width = vf->priv->h * d_width / d_height;
b2b070bf934e generate meaningful d_width & d_height when scaling, rather than useless nonsense.
rfelker
parents: 9985
diff changeset
214 d_height = vf->priv->h;
b2b070bf934e generate meaningful d_width & d_height when scaling, rather than useless nonsense.
rfelker
parents: 9985
diff changeset
215 } else {
b2b070bf934e generate meaningful d_width & d_height when scaling, rather than useless nonsense.
rfelker
parents: 9985
diff changeset
216 d_height = vf->priv->w * d_height / d_width;
b2b070bf934e generate meaningful d_width & d_height when scaling, rather than useless nonsense.
rfelker
parents: 9985
diff changeset
217 d_width = vf->priv->w;
b2b070bf934e generate meaningful d_width & d_height when scaling, rather than useless nonsense.
rfelker
parents: 9985
diff changeset
218 }
b2b070bf934e generate meaningful d_width & d_height when scaling, rather than useless nonsense.
rfelker
parents: 9985
diff changeset
219 //d_width=d_width*vf->priv->w/width;
b2b070bf934e generate meaningful d_width & d_height when scaling, rather than useless nonsense.
rfelker
parents: 9985
diff changeset
220 //d_height=d_height*vf->priv->h/height;
6060
61f39b98ba4d keep aspect ratio - based on Fredrik Kuivinen's idea
arpi
parents: 6003
diff changeset
221 }
5525
arpi
parents: 5523
diff changeset
222 return vf_next_config(vf,vf->priv->w,vf->priv->h,d_width,d_height,flags,best);
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
223 }
545c13161589 swscale filter
arpi
parents:
diff changeset
224
9491
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
225 static void start_slice(struct vf_instance_s* vf, mp_image_t *mpi){
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
226 // printf("start_slice called! flag=%d\n",mpi->flags&MP_IMGFLAG_DRAW_CALLBACK);
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
227 if(!(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK)) return; // shouldn't happen
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
228 // they want slices!!! allocate the buffer.
10140
30cad6ad9dbc fix segfaults with slices. support slice rendering into a filter even
rfelker
parents: 10022
diff changeset
229 mpi->priv=vf->dmpi=vf_get_image(vf->next,vf->priv->fmt,
9491
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
230 // mpi->type, mpi->flags & (~MP_IMGFLAG_DRAW_CALLBACK),
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
231 MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE,
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
232 vf->priv->w, vf->priv->h);
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
233 }
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
234
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
235 static void draw_slice(struct vf_instance_s* vf,
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
236 unsigned char** src, int* stride, int w,int h, int x, int y){
10140
30cad6ad9dbc fix segfaults with slices. support slice rendering into a filter even
rfelker
parents: 10022
diff changeset
237 mp_image_t *dmpi=vf->dmpi;
9491
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
238 if(!dmpi){
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
239 mp_msg(MSGT_VFILTER,MSGL_FATAL,"vf_scale: draw_slice() called with dmpi=NULL (no get_image??)\n");
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
240 return;
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
241 }
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
242 // printf("vf_scale::draw_slice() y=%d h=%d\n",y,h);
9697
5025150738eb 10000l (YUV vs. YVU swscale fix/cleanup)
michael
parents: 9598
diff changeset
243 sws_scale_ordered(vf->priv->ctx,src,stride,y,h,dmpi->planes,dmpi->stride);
9491
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
244 }
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
245
7368
a894e99c1e51 changing return type of put_image void->int
arpi
parents: 7044
diff changeset
246 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
9491
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
247 mp_image_t *dmpi=mpi->priv;
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
248
9491
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
249 // printf("vf_scale::put_image(): processing whole frame! dmpi=%p flag=%d\n",
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
250 // dmpi, (mpi->flags&MP_IMGFLAG_DRAW_CALLBACK));
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
251
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
252 if(!(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK && dmpi)){
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
253
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
254 // hope we'll get DR buffer:
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
255 dmpi=vf_get_image(vf->next,vf->priv->fmt,
6876
49485d9f0d47 imho swscale also likes aligned stride :)
arpi
parents: 6863
diff changeset
256 MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE,
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
257 vf->priv->w, vf->priv->h);
9697
5025150738eb 10000l (YUV vs. YVU swscale fix/cleanup)
michael
parents: 9598
diff changeset
258 sws_scale_ordered(vf->priv->ctx,mpi->planes,mpi->stride,0,mpi->h,dmpi->planes,dmpi->stride);
7720
c6aa14b47d03 yuy2 output support
michael
parents: 7403
diff changeset
259
9491
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
260 }
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
261
5527
04c5047ead0c pp passtrough
arpi
parents: 5526
diff changeset
262 if(vf->priv->w==mpi->w && vf->priv->h==mpi->h){
04c5047ead0c pp passtrough
arpi
parents: 5526
diff changeset
263 // just conversion, no scaling -> keep postprocessing data
04c5047ead0c pp passtrough
arpi
parents: 5526
diff changeset
264 // this way we can apply pp filter to non-yv12 source using scaler
9934
89da8ec89558 vf_clone_mpi_attributes()
michael
parents: 9697
diff changeset
265 vf_clone_mpi_attributes(dmpi, mpi);
5527
04c5047ead0c pp passtrough
arpi
parents: 5526
diff changeset
266 }
7783
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
267
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
268 if(vf->priv->palette) dmpi->planes[1]=vf->priv->palette; // export palette!
5527
04c5047ead0c pp passtrough
arpi
parents: 5526
diff changeset
269
7368
a894e99c1e51 changing return type of put_image void->int
arpi
parents: 7044
diff changeset
270 return vf_next_put_image(vf,dmpi);
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
271 }
545c13161589 swscale filter
arpi
parents:
diff changeset
272
9476
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
273 static int control(struct vf_instance_s* vf, int request, void* data){
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
274 int *table;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
275 int *inv_table;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
276 int r;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
277 int brightness, contrast, saturation, srcRange, dstRange;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
278 vf_equalizer_t *eq;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
279
10632
2294cbc41c34 -brightness && -vf scale fix
michael
parents: 10233
diff changeset
280 if(vf->priv->ctx)
9476
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
281 switch(request){
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
282 case VFCTRL_GET_EQUALIZER:
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
283 r= sws_getColorspaceDetails(vf->priv->ctx, &inv_table, &srcRange, &table, &dstRange, &brightness, &contrast, &saturation);
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
284 if(r<0) break;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
285
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
286 eq = data;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
287 if (!strcmp(eq->item,"brightness")) {
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
288 eq->value = ((brightness*100) + (1<<15))>>16;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
289 }
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
290 else if (!strcmp(eq->item,"contrast")) {
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
291 eq->value = (((contrast *100) + (1<<15))>>16) - 100;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
292 }
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
293 else if (!strcmp(eq->item,"saturation")) {
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
294 eq->value = (((saturation*100) + (1<<15))>>16) - 100;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
295 }
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
296 else
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
297 break;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
298 return CONTROL_TRUE;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
299 case VFCTRL_SET_EQUALIZER:
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
300 r= sws_getColorspaceDetails(vf->priv->ctx, &inv_table, &srcRange, &table, &dstRange, &brightness, &contrast, &saturation);
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
301 if(r<0) break;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
302 //printf("set %f %f %f\n", brightness/(float)(1<<16), contrast/(float)(1<<16), saturation/(float)(1<<16));
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
303 eq = data;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
304
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
305 if (!strcmp(eq->item,"brightness")) {
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
306 brightness = (( eq->value <<16) + 50)/100;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
307 }
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
308 else if (!strcmp(eq->item,"contrast")) {
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
309 contrast = (((eq->value+100)<<16) + 50)/100;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
310 }
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
311 else if (!strcmp(eq->item,"saturation")) {
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
312 saturation = (((eq->value+100)<<16) + 50)/100;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
313 }
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
314 else
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
315 break;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
316
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
317 r= sws_setColorspaceDetails(vf->priv->ctx, inv_table, srcRange, table, dstRange, brightness, contrast, saturation);
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
318 if(r<0) break;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
319
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
320 return CONTROL_TRUE;
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
321 default:
10233
35f52ad860a0 vf_scale.h & related cleanup & some small warning fix by dominik
michael
parents: 10140
diff changeset
322 break;
9476
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
323 }
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
324
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
325 return vf_next_control(vf,request,data);
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
326 }
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
327
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
328 //===========================================================================//
545c13161589 swscale filter
arpi
parents:
diff changeset
329
9071
25baacd1c650 UYVY input
michael
parents: 7783
diff changeset
330 // supported Input formats: YV12, I420, IYUV, YUY2, UYVY, BGR32, BGR24, BGR16, BGR15, RGB32, RGB24, Y8, Y800
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
331
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
332 static int query_format(struct vf_instance_s* vf, unsigned int fmt){
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
333 switch(fmt){
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
334 case IMGFMT_YV12:
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
335 case IMGFMT_I420:
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
336 case IMGFMT_IYUV:
9071
25baacd1c650 UYVY input
michael
parents: 7783
diff changeset
337 case IMGFMT_UYVY:
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
338 case IMGFMT_YUY2:
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
339 case IMGFMT_BGR32:
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
340 case IMGFMT_BGR24:
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
341 case IMGFMT_BGR16:
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
342 case IMGFMT_BGR15:
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
343 case IMGFMT_RGB32:
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
344 case IMGFMT_RGB24:
6533
52f8bde27fea yvu9 & y8
michael
parents: 6188
diff changeset
345 case IMGFMT_Y800:
52f8bde27fea yvu9 & y8
michael
parents: 6188
diff changeset
346 case IMGFMT_Y8:
52f8bde27fea yvu9 & y8
michael
parents: 6188
diff changeset
347 case IMGFMT_YVU9:
6536
87942adf9c1c IF09 added
arpi
parents: 6533
diff changeset
348 case IMGFMT_IF09:
6863
713182435a76 planar yuv 444 422 411 support
michael
parents: 6750
diff changeset
349 case IMGFMT_444P:
713182435a76 planar yuv 444 422 411 support
michael
parents: 6750
diff changeset
350 case IMGFMT_422P:
713182435a76 planar yuv 444 422 411 support
michael
parents: 6750
diff changeset
351 case IMGFMT_411P:
6533
52f8bde27fea yvu9 & y8
michael
parents: 6188
diff changeset
352 {
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
353 unsigned int best=find_best_out(vf);
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
354 int flags;
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
355 if(!best) return 0; // no matching out-fmt
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
356 flags=vf_next_query_format(vf,best);
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
357 if(!(flags&3)) return 0; // huh?
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
358 if(fmt!=best) flags&=~VFCAP_CSP_SUPPORTED_BY_HW;
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
359 // do not allow scaling, if we are before the PP fliter!
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
360 if(!(flags&VFCAP_POSTPROC)) flags|=VFCAP_SWSCALE;
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
361 return flags;
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
362 }
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
363 }
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5527
diff changeset
364 return 0; // nomatching in-fmt
5523
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
365 }
8d55957fa018 colorspace conversion support
arpi
parents: 5522
diff changeset
366
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
367 static int open(vf_instance_t *vf, char* args){
545c13161589 swscale filter
arpi
parents:
diff changeset
368 vf->config=config;
9491
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
369 vf->start_slice=start_slice;
21f7d83507ca draw_slice support
arpi
parents: 9476
diff changeset
370 vf->draw_slice=draw_slice;
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
371 vf->put_image=put_image;
5526
30679378f814 free old context, really use query_format
arpi
parents: 5525
diff changeset
372 vf->query_format=query_format;
9476
eff727517e6b yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents: 9276
diff changeset
373 vf->control= control;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
374 if(!vf->priv) {
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
375 vf->priv=malloc(sizeof(struct vf_priv_s));
545c13161589 swscale filter
arpi
parents:
diff changeset
376 // TODO: parse args ->
545c13161589 swscale filter
arpi
parents:
diff changeset
377 vf->priv->ctx=NULL;
545c13161589 swscale filter
arpi
parents:
diff changeset
378 vf->priv->w=
545c13161589 swscale filter
arpi
parents:
diff changeset
379 vf->priv->h=-1;
6542
7af3fcd76d2d support dropping some chroma src lines for a bit extra speed
michael
parents: 6536
diff changeset
380 vf->priv->v_chr_drop=0;
6637
f47f12ba3b88 more scaling algos
michael
parents: 6542
diff changeset
381 vf->priv->param=0;
7783
29c059774519 exporting palette for 4/8bpp modes
arpi
parents: 7720
diff changeset
382 vf->priv->palette=NULL;
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
383 } // if(!vf->priv)
6637
f47f12ba3b88 more scaling algos
michael
parents: 6542
diff changeset
384 if(args) sscanf(args, "%d:%d:%d:%d",
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
385 &vf->priv->w,
6542
7af3fcd76d2d support dropping some chroma src lines for a bit extra speed
michael
parents: 6536
diff changeset
386 &vf->priv->h,
6637
f47f12ba3b88 more scaling algos
michael
parents: 6542
diff changeset
387 &vf->priv->v_chr_drop,
f47f12ba3b88 more scaling algos
michael
parents: 6542
diff changeset
388 &vf->priv->param);
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6126
diff changeset
389 mp_msg(MSGT_VFILTER,MSGL_V,"SwScale params: %d x %d (-1=no scaling)\n",
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
390 vf->priv->w,
545c13161589 swscale filter
arpi
parents:
diff changeset
391 vf->priv->h);
545c13161589 swscale filter
arpi
parents:
diff changeset
392 return 1;
545c13161589 swscale filter
arpi
parents:
diff changeset
393 }
545c13161589 swscale filter
arpi
parents:
diff changeset
394
9975
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
395 //global sws_flags from the command line
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
396 int sws_flags=2;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
397
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
398 //global srcFilter
9985
3d8b145a5470 moving getFilter stuff back (vf_scale.c -> swscale.c)
michael
parents: 9975
diff changeset
399 static SwsFilter *src_filter= NULL;
9975
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
400
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
401 float sws_lum_gblur= 0.0;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
402 float sws_chr_gblur= 0.0;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
403 int sws_chr_vshift= 0;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
404 int sws_chr_hshift= 0;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
405 float sws_chr_sharpen= 0.0;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
406 float sws_lum_sharpen= 0.0;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
407
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
408 int get_sws_cpuflags(){
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
409 return
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
410 (gCpuCaps.hasMMX ? SWS_CPU_CAPS_MMX : 0)
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
411 | (gCpuCaps.hasMMX2 ? SWS_CPU_CAPS_MMX2 : 0)
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
412 | (gCpuCaps.has3DNow ? SWS_CPU_CAPS_3DNOW : 0);
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
413 }
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
414
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
415 void sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, SwsFilter **dstFilterParam)
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
416 {
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
417 static int firstTime=1;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
418 *flags=0;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
419
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
420 #ifdef ARCH_X86
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
421 if(gCpuCaps.hasMMX)
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
422 asm volatile("emms\n\t"::: "memory"); //FIXME this shouldnt be required but it IS (even for non mmx versions)
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
423 #endif
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
424 if(firstTime)
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
425 {
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
426 firstTime=0;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
427 *flags= SWS_PRINT_INFO;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
428 }
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
429 else if(verbose>1) *flags= SWS_PRINT_INFO;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
430
9985
3d8b145a5470 moving getFilter stuff back (vf_scale.c -> swscale.c)
michael
parents: 9975
diff changeset
431 if(src_filter) sws_freeFilter(src_filter);
9975
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
432
9985
3d8b145a5470 moving getFilter stuff back (vf_scale.c -> swscale.c)
michael
parents: 9975
diff changeset
433 src_filter= sws_getDefaultFilter(
3d8b145a5470 moving getFilter stuff back (vf_scale.c -> swscale.c)
michael
parents: 9975
diff changeset
434 sws_lum_gblur, sws_chr_gblur,
3d8b145a5470 moving getFilter stuff back (vf_scale.c -> swscale.c)
michael
parents: 9975
diff changeset
435 sws_lum_sharpen, sws_chr_sharpen,
3d8b145a5470 moving getFilter stuff back (vf_scale.c -> swscale.c)
michael
parents: 9975
diff changeset
436 sws_chr_vshift, sws_chr_hshift, verbose>1);
3d8b145a5470 moving getFilter stuff back (vf_scale.c -> swscale.c)
michael
parents: 9975
diff changeset
437
9975
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
438 switch(sws_flags)
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
439 {
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
440 case 0: *flags|= SWS_FAST_BILINEAR; break;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
441 case 1: *flags|= SWS_BILINEAR; break;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
442 case 2: *flags|= SWS_BICUBIC; break;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
443 case 3: *flags|= SWS_X; break;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
444 case 4: *flags|= SWS_POINT; break;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
445 case 5: *flags|= SWS_AREA; break;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
446 case 6: *flags|= SWS_BICUBLIN; break;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
447 case 7: *flags|= SWS_GAUSS; break;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
448 case 8: *flags|= SWS_SINC; break;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
449 case 9: *flags|= SWS_LANCZOS; break;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
450 case 10:*flags|= SWS_SPLINE; break;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
451 default:*flags|= SWS_BILINEAR; break;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
452 }
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
453
9985
3d8b145a5470 moving getFilter stuff back (vf_scale.c -> swscale.c)
michael
parents: 9975
diff changeset
454 *srcFilterParam= src_filter;
9975
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
455 *dstFilterParam= NULL;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
456 }
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
457
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
458 // will use sws_flags & src_filter (from cmd line)
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
459 struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat)
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
460 {
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
461 int flags;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
462 SwsFilter *dstFilterParam, *srcFilterParam;
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
463 sws_getFlagsAndFilterFromCmdLine(&flags, &srcFilterParam, &dstFilterParam);
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
464
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
465 return sws_getContext(srcW, srcH, srcFormat, dstW, dstH, dstFormat, flags | get_sws_cpuflags(), srcFilterParam, dstFilterParam);
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
466 }
3914afe5c0a7 removing sws - global verbose var dependancy
michael
parents: 9934
diff changeset
467
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
468 /// An example of presets usage
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
469 static struct size_preset {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
470 char* name;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
471 int w, h;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
472 } vf_size_presets_defs[] = {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
473 // TODO add more 'standard' resolutions
10814
7f34ec540e0f size presets: added the standard resolutions as proposed by Fabrice (ffmpeg)
alex
parents: 10632
diff changeset
474 { "qntsc", 352, 240 },
7f34ec540e0f size presets: added the standard resolutions as proposed by Fabrice (ffmpeg)
alex
parents: 10632
diff changeset
475 { "qpal", 352, 288 },
7f34ec540e0f size presets: added the standard resolutions as proposed by Fabrice (ffmpeg)
alex
parents: 10632
diff changeset
476 { "ntsc", 720, 480 },
7f34ec540e0f size presets: added the standard resolutions as proposed by Fabrice (ffmpeg)
alex
parents: 10632
diff changeset
477 { "pal", 720, 576 },
7f34ec540e0f size presets: added the standard resolutions as proposed by Fabrice (ffmpeg)
alex
parents: 10632
diff changeset
478 { "sntsc", 640, 480 },
7f34ec540e0f size presets: added the standard resolutions as proposed by Fabrice (ffmpeg)
alex
parents: 10632
diff changeset
479 { "spal", 768, 576 },
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
480 { NULL, 0, 0}
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
481 };
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
482
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
483 #define ST_OFF(f) M_ST_OFF(struct size_preset,f)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
484 static m_option_t vf_size_preset_fields[] = {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
485 {"w", ST_OFF(w), CONF_TYPE_INT, M_OPT_MIN,1 ,0, NULL},
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
486 {"h", ST_OFF(h), CONF_TYPE_INT, M_OPT_MIN,1 ,0, NULL},
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
487 { NULL, NULL, 0, 0, 0, 0, NULL }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
488 };
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
489
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
490 static m_struct_t vf_size_preset = {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
491 "scale_size_preset",
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
492 sizeof(struct size_preset),
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
493 NULL,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
494 vf_size_preset_fields
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
495 };
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
496
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
497 static m_struct_t vf_opts;
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
498 static m_obj_presets_t size_preset = {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
499 &vf_size_preset, // Input struct desc
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
500 &vf_opts, // Output struct desc
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
501 vf_size_presets_defs, // The list of presets
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
502 ST_OFF(name) // At wich offset is the name field in the preset struct
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
503 };
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
504
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
505 /// Now the options
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
506 #undef ST_OFF
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
507 #define ST_OFF(f) M_ST_OFF(struct vf_priv_s,f)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
508 static m_option_t vf_opts_fields[] = {
9598
ec21eefff17e 10L the scale filter accpet w and h to -3
albeu
parents: 9593
diff changeset
509 {"w", ST_OFF(w), CONF_TYPE_INT, M_OPT_MIN,-3 ,0, NULL},
ec21eefff17e 10L the scale filter accpet w and h to -3
albeu
parents: 9593
diff changeset
510 {"h", ST_OFF(h), CONF_TYPE_INT, M_OPT_MIN,-3 ,0, NULL},
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
511 {"chr-drop", ST_OFF(v_chr_drop), CONF_TYPE_INT, M_OPT_RANGE, 0, 3, NULL},
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
512 {"param", ST_OFF(param), CONF_TYPE_INT, M_OPT_RANGE, 0, 100, NULL},
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
513 // Note that here the 2 field is NULL (ie 0)
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
514 // As we want this option to act on the option struct itself
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
515 {"presize", 0, CONF_TYPE_OBJ_PRESETS, 0, 0, 0, &size_preset},
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
516 { NULL, NULL, 0, 0, 0, 0, NULL }
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
517 };
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
518
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
519 static m_struct_t vf_opts = {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
520 "scale",
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
521 sizeof(struct vf_priv_s),
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
522 &vf_priv_dflt,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
523 vf_opts_fields
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
524 };
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
525
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
526 vf_info_t vf_info_scale = {
545c13161589 swscale filter
arpi
parents:
diff changeset
527 "software scaling",
545c13161589 swscale filter
arpi
parents:
diff changeset
528 "scale",
545c13161589 swscale filter
arpi
parents:
diff changeset
529 "A'rpi",
545c13161589 swscale filter
arpi
parents:
diff changeset
530 "",
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
531 open,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9494
diff changeset
532 &vf_opts
5522
545c13161589 swscale filter
arpi
parents:
diff changeset
533 };
545c13161589 swscale filter
arpi
parents:
diff changeset
534
545c13161589 swscale filter
arpi
parents:
diff changeset
535 //===========================================================================//