generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yaowu Xu 2012-02-16 15:32:33 +00:00 committed by On2 (Google) Code Review
commit a96bf2038c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vp8/common/idctllm.c
View File

@ -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)

8
vp8/encoder/dct.c
View File

@ -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