[MPlayer-cvslog] r24966 - trunk/libvo/vo_directfb2.c

[Diego Biurrun]

On Sun, Nov 04, 2007 at 03:13:13PM +0100, Reimar Döffinger wrote:
> On Sun, Nov 04, 2007 at 02:41:07PM +0100, diego wrote:
> > 
> > Log:
> > Fix previous incorrect commit, +/- has higher precedence than shifts.
> > 
> > --- trunk/libvo/vo_directfb2.c	(original)
> > +++ trunk/libvo/vo_directfb2.c	Sun Nov  4 14:41:07 2007
> > @@ -1186,8 +1186,8 @@ static uint32_t get_image(mp_image_t *mp
> >         if (!frame) {
> >              if(mpi->flags&MP_IMGFLAG_PLANAR){
> >  		mpi->planes[0]= dst + yoffset * pitch + xoffset;
> > -		mpi->planes[1]+= ((yoffset * pitch) >> 2) + (xoffset >> 1);
> > -		mpi->planes[2]+= ((yoffset * pitch) >> 2) + (xoffset >> 1);
> > +		mpi->planes[1]+= (yoffset * pitch) >> (2 + xoffset) >> 1;
> > +		mpi->planes[2]+= (yoffset * pitch) >> (2 + xoffset) >> 1;
> 
> Uh... No idea what the previous commit was, and maybe this really
> restores the same behaviour as originally, but I can't imagine this is
> correct...

It restores the original behavior, fishy as it may look.  Here is my
previous incorrect commit:

--- vo_directfb2.c	(revision 24619)
+++ vo_directfb2.c	(revision 24959)
@@ -1186,8 +1186,8 @@
        if (!frame) {
             if(mpi->flags&MP_IMGFLAG_PLANAR){
 		mpi->planes[0]= dst + yoffset * pitch + xoffset;
-		mpi->planes[1]+= (yoffset * pitch) >> 2 + xoffset >> 1;
-		mpi->planes[2]+= (yoffset * pitch) >> 2 + xoffset >> 1;
+		mpi->planes[1]+= ((yoffset * pitch) >> 2) + (xoffset >> 1);
+		mpi->planes[2]+= ((yoffset * pitch) >> 2) + (xoffset >> 1);
 	    } else {
 		mpi->planes[0]=dst + yoffset * pitch + xoffset * (mpi->bpp >> 3);

Diego