Browse code

add rounding bias earlier in the idct, avoids many adds

Originally committed as revision 5618 to svn://svn.ffmpeg.org/ffmpeg/trunk

Michael Niedermayer authored on 2006/07/05 07:43:35
Showing 1 changed files
... ...
@@ -184,6 +184,8 @@ static void cavs_idct8_add_c(uint8_t *dst, DCTELEM *block, int stride) {
184 184
     DCTELEM (*src)[8] = (DCTELEM(*)[8])block;
185 185
     uint8_t *cm = cropTbl + MAX_NEG_CROP;
186 186
 
187
+    src[0][0] += 8;
188
+
187 189
     for( i = 0; i < 8; i++ ) {
188 190
         const int a0 =  3*src[i][1] - (src[i][7]<<1);
189 191
         const int a1 =  3*src[i][3] + (src[i][5]<<1);
... ...
@@ -197,22 +199,22 @@ static void cavs_idct8_add_c(uint8_t *dst, DCTELEM *block, int stride) {
197 197
 
198 198
         const int a7 = (src[i][2]<<2) - 10*src[i][6];
199 199
         const int a6 = (src[i][6]<<2) + 10*src[i][2];
200
-        const int a5 = (src[i][0] - src[i][4]) << 3;
201
-        const int a4 = (src[i][0] + src[i][4]) << 3;
200
+        const int a5 = ((src[i][0] - src[i][4]) << 3) + 4;
201
+        const int a4 = ((src[i][0] + src[i][4]) << 3) + 4;
202 202
 
203 203
         const int b0 = a4 + a6;
204 204
         const int b1 = a5 + a7;
205 205
         const int b2 = a5 - a7;
206 206
         const int b3 = a4 - a6;
207 207
 
208
-        src[i][0] = (b0 + b4 + 4) >> 3;
209
-        src[i][1] = (b1 + b5 + 4) >> 3;
210
-        src[i][2] = (b2 + b6 + 4) >> 3;
211
-        src[i][3] = (b3 + b7 + 4) >> 3;
212
-        src[i][4] = (b3 - b7 + 4) >> 3;
213
-        src[i][5] = (b2 - b6 + 4) >> 3;
214
-        src[i][6] = (b1 - b5 + 4) >> 3;
215
-        src[i][7] = (b0 - b4 + 4) >> 3;
208
+        src[i][0] = (b0 + b4) >> 3;
209
+        src[i][1] = (b1 + b5) >> 3;
210
+        src[i][2] = (b2 + b6) >> 3;
211
+        src[i][3] = (b3 + b7) >> 3;
212
+        src[i][4] = (b3 - b7) >> 3;
213
+        src[i][5] = (b2 - b6) >> 3;
214
+        src[i][6] = (b1 - b5) >> 3;
215
+        src[i][7] = (b0 - b4) >> 3;
216 216
     }
217 217
     for( i = 0; i < 8; i++ ) {
218 218
         const int a0 =  3*src[1][i] - (src[7][i]<<1);
... ...
@@ -235,14 +237,14 @@ static void cavs_idct8_add_c(uint8_t *dst, DCTELEM *block, int stride) {
235 235
         const int b2 = a5 - a7;
236 236
         const int b3 = a4 - a6;
237 237
 
238
-        dst[i + 0*stride] = cm[ dst[i + 0*stride] + ((b0 + b4 + 64) >> 7)];
239
-        dst[i + 1*stride] = cm[ dst[i + 1*stride] + ((b1 + b5 + 64) >> 7)];
240
-        dst[i + 2*stride] = cm[ dst[i + 2*stride] + ((b2 + b6 + 64) >> 7)];
241
-        dst[i + 3*stride] = cm[ dst[i + 3*stride] + ((b3 + b7 + 64) >> 7)];
242
-        dst[i + 4*stride] = cm[ dst[i + 4*stride] + ((b3 - b7 + 64) >> 7)];
243
-        dst[i + 5*stride] = cm[ dst[i + 5*stride] + ((b2 - b6 + 64) >> 7)];
244
-        dst[i + 6*stride] = cm[ dst[i + 6*stride] + ((b1 - b5 + 64) >> 7)];
245
-        dst[i + 7*stride] = cm[ dst[i + 7*stride] + ((b0 - b4 + 64) >> 7)];
238
+        dst[i + 0*stride] = cm[ dst[i + 0*stride] + ((b0 + b4) >> 7)];
239
+        dst[i + 1*stride] = cm[ dst[i + 1*stride] + ((b1 + b5) >> 7)];
240
+        dst[i + 2*stride] = cm[ dst[i + 2*stride] + ((b2 + b6) >> 7)];
241
+        dst[i + 3*stride] = cm[ dst[i + 3*stride] + ((b3 + b7) >> 7)];
242
+        dst[i + 4*stride] = cm[ dst[i + 4*stride] + ((b3 - b7) >> 7)];
243
+        dst[i + 5*stride] = cm[ dst[i + 5*stride] + ((b2 - b6) >> 7)];
244
+        dst[i + 6*stride] = cm[ dst[i + 6*stride] + ((b1 - b5) >> 7)];
245
+        dst[i + 7*stride] = cm[ dst[i + 7*stride] + ((b0 - b4) >> 7)];
246 246
     }
247 247
 }
248 248