Commit 62a78f03 authored by Yaowu Xu's avatar Yaowu Xu

re-scaled 2nd order haar transform

During the work of extend_qrange, we have rolled a factor of 2 from
quantization/dequatnization into 2nd order walsh-hadamard transform.
This commit does the same for the 2nd order haar transform. so they
can share the same quantizaiton process as the 2nd order WHT.

Change-Id: I734af4a20ea8149a01b5b1971a065092977dfe33
parent 454c7abc
......@@ -487,10 +487,10 @@ void vp8_short_ihaar2x2_c(short *input, short *output, int pitch)
op[i] = 0;
}
op[0] = (ip[0] + ip[1] + ip[4] + ip[8])>>2;
op[1] = (ip[0] - ip[1] + ip[4] - ip[8])>>2;
op[4] = (ip[0] + ip[1] - ip[4] - ip[8])>>2;
op[8] = (ip[0] - ip[1] - ip[4] + ip[8])>>2;
op[0] = (ip[0] + ip[1] + ip[4] + ip[8])>>1;
op[1] = (ip[0] - ip[1] + ip[4] - ip[8])>>1;
op[4] = (ip[0] + ip[1] - ip[4] - ip[8])>>1;
op[8] = (ip[0] - ip[1] - ip[4] + ip[8])>>1;
}
void vp8_short_ihaar2x2_1_c(short *input, short *output, int pitch)
......
......@@ -120,10 +120,10 @@ void vp8_short_fhaar2x2_c(short *input, short *output, int pitch) //pitch = 8
op1[i] = 0;
}
op1[0]=ip1[0] + ip1[1] + ip1[4] + ip1[8];
op1[1]=ip1[0] - ip1[1] + ip1[4] - ip1[8];
op1[4]=ip1[0] + ip1[1] - ip1[4] - ip1[8];
op1[8]=ip1[0] - ip1[1] - ip1[4] + ip1[8];
op1[0]=(ip1[0] + ip1[1] + ip1[4] + ip1[8])>>1;
op1[1]=(ip1[0] - ip1[1] + ip1[4] - ip1[8])>>1;
op1[4]=(ip1[0] + ip1[1] - ip1[4] - ip1[8])>>1;
op1[8]=(ip1[0] - ip1[1] - ip1[4] + ip1[8])>>1;
}
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment