diff options
| author |  pacman <pacman@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-27 21:42:41 +0000 |
|---|---|---|
| committer | pacman <pacman@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-27 21:42:41 +0000 |
| commit | 326fa789c69bd8ab25084b219b76a96688cdcffd (patch) | |
| tree | 3a63bb935457010b260eaef488ac0731631688b4 /postproc | |
| parent | 9d12ded2341c08ce18461f53180f84b6ebd86d5d (diff) | |
Fix some bugs handling input that is not aligned at 16 bytes or has
stride!=width.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18323 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'postproc')
| -rw-r--r-- | postproc/yuv2rgb_altivec.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/postproc/yuv2rgb_altivec.c b/postproc/yuv2rgb_altivec.c index 43ac871fd3..9a73b577ac 100644 --- a/postproc/yuv2rgb_altivec.c +++ b/postproc/yuv2rgb_altivec.c @@ -278,7 +278,7 @@ static int altivec_##name (SwsContext *c, \ vector signed short R1,G1,B1; \ vector unsigned char R,G,B; \ \ - vector unsigned char *uivP, *vivP; \ + vector unsigned char *y1ivP, *y2ivP, *uivP, *vivP; \ vector unsigned char align_perm; \ \ vector signed short \ @@ -292,7 +292,7 @@ static int altivec_##name (SwsContext *c, \ vector unsigned short lCSHIFT = c->CSHIFT; \ \ ubyte *y1i = in[0]; \ - ubyte *y2i = in[0]+w; \ + ubyte *y2i = in[0]+instrides[0]; \ ubyte *ui = in[1]; \ ubyte *vi = in[2]; \ \ @@ -304,7 +304,7 @@ static int altivec_##name (SwsContext *c, \ (oplanes[0]+srcSliceY*outstrides[0]+outstrides[0]); \ \ \ - instrides_scl[0] = instrides[0]; \ + instrides_scl[0] = instrides[0]*2-w; /* the loop moves y{1,2}i by w */ \ instrides_scl[1] = instrides[1]-w/2; /* the loop moves ui by w/2 */ \ instrides_scl[2] = instrides[2]-w/2; /* the loop moves vi by w/2 */ \ \ @@ -315,11 +315,17 @@ static int altivec_##name (SwsContext *c, \ \ for (j=0;j<w/16;j++) { \ \ - y0 = vec_ldl (0,y1i); \ - y1 = vec_ldl (0,y2i); \ + y1ivP = (vector unsigned char *)y1i; \ + y2ivP = (vector unsigned char *)y2i; \ uivP = (vector unsigned char *)ui; \ vivP = (vector unsigned char *)vi; \ \ + align_perm = vec_lvsl (0, y1i); \ + y0 = (vector unsigned char)vec_perm (y1ivP[0], y1ivP[1], align_perm);\ + \ + align_perm = vec_lvsl (0, y2i); \ + y1 = (vector unsigned char)vec_perm (y2ivP[0], y2ivP[1], align_perm);\ + \ align_perm = vec_lvsl (0, ui); \ u = (vector signed char)vec_perm (uivP[0], uivP[1], align_perm); \ \ |