annotate faandct.c @ 10893:2aafcafbe1f0 libavcodec

Replace cabac checks in inline functions from h264.h with constants. No benchmark because its just replacing variables with litteral constants (so no risk for slowdown outside gcc silliness) and i need sleep.
author michael
date Sat, 16 Jan 2010 05:41:33 +0000
parents e9d9d946f213
children 7dd2a45249a9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
1 /*
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
2 * Floating point AAN DCT
5214
470601203f44 Group all copyright and author notices together.
diego
parents: 4283
diff changeset
3 * this implementation is based upon the IJG integer AAN DCT (see jfdctfst.c)
470601203f44 Group all copyright and author notices together.
diego
parents: 4283
diff changeset
4 *
7821
39b409447bfa Relicense as ISC with the authors' permission.
diego
parents: 7129
diff changeset
5 * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
39b409447bfa Relicense as ISC with the authors' permission.
diego
parents: 7129
diff changeset
6 * Copyright (c) 2003 Roman Shaposhnik
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
7 *
7821
39b409447bfa Relicense as ISC with the authors' permission.
diego
parents: 7129
diff changeset
8 * Permission to use, copy, modify, and/or distribute this software for any
39b409447bfa Relicense as ISC with the authors' permission.
diego
parents: 7129
diff changeset
9 * purpose with or without fee is hereby granted, provided that the above
39b409447bfa Relicense as ISC with the authors' permission.
diego
parents: 7129
diff changeset
10 * copyright notice and this permission notice appear in all copies.
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
11 *
7821
39b409447bfa Relicense as ISC with the authors' permission.
diego
parents: 7129
diff changeset
12 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
39b409447bfa Relicense as ISC with the authors' permission.
diego
parents: 7129
diff changeset
13 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
39b409447bfa Relicense as ISC with the authors' permission.
diego
parents: 7129
diff changeset
14 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
39b409447bfa Relicense as ISC with the authors' permission.
diego
parents: 7129
diff changeset
15 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
39b409447bfa Relicense as ISC with the authors' permission.
diego
parents: 7129
diff changeset
16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
39b409447bfa Relicense as ISC with the authors' permission.
diego
parents: 7129
diff changeset
17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
39b409447bfa Relicense as ISC with the authors' permission.
diego
parents: 7129
diff changeset
18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
19 */
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
20
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
21 /**
8718
e9d9d946f213 Use full internal pathname in doxygen @file directives.
diego
parents: 7821
diff changeset
22 * @file libavcodec/faandct.c
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2024
diff changeset
23 * @brief
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
24 * Floating point AAN DCT
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
25 * @author Michael Niedermayer <michaelni@gmx.at>
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
26 */
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
27
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
28 #include "dsputil.h"
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
29 #include "faandct.h"
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
30
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
31 #define FLOAT float
1562
bf452704100f optionally merge postscale into quantization table for the float aan dct
michael
parents: 1561
diff changeset
32 #ifdef FAAN_POSTSCALE
bf452704100f optionally merge postscale into quantization table for the float aan dct
michael
parents: 1561
diff changeset
33 # define SCALE(x) postscale[x]
bf452704100f optionally merge postscale into quantization table for the float aan dct
michael
parents: 1561
diff changeset
34 #else
bf452704100f optionally merge postscale into quantization table for the float aan dct
michael
parents: 1561
diff changeset
35 # define SCALE(x) 1
bf452704100f optionally merge postscale into quantization table for the float aan dct
michael
parents: 1561
diff changeset
36 #endif
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
37
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
38 //numbers generated by simple c code (not as accurate as they could be)
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
39 /*
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
40 for(i=0; i<8; i++){
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
41 printf("#define B%d %1.20llf\n", i, (long double)1.0/(cosl(i*acosl(-1.0)/(long double)16.0)*sqrtl(2)));
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
42 }
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
43 */
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
44 #define B0 1.00000000000000000000
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
45 #define B1 0.72095982200694791383 // (cos(pi*1/16)sqrt(2))^-1
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
46 #define B2 0.76536686473017954350 // (cos(pi*2/16)sqrt(2))^-1
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
47 #define B3 0.85043009476725644878 // (cos(pi*3/16)sqrt(2))^-1
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
48 #define B4 1.00000000000000000000 // (cos(pi*4/16)sqrt(2))^-1
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
49 #define B5 1.27275858057283393842 // (cos(pi*5/16)sqrt(2))^-1
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
50 #define B6 1.84775906502257351242 // (cos(pi*6/16)sqrt(2))^-1
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
51 #define B7 3.62450978541155137218 // (cos(pi*7/16)sqrt(2))^-1
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
52
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
53
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
54 #define A1 0.70710678118654752438 // cos(pi*4/16)
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
55 #define A2 0.54119610014619698435 // cos(pi*6/16)sqrt(2)
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
56 #define A5 0.38268343236508977170 // cos(pi*6/16)
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
57 #define A4 1.30656296487637652774 // cos(pi*2/16)sqrt(2)
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
58
7129
322023e630a6 mark read-only data as const
stefang
parents: 6471
diff changeset
59 static const FLOAT postscale[64]={
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
60 B0*B0, B0*B1, B0*B2, B0*B3, B0*B4, B0*B5, B0*B6, B0*B7,
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
61 B1*B0, B1*B1, B1*B2, B1*B3, B1*B4, B1*B5, B1*B6, B1*B7,
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
62 B2*B0, B2*B1, B2*B2, B2*B3, B2*B4, B2*B5, B2*B6, B2*B7,
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
63 B3*B0, B3*B1, B3*B2, B3*B3, B3*B4, B3*B5, B3*B6, B3*B7,
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
64 B4*B0, B4*B1, B4*B2, B4*B3, B4*B4, B4*B5, B4*B6, B4*B7,
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
65 B5*B0, B5*B1, B5*B2, B5*B3, B5*B4, B5*B5, B5*B6, B5*B7,
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
66 B6*B0, B6*B1, B6*B2, B6*B3, B6*B4, B6*B5, B6*B6, B6*B7,
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
67 B7*B0, B7*B1, B7*B2, B7*B3, B7*B4, B7*B5, B7*B6, B7*B7,
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
68 };
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
69
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 3947
diff changeset
70 static av_always_inline void row_fdct(FLOAT temp[64], DCTELEM * data)
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
71 {
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
72 FLOAT tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
73 FLOAT tmp10, tmp11, tmp12, tmp13;
6471
b72f6c4cee12 Fix unused variable warnings.
diego
parents: 6411
diff changeset
74 FLOAT z2, z4, z11, z13;
b72f6c4cee12 Fix unused variable warnings.
diego
parents: 6411
diff changeset
75 FLOAT av_unused z5;
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
76 int i;
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
77
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
78 for (i=0; i<8*8; i+=8) {
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
79 tmp0= data[0 + i] + data[7 + i];
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
80 tmp7= data[0 + i] - data[7 + i];
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
81 tmp1= data[1 + i] + data[6 + i];
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
82 tmp6= data[1 + i] - data[6 + i];
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
83 tmp2= data[2 + i] + data[5 + i];
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
84 tmp5= data[2 + i] - data[5 + i];
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
85 tmp3= data[3 + i] + data[4 + i];
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
86 tmp4= data[3 + i] - data[4 + i];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2024
diff changeset
87
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
88 tmp10= tmp0 + tmp3;
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
89 tmp13= tmp0 - tmp3;
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
90 tmp11= tmp1 + tmp2;
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
91 tmp12= tmp1 - tmp2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2024
diff changeset
92
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
93 temp[0 + i]= tmp10 + tmp11;
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
94 temp[4 + i]= tmp10 - tmp11;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2024
diff changeset
95
6408
7af599600f2d One variable less. No real change to the actual code.
michael
parents: 6398
diff changeset
96 tmp12 += tmp13;
7af599600f2d One variable less. No real change to the actual code.
michael
parents: 6398
diff changeset
97 tmp12 *= A1;
7af599600f2d One variable less. No real change to the actual code.
michael
parents: 6398
diff changeset
98 temp[2 + i]= tmp13 + tmp12;
7af599600f2d One variable less. No real change to the actual code.
michael
parents: 6398
diff changeset
99 temp[6 + i]= tmp13 - tmp12;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2024
diff changeset
100
6409
813ff53ed933 Avoid a=b+c but rather use a+=b (gcc is too stupid to do this itself),
michael
parents: 6408
diff changeset
101 tmp4 += tmp5;
813ff53ed933 Avoid a=b+c but rather use a+=b (gcc is too stupid to do this itself),
michael
parents: 6408
diff changeset
102 tmp5 += tmp6;
813ff53ed933 Avoid a=b+c but rather use a+=b (gcc is too stupid to do this itself),
michael
parents: 6408
diff changeset
103 tmp6 += tmp7;
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
104
6411
5d50e8a7eb09 Alternative and faster (on gcc x86) plane rotation.
michael
parents: 6410
diff changeset
105 #if 0
6409
813ff53ed933 Avoid a=b+c but rather use a+=b (gcc is too stupid to do this itself),
michael
parents: 6408
diff changeset
106 z5= (tmp4 - tmp6) * A5;
813ff53ed933 Avoid a=b+c but rather use a+=b (gcc is too stupid to do this itself),
michael
parents: 6408
diff changeset
107 z2= tmp4*A2 + z5;
813ff53ed933 Avoid a=b+c but rather use a+=b (gcc is too stupid to do this itself),
michael
parents: 6408
diff changeset
108 z4= tmp6*A4 + z5;
6411
5d50e8a7eb09 Alternative and faster (on gcc x86) plane rotation.
michael
parents: 6410
diff changeset
109 #else
5d50e8a7eb09 Alternative and faster (on gcc x86) plane rotation.
michael
parents: 6410
diff changeset
110 z2= tmp4*(A2+A5) - tmp6*A5;
5d50e8a7eb09 Alternative and faster (on gcc x86) plane rotation.
michael
parents: 6410
diff changeset
111 z4= tmp6*(A4-A5) + tmp4*A5;
5d50e8a7eb09 Alternative and faster (on gcc x86) plane rotation.
michael
parents: 6410
diff changeset
112 #endif
6410
72e573046758 Get rid of another useless variable.
michael
parents: 6409
diff changeset
113 tmp5*=A1;
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
114
6410
72e573046758 Get rid of another useless variable.
michael
parents: 6409
diff changeset
115 z11= tmp7 + tmp5;
72e573046758 Get rid of another useless variable.
michael
parents: 6409
diff changeset
116 z13= tmp7 - tmp5;
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
117
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
118 temp[5 + i]= z13 + z2;
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
119 temp[3 + i]= z13 - z2;
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
120 temp[1 + i]= z11 + z4;
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
121 temp[7 + i]= z11 - z4;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2024
diff changeset
122 }
1589
eb26d190cf5a move identical code into its own function
michael
parents: 1571
diff changeset
123 }
eb26d190cf5a move identical code into its own function
michael
parents: 1571
diff changeset
124
eb26d190cf5a move identical code into its own function
michael
parents: 1571
diff changeset
125 void ff_faandct(DCTELEM * data)
eb26d190cf5a move identical code into its own function
michael
parents: 1571
diff changeset
126 {
eb26d190cf5a move identical code into its own function
michael
parents: 1571
diff changeset
127 FLOAT tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
eb26d190cf5a move identical code into its own function
michael
parents: 1571
diff changeset
128 FLOAT tmp10, tmp11, tmp12, tmp13;
6471
b72f6c4cee12 Fix unused variable warnings.
diego
parents: 6411
diff changeset
129 FLOAT z2, z4, z11, z13;
b72f6c4cee12 Fix unused variable warnings.
diego
parents: 6411
diff changeset
130 FLOAT av_unused z5;
1589
eb26d190cf5a move identical code into its own function
michael
parents: 1571
diff changeset
131 FLOAT temp[64];
eb26d190cf5a move identical code into its own function
michael
parents: 1571
diff changeset
132 int i;
eb26d190cf5a move identical code into its own function
michael
parents: 1571
diff changeset
133
eb26d190cf5a move identical code into its own function
michael
parents: 1571
diff changeset
134 emms_c();
eb26d190cf5a move identical code into its own function
michael
parents: 1571
diff changeset
135
eb26d190cf5a move identical code into its own function
michael
parents: 1571
diff changeset
136 row_fdct(temp, data);
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
137
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
138 for (i=0; i<8; i++) {
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
139 tmp0= temp[8*0 + i] + temp[8*7 + i];
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
140 tmp7= temp[8*0 + i] - temp[8*7 + i];
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
141 tmp1= temp[8*1 + i] + temp[8*6 + i];
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
142 tmp6= temp[8*1 + i] - temp[8*6 + i];
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
143 tmp2= temp[8*2 + i] + temp[8*5 + i];
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
144 tmp5= temp[8*2 + i] - temp[8*5 + i];
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
145 tmp3= temp[8*3 + i] + temp[8*4 + i];
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
146 tmp4= temp[8*3 + i] - temp[8*4 + i];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2024
diff changeset
147
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
148 tmp10= tmp0 + tmp3;
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
149 tmp13= tmp0 - tmp3;
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
150 tmp11= tmp1 + tmp2;
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
151 tmp12= tmp1 - tmp2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2024
diff changeset
152
1563
820e06c6ca9b 4.9-RC FreeBSD doesnt like lrint() so change to lrintf(), not that bsd supports that but we emulate it ...
michael
parents: 1562
diff changeset
153 data[8*0 + i]= lrintf(SCALE(8*0 + i) * (tmp10 + tmp11));
820e06c6ca9b 4.9-RC FreeBSD doesnt like lrint() so change to lrintf(), not that bsd supports that but we emulate it ...
michael
parents: 1562
diff changeset
154 data[8*4 + i]= lrintf(SCALE(8*4 + i) * (tmp10 - tmp11));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2024
diff changeset
155
6408
7af599600f2d One variable less. No real change to the actual code.
michael
parents: 6398
diff changeset
156 tmp12 += tmp13;
7af599600f2d One variable less. No real change to the actual code.
michael
parents: 6398
diff changeset
157 tmp12 *= A1;
7af599600f2d One variable less. No real change to the actual code.
michael
parents: 6398
diff changeset
158 data[8*2 + i]= lrintf(SCALE(8*2 + i) * (tmp13 + tmp12));
7af599600f2d One variable less. No real change to the actual code.
michael
parents: 6398
diff changeset
159 data[8*6 + i]= lrintf(SCALE(8*6 + i) * (tmp13 - tmp12));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2024
diff changeset
160
6409
813ff53ed933 Avoid a=b+c but rather use a+=b (gcc is too stupid to do this itself),
michael
parents: 6408
diff changeset
161 tmp4 += tmp5;
813ff53ed933 Avoid a=b+c but rather use a+=b (gcc is too stupid to do this itself),
michael
parents: 6408
diff changeset
162 tmp5 += tmp6;
813ff53ed933 Avoid a=b+c but rather use a+=b (gcc is too stupid to do this itself),
michael
parents: 6408
diff changeset
163 tmp6 += tmp7;
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
164
6411
5d50e8a7eb09 Alternative and faster (on gcc x86) plane rotation.
michael
parents: 6410
diff changeset
165 #if 0
6409
813ff53ed933 Avoid a=b+c but rather use a+=b (gcc is too stupid to do this itself),
michael
parents: 6408
diff changeset
166 z5= (tmp4 - tmp6) * A5;
813ff53ed933 Avoid a=b+c but rather use a+=b (gcc is too stupid to do this itself),
michael
parents: 6408
diff changeset
167 z2= tmp4*A2 + z5;
813ff53ed933 Avoid a=b+c but rather use a+=b (gcc is too stupid to do this itself),
michael
parents: 6408
diff changeset
168 z4= tmp6*A4 + z5;
6411
5d50e8a7eb09 Alternative and faster (on gcc x86) plane rotation.
michael
parents: 6410
diff changeset
169 #else
5d50e8a7eb09 Alternative and faster (on gcc x86) plane rotation.
michael
parents: 6410
diff changeset
170 z2= tmp4*(A2+A5) - tmp6*A5;
5d50e8a7eb09 Alternative and faster (on gcc x86) plane rotation.
michael
parents: 6410
diff changeset
171 z4= tmp6*(A4-A5) + tmp4*A5;
5d50e8a7eb09 Alternative and faster (on gcc x86) plane rotation.
michael
parents: 6410
diff changeset
172 #endif
6410
72e573046758 Get rid of another useless variable.
michael
parents: 6409
diff changeset
173 tmp5*=A1;
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
174
6410
72e573046758 Get rid of another useless variable.
michael
parents: 6409
diff changeset
175 z11= tmp7 + tmp5;
72e573046758 Get rid of another useless variable.
michael
parents: 6409
diff changeset
176 z13= tmp7 - tmp5;
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
177
1563
820e06c6ca9b 4.9-RC FreeBSD doesnt like lrint() so change to lrintf(), not that bsd supports that but we emulate it ...
michael
parents: 1562
diff changeset
178 data[8*5 + i]= lrintf(SCALE(8*5 + i) * (z13 + z2));
820e06c6ca9b 4.9-RC FreeBSD doesnt like lrint() so change to lrintf(), not that bsd supports that but we emulate it ...
michael
parents: 1562
diff changeset
179 data[8*3 + i]= lrintf(SCALE(8*3 + i) * (z13 - z2));
820e06c6ca9b 4.9-RC FreeBSD doesnt like lrint() so change to lrintf(), not that bsd supports that but we emulate it ...
michael
parents: 1562
diff changeset
180 data[8*1 + i]= lrintf(SCALE(8*1 + i) * (z11 + z4));
820e06c6ca9b 4.9-RC FreeBSD doesnt like lrint() so change to lrintf(), not that bsd supports that but we emulate it ...
michael
parents: 1562
diff changeset
181 data[8*7 + i]= lrintf(SCALE(8*7 + i) * (z11 - z4));
1557
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
182 }
5d53c03186a1 floating point AAN DCT
michael
parents:
diff changeset
183 }
1571
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
184
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
185 void ff_faandct248(DCTELEM * data)
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
186 {
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
187 FLOAT tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
188 FLOAT tmp10, tmp11, tmp12, tmp13;
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
189 FLOAT temp[64];
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
190 int i;
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
191
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
192 emms_c();
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
193
1589
eb26d190cf5a move identical code into its own function
michael
parents: 1571
diff changeset
194 row_fdct(temp, data);
1571
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
195
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
196 for (i=0; i<8; i++) {
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
197 tmp0 = temp[8*0 + i] + temp[8*1 + i];
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
198 tmp1 = temp[8*2 + i] + temp[8*3 + i];
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
199 tmp2 = temp[8*4 + i] + temp[8*5 + i];
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
200 tmp3 = temp[8*6 + i] + temp[8*7 + i];
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
201 tmp4 = temp[8*0 + i] - temp[8*1 + i];
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
202 tmp5 = temp[8*2 + i] - temp[8*3 + i];
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
203 tmp6 = temp[8*4 + i] - temp[8*5 + i];
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
204 tmp7 = temp[8*6 + i] - temp[8*7 + i];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2024
diff changeset
205
1571
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
206 tmp10 = tmp0 + tmp3;
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
207 tmp11 = tmp1 + tmp2;
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
208 tmp12 = tmp1 - tmp2;
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
209 tmp13 = tmp0 - tmp3;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2024
diff changeset
210
1571
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
211 data[8*0 + i] = lrintf(SCALE(8*0 + i) * (tmp10 + tmp11));
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
212 data[8*4 + i] = lrintf(SCALE(8*4 + i) * (tmp10 - tmp11));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2024
diff changeset
213
6408
7af599600f2d One variable less. No real change to the actual code.
michael
parents: 6398
diff changeset
214 tmp12 += tmp13;
7af599600f2d One variable less. No real change to the actual code.
michael
parents: 6398
diff changeset
215 tmp12 *= A1;
7af599600f2d One variable less. No real change to the actual code.
michael
parents: 6398
diff changeset
216 data[8*2 + i] = lrintf(SCALE(8*2 + i) * (tmp13 + tmp12));
7af599600f2d One variable less. No real change to the actual code.
michael
parents: 6398
diff changeset
217 data[8*6 + i] = lrintf(SCALE(8*6 + i) * (tmp13 - tmp12));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2024
diff changeset
218
1571
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
219 tmp10 = tmp4 + tmp7;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
220 tmp11 = tmp5 + tmp6;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
221 tmp12 = tmp5 - tmp6;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
222 tmp13 = tmp4 - tmp7;
1571
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
223
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
224 data[8*1 + i] = lrintf(SCALE(8*0 + i) * (tmp10 + tmp11));
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
225 data[8*5 + i] = lrintf(SCALE(8*4 + i) * (tmp10 - tmp11));
1571
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
226
6408
7af599600f2d One variable less. No real change to the actual code.
michael
parents: 6398
diff changeset
227 tmp12 += tmp13;
7af599600f2d One variable less. No real change to the actual code.
michael
parents: 6398
diff changeset
228 tmp12 *= A1;
7af599600f2d One variable less. No real change to the actual code.
michael
parents: 6398
diff changeset
229 data[8*3 + i] = lrintf(SCALE(8*2 + i) * (tmp13 + tmp12));
7af599600f2d One variable less. No real change to the actual code.
michael
parents: 6398
diff changeset
230 data[8*7 + i] = lrintf(SCALE(8*6 + i) * (tmp13 - tmp12));
1571
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
231 }
aa4dc16c0f18 * adding integer/floating point AAN implementations for DCT 2-4-8
romansh
parents: 1563
diff changeset
232 }