shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "re-scaled 2nd order haar transform" into experimental

--- a/vp8/common/idctllm.c

+++ b/vp8/common/idctllm.c

@@ -487,10 +487,10 @@

        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)

--- a/vp8/encoder/dct.c

+++ b/vp8/encoder/dct.c

@@ -120,10 +120,10 @@

        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