Mercurial > mplayer.hg
annotate libmpcodecs/vf_scale.c @ 30388:45dcf93d41fa
Use av_malloc to ensure sufficient alignment and also free at least some
of the allocated memory.
author | reimar |
---|---|
date | Sun, 24 Jan 2010 21:15:43 +0000 |
parents | 2db4c1158df9 |
children | bbb6ebec87a0 |
rev | line source |
---|---|
5522 | 1 #include <stdio.h> |
2 #include <stdlib.h> | |
3 #include <string.h> | |
4 #include <inttypes.h> | |
5 | |
17012 | 6 #include "config.h" |
7 #include "mp_msg.h" | |
8 #include "cpudetect.h" | |
5522 | 9 |
5607 | 10 #include "img_format.h" |
11 #include "mp_image.h" | |
5522 | 12 #include "vf.h" |
19870
1e5cf11e8b1f
Use PIX_FMT_* instead of IMGFMT_* when calling sws_getContext()
lucabe
parents:
19520
diff
changeset
|
13 #include "fmt-conversion.h" |
26542
3a2e8ae7c548
Consistently #include mpbswap.h instead of bswap.h everywhere.
diego
parents:
25221
diff
changeset
|
14 #include "mpbswap.h" |
5522 | 15 |
18861 | 16 #include "libswscale/swscale.h" |
10233
35f52ad860a0
vf_scale.h & related cleanup & some small warning fix by dominik
michael
parents:
10140
diff
changeset
|
17 #include "vf_scale.h" |
5522 | 18 |
9593
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
19 #include "m_option.h" |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
20 #include "m_struct.h" |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
21 |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
22 static struct vf_priv_s { |
5522 | 23 int w,h; |
6542
7af3fcd76d2d
support dropping some chroma src lines for a bit extra speed
michael
parents:
6536
diff
changeset
|
24 int v_chr_drop; |
13373
6bd869a18d2c
passing an array or double precission parameters for the scaling function, instead of missusing a few bits of the flags
michael
parents:
13268
diff
changeset
|
25 double param[2]; |
5523 | 26 unsigned int fmt; |
9494
543ab3909b78
sws_ prefix, more seperation between internal & external swscaler API
michael
parents:
9491
diff
changeset
|
27 struct SwsContext *ctx; |
11700 | 28 struct SwsContext *ctx2; //for interlaced slices only |
7783 | 29 unsigned char* palette; |
11700 | 30 int interlaced; |
17646
168d8eb397f1
no upscale flag so automatic downscaling is possible in mencoder
michael
parents:
17566
diff
changeset
|
31 int noup; |
19172
bae6c99a99cc
vertical scaler with accurate rounding, some people on doom9 can see +-1 errors
michael
parents:
18861
diff
changeset
|
32 int accurate_rnd; |
22027 | 33 } const vf_priv_dflt = { |
9593
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
34 -1,-1, |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
35 0, |
13373
6bd869a18d2c
passing an array or double precission parameters for the scaling function, instead of missusing a few bits of the flags
michael
parents:
13268
diff
changeset
|
36 {SWS_PARAM_DEFAULT, SWS_PARAM_DEFAULT}, |
9593
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
37 0, |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
38 NULL, |
11700 | 39 NULL, |
9593
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
40 NULL |
5522 | 41 }; |
42 | |
6060 | 43 extern int opt_screen_size_x; |
44 extern int opt_screen_size_y; | |
13268
125f1b58a325
do not modify d_width and d_height when -xy option was given, otherwise -xy has no effect with e.g. vo_gl
reimar
parents:
12475
diff
changeset
|
45 extern float screen_size_xy; |
6060 | 46 |
5522 | 47 //===========================================================================// |
48 | |
9985
3d8b145a5470
moving getFilter stuff back (vf_scale.c -> swscale.c)
michael
parents:
9975
diff
changeset
|
49 void sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, SwsFilter **dstFilterParam); |
3d8b145a5470
moving getFilter stuff back (vf_scale.c -> swscale.c)
michael
parents:
9975
diff
changeset
|
50 |
5523 | 51 static unsigned int outfmt_list[]={ |
12260
9d7e95b0a7e5
prefer yuv formats over rgb in case both are supported by hw
faust3
parents:
12017
diff
changeset
|
52 // YUV: |
9d7e95b0a7e5
prefer yuv formats over rgb in case both are supported by hw
faust3
parents:
12017
diff
changeset
|
53 IMGFMT_444P, |
30113
bb92638cdb86
Try to put the list of output formats for vf_scale in a more sensible
reimar
parents:
30110
diff
changeset
|
54 IMGFMT_444P16_LE, |
bb92638cdb86
Try to put the list of output formats for vf_scale in a more sensible
reimar
parents:
30110
diff
changeset
|
55 IMGFMT_444P16_BE, |
12260
9d7e95b0a7e5
prefer yuv formats over rgb in case both are supported by hw
faust3
parents:
12017
diff
changeset
|
56 IMGFMT_422P, |
30113
bb92638cdb86
Try to put the list of output formats for vf_scale in a more sensible
reimar
parents:
30110
diff
changeset
|
57 IMGFMT_422P16_LE, |
bb92638cdb86
Try to put the list of output formats for vf_scale in a more sensible
reimar
parents:
30110
diff
changeset
|
58 IMGFMT_422P16_BE, |
12260
9d7e95b0a7e5
prefer yuv formats over rgb in case both are supported by hw
faust3
parents:
12017
diff
changeset
|
59 IMGFMT_YV12, |
9d7e95b0a7e5
prefer yuv formats over rgb in case both are supported by hw
faust3
parents:
12017
diff
changeset
|
60 IMGFMT_I420, |
30113
bb92638cdb86
Try to put the list of output formats for vf_scale in a more sensible
reimar
parents:
30110
diff
changeset
|
61 IMGFMT_420P16_LE, |
bb92638cdb86
Try to put the list of output formats for vf_scale in a more sensible
reimar
parents:
30110
diff
changeset
|
62 IMGFMT_420P16_BE, |
30115
ad61464d02a7
Add support for YUV format with alpha and fix the codecs.conf entry for vp6a
reimar
parents:
30113
diff
changeset
|
63 IMGFMT_420A, |
12260
9d7e95b0a7e5
prefer yuv formats over rgb in case both are supported by hw
faust3
parents:
12017
diff
changeset
|
64 IMGFMT_IYUV, |
9d7e95b0a7e5
prefer yuv formats over rgb in case both are supported by hw
faust3
parents:
12017
diff
changeset
|
65 IMGFMT_YVU9, |
9d7e95b0a7e5
prefer yuv formats over rgb in case both are supported by hw
faust3
parents:
12017
diff
changeset
|
66 IMGFMT_IF09, |
9d7e95b0a7e5
prefer yuv formats over rgb in case both are supported by hw
faust3
parents:
12017
diff
changeset
|
67 IMGFMT_411P, |
14715 | 68 IMGFMT_NV12, |
69 IMGFMT_NV21, | |
12260
9d7e95b0a7e5
prefer yuv formats over rgb in case both are supported by hw
faust3
parents:
12017
diff
changeset
|
70 IMGFMT_YUY2, |
9d7e95b0a7e5
prefer yuv formats over rgb in case both are supported by hw
faust3
parents:
12017
diff
changeset
|
71 IMGFMT_UYVY, |
30100 | 72 IMGFMT_440P, |
12475
16e673350486
give Y8 and Y800 lower conversion priority to avoid grayscaled video
reimar
parents:
12260
diff
changeset
|
73 // RGB and grayscale (Y8 and Y800): |
5523 | 74 IMGFMT_BGR32, |
7403 | 75 IMGFMT_RGB32, |
5523 | 76 IMGFMT_BGR24, |
7403 | 77 IMGFMT_RGB24, |
29901
801650929968
Allow vf_scale to output to RGB48, though still prefer the 24 and 32 bit formats.
reimar
parents:
29444
diff
changeset
|
78 IMGFMT_RGB48LE, |
801650929968
Allow vf_scale to output to RGB48, though still prefer the 24 and 32 bit formats.
reimar
parents:
29444
diff
changeset
|
79 IMGFMT_RGB48BE, |
5523 | 80 IMGFMT_BGR16, |
7403 | 81 IMGFMT_RGB16, |
5523 | 82 IMGFMT_BGR15, |
7403 | 83 IMGFMT_RGB15, |
12475
16e673350486
give Y8 and Y800 lower conversion priority to avoid grayscaled video
reimar
parents:
12260
diff
changeset
|
84 IMGFMT_Y800, |
16e673350486
give Y8 and Y800 lower conversion priority to avoid grayscaled video
reimar
parents:
12260
diff
changeset
|
85 IMGFMT_Y8, |
6637 | 86 IMGFMT_BGR8, |
7403 | 87 IMGFMT_RGB8, |
6637 | 88 IMGFMT_BGR4, |
7403 | 89 IMGFMT_RGB4, |
9171 | 90 IMGFMT_BG4B, |
91 IMGFMT_RG4B, | |
6637 | 92 IMGFMT_BGR1, |
93 IMGFMT_RGB1, | |
6188 | 94 0 |
5523 | 95 }; |
96 | |
30367
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
97 /** |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
98 * A list of preferred conversions, in order of preference. |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
99 * This should be used for conversions that e.g. involve no scaling |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
100 * or to stop vf_scale from choosing a conversion that has no |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
101 * fast assembler implementation. |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
102 */ |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
103 static int preferred_conversions[][2] = { |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
104 {IMGFMT_YUY2, IMGFMT_UYVY}, |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
105 {IMGFMT_YUY2, IMGFMT_422P}, |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
106 {IMGFMT_UYVY, IMGFMT_YUY2}, |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
107 {IMGFMT_UYVY, IMGFMT_422P}, |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
108 {IMGFMT_422P, IMGFMT_YUY2}, |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
109 {IMGFMT_422P, IMGFMT_UYVY}, |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
110 {0, 0} |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
111 }; |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
112 |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
113 static unsigned int find_best_out(vf_instance_t *vf, int in_format){ |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
114 unsigned int best=0; |
30367
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
115 int i = -1; |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
116 int j = -1; |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
117 int format = 0; |
11373
3b9f8ee18ff9
another lame workaround for the g1 filter layer ...
michael
parents:
11069
diff
changeset
|
118 |
5523 | 119 // find the best outfmt: |
30367
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
120 while (1) { |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
121 int ret; |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
122 if (j < 0) { |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
123 format = in_format; |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
124 j = 0; |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
125 } else if (i < 0) { |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
126 while (preferred_conversions[j][0] && |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
127 preferred_conversions[j][0] != in_format) |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
128 j++; |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
129 format = preferred_conversions[j++][1]; |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
130 // switch to standard list |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
131 if (!format) |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
132 i = 0; |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
133 } |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
134 if (i >= 0) |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
135 format = outfmt_list[i++]; |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
136 if (!format) |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
137 break; |
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
138 ret = vf_next_query_format(vf, format); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
139 |
11373
3b9f8ee18ff9
another lame workaround for the g1 filter layer ...
michael
parents:
11069
diff
changeset
|
140 mp_msg(MSGT_VFILTER,MSGL_DBG2,"scale: query(%s) -> %d\n",vo_format_name(format),ret&3); |
3b9f8ee18ff9
another lame workaround for the g1 filter layer ...
michael
parents:
11069
diff
changeset
|
141 if(ret&VFCAP_CSP_SUPPORTED_BY_HW){ |
3b9f8ee18ff9
another lame workaround for the g1 filter layer ...
michael
parents:
11069
diff
changeset
|
142 best=format; // no conversion -> bingo! |
3b9f8ee18ff9
another lame workaround for the g1 filter layer ...
michael
parents:
11069
diff
changeset
|
143 break; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
144 } |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
145 if(ret&VFCAP_CSP_SUPPORTED && !best) |
11373
3b9f8ee18ff9
another lame workaround for the g1 filter layer ...
michael
parents:
11069
diff
changeset
|
146 best=format; // best with conversion |
5523 | 147 } |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
148 return best; |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
149 } |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
150 |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
151 static int config(struct vf_instance_s* vf, |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
152 int width, int height, int d_width, int d_height, |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
153 unsigned int flags, unsigned int outfmt){ |
30367
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
154 unsigned int best=find_best_out(vf, outfmt); |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
155 int vo_flags; |
6542
7af3fcd76d2d
support dropping some chroma src lines for a bit extra speed
michael
parents:
6536
diff
changeset
|
156 int int_sws_flags=0; |
14924
7f386d84805f
subtracting 8 from negative w and h rounds the dimension to the closest multiple of 16
nicodvb
parents:
14715
diff
changeset
|
157 int round_w=0, round_h=0; |
26703 | 158 int i; |
6542
7af3fcd76d2d
support dropping some chroma src lines for a bit extra speed
michael
parents:
6536
diff
changeset
|
159 SwsFilter *srcFilter, *dstFilter; |
19870
1e5cf11e8b1f
Use PIX_FMT_* instead of IMGFMT_* when calling sws_getContext()
lucabe
parents:
19520
diff
changeset
|
160 enum PixelFormat dfmt, sfmt; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
161 |
5523 | 162 if(!best){ |
6138
523014df7d32
big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents:
6126
diff
changeset
|
163 mp_msg(MSGT_VFILTER,MSGL_WARN,"SwScale: no supported outfmt found :(\n"); |
5523 | 164 return 0; |
165 } | |
19870
1e5cf11e8b1f
Use PIX_FMT_* instead of IMGFMT_* when calling sws_getContext()
lucabe
parents:
19520
diff
changeset
|
166 sfmt = imgfmt2pixfmt(outfmt); |
23478
8fae00da2059
RGB8/BGR8 IMGFMTs are paletted in case of swscale input.
reimar
parents:
23373
diff
changeset
|
167 if (outfmt == IMGFMT_RGB8 || outfmt == IMGFMT_BGR8) sfmt = PIX_FMT_PAL8; |
19870
1e5cf11e8b1f
Use PIX_FMT_* instead of IMGFMT_* when calling sws_getContext()
lucabe
parents:
19520
diff
changeset
|
168 dfmt = imgfmt2pixfmt(best); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
169 |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
170 vo_flags=vf->next->query_format(vf->next,best); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
171 |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
172 // scaling to dwidth*d_height, if all these TRUE: |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
173 // - option -zoom |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
174 // - no other sw/hw up/down scaling avail. |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
175 // - we're after postproc |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
176 // - user didn't set w:h |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
177 if(!(vo_flags&VFCAP_POSTPROC) && (flags&4) && |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
178 vf->priv->w<0 && vf->priv->h<0){ // -zoom |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
179 int x=(vo_flags&VFCAP_SWSCALE) ? 0 : 1; |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
180 if(d_width<width || d_height<height){ |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
181 // downscale! |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
182 if(vo_flags&VFCAP_HWSCALE_DOWN) x=0; |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
183 } else { |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
184 // upscale: |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
185 if(vo_flags&VFCAP_HWSCALE_UP) x=0; |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
186 } |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
187 if(x){ |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
188 // user wants sw scaling! (-zoom) |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
189 vf->priv->w=d_width; |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
190 vf->priv->h=d_height; |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
191 } |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
192 } |
5523 | 193 |
17646
168d8eb397f1
no upscale flag so automatic downscaling is possible in mencoder
michael
parents:
17566
diff
changeset
|
194 if(vf->priv->noup){ |
17674
0f314c38ce57
10l (dont limit dimension components independantly if noup)
michael
parents:
17646
diff
changeset
|
195 if((vf->priv->w > width) + (vf->priv->h > height) >= vf->priv->noup){ |
17646
168d8eb397f1
no upscale flag so automatic downscaling is possible in mencoder
michael
parents:
17566
diff
changeset
|
196 vf->priv->w= width; |
168d8eb397f1
no upscale flag so automatic downscaling is possible in mencoder
michael
parents:
17566
diff
changeset
|
197 vf->priv->h= height; |
17674
0f314c38ce57
10l (dont limit dimension components independantly if noup)
michael
parents:
17646
diff
changeset
|
198 } |
17646
168d8eb397f1
no upscale flag so automatic downscaling is possible in mencoder
michael
parents:
17566
diff
changeset
|
199 } |
168d8eb397f1
no upscale flag so automatic downscaling is possible in mencoder
michael
parents:
17566
diff
changeset
|
200 |
17215 | 201 if (vf->priv->w <= -8) { |
202 vf->priv->w += 8; | |
14924
7f386d84805f
subtracting 8 from negative w and h rounds the dimension to the closest multiple of 16
nicodvb
parents:
14715
diff
changeset
|
203 round_w = 1; |
7f386d84805f
subtracting 8 from negative w and h rounds the dimension to the closest multiple of 16
nicodvb
parents:
14715
diff
changeset
|
204 } |
17215 | 205 if (vf->priv->h <= -8) { |
206 vf->priv->h += 8; | |
14924
7f386d84805f
subtracting 8 from negative w and h rounds the dimension to the closest multiple of 16
nicodvb
parents:
14715
diff
changeset
|
207 round_h = 1; |
7f386d84805f
subtracting 8 from negative w and h rounds the dimension to the closest multiple of 16
nicodvb
parents:
14715
diff
changeset
|
208 } |
7f386d84805f
subtracting 8 from negative w and h rounds the dimension to the closest multiple of 16
nicodvb
parents:
14715
diff
changeset
|
209 |
13925
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
210 if (vf->priv->w < -3 || vf->priv->h < -3 || |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
211 (vf->priv->w < -1 && vf->priv->h < -1)) { |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
212 // TODO: establish a direct connection to the user's brain |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
213 // and find out what the heck he thinks MPlayer should do |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
214 // with this nonsense. |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
215 mp_msg(MSGT_VFILTER, MSGL_ERR, "SwScale: EUSERBROKEN Check your parameters, they make no sense!\n"); |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
216 return 0; |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
217 } |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
218 |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
219 if (vf->priv->w == -1) |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
220 vf->priv->w = width; |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
221 if (vf->priv->w == 0) |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
222 vf->priv->w = d_width; |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
223 |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
224 if (vf->priv->h == -1) |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
225 vf->priv->h = height; |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
226 if (vf->priv->h == 0) |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
227 vf->priv->h = d_height; |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
228 |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
229 if (vf->priv->w == -3) |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
230 vf->priv->w = vf->priv->h * width / height; |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
231 if (vf->priv->w == -2) |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
232 vf->priv->w = vf->priv->h * d_width / d_height; |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
233 |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
234 if (vf->priv->h == -3) |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
235 vf->priv->h = vf->priv->w * height / width; |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
236 if (vf->priv->h == -2) |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
237 vf->priv->h = vf->priv->w * d_height / d_width; |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
238 |
14924
7f386d84805f
subtracting 8 from negative w and h rounds the dimension to the closest multiple of 16
nicodvb
parents:
14715
diff
changeset
|
239 if (round_w) |
7f386d84805f
subtracting 8 from negative w and h rounds the dimension to the closest multiple of 16
nicodvb
parents:
14715
diff
changeset
|
240 vf->priv->w = ((vf->priv->w + 8) / 16) * 16; |
7f386d84805f
subtracting 8 from negative w and h rounds the dimension to the closest multiple of 16
nicodvb
parents:
14715
diff
changeset
|
241 if (round_h) |
7f386d84805f
subtracting 8 from negative w and h rounds the dimension to the closest multiple of 16
nicodvb
parents:
14715
diff
changeset
|
242 vf->priv->h = ((vf->priv->h + 8) / 16) * 16; |
7f386d84805f
subtracting 8 from negative w and h rounds the dimension to the closest multiple of 16
nicodvb
parents:
14715
diff
changeset
|
243 |
5522 | 244 // calculate the missing parameters: |
6746
0e2b14e606ac
Round height or width to valid values when doing automatic calculation.
kmkaplan
parents:
6708
diff
changeset
|
245 switch(best) { |
0e2b14e606ac
Round height or width to valid values when doing automatic calculation.
kmkaplan
parents:
6708
diff
changeset
|
246 case IMGFMT_YV12: /* YV12 needs w & h rounded to 2 */ |
11069 | 247 case IMGFMT_I420: |
248 case IMGFMT_IYUV: | |
14715 | 249 case IMGFMT_NV12: |
250 case IMGFMT_NV21: | |
13925
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
251 vf->priv->h = (vf->priv->h + 1) & ~1; |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
252 case IMGFMT_YUY2: /* YUY2 needs w rounded to 2 */ |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
253 case IMGFMT_UYVY: |
72f8a761e714
fix for negative values for width and height (aspect-preserving scaling).
reimar
parents:
13373
diff
changeset
|
254 vf->priv->w = (vf->priv->w + 1) & ~1; |
6746
0e2b14e606ac
Round height or width to valid values when doing automatic calculation.
kmkaplan
parents:
6708
diff
changeset
|
255 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
256 |
6138
523014df7d32
big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents:
6126
diff
changeset
|
257 mp_msg(MSGT_VFILTER,MSGL_DBG2,"SwScale: scaling %dx%d %s to %dx%d %s \n", |
5523 | 258 width,height,vo_format_name(outfmt), |
259 vf->priv->w,vf->priv->h,vo_format_name(best)); | |
5526 | 260 |
261 // free old ctx: | |
9494
543ab3909b78
sws_ prefix, more seperation between internal & external swscaler API
michael
parents:
9491
diff
changeset
|
262 if(vf->priv->ctx) sws_freeContext(vf->priv->ctx); |
11700 | 263 if(vf->priv->ctx2)sws_freeContext(vf->priv->ctx2); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
264 |
5522 | 265 // new swscaler: |
9494
543ab3909b78
sws_ prefix, more seperation between internal & external swscaler API
michael
parents:
9491
diff
changeset
|
266 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
|
267 int_sws_flags|= vf->priv->v_chr_drop << SWS_SRC_V_CHR_DROP_SHIFT; |
19172
bae6c99a99cc
vertical scaler with accurate rounding, some people on doom9 can see +-1 errors
michael
parents:
18861
diff
changeset
|
268 int_sws_flags|= vf->priv->accurate_rnd * SWS_ACCURATE_RND; |
11700 | 269 vf->priv->ctx=sws_getContext(width, height >> vf->priv->interlaced, |
19870
1e5cf11e8b1f
Use PIX_FMT_* instead of IMGFMT_* when calling sws_getContext()
lucabe
parents:
19520
diff
changeset
|
270 sfmt, |
11700 | 271 vf->priv->w, vf->priv->h >> vf->priv->interlaced, |
19870
1e5cf11e8b1f
Use PIX_FMT_* instead of IMGFMT_* when calling sws_getContext()
lucabe
parents:
19520
diff
changeset
|
272 dfmt, |
13373
6bd869a18d2c
passing an array or double precission parameters for the scaling function, instead of missusing a few bits of the flags
michael
parents:
13268
diff
changeset
|
273 int_sws_flags | get_sws_cpuflags(), srcFilter, dstFilter, vf->priv->param); |
11700 | 274 if(vf->priv->interlaced){ |
275 vf->priv->ctx2=sws_getContext(width, height >> 1, | |
19870
1e5cf11e8b1f
Use PIX_FMT_* instead of IMGFMT_* when calling sws_getContext()
lucabe
parents:
19520
diff
changeset
|
276 sfmt, |
11700 | 277 vf->priv->w, vf->priv->h >> 1, |
19870
1e5cf11e8b1f
Use PIX_FMT_* instead of IMGFMT_* when calling sws_getContext()
lucabe
parents:
19520
diff
changeset
|
278 dfmt, |
13373
6bd869a18d2c
passing an array or double precission parameters for the scaling function, instead of missusing a few bits of the flags
michael
parents:
13268
diff
changeset
|
279 int_sws_flags | get_sws_cpuflags(), srcFilter, dstFilter, vf->priv->param); |
11700 | 280 } |
5522 | 281 if(!vf->priv->ctx){ |
282 // error... | |
6138
523014df7d32
big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents:
6126
diff
changeset
|
283 mp_msg(MSGT_VFILTER,MSGL_WARN,"Couldn't init SwScaler for this setup\n"); |
5522 | 284 return 0; |
285 } | |
5523 | 286 vf->priv->fmt=best; |
6060 | 287 |
7783 | 288 if(vf->priv->palette){ |
289 free(vf->priv->palette); | |
290 vf->priv->palette=NULL; | |
291 } | |
292 switch(best){ | |
22225
345d2866dfcf
add IMGFMT_RGB8 palette init code what moron actually added init code just for half of the formats?!
michael
parents:
22224
diff
changeset
|
293 case IMGFMT_RGB8: { |
345d2866dfcf
add IMGFMT_RGB8 palette init code what moron actually added init code just for half of the formats?!
michael
parents:
22224
diff
changeset
|
294 /* set 332 palette for 8 bpp */ |
345d2866dfcf
add IMGFMT_RGB8 palette init code what moron actually added init code just for half of the formats?!
michael
parents:
22224
diff
changeset
|
295 vf->priv->palette=malloc(4*256); |
345d2866dfcf
add IMGFMT_RGB8 palette init code what moron actually added init code just for half of the formats?!
michael
parents:
22224
diff
changeset
|
296 for(i=0; i<256; i++){ |
345d2866dfcf
add IMGFMT_RGB8 palette init code what moron actually added init code just for half of the formats?!
michael
parents:
22224
diff
changeset
|
297 vf->priv->palette[4*i+0]=4*(i>>6)*21; |
345d2866dfcf
add IMGFMT_RGB8 palette init code what moron actually added init code just for half of the formats?!
michael
parents:
22224
diff
changeset
|
298 vf->priv->palette[4*i+1]=4*((i>>3)&7)*9; |
345d2866dfcf
add IMGFMT_RGB8 palette init code what moron actually added init code just for half of the formats?!
michael
parents:
22224
diff
changeset
|
299 vf->priv->palette[4*i+2]=4*((i&7)&7)*9; |
345d2866dfcf
add IMGFMT_RGB8 palette init code what moron actually added init code just for half of the formats?!
michael
parents:
22224
diff
changeset
|
300 vf->priv->palette[4*i+3]=0; |
345d2866dfcf
add IMGFMT_RGB8 palette init code what moron actually added init code just for half of the formats?!
michael
parents:
22224
diff
changeset
|
301 } |
345d2866dfcf
add IMGFMT_RGB8 palette init code what moron actually added init code just for half of the formats?!
michael
parents:
22224
diff
changeset
|
302 break; } |
7783 | 303 case IMGFMT_BGR8: { |
304 /* set 332 palette for 8 bpp */ | |
305 vf->priv->palette=malloc(4*256); | |
306 for(i=0; i<256; i++){ | |
307 vf->priv->palette[4*i+0]=4*(i&3)*21; | |
308 vf->priv->palette[4*i+1]=4*((i>>2)&7)*9; | |
309 vf->priv->palette[4*i+2]=4*((i>>5)&7)*9; | |
22224
79967c519e43
another ridiculous palette bug which has nothing to do with the new palete support in sws
michael
parents:
22219
diff
changeset
|
310 vf->priv->palette[4*i+3]=0; |
7783 | 311 } |
312 break; } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
313 case IMGFMT_BGR4: |
9171 | 314 case IMGFMT_BG4B: { |
7783 | 315 vf->priv->palette=malloc(4*16); |
316 for(i=0; i<16; i++){ | |
317 vf->priv->palette[4*i+0]=4*(i&1)*63; | |
318 vf->priv->palette[4*i+1]=4*((i>>1)&3)*21; | |
319 vf->priv->palette[4*i+2]=4*((i>>3)&1)*63; | |
22224
79967c519e43
another ridiculous palette bug which has nothing to do with the new palete support in sws
michael
parents:
22219
diff
changeset
|
320 vf->priv->palette[4*i+3]=0; |
7783 | 321 } |
322 break; } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
323 case IMGFMT_RGB4: |
22227
cec1eb5be9e4
palette init code for IMGFMT_RGB4 and IMGFMT_RG4B
michael
parents:
22225
diff
changeset
|
324 case IMGFMT_RG4B: { |
cec1eb5be9e4
palette init code for IMGFMT_RGB4 and IMGFMT_RG4B
michael
parents:
22225
diff
changeset
|
325 vf->priv->palette=malloc(4*16); |
cec1eb5be9e4
palette init code for IMGFMT_RGB4 and IMGFMT_RG4B
michael
parents:
22225
diff
changeset
|
326 for(i=0; i<16; i++){ |
cec1eb5be9e4
palette init code for IMGFMT_RGB4 and IMGFMT_RG4B
michael
parents:
22225
diff
changeset
|
327 vf->priv->palette[4*i+0]=4*(i>>3)*63; |
cec1eb5be9e4
palette init code for IMGFMT_RGB4 and IMGFMT_RG4B
michael
parents:
22225
diff
changeset
|
328 vf->priv->palette[4*i+1]=4*((i>>1)&3)*21; |
cec1eb5be9e4
palette init code for IMGFMT_RGB4 and IMGFMT_RG4B
michael
parents:
22225
diff
changeset
|
329 vf->priv->palette[4*i+2]=4*((i&1)&1)*63; |
cec1eb5be9e4
palette init code for IMGFMT_RGB4 and IMGFMT_RG4B
michael
parents:
22225
diff
changeset
|
330 vf->priv->palette[4*i+3]=0; |
cec1eb5be9e4
palette init code for IMGFMT_RGB4 and IMGFMT_RG4B
michael
parents:
22225
diff
changeset
|
331 } |
cec1eb5be9e4
palette init code for IMGFMT_RGB4 and IMGFMT_RG4B
michael
parents:
22225
diff
changeset
|
332 break; } |
7783 | 333 } |
334 | |
13268
125f1b58a325
do not modify d_width and d_height when -xy option was given, otherwise -xy has no effect with e.g. vo_gl
reimar
parents:
12475
diff
changeset
|
335 if(!opt_screen_size_x && !opt_screen_size_y && !(screen_size_xy >= 0.001)){ |
10002
b2b070bf934e
generate meaningful d_width & d_height when scaling, rather than useless nonsense.
rfelker
parents:
9985
diff
changeset
|
336 // 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
|
337 // 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
|
338 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
|
339 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
|
340 d_height = vf->priv->h; |
b2b070bf934e
generate meaningful d_width & d_height when scaling, rather than useless nonsense.
rfelker
parents:
9985
diff
changeset
|
341 } else { |
b2b070bf934e
generate meaningful d_width & d_height when scaling, rather than useless nonsense.
rfelker
parents:
9985
diff
changeset
|
342 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
|
343 d_width = vf->priv->w; |
b2b070bf934e
generate meaningful d_width & d_height when scaling, rather than useless nonsense.
rfelker
parents:
9985
diff
changeset
|
344 } |
b2b070bf934e
generate meaningful d_width & d_height when scaling, rather than useless nonsense.
rfelker
parents:
9985
diff
changeset
|
345 //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
|
346 //d_height=d_height*vf->priv->h/height; |
6060 | 347 } |
5525 | 348 return vf_next_config(vf,vf->priv->w,vf->priv->h,d_width,d_height,flags,best); |
5522 | 349 } |
350 | |
9491 | 351 static void start_slice(struct vf_instance_s* vf, mp_image_t *mpi){ |
352 // printf("start_slice called! flag=%d\n",mpi->flags&MP_IMGFLAG_DRAW_CALLBACK); | |
353 if(!(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK)) return; // shouldn't happen | |
354 // they want slices!!! allocate the buffer. | |
10140
30cad6ad9dbc
fix segfaults with slices. support slice rendering into a filter even
rfelker
parents:
10022
diff
changeset
|
355 mpi->priv=vf->dmpi=vf_get_image(vf->next,vf->priv->fmt, |
9491 | 356 // mpi->type, mpi->flags & (~MP_IMGFLAG_DRAW_CALLBACK), |
357 MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE, | |
358 vf->priv->w, vf->priv->h); | |
359 } | |
360 | |
29064
67c256364220
Consistently use MP_MAX_PLANES as size for plane pointer/stride arrays in libmpcodecs.
reimar
parents:
28299
diff
changeset
|
361 static void scale(struct SwsContext *sws1, struct SwsContext *sws2, uint8_t *src[MP_MAX_PLANES], int src_stride[MP_MAX_PLANES], |
67c256364220
Consistently use MP_MAX_PLANES as size for plane pointer/stride arrays in libmpcodecs.
reimar
parents:
28299
diff
changeset
|
362 int y, int h, uint8_t *dst[MP_MAX_PLANES], int dst_stride[MP_MAX_PLANES], int interlaced){ |
30116
f2d9ce0a6b28
Also pass alpha plane to swscale, avoids crashes when converting between
reimar
parents:
30115
diff
changeset
|
363 uint8_t *src2[MP_MAX_PLANES]={src[0], src[1], src[2], src[3]}; |
29401
f01023c524c3
Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
diego
parents:
29263
diff
changeset
|
364 #if HAVE_BIGENDIAN |
22228 | 365 uint32_t pal2[256]; |
366 if (src[1] && !src[2]){ | |
367 int i; | |
368 for(i=0; i<256; i++) | |
369 pal2[i]= bswap_32(((uint32_t*)src[1])[i]); | |
370 src2[1]= pal2; | |
371 } | |
372 #endif | |
373 | |
11700 | 374 if(interlaced){ |
375 int i; | |
30116
f2d9ce0a6b28
Also pass alpha plane to swscale, avoids crashes when converting between
reimar
parents:
30115
diff
changeset
|
376 uint8_t *dst2[MP_MAX_PLANES]={dst[0], dst[1], dst[2], dst[3]}; |
f2d9ce0a6b28
Also pass alpha plane to swscale, avoids crashes when converting between
reimar
parents:
30115
diff
changeset
|
377 int src_stride2[MP_MAX_PLANES]={2*src_stride[0], 2*src_stride[1], 2*src_stride[2], 2*src_stride[3]}; |
f2d9ce0a6b28
Also pass alpha plane to swscale, avoids crashes when converting between
reimar
parents:
30115
diff
changeset
|
378 int dst_stride2[MP_MAX_PLANES]={2*dst_stride[0], 2*dst_stride[1], 2*dst_stride[2], 2*dst_stride[3]}; |
11700 | 379 |
30150
16c71b965952
Replace deprecated sws_scale_ordered usages by sws_scale (which does the same).
reimar
parents:
30117
diff
changeset
|
380 sws_scale(sws1, src2, src_stride2, y>>1, h>>1, dst2, dst_stride2); |
30117 | 381 for(i=0; i<MP_MAX_PLANES; i++){ |
11700 | 382 src2[i] += src_stride[i]; |
383 dst2[i] += dst_stride[i]; | |
384 } | |
30150
16c71b965952
Replace deprecated sws_scale_ordered usages by sws_scale (which does the same).
reimar
parents:
30117
diff
changeset
|
385 sws_scale(sws2, src2, src_stride2, y>>1, h>>1, dst2, dst_stride2); |
11700 | 386 }else{ |
30150
16c71b965952
Replace deprecated sws_scale_ordered usages by sws_scale (which does the same).
reimar
parents:
30117
diff
changeset
|
387 sws_scale(sws1, src2, src_stride, y, h, dst, dst_stride); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
388 } |
11700 | 389 } |
390 | |
9491 | 391 static void draw_slice(struct vf_instance_s* vf, |
392 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
|
393 mp_image_t *dmpi=vf->dmpi; |
9491 | 394 if(!dmpi){ |
24249 | 395 mp_msg(MSGT_VFILTER,MSGL_FATAL,"vf_scale: draw_slice() called with dmpi=NULL (no get_image?)\n"); |
9491 | 396 return; |
397 } | |
398 // printf("vf_scale::draw_slice() y=%d h=%d\n",y,h); | |
11700 | 399 scale(vf->priv->ctx, vf->priv->ctx2, src, stride, y, h, dmpi->planes, dmpi->stride, vf->priv->interlaced); |
9491 | 400 } |
401 | |
17906
20aca9baf5d8
passing pts through the filter layer (lets see if pts or cola comes out at the end)
michael
parents:
17674
diff
changeset
|
402 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ |
9491 | 403 mp_image_t *dmpi=mpi->priv; |
5522 | 404 |
9491 | 405 // printf("vf_scale::put_image(): processing whole frame! dmpi=%p flag=%d\n", |
406 // dmpi, (mpi->flags&MP_IMGFLAG_DRAW_CALLBACK)); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
407 |
9491 | 408 if(!(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK && dmpi)){ |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
409 |
5522 | 410 // hope we'll get DR buffer: |
5523 | 411 dmpi=vf_get_image(vf->next,vf->priv->fmt, |
6876 | 412 MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE, |
5522 | 413 vf->priv->w, vf->priv->h); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
414 |
11700 | 415 scale(vf->priv->ctx, vf->priv->ctx, mpi->planes,mpi->stride,0,mpi->h,dmpi->planes,dmpi->stride, vf->priv->interlaced); |
9491 | 416 } |
417 | |
5527 | 418 if(vf->priv->w==mpi->w && vf->priv->h==mpi->h){ |
419 // just conversion, no scaling -> keep postprocessing data | |
420 // this way we can apply pp filter to non-yv12 source using scaler | |
9934 | 421 vf_clone_mpi_attributes(dmpi, mpi); |
5527 | 422 } |
7783 | 423 |
424 if(vf->priv->palette) dmpi->planes[1]=vf->priv->palette; // export palette! | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
425 |
17906
20aca9baf5d8
passing pts through the filter layer (lets see if pts or cola comes out at the end)
michael
parents:
17674
diff
changeset
|
426 return vf_next_put_image(vf,dmpi, pts); |
5522 | 427 } |
428 | |
9476
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
429 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
|
430 int *table; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
431 int *inv_table; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
432 int r; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
433 int brightness, contrast, saturation, srcRange, dstRange; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
434 vf_equalizer_t *eq; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
435 |
10632 | 436 if(vf->priv->ctx) |
9476
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
437 switch(request){ |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
438 case VFCTRL_GET_EQUALIZER: |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
439 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
|
440 if(r<0) break; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
441 |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
442 eq = data; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
443 if (!strcmp(eq->item,"brightness")) { |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
444 eq->value = ((brightness*100) + (1<<15))>>16; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
445 } |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
446 else if (!strcmp(eq->item,"contrast")) { |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
447 eq->value = (((contrast *100) + (1<<15))>>16) - 100; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
448 } |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
449 else if (!strcmp(eq->item,"saturation")) { |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
450 eq->value = (((saturation*100) + (1<<15))>>16) - 100; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
451 } |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
452 else |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
453 break; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
454 return CONTROL_TRUE; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
455 case VFCTRL_SET_EQUALIZER: |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
456 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
|
457 if(r<0) break; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
458 //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
|
459 eq = data; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
460 |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
461 if (!strcmp(eq->item,"brightness")) { |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
462 brightness = (( eq->value <<16) + 50)/100; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
463 } |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
464 else if (!strcmp(eq->item,"contrast")) { |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
465 contrast = (((eq->value+100)<<16) + 50)/100; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
466 } |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
467 else if (!strcmp(eq->item,"saturation")) { |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
468 saturation = (((eq->value+100)<<16) + 50)/100; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
469 } |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
470 else |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
471 break; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
472 |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
473 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
|
474 if(r<0) break; |
11700 | 475 if(vf->priv->ctx2){ |
476 r= sws_setColorspaceDetails(vf->priv->ctx2, inv_table, srcRange, table, dstRange, brightness, contrast, saturation); | |
477 if(r<0) break; | |
478 } | |
9476
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
479 |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
480 return CONTROL_TRUE; |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
481 default: |
10233
35f52ad860a0
vf_scale.h & related cleanup & some small warning fix by dominik
michael
parents:
10140
diff
changeset
|
482 break; |
9476
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
483 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
484 |
9476
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
485 return vf_next_control(vf,request,data); |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
486 } |
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
487 |
5522 | 488 //===========================================================================// |
489 | |
9071 | 490 // supported Input formats: YV12, I420, IYUV, YUY2, UYVY, BGR32, BGR24, BGR16, BGR15, RGB32, RGB24, Y8, Y800 |
5523 | 491 |
492 static int query_format(struct vf_instance_s* vf, unsigned int fmt){ | |
493 switch(fmt){ | |
494 case IMGFMT_YV12: | |
495 case IMGFMT_I420: | |
496 case IMGFMT_IYUV: | |
9071 | 497 case IMGFMT_UYVY: |
5523 | 498 case IMGFMT_YUY2: |
499 case IMGFMT_BGR32: | |
500 case IMGFMT_BGR24: | |
501 case IMGFMT_BGR16: | |
502 case IMGFMT_BGR15: | |
503 case IMGFMT_RGB32: | |
504 case IMGFMT_RGB24: | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
505 case IMGFMT_Y800: |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
506 case IMGFMT_Y8: |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
507 case IMGFMT_YVU9: |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
508 case IMGFMT_IF09: |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
509 case IMGFMT_444P: |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
510 case IMGFMT_422P: |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
511 case IMGFMT_411P: |
30100 | 512 case IMGFMT_440P: |
30115
ad61464d02a7
Add support for YUV format with alpha and fix the codecs.conf entry for vp6a
reimar
parents:
30113
diff
changeset
|
513 case IMGFMT_420A: |
30110 | 514 case IMGFMT_444P16_LE: |
515 case IMGFMT_444P16_BE: | |
516 case IMGFMT_422P16_LE: | |
517 case IMGFMT_422P16_BE: | |
518 case IMGFMT_420P16_LE: | |
519 case IMGFMT_420P16_BE: | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
520 case IMGFMT_BGR8: |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
521 case IMGFMT_RGB8: |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
522 case IMGFMT_BG4B: |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
523 case IMGFMT_RG4B: |
29444 | 524 case IMGFMT_RGB48LE: |
525 case IMGFMT_RGB48BE: | |
6533 | 526 { |
30367
2db4c1158df9
Make the scale filter prefer yuv conversions that do not need chroma scaling.
reimar
parents:
30366
diff
changeset
|
527 unsigned int best=find_best_out(vf, fmt); |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
528 int flags; |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
529 if(!best) return 0; // no matching out-fmt |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
530 flags=vf_next_query_format(vf,best); |
15537 | 531 if(!(flags&(VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW))) return 0; // huh? |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
532 if(fmt!=best) flags&=~VFCAP_CSP_SUPPORTED_BY_HW; |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
533 // 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
|
534 if(!(flags&VFCAP_POSTPROC)) flags|=VFCAP_SWSCALE; |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
535 return flags; |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
536 } |
5523 | 537 } |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5527
diff
changeset
|
538 return 0; // nomatching in-fmt |
5523 | 539 } |
540 | |
11537 | 541 static void uninit(struct vf_instance_s *vf){ |
542 if(vf->priv->ctx) sws_freeContext(vf->priv->ctx); | |
11700 | 543 if(vf->priv->ctx2) sws_freeContext(vf->priv->ctx2); |
11537 | 544 if(vf->priv->palette) free(vf->priv->palette); |
545 free(vf->priv); | |
546 } | |
547 | |
5522 | 548 static int open(vf_instance_t *vf, char* args){ |
549 vf->config=config; | |
9491 | 550 vf->start_slice=start_slice; |
551 vf->draw_slice=draw_slice; | |
5522 | 552 vf->put_image=put_image; |
5526 | 553 vf->query_format=query_format; |
9476
eff727517e6b
yuv2rgb brightness/contrast/saturation/different colorspaces support finished
michael
parents:
9276
diff
changeset
|
554 vf->control= control; |
11537 | 555 vf->uninit=uninit; |
6138
523014df7d32
big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents:
6126
diff
changeset
|
556 mp_msg(MSGT_VFILTER,MSGL_V,"SwScale params: %d x %d (-1=no scaling)\n", |
5522 | 557 vf->priv->w, |
558 vf->priv->h); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
559 |
5522 | 560 return 1; |
561 } | |
562 | |
9975 | 563 //global sws_flags from the command line |
564 int sws_flags=2; | |
565 | |
566 //global srcFilter | |
9985
3d8b145a5470
moving getFilter stuff back (vf_scale.c -> swscale.c)
michael
parents:
9975
diff
changeset
|
567 static SwsFilter *src_filter= NULL; |
9975 | 568 |
569 float sws_lum_gblur= 0.0; | |
570 float sws_chr_gblur= 0.0; | |
571 int sws_chr_vshift= 0; | |
572 int sws_chr_hshift= 0; | |
573 float sws_chr_sharpen= 0.0; | |
574 float sws_lum_sharpen= 0.0; | |
575 | |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17215
diff
changeset
|
576 int get_sws_cpuflags(void){ |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
577 return |
9975 | 578 (gCpuCaps.hasMMX ? SWS_CPU_CAPS_MMX : 0) |
579 | (gCpuCaps.hasMMX2 ? SWS_CPU_CAPS_MMX2 : 0) | |
12017
21e5cb258a95
AltiVec support in postproc/ + altivec optimizations for yuv2yuvX patch by (Romain Dolbeau <dolbeau at irisa dot fr>)
michael
parents:
11700
diff
changeset
|
580 | (gCpuCaps.has3DNow ? SWS_CPU_CAPS_3DNOW : 0) |
21e5cb258a95
AltiVec support in postproc/ + altivec optimizations for yuv2yuvX patch by (Romain Dolbeau <dolbeau at irisa dot fr>)
michael
parents:
11700
diff
changeset
|
581 | (gCpuCaps.hasAltiVec ? SWS_CPU_CAPS_ALTIVEC : 0); |
9975 | 582 } |
583 | |
584 void sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, SwsFilter **dstFilterParam) | |
585 { | |
586 static int firstTime=1; | |
587 *flags=0; | |
588 | |
28290 | 589 #if ARCH_X86 |
9975 | 590 if(gCpuCaps.hasMMX) |
27754
08d18fe9da52
Change all occurrences of asm and __asm to __asm__, same as was done for FFmpeg.
diego
parents:
26703
diff
changeset
|
591 __asm__ volatile("emms\n\t"::: "memory"); //FIXME this should not be required but it IS (even for non-MMX versions) |
9975 | 592 #endif |
593 if(firstTime) | |
594 { | |
595 firstTime=0; | |
596 *flags= SWS_PRINT_INFO; | |
597 } | |
17932 | 598 else if( mp_msg_test(MSGT_VFILTER,MSGL_DBG2) ) *flags= SWS_PRINT_INFO; |
9975 | 599 |
9985
3d8b145a5470
moving getFilter stuff back (vf_scale.c -> swscale.c)
michael
parents:
9975
diff
changeset
|
600 if(src_filter) sws_freeFilter(src_filter); |
9975 | 601 |
9985
3d8b145a5470
moving getFilter stuff back (vf_scale.c -> swscale.c)
michael
parents:
9975
diff
changeset
|
602 src_filter= sws_getDefaultFilter( |
3d8b145a5470
moving getFilter stuff back (vf_scale.c -> swscale.c)
michael
parents:
9975
diff
changeset
|
603 sws_lum_gblur, sws_chr_gblur, |
3d8b145a5470
moving getFilter stuff back (vf_scale.c -> swscale.c)
michael
parents:
9975
diff
changeset
|
604 sws_lum_sharpen, sws_chr_sharpen, |
11373
3b9f8ee18ff9
another lame workaround for the g1 filter layer ...
michael
parents:
11069
diff
changeset
|
605 sws_chr_hshift, sws_chr_vshift, verbose>1); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
606 |
9975 | 607 switch(sws_flags) |
608 { | |
609 case 0: *flags|= SWS_FAST_BILINEAR; break; | |
610 case 1: *flags|= SWS_BILINEAR; break; | |
611 case 2: *flags|= SWS_BICUBIC; break; | |
612 case 3: *flags|= SWS_X; break; | |
613 case 4: *flags|= SWS_POINT; break; | |
614 case 5: *flags|= SWS_AREA; break; | |
615 case 6: *flags|= SWS_BICUBLIN; break; | |
616 case 7: *flags|= SWS_GAUSS; break; | |
617 case 8: *flags|= SWS_SINC; break; | |
618 case 9: *flags|= SWS_LANCZOS; break; | |
619 case 10:*flags|= SWS_SPLINE; break; | |
620 default:*flags|= SWS_BILINEAR; break; | |
621 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29064
diff
changeset
|
622 |
9985
3d8b145a5470
moving getFilter stuff back (vf_scale.c -> swscale.c)
michael
parents:
9975
diff
changeset
|
623 *srcFilterParam= src_filter; |
9975 | 624 *dstFilterParam= NULL; |
625 } | |
626 | |
627 // will use sws_flags & src_filter (from cmd line) | |
628 struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat) | |
629 { | |
630 int flags; | |
631 SwsFilter *dstFilterParam, *srcFilterParam; | |
19870
1e5cf11e8b1f
Use PIX_FMT_* instead of IMGFMT_* when calling sws_getContext()
lucabe
parents:
19520
diff
changeset
|
632 enum PixelFormat dfmt, sfmt; |
1e5cf11e8b1f
Use PIX_FMT_* instead of IMGFMT_* when calling sws_getContext()
lucabe
parents:
19520
diff
changeset
|
633 |
1e5cf11e8b1f
Use PIX_FMT_* instead of IMGFMT_* when calling sws_getContext()
lucabe
parents:
19520
diff
changeset
|
634 dfmt = imgfmt2pixfmt(dstFormat); |
1e5cf11e8b1f
Use PIX_FMT_* instead of IMGFMT_* when calling sws_getContext()
lucabe
parents:
19520
diff
changeset
|
635 sfmt = imgfmt2pixfmt(srcFormat); |
23479
db82492b2f30
100l, fix compile error in r23498 due to bad copy in paste
reimar
parents:
23478
diff
changeset
|
636 if (srcFormat == IMGFMT_RGB8 || srcFormat == IMGFMT_BGR8) sfmt = PIX_FMT_PAL8; |
9975 | 637 sws_getFlagsAndFilterFromCmdLine(&flags, &srcFilterParam, &dstFilterParam); |
638 | |
19870
1e5cf11e8b1f
Use PIX_FMT_* instead of IMGFMT_* when calling sws_getContext()
lucabe
parents:
19520
diff
changeset
|
639 return sws_getContext(srcW, srcH, sfmt, dstW, dstH, dfmt, flags | get_sws_cpuflags(), srcFilterParam, dstFilterParam, NULL); |
9975 | 640 } |
641 | |
9593
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
642 /// 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
|
643 static struct size_preset { |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
644 char* name; |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
645 int w, h; |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
646 } vf_size_presets_defs[] = { |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
647 // TODO add more 'standard' resolutions |
10814
7f34ec540e0f
size presets: added the standard resolutions as proposed by Fabrice (ffmpeg)
alex
parents:
10632
diff
changeset
|
648 { "qntsc", 352, 240 }, |
7f34ec540e0f
size presets: added the standard resolutions as proposed by Fabrice (ffmpeg)
alex
parents:
10632
diff
changeset
|
649 { "qpal", 352, 288 }, |
7f34ec540e0f
size presets: added the standard resolutions as proposed by Fabrice (ffmpeg)
alex
parents:
10632
diff
changeset
|
650 { "ntsc", 720, 480 }, |
7f34ec540e0f
size presets: added the standard resolutions as proposed by Fabrice (ffmpeg)
alex
parents:
10632
diff
changeset
|
651 { "pal", 720, 576 }, |
7f34ec540e0f
size presets: added the standard resolutions as proposed by Fabrice (ffmpeg)
alex
parents:
10632
diff
changeset
|
652 { "sntsc", 640, 480 }, |
7f34ec540e0f
size presets: added the standard resolutions as proposed by Fabrice (ffmpeg)
alex
parents:
10632
diff
changeset
|
653 { "spal", 768, 576 }, |
9593
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
654 { NULL, 0, 0} |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
655 }; |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
656 |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
657 #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
|
658 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
|
659 {"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
|
660 {"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
|
661 { 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
|
662 }; |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
663 |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
664 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
|
665 "scale_size_preset", |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
666 sizeof(struct size_preset), |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
667 NULL, |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
668 vf_size_preset_fields |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
669 }; |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
670 |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
671 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
|
672 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
|
673 &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
|
674 &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
|
675 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
|
676 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
|
677 }; |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
678 |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
679 /// Now the options |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
680 #undef ST_OFF |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
681 #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
|
682 static m_option_t vf_opts_fields[] = { |
14924
7f386d84805f
subtracting 8 from negative w and h rounds the dimension to the closest multiple of 16
nicodvb
parents:
14715
diff
changeset
|
683 {"w", ST_OFF(w), CONF_TYPE_INT, M_OPT_MIN,-11,0, NULL}, |
7f386d84805f
subtracting 8 from negative w and h rounds the dimension to the closest multiple of 16
nicodvb
parents:
14715
diff
changeset
|
684 {"h", ST_OFF(h), CONF_TYPE_INT, M_OPT_MIN,-11,0, NULL}, |
11700 | 685 {"interlaced", ST_OFF(interlaced), CONF_TYPE_INT, M_OPT_RANGE, 0, 1, NULL}, |
9593
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
686 {"chr-drop", ST_OFF(v_chr_drop), CONF_TYPE_INT, M_OPT_RANGE, 0, 3, NULL}, |
13373
6bd869a18d2c
passing an array or double precission parameters for the scaling function, instead of missusing a few bits of the flags
michael
parents:
13268
diff
changeset
|
687 {"param" , ST_OFF(param[0]), CONF_TYPE_DOUBLE, M_OPT_RANGE, 0.0, 100.0, NULL}, |
6bd869a18d2c
passing an array or double precission parameters for the scaling function, instead of missusing a few bits of the flags
michael
parents:
13268
diff
changeset
|
688 {"param2", ST_OFF(param[1]), CONF_TYPE_DOUBLE, M_OPT_RANGE, 0.0, 100.0, NULL}, |
9593
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
689 // 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
|
690 // 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
|
691 {"presize", 0, CONF_TYPE_OBJ_PRESETS, 0, 0, 0, &size_preset}, |
19520 | 692 {"noup", ST_OFF(noup), CONF_TYPE_INT, M_OPT_RANGE, 0, 2, NULL}, |
19172
bae6c99a99cc
vertical scaler with accurate rounding, some people on doom9 can see +-1 errors
michael
parents:
18861
diff
changeset
|
693 {"arnd", ST_OFF(accurate_rnd), CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
9593
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
694 { 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
|
695 }; |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
696 |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
697 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
|
698 "scale", |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
699 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
|
700 &vf_priv_dflt, |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
701 vf_opts_fields |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
702 }; |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
703 |
25221 | 704 const vf_info_t vf_info_scale = { |
5522 | 705 "software scaling", |
706 "scale", | |
707 "A'rpi", | |
708 "", | |
9593
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
709 open, |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9494
diff
changeset
|
710 &vf_opts |
5522 | 711 }; |
712 | |
713 //===========================================================================// |