Mercurial > mplayer.hg
changeset 5315:75092614a37d
UV vs VU fix
| author | arpi |
|---|---|
| date | Sun, 24 Mar 2002 19:01:01 +0000 |
| parents | ba5c92e64c5d |
| children | ce6f625f6682 |
| files | libmpcodecs/vd.c |
| diffstat | 1 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/vd.c Sun Mar 24 18:44:15 2002 +0000 +++ b/libmpcodecs/vd.c Sun Mar 24 19:01:01 2002 +0000 @@ -245,7 +245,7 @@ // Note: buffer allocation may be moved to mpcodecs_config_vo() later... mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h){ mp_image_t* mpi=NULL; - int w2=(mp_imgflag&MP_IMGFLAG_ACCEPT_STRIDE)?((w+15)&(~15)):w; + int w2=w; //(mp_imgflag&MP_IMGFLAG_ACCEPT_STRIDE)?((w+15)&(~15)):w; // Note: we should call libvo first to check if it supports direct rendering // and if not, then fallback to software buffers: switch(mp_imgtype){ @@ -301,8 +301,15 @@ // YV12/I420. feel free to add other planar formats here... if(!mpi->stride[0]) mpi->stride[0]=mpi->width; if(!mpi->stride[1]) mpi->stride[1]=mpi->stride[2]=mpi->width/2; - mpi->planes[1]=mpi->planes[0]+mpi->width*mpi->height; - mpi->planes[2]=mpi->planes[1]+mpi->width*mpi->height/4; + if(mpi->flags&MP_IMGFLAG_SWAPPED){ + // I420/IYUV (Y,U,V) + mpi->planes[1]=mpi->planes[0]+mpi->width*mpi->height; + mpi->planes[2]=mpi->planes[1]+(mpi->width>>1)*(mpi->height>>1); + } else { + // YV12,YVU9 (Y,V,U) + mpi->planes[2]=mpi->planes[0]+mpi->width*mpi->height; + mpi->planes[1]=mpi->planes[2]+(mpi->width>>1)*(mpi->height>>1); + } } else { if(!mpi->stride[0]) mpi->stride[0]=mpi->width*mpi->bpp/8; }