Mercurial > libavcodec.hg
annotate imgresample.c @ 3960:d075bbfca527 libavcodec
Fixes:
parser.c:555: warning: implicit declaration of function ?ff_cavs_find_frame_end?
Approved by Michael.
| author | rathann |
|---|---|
| date | Sun, 08 Oct 2006 21:23:57 +0000 |
| parents | c8c591fe26f8 |
| children | 207c22206d53 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2967 | 2 * High quality image resampling with polyphase filters |
| 429 | 3 * Copyright (c) 2001 Fabrice Bellard. |
| 0 | 4 * |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3589
diff
changeset
|
5 * This file is part of FFmpeg. |
|
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3589
diff
changeset
|
6 * |
|
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3589
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
| 429 | 8 * modify it under the terms of the GNU Lesser General Public |
| 9 * License as published by the Free Software Foundation; either | |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3589
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
| 0 | 11 * |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3589
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
| 0 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 429 | 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 15 * Lesser General Public License for more details. | |
| 0 | 16 * |
| 429 | 17 * You should have received a copy of the GNU Lesser General Public |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3589
diff
changeset
|
18 * License along with FFmpeg; if not, write to the Free Software |
|
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
2979
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 20 */ |
| 2967 | 21 |
| 1106 | 22 /** |
| 23 * @file imgresample.c | |
| 24 * High quality image resampling with polyphase filters . | |
| 25 */ | |
| 2967 | 26 |
|
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
18
diff
changeset
|
27 #include "avcodec.h" |
| 3249 | 28 #include "swscale.h" |
| 0 | 29 #include "dsputil.h" |
| 30 | |
| 17 | 31 #ifdef USE_FASTMEMCPY |
| 3589 | 32 #include "libvo/fastmemcpy.h" |
| 17 | 33 #endif |
| 34 | |
| 0 | 35 #define NB_COMPONENTS 3 |
| 36 | |
| 37 #define PHASE_BITS 4 | |
| 38 #define NB_PHASES (1 << PHASE_BITS) | |
| 39 #define NB_TAPS 4 | |
| 40 #define FCENTER 1 /* index of the center of the filter */ | |
|
630
b4ee42142ad1
croping patch by (talus25 at speakeasy dot net) with fixes from atmos & me
michaelni
parents:
429
diff
changeset
|
41 //#define TEST 1 /* Test it */ |
| 0 | 42 |
| 43 #define POS_FRAC_BITS 16 | |
| 44 #define POS_FRAC (1 << POS_FRAC_BITS) | |
| 45 /* 6 bits precision is needed for MMX */ | |
| 46 #define FILTER_BITS 8 | |
| 47 | |
| 48 #define LINE_BUF_HEIGHT (NB_TAPS * 4) | |
| 49 | |
| 50 struct ImgReSampleContext { | |
|
1928
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
51 int iwidth, iheight, owidth, oheight; |
|
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
52 int topBand, bottomBand, leftBand, rightBand; |
|
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
53 int padtop, padbottom, padleft, padright; |
|
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
54 int pad_owidth, pad_oheight; |
| 0 | 55 int h_incr, v_incr; |
| 3089 | 56 DECLARE_ALIGNED_8(int16_t, h_filters[NB_PHASES][NB_TAPS]); /* horizontal filters */ |
| 57 DECLARE_ALIGNED_8(int16_t, v_filters[NB_PHASES][NB_TAPS]); /* vertical filters */ | |
| 1064 | 58 uint8_t *line_buf; |
| 0 | 59 }; |
| 60 | |
|
2082
3dc9bbe1b152
polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents:
2064
diff
changeset
|
61 void av_build_filter(int16_t *filter, double factor, int tap_count, int phase_count, int scale, int type); |
|
3dc9bbe1b152
polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents:
2064
diff
changeset
|
62 |
| 0 | 63 static inline int get_phase(int pos) |
| 64 { | |
| 65 return ((pos) >> (POS_FRAC_BITS - PHASE_BITS)) & ((1 << PHASE_BITS) - 1); | |
| 66 } | |
| 67 | |
| 68 /* This function must be optimized */ | |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1106
diff
changeset
|
69 static void h_resample_fast(uint8_t *dst, int dst_width, const uint8_t *src, |
| 2979 | 70 int src_width, int src_start, int src_incr, |
| 71 int16_t *filters) | |
| 0 | 72 { |
| 73 int src_pos, phase, sum, i; | |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1106
diff
changeset
|
74 const uint8_t *s; |
| 1064 | 75 int16_t *filter; |
| 0 | 76 |
| 77 src_pos = src_start; | |
| 78 for(i=0;i<dst_width;i++) { | |
| 79 #ifdef TEST | |
| 80 /* test */ | |
| 81 if ((src_pos >> POS_FRAC_BITS) < 0 || | |
| 82 (src_pos >> POS_FRAC_BITS) > (src_width - NB_TAPS)) | |
| 653 | 83 av_abort(); |
| 0 | 84 #endif |
| 85 s = src + (src_pos >> POS_FRAC_BITS); | |
| 86 phase = get_phase(src_pos); | |
| 87 filter = filters + phase * NB_TAPS; | |
| 88 #if NB_TAPS == 4 | |
| 89 sum = s[0] * filter[0] + | |
| 90 s[1] * filter[1] + | |
| 91 s[2] * filter[2] + | |
| 92 s[3] * filter[3]; | |
| 93 #else | |
| 94 { | |
| 95 int j; | |
| 96 sum = 0; | |
| 97 for(j=0;j<NB_TAPS;j++) | |
| 98 sum += s[j] * filter[j]; | |
| 99 } | |
| 100 #endif | |
| 101 sum = sum >> FILTER_BITS; | |
| 102 if (sum < 0) | |
| 103 sum = 0; | |
| 104 else if (sum > 255) | |
| 105 sum = 255; | |
| 106 dst[0] = sum; | |
| 107 src_pos += src_incr; | |
| 108 dst++; | |
| 109 } | |
| 110 } | |
| 111 | |
| 112 /* This function must be optimized */ | |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1106
diff
changeset
|
113 static void v_resample(uint8_t *dst, int dst_width, const uint8_t *src, |
| 2979 | 114 int wrap, int16_t *filter) |
| 0 | 115 { |
| 116 int sum, i; | |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1106
diff
changeset
|
117 const uint8_t *s; |
| 0 | 118 |
| 119 s = src; | |
| 120 for(i=0;i<dst_width;i++) { | |
| 121 #if NB_TAPS == 4 | |
| 122 sum = s[0 * wrap] * filter[0] + | |
| 123 s[1 * wrap] * filter[1] + | |
| 124 s[2 * wrap] * filter[2] + | |
| 125 s[3 * wrap] * filter[3]; | |
| 126 #else | |
| 127 { | |
| 128 int j; | |
| 1064 | 129 uint8_t *s1 = s; |
| 0 | 130 |
| 131 sum = 0; | |
| 132 for(j=0;j<NB_TAPS;j++) { | |
| 133 sum += s1[0] * filter[j]; | |
| 134 s1 += wrap; | |
| 135 } | |
| 136 } | |
| 137 #endif | |
| 138 sum = sum >> FILTER_BITS; | |
| 139 if (sum < 0) | |
| 140 sum = 0; | |
| 141 else if (sum > 255) | |
| 142 sum = 255; | |
| 143 dst[0] = sum; | |
| 144 dst++; | |
| 145 s++; | |
| 146 } | |
| 147 } | |
| 148 | |
| 2 | 149 #ifdef HAVE_MMX |
| 0 | 150 |
| 151 #include "i386/mmx.h" | |
| 152 | |
| 153 #define FILTER4(reg) \ | |
| 154 {\ | |
| 155 s = src + (src_pos >> POS_FRAC_BITS);\ | |
| 156 phase = get_phase(src_pos);\ | |
| 157 filter = filters + phase * NB_TAPS;\ | |
| 158 movq_m2r(*s, reg);\ | |
| 159 punpcklbw_r2r(mm7, reg);\ | |
| 160 movq_m2r(*filter, mm6);\ | |
| 161 pmaddwd_r2r(reg, mm6);\ | |
| 162 movq_r2r(mm6, reg);\ | |
| 163 psrlq_i2r(32, reg);\ | |
| 164 paddd_r2r(mm6, reg);\ | |
| 165 psrad_i2r(FILTER_BITS, reg);\ | |
| 166 src_pos += src_incr;\ | |
| 167 } | |
| 168 | |
| 169 #define DUMP(reg) movq_r2m(reg, tmp); printf(#reg "=%016Lx\n", tmp.uq); | |
| 170 | |
| 171 /* XXX: do four pixels at a time */ | |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1106
diff
changeset
|
172 static void h_resample_fast4_mmx(uint8_t *dst, int dst_width, |
| 2979 | 173 const uint8_t *src, int src_width, |
| 1064 | 174 int src_start, int src_incr, int16_t *filters) |
| 0 | 175 { |
| 176 int src_pos, phase; | |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1106
diff
changeset
|
177 const uint8_t *s; |
| 1064 | 178 int16_t *filter; |
| 0 | 179 mmx_t tmp; |
| 2967 | 180 |
| 0 | 181 src_pos = src_start; |
| 182 pxor_r2r(mm7, mm7); | |
| 183 | |
| 184 while (dst_width >= 4) { | |
| 185 | |
| 186 FILTER4(mm0); | |
| 187 FILTER4(mm1); | |
| 188 FILTER4(mm2); | |
| 189 FILTER4(mm3); | |
| 190 | |
| 191 packuswb_r2r(mm7, mm0); | |
| 192 packuswb_r2r(mm7, mm1); | |
| 193 packuswb_r2r(mm7, mm3); | |
| 194 packuswb_r2r(mm7, mm2); | |
| 195 movq_r2m(mm0, tmp); | |
| 196 dst[0] = tmp.ub[0]; | |
| 197 movq_r2m(mm1, tmp); | |
| 198 dst[1] = tmp.ub[0]; | |
| 199 movq_r2m(mm2, tmp); | |
| 200 dst[2] = tmp.ub[0]; | |
| 201 movq_r2m(mm3, tmp); | |
| 202 dst[3] = tmp.ub[0]; | |
| 203 dst += 4; | |
| 204 dst_width -= 4; | |
| 205 } | |
| 206 while (dst_width > 0) { | |
| 207 FILTER4(mm0); | |
| 208 packuswb_r2r(mm7, mm0); | |
| 209 movq_r2m(mm0, tmp); | |
| 210 dst[0] = tmp.ub[0]; | |
| 211 dst++; | |
| 212 dst_width--; | |
| 213 } | |
| 214 emms(); | |
| 215 } | |
| 216 | |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1106
diff
changeset
|
217 static void v_resample4_mmx(uint8_t *dst, int dst_width, const uint8_t *src, |
| 2979 | 218 int wrap, int16_t *filter) |
| 0 | 219 { |
| 220 int sum, i, v; | |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1106
diff
changeset
|
221 const uint8_t *s; |
| 0 | 222 mmx_t tmp; |
| 223 mmx_t coefs[4]; | |
| 2967 | 224 |
| 0 | 225 for(i=0;i<4;i++) { |
| 226 v = filter[i]; | |
| 227 coefs[i].uw[0] = v; | |
| 228 coefs[i].uw[1] = v; | |
| 229 coefs[i].uw[2] = v; | |
| 230 coefs[i].uw[3] = v; | |
| 231 } | |
| 2967 | 232 |
| 0 | 233 pxor_r2r(mm7, mm7); |
| 234 s = src; | |
| 235 while (dst_width >= 4) { | |
| 236 movq_m2r(s[0 * wrap], mm0); | |
| 237 punpcklbw_r2r(mm7, mm0); | |
| 238 movq_m2r(s[1 * wrap], mm1); | |
| 239 punpcklbw_r2r(mm7, mm1); | |
| 240 movq_m2r(s[2 * wrap], mm2); | |
| 241 punpcklbw_r2r(mm7, mm2); | |
| 242 movq_m2r(s[3 * wrap], mm3); | |
| 243 punpcklbw_r2r(mm7, mm3); | |
| 244 | |
| 245 pmullw_m2r(coefs[0], mm0); | |
| 246 pmullw_m2r(coefs[1], mm1); | |
| 247 pmullw_m2r(coefs[2], mm2); | |
| 248 pmullw_m2r(coefs[3], mm3); | |
| 249 | |
| 250 paddw_r2r(mm1, mm0); | |
| 251 paddw_r2r(mm3, mm2); | |
| 252 paddw_r2r(mm2, mm0); | |
| 253 psraw_i2r(FILTER_BITS, mm0); | |
| 2967 | 254 |
| 0 | 255 packuswb_r2r(mm7, mm0); |
| 256 movq_r2m(mm0, tmp); | |
| 257 | |
| 1064 | 258 *(uint32_t *)dst = tmp.ud[0]; |
| 0 | 259 dst += 4; |
| 260 s += 4; | |
| 261 dst_width -= 4; | |
| 262 } | |
| 263 while (dst_width > 0) { | |
| 264 sum = s[0 * wrap] * filter[0] + | |
| 265 s[1 * wrap] * filter[1] + | |
| 266 s[2 * wrap] * filter[2] + | |
| 267 s[3 * wrap] * filter[3]; | |
| 268 sum = sum >> FILTER_BITS; | |
| 269 if (sum < 0) | |
| 270 sum = 0; | |
| 271 else if (sum > 255) | |
| 272 sum = 255; | |
| 273 dst[0] = sum; | |
| 274 dst++; | |
| 275 s++; | |
| 276 dst_width--; | |
| 277 } | |
| 278 emms(); | |
| 279 } | |
| 280 #endif | |
| 281 | |
|
894
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
282 #ifdef HAVE_ALTIVEC |
| 2979 | 283 typedef union { |
|
894
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
284 vector unsigned char v; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
285 unsigned char c[16]; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
286 } vec_uc_t; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
287 |
| 2979 | 288 typedef union { |
|
894
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
289 vector signed short v; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
290 signed short s[8]; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
291 } vec_ss_t; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
292 |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1106
diff
changeset
|
293 void v_resample16_altivec(uint8_t *dst, int dst_width, const uint8_t *src, |
| 2979 | 294 int wrap, int16_t *filter) |
|
894
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
295 { |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
296 int sum, i; |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1106
diff
changeset
|
297 const uint8_t *s; |
|
894
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
298 vector unsigned char *tv, tmp, dstv, zero; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
299 vec_ss_t srchv[4], srclv[4], fv[4]; |
| 2967 | 300 vector signed short zeros, sumhv, sumlv; |
|
894
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
301 s = src; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
302 |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
303 for(i=0;i<4;i++) |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
304 { |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
305 /* |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
306 The vec_madds later on does an implicit >>15 on the result. |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
307 Since FILTER_BITS is 8, and we have 15 bits of magnitude in |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
308 a signed short, we have just enough bits to pre-shift our |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
309 filter constants <<7 to compensate for vec_madds. |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
310 */ |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
311 fv[i].s[0] = filter[i] << (15-FILTER_BITS); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
312 fv[i].v = vec_splat(fv[i].v, 0); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
313 } |
| 2967 | 314 |
|
894
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
315 zero = vec_splat_u8(0); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
316 zeros = vec_splat_s16(0); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
317 |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
318 |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
319 /* |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
320 When we're resampling, we'd ideally like both our input buffers, |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
321 and output buffers to be 16-byte aligned, so we can do both aligned |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
322 reads and writes. Sadly we can't always have this at the moment, so |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
323 we opt for aligned writes, as unaligned writes have a huge overhead. |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
324 To do this, do enough scalar resamples to get dst 16-byte aligned. |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
325 */ |
|
898
6d5e3fe7aea1
Simplify an expression and eliminate a compile warning
philipjsg
parents:
894
diff
changeset
|
326 i = (-(int)dst) & 0xf; |
|
894
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
327 while(i>0) { |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
328 sum = s[0 * wrap] * filter[0] + |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
329 s[1 * wrap] * filter[1] + |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
330 s[2 * wrap] * filter[2] + |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
331 s[3 * wrap] * filter[3]; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
332 sum = sum >> FILTER_BITS; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
333 if (sum<0) sum = 0; else if (sum>255) sum=255; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
334 dst[0] = sum; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
335 dst++; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
336 s++; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
337 dst_width--; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
338 i--; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
339 } |
| 2967 | 340 |
|
894
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
341 /* Do our altivec resampling on 16 pixels at once. */ |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
342 while(dst_width>=16) { |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
343 /* |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
344 Read 16 (potentially unaligned) bytes from each of |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
345 4 lines into 4 vectors, and split them into shorts. |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
346 Interleave the multipy/accumulate for the resample |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
347 filter with the loads to hide the 3 cycle latency |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
348 the vec_madds have. |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
349 */ |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
350 tv = (vector unsigned char *) &s[0 * wrap]; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
351 tmp = vec_perm(tv[0], tv[1], vec_lvsl(0, &s[i * wrap])); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
352 srchv[0].v = (vector signed short) vec_mergeh(zero, tmp); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
353 srclv[0].v = (vector signed short) vec_mergel(zero, tmp); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
354 sumhv = vec_madds(srchv[0].v, fv[0].v, zeros); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
355 sumlv = vec_madds(srclv[0].v, fv[0].v, zeros); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
356 |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
357 tv = (vector unsigned char *) &s[1 * wrap]; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
358 tmp = vec_perm(tv[0], tv[1], vec_lvsl(0, &s[1 * wrap])); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
359 srchv[1].v = (vector signed short) vec_mergeh(zero, tmp); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
360 srclv[1].v = (vector signed short) vec_mergel(zero, tmp); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
361 sumhv = vec_madds(srchv[1].v, fv[1].v, sumhv); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
362 sumlv = vec_madds(srclv[1].v, fv[1].v, sumlv); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
363 |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
364 tv = (vector unsigned char *) &s[2 * wrap]; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
365 tmp = vec_perm(tv[0], tv[1], vec_lvsl(0, &s[2 * wrap])); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
366 srchv[2].v = (vector signed short) vec_mergeh(zero, tmp); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
367 srclv[2].v = (vector signed short) vec_mergel(zero, tmp); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
368 sumhv = vec_madds(srchv[2].v, fv[2].v, sumhv); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
369 sumlv = vec_madds(srclv[2].v, fv[2].v, sumlv); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
370 |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
371 tv = (vector unsigned char *) &s[3 * wrap]; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
372 tmp = vec_perm(tv[0], tv[1], vec_lvsl(0, &s[3 * wrap])); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
373 srchv[3].v = (vector signed short) vec_mergeh(zero, tmp); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
374 srclv[3].v = (vector signed short) vec_mergel(zero, tmp); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
375 sumhv = vec_madds(srchv[3].v, fv[3].v, sumhv); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
376 sumlv = vec_madds(srclv[3].v, fv[3].v, sumlv); |
| 2967 | 377 |
|
894
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
378 /* |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
379 Pack the results into our destination vector, |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
380 and do an aligned write of that back to memory. |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
381 */ |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
382 dstv = vec_packsu(sumhv, sumlv) ; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
383 vec_st(dstv, 0, (vector unsigned char *) dst); |
| 2967 | 384 |
|
894
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
385 dst+=16; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
386 s+=16; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
387 dst_width-=16; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
388 } |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
389 |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
390 /* |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
391 If there are any leftover pixels, resample them |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
392 with the slow scalar method. |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
393 */ |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
394 while(dst_width>0) { |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
395 sum = s[0 * wrap] * filter[0] + |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
396 s[1 * wrap] * filter[1] + |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
397 s[2 * wrap] * filter[2] + |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
398 s[3 * wrap] * filter[3]; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
399 sum = sum >> FILTER_BITS; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
400 if (sum<0) sum = 0; else if (sum>255) sum=255; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
401 dst[0] = sum; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
402 dst++; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
403 s++; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
404 dst_width--; |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
405 } |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
406 } |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
407 #endif |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
408 |
| 0 | 409 /* slow version to handle limit cases. Does not need optimisation */ |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1106
diff
changeset
|
410 static void h_resample_slow(uint8_t *dst, int dst_width, |
| 2979 | 411 const uint8_t *src, int src_width, |
| 1064 | 412 int src_start, int src_incr, int16_t *filters) |
| 0 | 413 { |
| 414 int src_pos, phase, sum, j, v, i; | |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1106
diff
changeset
|
415 const uint8_t *s, *src_end; |
| 1064 | 416 int16_t *filter; |
| 0 | 417 |
| 418 src_end = src + src_width; | |
| 419 src_pos = src_start; | |
| 420 for(i=0;i<dst_width;i++) { | |
| 421 s = src + (src_pos >> POS_FRAC_BITS); | |
| 422 phase = get_phase(src_pos); | |
| 423 filter = filters + phase * NB_TAPS; | |
| 424 sum = 0; | |
| 425 for(j=0;j<NB_TAPS;j++) { | |
| 426 if (s < src) | |
| 427 v = src[0]; | |
| 428 else if (s >= src_end) | |
| 429 v = src_end[-1]; | |
| 430 else | |
| 431 v = s[0]; | |
| 432 sum += v * filter[j]; | |
| 433 s++; | |
| 434 } | |
| 435 sum = sum >> FILTER_BITS; | |
| 436 if (sum < 0) | |
| 437 sum = 0; | |
| 438 else if (sum > 255) | |
| 439 sum = 255; | |
| 440 dst[0] = sum; | |
| 441 src_pos += src_incr; | |
| 442 dst++; | |
| 443 } | |
| 444 } | |
| 445 | |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1106
diff
changeset
|
446 static void h_resample(uint8_t *dst, int dst_width, const uint8_t *src, |
| 2979 | 447 int src_width, int src_start, int src_incr, |
| 448 int16_t *filters) | |
| 0 | 449 { |
| 450 int n, src_end; | |
| 451 | |
| 452 if (src_start < 0) { | |
| 453 n = (0 - src_start + src_incr - 1) / src_incr; | |
| 454 h_resample_slow(dst, n, src, src_width, src_start, src_incr, filters); | |
| 455 dst += n; | |
| 456 dst_width -= n; | |
| 457 src_start += n * src_incr; | |
| 458 } | |
| 459 src_end = src_start + dst_width * src_incr; | |
| 460 if (src_end > ((src_width - NB_TAPS) << POS_FRAC_BITS)) { | |
| 2967 | 461 n = (((src_width - NB_TAPS + 1) << POS_FRAC_BITS) - 1 - src_start) / |
| 0 | 462 src_incr; |
| 463 } else { | |
| 464 n = dst_width; | |
| 465 } | |
| 2 | 466 #ifdef HAVE_MMX |
| 0 | 467 if ((mm_flags & MM_MMX) && NB_TAPS == 4) |
| 2967 | 468 h_resample_fast4_mmx(dst, n, |
| 0 | 469 src, src_width, src_start, src_incr, filters); |
| 470 else | |
| 471 #endif | |
| 2967 | 472 h_resample_fast(dst, n, |
| 0 | 473 src, src_width, src_start, src_incr, filters); |
| 474 if (n < dst_width) { | |
| 475 dst += n; | |
| 476 dst_width -= n; | |
| 477 src_start += n * src_incr; | |
| 2967 | 478 h_resample_slow(dst, dst_width, |
| 0 | 479 src, src_width, src_start, src_incr, filters); |
| 480 } | |
| 481 } | |
| 482 | |
| 2967 | 483 static void component_resample(ImgReSampleContext *s, |
| 1064 | 484 uint8_t *output, int owrap, int owidth, int oheight, |
| 485 uint8_t *input, int iwrap, int iwidth, int iheight) | |
| 0 | 486 { |
| 487 int src_y, src_y1, last_src_y, ring_y, phase_y, y1, y; | |
| 1064 | 488 uint8_t *new_line, *src_line; |
| 0 | 489 |
| 490 last_src_y = - FCENTER - 1; | |
| 491 /* position of the bottom of the filter in the source image */ | |
| 2967 | 492 src_y = (last_src_y + NB_TAPS) * POS_FRAC; |
| 0 | 493 ring_y = NB_TAPS; /* position in ring buffer */ |
| 494 for(y=0;y<oheight;y++) { | |
| 495 /* apply horizontal filter on new lines from input if needed */ | |
| 496 src_y1 = src_y >> POS_FRAC_BITS; | |
| 497 while (last_src_y < src_y1) { | |
| 498 if (++ring_y >= LINE_BUF_HEIGHT + NB_TAPS) | |
| 499 ring_y = NB_TAPS; | |
| 500 last_src_y++; | |
|
630
b4ee42142ad1
croping patch by (talus25 at speakeasy dot net) with fixes from atmos & me
michaelni
parents:
429
diff
changeset
|
501 /* handle limit conditions : replicate line (slightly |
|
b4ee42142ad1
croping patch by (talus25 at speakeasy dot net) with fixes from atmos & me
michaelni
parents:
429
diff
changeset
|
502 inefficient because we filter multiple times) */ |
| 0 | 503 y1 = last_src_y; |
| 504 if (y1 < 0) { | |
| 505 y1 = 0; | |
| 506 } else if (y1 >= iheight) { | |
| 507 y1 = iheight - 1; | |
| 508 } | |
| 509 src_line = input + y1 * iwrap; | |
| 510 new_line = s->line_buf + ring_y * owidth; | |
| 511 /* apply filter and handle limit cases correctly */ | |
| 2967 | 512 h_resample(new_line, owidth, |
| 513 src_line, iwidth, - FCENTER * POS_FRAC, s->h_incr, | |
| 0 | 514 &s->h_filters[0][0]); |
| 515 /* handle ring buffer wraping */ | |
| 516 if (ring_y >= LINE_BUF_HEIGHT) { | |
| 517 memcpy(s->line_buf + (ring_y - LINE_BUF_HEIGHT) * owidth, | |
| 518 new_line, owidth); | |
| 519 } | |
| 520 } | |
| 521 /* apply vertical filter */ | |
| 522 phase_y = get_phase(src_y); | |
| 2 | 523 #ifdef HAVE_MMX |
| 0 | 524 /* desactivated MMX because loss of precision */ |
| 525 if ((mm_flags & MM_MMX) && NB_TAPS == 4 && 0) | |
| 2967 | 526 v_resample4_mmx(output, owidth, |
| 527 s->line_buf + (ring_y - NB_TAPS + 1) * owidth, owidth, | |
| 0 | 528 &s->v_filters[phase_y][0]); |
| 529 else | |
| 530 #endif | |
|
894
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
531 #ifdef HAVE_ALTIVEC |
|
920
a0ad8e3452f2
practically disabling altivec resampling code (some ppl said its broken) patch by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
898
diff
changeset
|
532 if ((mm_flags & MM_ALTIVEC) && NB_TAPS == 4 && FILTER_BITS <= 6) |
|
894
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
533 v_resample16_altivec(output, owidth, |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
534 s->line_buf + (ring_y - NB_TAPS + 1) * owidth, owidth, |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
535 &s->v_filters[phase_y][0]); |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
536 else |
|
a408778eff87
altivec accelerated v-resample patch by (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
michaelni
parents:
653
diff
changeset
|
537 #endif |
| 2967 | 538 v_resample(output, owidth, |
| 539 s->line_buf + (ring_y - NB_TAPS + 1) * owidth, owidth, | |
| 0 | 540 &s->v_filters[phase_y][0]); |
| 2967 | 541 |
| 0 | 542 src_y += s->v_incr; |
| 2967 | 543 |
| 0 | 544 output += owrap; |
| 545 } | |
| 546 } | |
| 547 | |
| 548 ImgReSampleContext *img_resample_init(int owidth, int oheight, | |
| 549 int iwidth, int iheight) | |
| 550 { | |
| 2967 | 551 return img_resample_full_init(owidth, oheight, iwidth, iheight, |
|
1928
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
552 0, 0, 0, 0, 0, 0, 0, 0); |
|
630
b4ee42142ad1
croping patch by (talus25 at speakeasy dot net) with fixes from atmos & me
michaelni
parents:
429
diff
changeset
|
553 } |
|
b4ee42142ad1
croping patch by (talus25 at speakeasy dot net) with fixes from atmos & me
michaelni
parents:
429
diff
changeset
|
554 |
|
b4ee42142ad1
croping patch by (talus25 at speakeasy dot net) with fixes from atmos & me
michaelni
parents:
429
diff
changeset
|
555 ImgReSampleContext *img_resample_full_init(int owidth, int oheight, |
|
b4ee42142ad1
croping patch by (talus25 at speakeasy dot net) with fixes from atmos & me
michaelni
parents:
429
diff
changeset
|
556 int iwidth, int iheight, |
|
b4ee42142ad1
croping patch by (talus25 at speakeasy dot net) with fixes from atmos & me
michaelni
parents:
429
diff
changeset
|
557 int topBand, int bottomBand, |
|
1928
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
558 int leftBand, int rightBand, |
|
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
559 int padtop, int padbottom, |
|
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
560 int padleft, int padright) |
|
630
b4ee42142ad1
croping patch by (talus25 at speakeasy dot net) with fixes from atmos & me
michaelni
parents:
429
diff
changeset
|
561 { |
| 0 | 562 ImgReSampleContext *s; |
| 563 | |
| 2904 | 564 if (!owidth || !oheight || !iwidth || !iheight) |
| 2979 | 565 return NULL; |
| 2904 | 566 |
| 0 | 567 s = av_mallocz(sizeof(ImgReSampleContext)); |
| 568 if (!s) | |
| 569 return NULL; | |
| 2422 | 570 if((unsigned)owidth >= UINT_MAX / (LINE_BUF_HEIGHT + NB_TAPS)) |
| 571 return NULL; | |
| 0 | 572 s->line_buf = av_mallocz(owidth * (LINE_BUF_HEIGHT + NB_TAPS)); |
| 2967 | 573 if (!s->line_buf) |
| 0 | 574 goto fail; |
| 2967 | 575 |
| 0 | 576 s->owidth = owidth; |
| 577 s->oheight = oheight; | |
| 578 s->iwidth = iwidth; | |
| 579 s->iheight = iheight; | |
| 2967 | 580 |
|
630
b4ee42142ad1
croping patch by (talus25 at speakeasy dot net) with fixes from atmos & me
michaelni
parents:
429
diff
changeset
|
581 s->topBand = topBand; |
|
b4ee42142ad1
croping patch by (talus25 at speakeasy dot net) with fixes from atmos & me
michaelni
parents:
429
diff
changeset
|
582 s->bottomBand = bottomBand; |
|
b4ee42142ad1
croping patch by (talus25 at speakeasy dot net) with fixes from atmos & me
michaelni
parents:
429
diff
changeset
|
583 s->leftBand = leftBand; |
|
b4ee42142ad1
croping patch by (talus25 at speakeasy dot net) with fixes from atmos & me
michaelni
parents:
429
diff
changeset
|
584 s->rightBand = rightBand; |
| 2967 | 585 |
|
1928
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
586 s->padtop = padtop; |
|
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
587 s->padbottom = padbottom; |
|
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
588 s->padleft = padleft; |
|
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
589 s->padright = padright; |
|
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
590 |
|
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
591 s->pad_owidth = owidth - (padleft + padright); |
|
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
592 s->pad_oheight = oheight - (padtop + padbottom); |
|
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
593 |
|
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
594 s->h_incr = ((iwidth - leftBand - rightBand) * POS_FRAC) / s->pad_owidth; |
| 2967 | 595 s->v_incr = ((iheight - topBand - bottomBand) * POS_FRAC) / s->pad_oheight; |
|
1928
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
596 |
| 2967 | 597 av_build_filter(&s->h_filters[0][0], (float) s->pad_owidth / |
|
2082
3dc9bbe1b152
polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents:
2064
diff
changeset
|
598 (float) (iwidth - leftBand - rightBand), NB_TAPS, NB_PHASES, 1<<FILTER_BITS, 0); |
| 2967 | 599 av_build_filter(&s->v_filters[0][0], (float) s->pad_oheight / |
|
2082
3dc9bbe1b152
polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents:
2064
diff
changeset
|
600 (float) (iheight - topBand - bottomBand), NB_TAPS, NB_PHASES, 1<<FILTER_BITS, 0); |
| 0 | 601 |
| 602 return s; | |
|
1928
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
603 fail: |
|
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
18
diff
changeset
|
604 av_free(s); |
| 0 | 605 return NULL; |
| 606 } | |
| 607 | |
| 2967 | 608 void img_resample(ImgReSampleContext *s, |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1106
diff
changeset
|
609 AVPicture *output, const AVPicture *input) |
| 0 | 610 { |
| 611 int i, shift; | |
|
1928
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
612 uint8_t* optr; |
| 0 | 613 |
|
1928
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
614 for (i=0;i<3;i++) { |
| 0 | 615 shift = (i == 0) ? 0 : 1; |
|
1928
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
616 |
| 2967 | 617 optr = output->data[i] + (((output->linesize[i] * |
|
1928
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
618 s->padtop) + s->padleft) >> shift); |
|
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
619 |
| 2967 | 620 component_resample(s, optr, output->linesize[i], |
|
1928
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
621 s->pad_owidth >> shift, s->pad_oheight >> shift, |
| 2967 | 622 input->data[i] + (input->linesize[i] * |
|
1928
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
623 (s->topBand >> shift)) + (s->leftBand >> shift), |
| 2967 | 624 input->linesize[i], ((s->iwidth - s->leftBand - |
|
1928
0c23a5564489
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
michael
parents:
1488
diff
changeset
|
625 s->rightBand) >> shift), |
|
630
b4ee42142ad1
croping patch by (talus25 at speakeasy dot net) with fixes from atmos & me
michaelni
parents:
429
diff
changeset
|
626 (s->iheight - s->topBand - s->bottomBand) >> shift); |
| 0 | 627 } |
| 628 } | |
| 629 | |
| 630 void img_resample_close(ImgReSampleContext *s) | |
| 631 { | |
|
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
18
diff
changeset
|
632 av_free(s->line_buf); |
|
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
18
diff
changeset
|
633 av_free(s); |
| 0 | 634 } |
| 635 | |
| 3249 | 636 struct SwsContext *sws_getContext(int srcW, int srcH, int srcFormat, |
| 637 int dstW, int dstH, int dstFormat, | |
| 638 int flags, SwsFilter *srcFilter, | |
| 639 SwsFilter *dstFilter, double *param) | |
| 640 { | |
| 641 struct SwsContext *ctx; | |
| 642 | |
| 643 ctx = av_malloc(sizeof(struct SwsContext)); | |
| 644 if (ctx == NULL) { | |
| 645 av_log(NULL, AV_LOG_ERROR, "Cannot allocate a resampling context!\n"); | |
| 646 | |
| 647 return NULL; | |
| 648 } | |
| 649 | |
| 650 if ((srcH != dstH) || (srcW != dstW)) { | |
| 651 if ((srcFormat != PIX_FMT_YUV420P) || (dstFormat != PIX_FMT_YUV420P)) { | |
| 652 av_log(NULL, AV_LOG_INFO, "PIX_FMT_YUV420P will be used as an intermediate format for rescaling\n"); | |
| 653 } | |
| 654 ctx->resampling_ctx = img_resample_init(dstW, dstH, srcW, srcH); | |
| 655 } else { | |
| 656 ctx->resampling_ctx = av_malloc(sizeof(ImgReSampleContext)); | |
| 657 ctx->resampling_ctx->iheight = srcH; | |
| 658 ctx->resampling_ctx->iwidth = srcW; | |
| 659 ctx->resampling_ctx->oheight = dstH; | |
| 660 ctx->resampling_ctx->owidth = dstW; | |
| 661 } | |
| 662 ctx->src_pix_fmt = srcFormat; | |
| 663 ctx->dst_pix_fmt = dstFormat; | |
| 664 | |
| 665 return ctx; | |
| 666 } | |
| 667 | |
| 668 void sws_freeContext(struct SwsContext *ctx) | |
| 669 { | |
| 670 if ((ctx->resampling_ctx->iwidth != ctx->resampling_ctx->owidth) || | |
| 671 (ctx->resampling_ctx->iheight != ctx->resampling_ctx->oheight)) { | |
| 672 img_resample_close(ctx->resampling_ctx); | |
| 673 } else { | |
| 674 av_free(ctx->resampling_ctx); | |
| 675 } | |
| 676 av_free(ctx); | |
| 677 } | |
| 678 | |
| 679 int sws_scale(struct SwsContext *ctx, uint8_t* src[], int srcStride[], | |
| 680 int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]) | |
| 681 { | |
| 682 AVPicture src_pict, dst_pict; | |
| 683 int i, res = 0; | |
| 684 AVPicture picture_format_temp; | |
| 685 AVPicture picture_resample_temp, *formatted_picture, *resampled_picture; | |
| 686 uint8_t *buf1 = NULL, *buf2 = NULL; | |
| 687 enum PixelFormat current_pix_fmt; | |
| 688 | |
| 689 for (i = 0; i < 3; i++) { | |
| 690 src_pict.data[i] = src[i]; | |
| 691 src_pict.linesize[i] = srcStride[i]; | |
| 692 dst_pict.data[i] = dst[i]; | |
| 693 dst_pict.linesize[i] = dstStride[i]; | |
| 694 } | |
| 695 if ((ctx->resampling_ctx->iwidth != ctx->resampling_ctx->owidth) || | |
| 696 (ctx->resampling_ctx->iheight != ctx->resampling_ctx->oheight)) { | |
| 697 /* We have to rescale the picture, but only YUV420P rescaling is supported... */ | |
| 698 | |
| 699 if (ctx->src_pix_fmt != PIX_FMT_YUV420P) { | |
| 700 int size; | |
| 701 | |
| 702 /* create temporary picture for rescaling input*/ | |
| 703 size = avpicture_get_size(PIX_FMT_YUV420P, ctx->resampling_ctx->iwidth, ctx->resampling_ctx->iheight); | |
| 704 buf1 = av_malloc(size); | |
| 705 if (!buf1) { | |
| 706 res = -1; | |
| 707 goto the_end; | |
| 708 } | |
| 709 formatted_picture = &picture_format_temp; | |
| 710 avpicture_fill((AVPicture*)formatted_picture, buf1, | |
| 711 PIX_FMT_YUV420P, ctx->resampling_ctx->iwidth, ctx->resampling_ctx->iheight); | |
| 712 | |
| 713 if (img_convert((AVPicture*)formatted_picture, PIX_FMT_YUV420P, | |
| 714 &src_pict, ctx->src_pix_fmt, | |
| 715 ctx->resampling_ctx->iwidth, ctx->resampling_ctx->iheight) < 0) { | |
| 716 | |
| 717 av_log(NULL, AV_LOG_ERROR, "pixel format conversion not handled\n"); | |
| 718 res = -1; | |
| 719 goto the_end; | |
| 720 } | |
| 721 } else { | |
| 722 formatted_picture = &src_pict; | |
| 723 } | |
| 724 | |
| 725 if (ctx->dst_pix_fmt != PIX_FMT_YUV420P) { | |
| 726 int size; | |
| 727 | |
| 728 /* create temporary picture for rescaling output*/ | |
| 729 size = avpicture_get_size(PIX_FMT_YUV420P, ctx->resampling_ctx->owidth, ctx->resampling_ctx->oheight); | |
| 730 buf2 = av_malloc(size); | |
| 731 if (!buf2) { | |
| 732 res = -1; | |
| 733 goto the_end; | |
| 734 } | |
| 735 resampled_picture = &picture_resample_temp; | |
| 736 avpicture_fill((AVPicture*)resampled_picture, buf2, | |
| 737 PIX_FMT_YUV420P, ctx->resampling_ctx->owidth, ctx->resampling_ctx->oheight); | |
| 738 | |
| 739 } else { | |
| 740 resampled_picture = &dst_pict; | |
| 741 } | |
| 742 | |
| 743 /* ...and finally rescale!!! */ | |
| 744 img_resample(ctx->resampling_ctx, resampled_picture, formatted_picture); | |
| 745 current_pix_fmt = PIX_FMT_YUV420P; | |
| 746 } else { | |
| 747 resampled_picture = &src_pict; | |
| 748 current_pix_fmt = ctx->src_pix_fmt; | |
| 749 } | |
| 750 | |
| 751 if (current_pix_fmt != ctx->dst_pix_fmt) { | |
| 752 if (img_convert(&dst_pict, ctx->dst_pix_fmt, | |
| 753 resampled_picture, current_pix_fmt, | |
| 754 ctx->resampling_ctx->owidth, ctx->resampling_ctx->oheight) < 0) { | |
| 755 | |
| 756 av_log(NULL, AV_LOG_ERROR, "pixel format conversion not handled\n"); | |
| 757 | |
| 758 res = -1; | |
| 759 goto the_end; | |
| 760 } | |
| 3516 | 761 } else if (resampled_picture != &dst_pict) { |
| 762 img_copy(&dst_pict, resampled_picture, current_pix_fmt, | |
| 763 ctx->resampling_ctx->owidth, ctx->resampling_ctx->oheight); | |
| 3249 | 764 } |
| 765 | |
| 766 the_end: | |
| 767 av_free(buf1); | |
| 768 av_free(buf2); | |
| 769 return res; | |
| 770 } | |
| 771 | |
| 772 | |
| 0 | 773 #ifdef TEST |
|
2400
17ec73c65748
imgresample test cleanup patch by (Panagiotis Issaris <takis )( lumumba d0t luc d0t ac.be>)
michael
parents:
2082
diff
changeset
|
774 #include <stdio.h> |
|
630
b4ee42142ad1
croping patch by (talus25 at speakeasy dot net) with fixes from atmos & me
michaelni
parents:
429
diff
changeset
|
775 |
| 0 | 776 /* input */ |
| 777 #define XSIZE 256 | |
| 778 #define YSIZE 256 | |
| 1064 | 779 uint8_t img[XSIZE * YSIZE]; |
| 0 | 780 |
| 781 /* output */ | |
| 782 #define XSIZE1 512 | |
| 783 #define YSIZE1 512 | |
| 1064 | 784 uint8_t img1[XSIZE1 * YSIZE1]; |
| 785 uint8_t img2[XSIZE1 * YSIZE1]; | |
| 0 | 786 |
| 1064 | 787 void save_pgm(const char *filename, uint8_t *img, int xsize, int ysize) |
| 0 | 788 { |
|
2846
40765c51a7a9
Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
michael
parents:
2423
diff
changeset
|
789 #undef fprintf |
| 0 | 790 FILE *f; |
| 791 f=fopen(filename,"w"); | |
| 792 fprintf(f,"P5\n%d %d\n%d\n", xsize, ysize, 255); | |
| 793 fwrite(img,1, xsize * ysize,f); | |
| 794 fclose(f); | |
|
2846
40765c51a7a9
Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
michael
parents:
2423
diff
changeset
|
795 #define fprintf please_use_av_log |
| 0 | 796 } |
| 797 | |
| 1064 | 798 static void dump_filter(int16_t *filter) |
| 0 | 799 { |
| 800 int i, ph; | |
| 801 | |
| 802 for(ph=0;ph<NB_PHASES;ph++) { | |
|
2400
17ec73c65748
imgresample test cleanup patch by (Panagiotis Issaris <takis )( lumumba d0t luc d0t ac.be>)
michael
parents:
2082
diff
changeset
|
803 av_log(NULL, AV_LOG_INFO, "%2d: ", ph); |
| 0 | 804 for(i=0;i<NB_TAPS;i++) { |
|
2400
17ec73c65748
imgresample test cleanup patch by (Panagiotis Issaris <takis )( lumumba d0t luc d0t ac.be>)
michael
parents:
2082
diff
changeset
|
805 av_log(NULL, AV_LOG_INFO, " %5.2f", filter[ph * NB_TAPS + i] / 256.0); |
| 0 | 806 } |
|
2400
17ec73c65748
imgresample test cleanup patch by (Panagiotis Issaris <takis )( lumumba d0t luc d0t ac.be>)
michael
parents:
2082
diff
changeset
|
807 av_log(NULL, AV_LOG_INFO, "\n"); |
| 0 | 808 } |
| 809 } | |
| 810 | |
| 2 | 811 #ifdef HAVE_MMX |
| 644 | 812 int mm_flags; |
| 0 | 813 #endif |
| 814 | |
| 815 int main(int argc, char **argv) | |
| 816 { | |
| 817 int x, y, v, i, xsize, ysize; | |
| 818 ImgReSampleContext *s; | |
| 819 float fact, factors[] = { 1/2.0, 3.0/4.0, 1.0, 4.0/3.0, 16.0/9.0, 2.0 }; | |
| 820 char buf[256]; | |
| 821 | |
| 822 /* build test image */ | |
| 823 for(y=0;y<YSIZE;y++) { | |
| 824 for(x=0;x<XSIZE;x++) { | |
| 825 if (x < XSIZE/2 && y < YSIZE/2) { | |
| 826 if (x < XSIZE/4 && y < YSIZE/4) { | |
| 827 if ((x % 10) <= 6 && | |
| 828 (y % 10) <= 6) | |
| 829 v = 0xff; | |
| 830 else | |
| 831 v = 0x00; | |
| 832 } else if (x < XSIZE/4) { | |
| 2967 | 833 if (x & 1) |
| 0 | 834 v = 0xff; |
| 2967 | 835 else |
| 0 | 836 v = 0; |
| 837 } else if (y < XSIZE/4) { | |
| 2967 | 838 if (y & 1) |
| 0 | 839 v = 0xff; |
| 2967 | 840 else |
| 0 | 841 v = 0; |
| 842 } else { | |
| 843 if (y < YSIZE*3/8) { | |
| 2967 | 844 if ((y+x) & 1) |
| 0 | 845 v = 0xff; |
| 2967 | 846 else |
| 0 | 847 v = 0; |
| 848 } else { | |
| 849 if (((x+3) % 4) <= 1 && | |
| 850 ((y+3) % 4) <= 1) | |
| 851 v = 0xff; | |
| 852 else | |
| 853 v = 0x00; | |
| 854 } | |
| 855 } | |
| 856 } else if (x < XSIZE/2) { | |
| 857 v = ((x - (XSIZE/2)) * 255) / (XSIZE/2); | |
| 858 } else if (y < XSIZE/2) { | |
| 859 v = ((y - (XSIZE/2)) * 255) / (XSIZE/2); | |
| 860 } else { | |
| 861 v = ((x + y - XSIZE) * 255) / XSIZE; | |
| 862 } | |
|
630
b4ee42142ad1
croping patch by (talus25 at speakeasy dot net) with fixes from atmos & me
michaelni
parents:
429
diff
changeset
|
863 img[(YSIZE - y) * XSIZE + (XSIZE - x)] = v; |
| 0 | 864 } |
| 865 } | |
| 866 save_pgm("/tmp/in.pgm", img, XSIZE, YSIZE); | |
| 867 for(i=0;i<sizeof(factors)/sizeof(float);i++) { | |
| 868 fact = factors[i]; | |
| 869 xsize = (int)(XSIZE * fact); | |
|
630
b4ee42142ad1
croping patch by (talus25 at speakeasy dot net) with fixes from atmos & me
michaelni
parents:
429
diff
changeset
|
870 ysize = (int)((YSIZE - 100) * fact); |
|
2400
17ec73c65748
imgresample test cleanup patch by (Panagiotis Issaris <takis )( lumumba d0t luc d0t ac.be>)
michael
parents:
2082
diff
changeset
|
871 s = img_resample_full_init(xsize, ysize, XSIZE, YSIZE, 50 ,50, 0, 0, 0, 0, 0, 0); |
|
17ec73c65748
imgresample test cleanup patch by (Panagiotis Issaris <takis )( lumumba d0t luc d0t ac.be>)
michael
parents:
2082
diff
changeset
|
872 av_log(NULL, AV_LOG_INFO, "Factor=%0.2f\n", fact); |
| 0 | 873 dump_filter(&s->h_filters[0][0]); |
| 874 component_resample(s, img1, xsize, xsize, ysize, | |
|
630
b4ee42142ad1
croping patch by (talus25 at speakeasy dot net) with fixes from atmos & me
michaelni
parents:
429
diff
changeset
|
875 img + 50 * XSIZE, XSIZE, XSIZE, YSIZE - 100); |
| 0 | 876 img_resample_close(s); |
| 877 | |
| 2423 | 878 snprintf(buf, sizeof(buf), "/tmp/out%d.pgm", i); |
| 0 | 879 save_pgm(buf, img1, xsize, ysize); |
| 880 } | |
| 881 | |
| 882 /* mmx test */ | |
| 2 | 883 #ifdef HAVE_MMX |
|
2400
17ec73c65748
imgresample test cleanup patch by (Panagiotis Issaris <takis )( lumumba d0t luc d0t ac.be>)
michael
parents:
2082
diff
changeset
|
884 av_log(NULL, AV_LOG_INFO, "MMX test\n"); |
| 0 | 885 fact = 0.72; |
| 886 xsize = (int)(XSIZE * fact); | |
| 887 ysize = (int)(YSIZE * fact); | |
| 888 mm_flags = MM_MMX; | |
| 889 s = img_resample_init(xsize, ysize, XSIZE, YSIZE); | |
| 890 component_resample(s, img1, xsize, xsize, ysize, | |
| 891 img, XSIZE, XSIZE, YSIZE); | |
| 892 | |
| 893 mm_flags = 0; | |
| 894 s = img_resample_init(xsize, ysize, XSIZE, YSIZE); | |
| 895 component_resample(s, img2, xsize, xsize, ysize, | |
| 896 img, XSIZE, XSIZE, YSIZE); | |
| 897 if (memcmp(img1, img2, xsize * ysize) != 0) { | |
|
2400
17ec73c65748
imgresample test cleanup patch by (Panagiotis Issaris <takis )( lumumba d0t luc d0t ac.be>)
michael
parents:
2082
diff
changeset
|
898 av_log(NULL, AV_LOG_ERROR, "mmx error\n"); |
| 0 | 899 exit(1); |
| 900 } | |
|
2400
17ec73c65748
imgresample test cleanup patch by (Panagiotis Issaris <takis )( lumumba d0t luc d0t ac.be>)
michael
parents:
2082
diff
changeset
|
901 av_log(NULL, AV_LOG_INFO, "MMX OK\n"); |
| 0 | 902 #endif |
| 903 return 0; | |
| 904 } | |
| 905 | |
| 906 #endif |
