annotate imgresample.c @ 3983:fec25fd9febf libavcodec

Move TRANSPOSE8 macro to dsputil_altivec.h. (was duplicated in libavcodec/ppc/vc1dsp_altivec.c nd libavcodec/ppc/mpegvideo_altivec.c, and will be used in upcoming routines for h264_altivec.c)
author gpoirier
date Tue, 10 Oct 2006 08:01:19 +0000
parents c8c591fe26f8
children 207c22206d53
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1 /*
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
2 * High quality image resampling with polyphase filters
429
718a22dc121f license/copyright change
glantau
parents: 412
diff changeset
3 * Copyright (c) 2001 Fabrice Bellard.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
718a22dc121f license/copyright change
glantau
parents: 412
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 412
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 412
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 412
diff changeset
15 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
16 *
429
718a22dc121f license/copyright change
glantau
parents: 412
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
20 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
21
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
22 /**
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
23 * @file imgresample.c
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
24 * High quality image resampling with polyphase filters .
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
25 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
26
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 18
diff changeset
27 #include "avcodec.h"
3249
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
28 #include "swscale.h"
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
29 #include "dsputil.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
30
17
b69fe46fd708 Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents: 2
diff changeset
31 #ifdef USE_FASTMEMCPY
3589
19c437d6aba5 Explicitly include fastmemcpy.h from libvo/.
diego
parents: 3516
diff changeset
32 #include "libvo/fastmemcpy.h"
17
b69fe46fd708 Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents: 2
diff changeset
33 #endif
b69fe46fd708 Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents: 2
diff changeset
34
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
35 #define NB_COMPONENTS 3
986e461dc072 Initial revision
glantau
parents:
diff changeset
36
986e461dc072 Initial revision
glantau
parents:
diff changeset
37 #define PHASE_BITS 4
986e461dc072 Initial revision
glantau
parents:
diff changeset
38 #define NB_PHASES (1 << PHASE_BITS)
986e461dc072 Initial revision
glantau
parents:
diff changeset
39 #define NB_TAPS 4
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
42
986e461dc072 Initial revision
glantau
parents:
diff changeset
43 #define POS_FRAC_BITS 16
986e461dc072 Initial revision
glantau
parents:
diff changeset
44 #define POS_FRAC (1 << POS_FRAC_BITS)
986e461dc072 Initial revision
glantau
parents:
diff changeset
45 /* 6 bits precision is needed for MMX */
986e461dc072 Initial revision
glantau
parents:
diff changeset
46 #define FILTER_BITS 8
986e461dc072 Initial revision
glantau
parents:
diff changeset
47
986e461dc072 Initial revision
glantau
parents:
diff changeset
48 #define LINE_BUF_HEIGHT (NB_TAPS * 4)
986e461dc072 Initial revision
glantau
parents:
diff changeset
49
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
55 int h_incr, v_incr;
3089
072dbc669253 MSVC-compatible __align8/__align16 declaration
diego
parents: 3036
diff changeset
56 DECLARE_ALIGNED_8(int16_t, h_filters[NB_PHASES][NB_TAPS]); /* horizontal filters */
072dbc669253 MSVC-compatible __align8/__align16 declaration
diego
parents: 3036
diff changeset
57 DECLARE_ALIGNED_8(int16_t, v_filters[NB_PHASES][NB_TAPS]); /* vertical filters */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
58 uint8_t *line_buf;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
59 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
63 static inline int get_phase(int pos)
986e461dc072 Initial revision
glantau
parents:
diff changeset
64 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
65 return ((pos) >> (POS_FRAC_BITS - PHASE_BITS)) & ((1 << PHASE_BITS) - 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
66 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
67
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
70 int src_width, int src_start, int src_incr,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
71 int16_t *filters)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
72 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
75 int16_t *filter;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
76
986e461dc072 Initial revision
glantau
parents:
diff changeset
77 src_pos = src_start;
986e461dc072 Initial revision
glantau
parents:
diff changeset
78 for(i=0;i<dst_width;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
79 #ifdef TEST
986e461dc072 Initial revision
glantau
parents:
diff changeset
80 /* test */
986e461dc072 Initial revision
glantau
parents:
diff changeset
81 if ((src_pos >> POS_FRAC_BITS) < 0 ||
986e461dc072 Initial revision
glantau
parents:
diff changeset
82 (src_pos >> POS_FRAC_BITS) > (src_width - NB_TAPS))
653
714795876872 Change abort() calls to av_abort() calls.
philipjsg
parents: 644
diff changeset
83 av_abort();
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
84 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
85 s = src + (src_pos >> POS_FRAC_BITS);
986e461dc072 Initial revision
glantau
parents:
diff changeset
86 phase = get_phase(src_pos);
986e461dc072 Initial revision
glantau
parents:
diff changeset
87 filter = filters + phase * NB_TAPS;
986e461dc072 Initial revision
glantau
parents:
diff changeset
88 #if NB_TAPS == 4
986e461dc072 Initial revision
glantau
parents:
diff changeset
89 sum = s[0] * filter[0] +
986e461dc072 Initial revision
glantau
parents:
diff changeset
90 s[1] * filter[1] +
986e461dc072 Initial revision
glantau
parents:
diff changeset
91 s[2] * filter[2] +
986e461dc072 Initial revision
glantau
parents:
diff changeset
92 s[3] * filter[3];
986e461dc072 Initial revision
glantau
parents:
diff changeset
93 #else
986e461dc072 Initial revision
glantau
parents:
diff changeset
94 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
95 int j;
986e461dc072 Initial revision
glantau
parents:
diff changeset
96 sum = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
97 for(j=0;j<NB_TAPS;j++)
986e461dc072 Initial revision
glantau
parents:
diff changeset
98 sum += s[j] * filter[j];
986e461dc072 Initial revision
glantau
parents:
diff changeset
99 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
100 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
101 sum = sum >> FILTER_BITS;
986e461dc072 Initial revision
glantau
parents:
diff changeset
102 if (sum < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
103 sum = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
104 else if (sum > 255)
986e461dc072 Initial revision
glantau
parents:
diff changeset
105 sum = 255;
986e461dc072 Initial revision
glantau
parents:
diff changeset
106 dst[0] = sum;
986e461dc072 Initial revision
glantau
parents:
diff changeset
107 src_pos += src_incr;
986e461dc072 Initial revision
glantau
parents:
diff changeset
108 dst++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
109 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
110 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
111
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
114 int wrap, int16_t *filter)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
115 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
118
986e461dc072 Initial revision
glantau
parents:
diff changeset
119 s = src;
986e461dc072 Initial revision
glantau
parents:
diff changeset
120 for(i=0;i<dst_width;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
121 #if NB_TAPS == 4
986e461dc072 Initial revision
glantau
parents:
diff changeset
122 sum = s[0 * wrap] * filter[0] +
986e461dc072 Initial revision
glantau
parents:
diff changeset
123 s[1 * wrap] * filter[1] +
986e461dc072 Initial revision
glantau
parents:
diff changeset
124 s[2 * wrap] * filter[2] +
986e461dc072 Initial revision
glantau
parents:
diff changeset
125 s[3 * wrap] * filter[3];
986e461dc072 Initial revision
glantau
parents:
diff changeset
126 #else
986e461dc072 Initial revision
glantau
parents:
diff changeset
127 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
128 int j;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
129 uint8_t *s1 = s;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
130
986e461dc072 Initial revision
glantau
parents:
diff changeset
131 sum = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
132 for(j=0;j<NB_TAPS;j++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
133 sum += s1[0] * filter[j];
986e461dc072 Initial revision
glantau
parents:
diff changeset
134 s1 += wrap;
986e461dc072 Initial revision
glantau
parents:
diff changeset
135 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
136 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
137 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
138 sum = sum >> FILTER_BITS;
986e461dc072 Initial revision
glantau
parents:
diff changeset
139 if (sum < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
140 sum = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
141 else if (sum > 255)
986e461dc072 Initial revision
glantau
parents:
diff changeset
142 sum = 255;
986e461dc072 Initial revision
glantau
parents:
diff changeset
143 dst[0] = sum;
986e461dc072 Initial revision
glantau
parents:
diff changeset
144 dst++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
145 s++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
146 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
147 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
148
2
2e2c46c87460 fixed config for direct mplayer build compatibility
glantau
parents: 0
diff changeset
149 #ifdef HAVE_MMX
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
150
986e461dc072 Initial revision
glantau
parents:
diff changeset
151 #include "i386/mmx.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
152
986e461dc072 Initial revision
glantau
parents:
diff changeset
153 #define FILTER4(reg) \
986e461dc072 Initial revision
glantau
parents:
diff changeset
154 {\
986e461dc072 Initial revision
glantau
parents:
diff changeset
155 s = src + (src_pos >> POS_FRAC_BITS);\
986e461dc072 Initial revision
glantau
parents:
diff changeset
156 phase = get_phase(src_pos);\
986e461dc072 Initial revision
glantau
parents:
diff changeset
157 filter = filters + phase * NB_TAPS;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
158 movq_m2r(*s, reg);\
986e461dc072 Initial revision
glantau
parents:
diff changeset
159 punpcklbw_r2r(mm7, reg);\
986e461dc072 Initial revision
glantau
parents:
diff changeset
160 movq_m2r(*filter, mm6);\
986e461dc072 Initial revision
glantau
parents:
diff changeset
161 pmaddwd_r2r(reg, mm6);\
986e461dc072 Initial revision
glantau
parents:
diff changeset
162 movq_r2r(mm6, reg);\
986e461dc072 Initial revision
glantau
parents:
diff changeset
163 psrlq_i2r(32, reg);\
986e461dc072 Initial revision
glantau
parents:
diff changeset
164 paddd_r2r(mm6, reg);\
986e461dc072 Initial revision
glantau
parents:
diff changeset
165 psrad_i2r(FILTER_BITS, reg);\
986e461dc072 Initial revision
glantau
parents:
diff changeset
166 src_pos += src_incr;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
167 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
168
986e461dc072 Initial revision
glantau
parents:
diff changeset
169 #define DUMP(reg) movq_r2m(reg, tmp); printf(#reg "=%016Lx\n", tmp.uq);
986e461dc072 Initial revision
glantau
parents:
diff changeset
170
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
173 const uint8_t *src, int src_width,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
174 int src_start, int src_incr, int16_t *filters)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
175 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
178 int16_t *filter;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
179 mmx_t tmp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
180
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
181 src_pos = src_start;
986e461dc072 Initial revision
glantau
parents:
diff changeset
182 pxor_r2r(mm7, mm7);
986e461dc072 Initial revision
glantau
parents:
diff changeset
183
986e461dc072 Initial revision
glantau
parents:
diff changeset
184 while (dst_width >= 4) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
185
986e461dc072 Initial revision
glantau
parents:
diff changeset
186 FILTER4(mm0);
986e461dc072 Initial revision
glantau
parents:
diff changeset
187 FILTER4(mm1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
188 FILTER4(mm2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
189 FILTER4(mm3);
986e461dc072 Initial revision
glantau
parents:
diff changeset
190
986e461dc072 Initial revision
glantau
parents:
diff changeset
191 packuswb_r2r(mm7, mm0);
986e461dc072 Initial revision
glantau
parents:
diff changeset
192 packuswb_r2r(mm7, mm1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
193 packuswb_r2r(mm7, mm3);
986e461dc072 Initial revision
glantau
parents:
diff changeset
194 packuswb_r2r(mm7, mm2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
195 movq_r2m(mm0, tmp);
986e461dc072 Initial revision
glantau
parents:
diff changeset
196 dst[0] = tmp.ub[0];
986e461dc072 Initial revision
glantau
parents:
diff changeset
197 movq_r2m(mm1, tmp);
986e461dc072 Initial revision
glantau
parents:
diff changeset
198 dst[1] = tmp.ub[0];
986e461dc072 Initial revision
glantau
parents:
diff changeset
199 movq_r2m(mm2, tmp);
986e461dc072 Initial revision
glantau
parents:
diff changeset
200 dst[2] = tmp.ub[0];
986e461dc072 Initial revision
glantau
parents:
diff changeset
201 movq_r2m(mm3, tmp);
986e461dc072 Initial revision
glantau
parents:
diff changeset
202 dst[3] = tmp.ub[0];
986e461dc072 Initial revision
glantau
parents:
diff changeset
203 dst += 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
204 dst_width -= 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
205 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
206 while (dst_width > 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
207 FILTER4(mm0);
986e461dc072 Initial revision
glantau
parents:
diff changeset
208 packuswb_r2r(mm7, mm0);
986e461dc072 Initial revision
glantau
parents:
diff changeset
209 movq_r2m(mm0, tmp);
986e461dc072 Initial revision
glantau
parents:
diff changeset
210 dst[0] = tmp.ub[0];
986e461dc072 Initial revision
glantau
parents:
diff changeset
211 dst++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
212 dst_width--;
986e461dc072 Initial revision
glantau
parents:
diff changeset
213 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
214 emms();
986e461dc072 Initial revision
glantau
parents:
diff changeset
215 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
218 int wrap, int16_t *filter)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
219 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
222 mmx_t tmp;
986e461dc072 Initial revision
glantau
parents:
diff changeset
223 mmx_t coefs[4];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
224
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
225 for(i=0;i<4;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
226 v = filter[i];
986e461dc072 Initial revision
glantau
parents:
diff changeset
227 coefs[i].uw[0] = v;
986e461dc072 Initial revision
glantau
parents:
diff changeset
228 coefs[i].uw[1] = v;
986e461dc072 Initial revision
glantau
parents:
diff changeset
229 coefs[i].uw[2] = v;
986e461dc072 Initial revision
glantau
parents:
diff changeset
230 coefs[i].uw[3] = v;
986e461dc072 Initial revision
glantau
parents:
diff changeset
231 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
232
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
233 pxor_r2r(mm7, mm7);
986e461dc072 Initial revision
glantau
parents:
diff changeset
234 s = src;
986e461dc072 Initial revision
glantau
parents:
diff changeset
235 while (dst_width >= 4) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
236 movq_m2r(s[0 * wrap], mm0);
986e461dc072 Initial revision
glantau
parents:
diff changeset
237 punpcklbw_r2r(mm7, mm0);
986e461dc072 Initial revision
glantau
parents:
diff changeset
238 movq_m2r(s[1 * wrap], mm1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
239 punpcklbw_r2r(mm7, mm1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
240 movq_m2r(s[2 * wrap], mm2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
241 punpcklbw_r2r(mm7, mm2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
242 movq_m2r(s[3 * wrap], mm3);
986e461dc072 Initial revision
glantau
parents:
diff changeset
243 punpcklbw_r2r(mm7, mm3);
986e461dc072 Initial revision
glantau
parents:
diff changeset
244
986e461dc072 Initial revision
glantau
parents:
diff changeset
245 pmullw_m2r(coefs[0], mm0);
986e461dc072 Initial revision
glantau
parents:
diff changeset
246 pmullw_m2r(coefs[1], mm1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
247 pmullw_m2r(coefs[2], mm2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
248 pmullw_m2r(coefs[3], mm3);
986e461dc072 Initial revision
glantau
parents:
diff changeset
249
986e461dc072 Initial revision
glantau
parents:
diff changeset
250 paddw_r2r(mm1, mm0);
986e461dc072 Initial revision
glantau
parents:
diff changeset
251 paddw_r2r(mm3, mm2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
252 paddw_r2r(mm2, mm0);
986e461dc072 Initial revision
glantau
parents:
diff changeset
253 psraw_i2r(FILTER_BITS, mm0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
254
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
255 packuswb_r2r(mm7, mm0);
986e461dc072 Initial revision
glantau
parents:
diff changeset
256 movq_r2m(mm0, tmp);
986e461dc072 Initial revision
glantau
parents:
diff changeset
257
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
258 *(uint32_t *)dst = tmp.ud[0];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
259 dst += 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
260 s += 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
261 dst_width -= 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
262 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
263 while (dst_width > 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
264 sum = s[0 * wrap] * filter[0] +
986e461dc072 Initial revision
glantau
parents:
diff changeset
265 s[1 * wrap] * filter[1] +
986e461dc072 Initial revision
glantau
parents:
diff changeset
266 s[2 * wrap] * filter[2] +
986e461dc072 Initial revision
glantau
parents:
diff changeset
267 s[3 * wrap] * filter[3];
986e461dc072 Initial revision
glantau
parents:
diff changeset
268 sum = sum >> FILTER_BITS;
986e461dc072 Initial revision
glantau
parents:
diff changeset
269 if (sum < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
270 sum = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
271 else if (sum > 255)
986e461dc072 Initial revision
glantau
parents:
diff changeset
272 sum = 255;
986e461dc072 Initial revision
glantau
parents:
diff changeset
273 dst[0] = sum;
986e461dc072 Initial revision
glantau
parents:
diff changeset
274 dst++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
275 s++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
276 dst_width--;
986e461dc072 Initial revision
glantau
parents:
diff changeset
277 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
278 emms();
986e461dc072 Initial revision
glantau
parents:
diff changeset
279 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
280 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
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
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
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
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
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
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
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
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
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
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
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
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
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
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
411 const uint8_t *src, int src_width,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
412 int src_start, int src_incr, int16_t *filters)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
413 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
416 int16_t *filter;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
417
986e461dc072 Initial revision
glantau
parents:
diff changeset
418 src_end = src + src_width;
986e461dc072 Initial revision
glantau
parents:
diff changeset
419 src_pos = src_start;
986e461dc072 Initial revision
glantau
parents:
diff changeset
420 for(i=0;i<dst_width;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
421 s = src + (src_pos >> POS_FRAC_BITS);
986e461dc072 Initial revision
glantau
parents:
diff changeset
422 phase = get_phase(src_pos);
986e461dc072 Initial revision
glantau
parents:
diff changeset
423 filter = filters + phase * NB_TAPS;
986e461dc072 Initial revision
glantau
parents:
diff changeset
424 sum = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
425 for(j=0;j<NB_TAPS;j++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
426 if (s < src)
986e461dc072 Initial revision
glantau
parents:
diff changeset
427 v = src[0];
986e461dc072 Initial revision
glantau
parents:
diff changeset
428 else if (s >= src_end)
986e461dc072 Initial revision
glantau
parents:
diff changeset
429 v = src_end[-1];
986e461dc072 Initial revision
glantau
parents:
diff changeset
430 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
431 v = s[0];
986e461dc072 Initial revision
glantau
parents:
diff changeset
432 sum += v * filter[j];
986e461dc072 Initial revision
glantau
parents:
diff changeset
433 s++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
434 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
435 sum = sum >> FILTER_BITS;
986e461dc072 Initial revision
glantau
parents:
diff changeset
436 if (sum < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
437 sum = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
438 else if (sum > 255)
986e461dc072 Initial revision
glantau
parents:
diff changeset
439 sum = 255;
986e461dc072 Initial revision
glantau
parents:
diff changeset
440 dst[0] = sum;
986e461dc072 Initial revision
glantau
parents:
diff changeset
441 src_pos += src_incr;
986e461dc072 Initial revision
glantau
parents:
diff changeset
442 dst++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
443 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
444 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
447 int src_width, int src_start, int src_incr,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
448 int16_t *filters)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
449 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
450 int n, src_end;
986e461dc072 Initial revision
glantau
parents:
diff changeset
451
986e461dc072 Initial revision
glantau
parents:
diff changeset
452 if (src_start < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
453 n = (0 - src_start + src_incr - 1) / src_incr;
986e461dc072 Initial revision
glantau
parents:
diff changeset
454 h_resample_slow(dst, n, src, src_width, src_start, src_incr, filters);
986e461dc072 Initial revision
glantau
parents:
diff changeset
455 dst += n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
456 dst_width -= n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
457 src_start += n * src_incr;
986e461dc072 Initial revision
glantau
parents:
diff changeset
458 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
459 src_end = src_start + dst_width * src_incr;
986e461dc072 Initial revision
glantau
parents:
diff changeset
460 if (src_end > ((src_width - NB_TAPS) << POS_FRAC_BITS)) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
461 n = (((src_width - NB_TAPS + 1) << POS_FRAC_BITS) - 1 - src_start) /
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
462 src_incr;
986e461dc072 Initial revision
glantau
parents:
diff changeset
463 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
464 n = dst_width;
986e461dc072 Initial revision
glantau
parents:
diff changeset
465 }
2
2e2c46c87460 fixed config for direct mplayer build compatibility
glantau
parents: 0
diff changeset
466 #ifdef HAVE_MMX
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
467 if ((mm_flags & MM_MMX) && NB_TAPS == 4)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
468 h_resample_fast4_mmx(dst, n,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
469 src, src_width, src_start, src_incr, filters);
986e461dc072 Initial revision
glantau
parents:
diff changeset
470 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
471 #endif
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
472 h_resample_fast(dst, n,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
473 src, src_width, src_start, src_incr, filters);
986e461dc072 Initial revision
glantau
parents:
diff changeset
474 if (n < dst_width) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
475 dst += n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
476 dst_width -= n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
477 src_start += n * src_incr;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
478 h_resample_slow(dst, dst_width,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
479 src, src_width, src_start, src_incr, filters);
986e461dc072 Initial revision
glantau
parents:
diff changeset
480 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
481 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
482
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
483 static void component_resample(ImgReSampleContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
484 uint8_t *output, int owrap, int owidth, int oheight,
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
485 uint8_t *input, int iwrap, int iwidth, int iheight)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
486 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
487 int src_y, src_y1, last_src_y, ring_y, phase_y, y1, y;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
488 uint8_t *new_line, *src_line;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
489
986e461dc072 Initial revision
glantau
parents:
diff changeset
490 last_src_y = - FCENTER - 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
491 /* position of the bottom of the filter in the source image */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
492 src_y = (last_src_y + NB_TAPS) * POS_FRAC;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
493 ring_y = NB_TAPS; /* position in ring buffer */
986e461dc072 Initial revision
glantau
parents:
diff changeset
494 for(y=0;y<oheight;y++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
495 /* apply horizontal filter on new lines from input if needed */
986e461dc072 Initial revision
glantau
parents:
diff changeset
496 src_y1 = src_y >> POS_FRAC_BITS;
986e461dc072 Initial revision
glantau
parents:
diff changeset
497 while (last_src_y < src_y1) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
498 if (++ring_y >= LINE_BUF_HEIGHT + NB_TAPS)
986e461dc072 Initial revision
glantau
parents:
diff changeset
499 ring_y = NB_TAPS;
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
503 y1 = last_src_y;
986e461dc072 Initial revision
glantau
parents:
diff changeset
504 if (y1 < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
505 y1 = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
506 } else if (y1 >= iheight) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
507 y1 = iheight - 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
508 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
509 src_line = input + y1 * iwrap;
986e461dc072 Initial revision
glantau
parents:
diff changeset
510 new_line = s->line_buf + ring_y * owidth;
986e461dc072 Initial revision
glantau
parents:
diff changeset
511 /* apply filter and handle limit cases correctly */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
512 h_resample(new_line, owidth,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
513 src_line, iwidth, - FCENTER * POS_FRAC, s->h_incr,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
514 &s->h_filters[0][0]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
515 /* handle ring buffer wraping */
986e461dc072 Initial revision
glantau
parents:
diff changeset
516 if (ring_y >= LINE_BUF_HEIGHT) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
517 memcpy(s->line_buf + (ring_y - LINE_BUF_HEIGHT) * owidth,
986e461dc072 Initial revision
glantau
parents:
diff changeset
518 new_line, owidth);
986e461dc072 Initial revision
glantau
parents:
diff changeset
519 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
520 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
521 /* apply vertical filter */
986e461dc072 Initial revision
glantau
parents:
diff changeset
522 phase_y = get_phase(src_y);
2
2e2c46c87460 fixed config for direct mplayer build compatibility
glantau
parents: 0
diff changeset
523 #ifdef HAVE_MMX
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
524 /* desactivated MMX because loss of precision */
986e461dc072 Initial revision
glantau
parents:
diff changeset
525 if ((mm_flags & MM_MMX) && NB_TAPS == 4 && 0)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
526 v_resample4_mmx(output, owidth,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
527 s->line_buf + (ring_y - NB_TAPS + 1) * owidth, owidth,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
528 &s->v_filters[phase_y][0]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
529 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
538 v_resample(output, owidth,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
539 s->line_buf + (ring_y - NB_TAPS + 1) * owidth, owidth,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
540 &s->v_filters[phase_y][0]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
541
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
542 src_y += s->v_incr;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
543
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
544 output += owrap;
986e461dc072 Initial revision
glantau
parents:
diff changeset
545 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
546 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
547
986e461dc072 Initial revision
glantau
parents:
diff changeset
548 ImgReSampleContext *img_resample_init(int owidth, int oheight,
986e461dc072 Initial revision
glantau
parents:
diff changeset
549 int iwidth, int iheight)
986e461dc072 Initial revision
glantau
parents:
diff changeset
550 {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
562 ImgReSampleContext *s;
986e461dc072 Initial revision
glantau
parents:
diff changeset
563
2904
84404858c529 sanity check whether dimensions are non-null
alex
parents: 2846
diff changeset
564 if (!owidth || !oheight || !iwidth || !iheight)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
565 return NULL;
2904
84404858c529 sanity check whether dimensions are non-null
alex
parents: 2846
diff changeset
566
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
567 s = av_mallocz(sizeof(ImgReSampleContext));
986e461dc072 Initial revision
glantau
parents:
diff changeset
568 if (!s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
569 return NULL;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2400
diff changeset
570 if((unsigned)owidth >= UINT_MAX / (LINE_BUF_HEIGHT + NB_TAPS))
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2400
diff changeset
571 return NULL;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
572 s->line_buf = av_mallocz(owidth * (LINE_BUF_HEIGHT + NB_TAPS));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
573 if (!s->line_buf)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
574 goto fail;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
575
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
576 s->owidth = owidth;
986e461dc072 Initial revision
glantau
parents:
diff changeset
577 s->oheight = oheight;
986e461dc072 Initial revision
glantau
parents:
diff changeset
578 s->iwidth = iwidth;
986e461dc072 Initial revision
glantau
parents:
diff changeset
579 s->iheight = iheight;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
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
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
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
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
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
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
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
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
601
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
605 return NULL;
986e461dc072 Initial revision
glantau
parents:
diff changeset
606 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
607
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
610 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
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
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
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
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
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
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
627 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
628 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
629
986e461dc072 Initial revision
glantau
parents:
diff changeset
630 void img_resample_close(ImgReSampleContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
634 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
635
3249
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
636 struct SwsContext *sws_getContext(int srcW, int srcH, int srcFormat,
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
637 int dstW, int dstH, int dstFormat,
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
638 int flags, SwsFilter *srcFilter,
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
639 SwsFilter *dstFilter, double *param)
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
640 {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
641 struct SwsContext *ctx;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
642
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
643 ctx = av_malloc(sizeof(struct SwsContext));
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
644 if (ctx == NULL) {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
645 av_log(NULL, AV_LOG_ERROR, "Cannot allocate a resampling context!\n");
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
646
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
647 return NULL;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
648 }
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
649
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
650 if ((srcH != dstH) || (srcW != dstW)) {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
651 if ((srcFormat != PIX_FMT_YUV420P) || (dstFormat != PIX_FMT_YUV420P)) {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
652 av_log(NULL, AV_LOG_INFO, "PIX_FMT_YUV420P will be used as an intermediate format for rescaling\n");
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
653 }
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
654 ctx->resampling_ctx = img_resample_init(dstW, dstH, srcW, srcH);
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
655 } else {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
656 ctx->resampling_ctx = av_malloc(sizeof(ImgReSampleContext));
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
657 ctx->resampling_ctx->iheight = srcH;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
658 ctx->resampling_ctx->iwidth = srcW;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
659 ctx->resampling_ctx->oheight = dstH;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
660 ctx->resampling_ctx->owidth = dstW;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
661 }
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
662 ctx->src_pix_fmt = srcFormat;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
663 ctx->dst_pix_fmt = dstFormat;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
664
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
665 return ctx;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
666 }
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
667
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
668 void sws_freeContext(struct SwsContext *ctx)
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
669 {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
670 if ((ctx->resampling_ctx->iwidth != ctx->resampling_ctx->owidth) ||
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
671 (ctx->resampling_ctx->iheight != ctx->resampling_ctx->oheight)) {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
672 img_resample_close(ctx->resampling_ctx);
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
673 } else {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
674 av_free(ctx->resampling_ctx);
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
675 }
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
676 av_free(ctx);
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
677 }
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
678
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
679 int sws_scale(struct SwsContext *ctx, uint8_t* src[], int srcStride[],
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
680 int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[])
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
681 {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
682 AVPicture src_pict, dst_pict;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
683 int i, res = 0;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
684 AVPicture picture_format_temp;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
685 AVPicture picture_resample_temp, *formatted_picture, *resampled_picture;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
686 uint8_t *buf1 = NULL, *buf2 = NULL;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
687 enum PixelFormat current_pix_fmt;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
688
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
689 for (i = 0; i < 3; i++) {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
690 src_pict.data[i] = src[i];
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
691 src_pict.linesize[i] = srcStride[i];
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
692 dst_pict.data[i] = dst[i];
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
693 dst_pict.linesize[i] = dstStride[i];
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
694 }
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
695 if ((ctx->resampling_ctx->iwidth != ctx->resampling_ctx->owidth) ||
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
696 (ctx->resampling_ctx->iheight != ctx->resampling_ctx->oheight)) {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
697 /* We have to rescale the picture, but only YUV420P rescaling is supported... */
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
698
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
699 if (ctx->src_pix_fmt != PIX_FMT_YUV420P) {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
700 int size;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
701
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
702 /* create temporary picture for rescaling input*/
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
703 size = avpicture_get_size(PIX_FMT_YUV420P, ctx->resampling_ctx->iwidth, ctx->resampling_ctx->iheight);
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
704 buf1 = av_malloc(size);
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
705 if (!buf1) {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
706 res = -1;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
707 goto the_end;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
708 }
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
709 formatted_picture = &picture_format_temp;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
710 avpicture_fill((AVPicture*)formatted_picture, buf1,
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
711 PIX_FMT_YUV420P, ctx->resampling_ctx->iwidth, ctx->resampling_ctx->iheight);
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
712
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
713 if (img_convert((AVPicture*)formatted_picture, PIX_FMT_YUV420P,
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
714 &src_pict, ctx->src_pix_fmt,
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
715 ctx->resampling_ctx->iwidth, ctx->resampling_ctx->iheight) < 0) {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
716
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
717 av_log(NULL, AV_LOG_ERROR, "pixel format conversion not handled\n");
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
718 res = -1;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
719 goto the_end;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
720 }
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
721 } else {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
722 formatted_picture = &src_pict;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
723 }
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
724
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
725 if (ctx->dst_pix_fmt != PIX_FMT_YUV420P) {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
726 int size;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
727
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
728 /* create temporary picture for rescaling output*/
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
729 size = avpicture_get_size(PIX_FMT_YUV420P, ctx->resampling_ctx->owidth, ctx->resampling_ctx->oheight);
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
730 buf2 = av_malloc(size);
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
731 if (!buf2) {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
732 res = -1;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
733 goto the_end;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
734 }
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
735 resampled_picture = &picture_resample_temp;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
736 avpicture_fill((AVPicture*)resampled_picture, buf2,
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
737 PIX_FMT_YUV420P, ctx->resampling_ctx->owidth, ctx->resampling_ctx->oheight);
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
738
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
739 } else {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
740 resampled_picture = &dst_pict;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
741 }
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
742
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
743 /* ...and finally rescale!!! */
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
744 img_resample(ctx->resampling_ctx, resampled_picture, formatted_picture);
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
745 current_pix_fmt = PIX_FMT_YUV420P;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
746 } else {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
747 resampled_picture = &src_pict;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
748 current_pix_fmt = ctx->src_pix_fmt;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
749 }
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
750
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
751 if (current_pix_fmt != ctx->dst_pix_fmt) {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
752 if (img_convert(&dst_pict, ctx->dst_pix_fmt,
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
753 resampled_picture, current_pix_fmt,
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
754 ctx->resampling_ctx->owidth, ctx->resampling_ctx->oheight) < 0) {
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
755
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
756 av_log(NULL, AV_LOG_ERROR, "pixel format conversion not handled\n");
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
757
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
758 res = -1;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
759 goto the_end;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
760 }
3516
f60df50f50aa Fix a corner case in sws emulation
lucabe
parents: 3249
diff changeset
761 } else if (resampled_picture != &dst_pict) {
f60df50f50aa Fix a corner case in sws emulation
lucabe
parents: 3249
diff changeset
762 img_copy(&dst_pict, resampled_picture, current_pix_fmt,
f60df50f50aa Fix a corner case in sws emulation
lucabe
parents: 3249
diff changeset
763 ctx->resampling_ctx->owidth, ctx->resampling_ctx->oheight);
3249
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
764 }
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
765
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
766 the_end:
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
767 av_free(buf1);
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
768 av_free(buf2);
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
769 return res;
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
770 }
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
771
ad3d12d04645 Introduce swscale interface in libavcodec
lucabe
parents: 3089
diff changeset
772
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
776 /* input */
986e461dc072 Initial revision
glantau
parents:
diff changeset
777 #define XSIZE 256
986e461dc072 Initial revision
glantau
parents:
diff changeset
778 #define YSIZE 256
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
779 uint8_t img[XSIZE * YSIZE];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
780
986e461dc072 Initial revision
glantau
parents:
diff changeset
781 /* output */
986e461dc072 Initial revision
glantau
parents:
diff changeset
782 #define XSIZE1 512
986e461dc072 Initial revision
glantau
parents:
diff changeset
783 #define YSIZE1 512
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
784 uint8_t img1[XSIZE1 * YSIZE1];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
785 uint8_t img2[XSIZE1 * YSIZE1];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
786
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
787 void save_pgm(const char *filename, uint8_t *img, int xsize, int ysize)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
790 FILE *f;
986e461dc072 Initial revision
glantau
parents:
diff changeset
791 f=fopen(filename,"w");
986e461dc072 Initial revision
glantau
parents:
diff changeset
792 fprintf(f,"P5\n%d %d\n%d\n", xsize, ysize, 255);
986e461dc072 Initial revision
glantau
parents:
diff changeset
793 fwrite(img,1, xsize * ysize,f);
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
796 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
797
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
798 static void dump_filter(int16_t *filter)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
799 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
800 int i, ph;
986e461dc072 Initial revision
glantau
parents:
diff changeset
801
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
808 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
809 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
810
2
2e2c46c87460 fixed config for direct mplayer build compatibility
glantau
parents: 0
diff changeset
811 #ifdef HAVE_MMX
644
641708b5c33c fixing tests
michaelni
parents: 630
diff changeset
812 int mm_flags;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
813 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
814
986e461dc072 Initial revision
glantau
parents:
diff changeset
815 int main(int argc, char **argv)
986e461dc072 Initial revision
glantau
parents:
diff changeset
816 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
817 int x, y, v, i, xsize, ysize;
986e461dc072 Initial revision
glantau
parents:
diff changeset
818 ImgReSampleContext *s;
986e461dc072 Initial revision
glantau
parents:
diff changeset
819 float fact, factors[] = { 1/2.0, 3.0/4.0, 1.0, 4.0/3.0, 16.0/9.0, 2.0 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
820 char buf[256];
986e461dc072 Initial revision
glantau
parents:
diff changeset
821
986e461dc072 Initial revision
glantau
parents:
diff changeset
822 /* build test image */
986e461dc072 Initial revision
glantau
parents:
diff changeset
823 for(y=0;y<YSIZE;y++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
824 for(x=0;x<XSIZE;x++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
825 if (x < XSIZE/2 && y < YSIZE/2) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
826 if (x < XSIZE/4 && y < YSIZE/4) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
827 if ((x % 10) <= 6 &&
986e461dc072 Initial revision
glantau
parents:
diff changeset
828 (y % 10) <= 6)
986e461dc072 Initial revision
glantau
parents:
diff changeset
829 v = 0xff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
830 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
831 v = 0x00;
986e461dc072 Initial revision
glantau
parents:
diff changeset
832 } else if (x < XSIZE/4) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
833 if (x & 1)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
834 v = 0xff;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
835 else
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
836 v = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
837 } else if (y < XSIZE/4) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
838 if (y & 1)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
839 v = 0xff;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
840 else
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
841 v = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
842 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
843 if (y < YSIZE*3/8) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
844 if ((y+x) & 1)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
845 v = 0xff;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2904
diff changeset
846 else
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
847 v = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
848 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
849 if (((x+3) % 4) <= 1 &&
986e461dc072 Initial revision
glantau
parents:
diff changeset
850 ((y+3) % 4) <= 1)
986e461dc072 Initial revision
glantau
parents:
diff changeset
851 v = 0xff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
852 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
853 v = 0x00;
986e461dc072 Initial revision
glantau
parents:
diff changeset
854 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
855 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
856 } else if (x < XSIZE/2) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
857 v = ((x - (XSIZE/2)) * 255) / (XSIZE/2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
858 } else if (y < XSIZE/2) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
859 v = ((y - (XSIZE/2)) * 255) / (XSIZE/2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
860 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
861 v = ((x + y - XSIZE) * 255) / XSIZE;
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
864 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
865 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
866 save_pgm("/tmp/in.pgm", img, XSIZE, YSIZE);
986e461dc072 Initial revision
glantau
parents:
diff changeset
867 for(i=0;i<sizeof(factors)/sizeof(float);i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
868 fact = factors[i];
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
873 dump_filter(&s->h_filters[0][0]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
876 img_resample_close(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
877
2423
87b7fbed8609 dissallow sprintf
michael
parents: 2422
diff changeset
878 snprintf(buf, sizeof(buf), "/tmp/out%d.pgm", i);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
879 save_pgm(buf, img1, xsize, ysize);
986e461dc072 Initial revision
glantau
parents:
diff changeset
880 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
881
986e461dc072 Initial revision
glantau
parents:
diff changeset
882 /* mmx test */
2
2e2c46c87460 fixed config for direct mplayer build compatibility
glantau
parents: 0
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
885 fact = 0.72;
986e461dc072 Initial revision
glantau
parents:
diff changeset
886 xsize = (int)(XSIZE * fact);
986e461dc072 Initial revision
glantau
parents:
diff changeset
887 ysize = (int)(YSIZE * fact);
986e461dc072 Initial revision
glantau
parents:
diff changeset
888 mm_flags = MM_MMX;
986e461dc072 Initial revision
glantau
parents:
diff changeset
889 s = img_resample_init(xsize, ysize, XSIZE, YSIZE);
986e461dc072 Initial revision
glantau
parents:
diff changeset
890 component_resample(s, img1, xsize, xsize, ysize,
986e461dc072 Initial revision
glantau
parents:
diff changeset
891 img, XSIZE, XSIZE, YSIZE);
986e461dc072 Initial revision
glantau
parents:
diff changeset
892
986e461dc072 Initial revision
glantau
parents:
diff changeset
893 mm_flags = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
894 s = img_resample_init(xsize, ysize, XSIZE, YSIZE);
986e461dc072 Initial revision
glantau
parents:
diff changeset
895 component_resample(s, img2, xsize, xsize, ysize,
986e461dc072 Initial revision
glantau
parents:
diff changeset
896 img, XSIZE, XSIZE, YSIZE);
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
899 exit(1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
902 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
903 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
904 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
905
986e461dc072 Initial revision
glantau
parents:
diff changeset
906 #endif