- p0 += (tmp0 + tmp1) << 3;
- p1 += (tmp0 + tmp1 + b1_1 + b1_2) << 2;
- p2 += tmp2 << 2;
- p3 += (tmp2 + b1_3) << 1;
+ p0 += (tmp0 + tmp1) * 8;
+ p1 += (tmp0 + tmp1 + b1_1 + b1_2) * 4;
+ p2 += tmp2 * 4;
+ p3 += (tmp2 + b1_3) * 2;
- p0 += (tmp0 + tmp1) << 2;
- p1 += (tmp0 - tmp1*6 + tmp2) << 1;
- p2 += (b3_7 + b3_8) << 1;
+ p0 += (tmp0 + tmp1) * 4;
+ p1 += (tmp0 - tmp1*6 + tmp2) * 2;
+ p2 += (b3_7 + b3_8) * 2;
#define INV_HAAR8(s1, s5, s3, s7, s2, s4, s6, s8,\
d1, d2, d3, d4, d5, d6, d7, d8,\
t0, t1, t2, t3, t4, t5, t6, t7, t8) {\
#define INV_HAAR8(s1, s5, s3, s7, s2, s4, s6, s8,\
d1, d2, d3, d4, d5, d6, d7, d8,\
t0, t1, t2, t3, t4, t5, t6, t7, t8) {\
IVI_HAAR_BFLY(t1, t5, t1, t5, t0); IVI_HAAR_BFLY(t1, s3, t1, t3, t0);\
IVI_HAAR_BFLY(t5, s7, t5, t7, t0); IVI_HAAR_BFLY(t1, s2, t1, t2, t0);\
IVI_HAAR_BFLY(t3, s4, t3, t4, t0); IVI_HAAR_BFLY(t5, s6, t5, t6, t0);\
IVI_HAAR_BFLY(t1, t5, t1, t5, t0); IVI_HAAR_BFLY(t1, s3, t1, t3, t0);\
IVI_HAAR_BFLY(t5, s7, t5, t7, t0); IVI_HAAR_BFLY(t1, s2, t1, t2, t0);\
IVI_HAAR_BFLY(t3, s4, t3, t4, t0); IVI_HAAR_BFLY(t5, s6, t5, t6, t0);\
- sp1 = src[ 0] << shift;
- sp2 = src[ 8] << shift;
- sp3 = src[16] << shift;
- sp4 = src[24] << shift;
+ sp1 = src[ 0] * (1 << shift);
+ sp2 = src[ 8] * (1 << shift);
+ sp3 = src[16] * (1 << shift);
+ sp4 = src[24] * (1 << shift);
INV_HAAR8( sp1, sp2, sp3, sp4,
src[32], src[40], src[48], src[56],
dst[ 0], dst[ 8], dst[16], dst[24],
INV_HAAR8( sp1, sp2, sp3, sp4,
src[32], src[40], src[48], src[56],
dst[ 0], dst[ 8], dst[16], dst[24],
INV_HAAR4( sp1, sp2, src[8], src[12],
dst[0], dst[4], dst[8], dst[12],
t0, t1, t2, t3, t4);
INV_HAAR4( sp1, sp2, src[8], src[12],
dst[0], dst[4], dst[8], dst[12],
t0, t1, t2, t3, t4);