Mercurial > libavcodec.hg
changeset 3231:037570194464 libavcodec
Cast cruft in order to support Apple gcc
| author | lu_zero |
|---|---|
| date | Wed, 29 Mar 2006 18:42:50 +0000 |
| parents | 1b08812fa15c |
| children | b9f906a0b0f8 |
| files | ppc/dsputil_snow_altivec.c |
| diffstat | 1 files changed, 59 insertions(+), 49 deletions(-) [+] |
line wrap: on
line diff
--- a/ppc/dsputil_snow_altivec.c Wed Mar 29 11:01:17 2006 +0000 +++ b/ppc/dsputil_snow_altivec.c Wed Mar 29 18:42:50 2006 +0000 @@ -510,35 +510,39 @@ tmp2 = vec_ld(15, obmc4); ob4 = vec_perm(tmp1,tmp2,align); - h1 = vec_mergeh(ob1, ob2); /*h1 <- [ a,b,a,b, a,b,a,b, + h1 = (vector unsigned short) + vec_mergeh(ob1, ob2); /*h1 <- [ a,b,a,b, a,b,a,b, a,b,a,b, a,b,a,b ] */ - h2 = vec_mergeh(ob3, ob4); /*h2 <- [ c,d,c,d, c,d,c,d, + h2 = (vector unsigned short) + vec_mergeh(ob3, ob4); /*h2 <- [ c,d,c,d, c,d,c,d, c,d,c,d, c,d,c,d ] */ - ih = vec_mergeh(h1,h2); /* ih <- [ a,b,c,d,a,b,c,d,a,b,c,d,a,b,c,d ]*/ + ih = (vector unsigned char) + vec_mergeh(h1,h2); /*ih <- [ a,b,c,d, a,b,c,d, + a,b,c,d, a,b,c,d ]*/ - l1 = vec_mergeh(b3, b2); + l1 = (vector unsigned short) vec_mergeh(b3, b2); - l2 = vec_mergeh(b1, b0); + l2 = (vector unsigned short) vec_mergeh(b1, b0); - il = vec_mergeh(l1,l2); + il = (vector unsigned char) vec_mergeh(l1, l2); - v[0] = vec_msum(ih, il, vec_splat_u32(0)); + v[0] = (vector signed int) vec_msum(ih, il, vec_splat_u32(0)); //step1 - h1 = vec_mergeh(ob1, ob2); + h1 = (vector unsigned short) vec_mergeh(ob1, ob2); - h2 = vec_mergeh(ob3, ob4); + h2 = (vector unsigned short) vec_mergeh(ob3, ob4); - ih = vec_mergel(h1,h2); + ih = (vector unsigned char) vec_mergel(h1, h2); - l1 = vec_mergeh(b3, b2); + l1 = (vector unsigned short) vec_mergeh(b3, b2); - l2 = vec_mergeh(b1, b0); + l2 = (vector unsigned short) vec_mergeh(b1, b0); - il = vec_mergel(l1,l2); + il = (vector unsigned char) vec_mergel(l1, l2); - v[1] = vec_msum(ih, il, vec_splat_u32(0)); + v[1] = (vector signed int) vec_msum(ih, il, vec_splat_u32(0)); #endif @@ -664,69 +668,75 @@ ob4 = vec_perm(tmp1,tmp2,align); //step0 - h1 = vec_mergeh(ob1, ob2); /*h1 <- [ a,b,a,b, - a,b,a,b, - a,b,a,b, - a,b,a,b ] */ - h2 = vec_mergeh(ob3, ob4); /*h2 <- [ c,d,c,d, - c,d,c,d, - c,d,c,d, - c,d,c,d ] */ + h1 = (vector unsigned short) + vec_mergeh(ob1, ob2); /*h1 <- [ a,b,a,b, + a,b,a,b, + a,b,a,b, + a,b,a,b ] */ + h2 = (vector unsigned short) + vec_mergeh(ob3, ob4); /*h2 <- [ c,d,c,d, + c,d,c,d, + c,d,c,d, + c,d,c,d ] */ - ih = vec_mergeh(h1,h2); /* ih <- [ a,b,c,d,a,b,c,d,a,b,c,d,a,b,c,d ]*/ - - l1 = vec_mergeh(b3, b2); + ih = (vector unsigned char) + vec_mergeh(h1,h2); /*ih <- [ a,b,c,d, + a,b,c,d, + a,b,c,d, + a,b,c,d ]*/ - l2 = vec_mergeh(b1, b0); + l1 = (vector unsigned short) vec_mergeh(b3, b2); + + l2 = (vector unsigned short) vec_mergeh(b1, b0); - il = vec_mergeh(l1,l2); + il = (vector unsigned char) vec_mergeh(l1,l2); - v[0] = vec_msum(ih, il, vec_splat_u32(0)); + v[0] = (vector signed int) vec_msum(ih, il, vec_splat_u32(0)); //step1 - h1 = vec_mergeh(ob1, ob2); + h1 = (vector unsigned short) vec_mergeh(ob1, ob2); - h2 = vec_mergeh(ob3, ob4); + h2 = (vector unsigned short) vec_mergeh(ob3, ob4); - ih = vec_mergel(h1,h2); + ih = (vector unsigned char) vec_mergel(h1,h2); - l1 = vec_mergeh(b3, b2); + l1 = (vector unsigned short) vec_mergeh(b3, b2); - l2 = vec_mergeh(b1, b0); + l2 = (vector unsigned short) vec_mergeh(b1, b0); - il = vec_mergel(l1,l2); + il = (vector unsigned char) vec_mergel(l1,l2); - v[1] = vec_msum(ih, il, vec_splat_u32(0)); + v[1] = (vector signed int) vec_msum(ih, il, vec_splat_u32(0)); //step2 - h1 = vec_mergel(ob1, ob2); + h1 = (vector unsigned short) vec_mergel(ob1, ob2); - h2 = vec_mergel(ob3, ob4); + h2 = (vector unsigned short) vec_mergel(ob3, ob4); - ih = vec_mergeh(h1,h2); + ih = (vector unsigned char) vec_mergeh(h1,h2); - l1 = vec_mergel(b3, b2); + l1 = (vector unsigned short) vec_mergel(b3, b2); - l2 = vec_mergel(b1, b0); + l2 = (vector unsigned short) vec_mergel(b1, b0); - il = vec_mergeh(l1,l2); + il = (vector unsigned char) vec_mergeh(l1,l2); - v[2] = vec_msum(ih, il, vec_splat_u32(0)); + v[2] = (vector signed int) vec_msum(ih, il, vec_splat_u32(0)); //step3 - h1 = vec_mergel(ob1, ob2); + h1 = (vector unsigned short) vec_mergel(ob1, ob2); - h2 = vec_mergel(ob3, ob4); + h2 = (vector unsigned short) vec_mergel(ob3, ob4); - ih = vec_mergel(h1,h2); + ih = (vector unsigned char) vec_mergel(h1,h2); - l1 = vec_mergel(b3, b2); + l1 = (vector unsigned short) vec_mergel(b3, b2); - l2 = vec_mergel(b1, b0); + l2 = (vector unsigned short) vec_mergel(b1, b0); - il = vec_mergel(l1,l2); + il = (vector unsigned char) vec_mergel(l1,l2); - v[3] = vec_msum(ih, il, vec_splat_u32(0)); + v[3] = (vector signed int) vec_msum(ih, il, vec_splat_u32(0)); #if 1 for(x=0; x<b_w; x++) if(add){