From d641bf033790826813dd9dfc0534d1d94ce5dc8d Mon Sep 17 00:00:00 2001 From: iive Date: Wed, 20 Jul 2005 01:22:24 +0000 Subject: [PATCH] use stored dimensions instead of visible one when (vf_)get_image is called let's see where does the cola goes :) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16019 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vf_fspp.c | 4 ++-- libmpcodecs/vf_pp.c | 4 ++-- libmpcodecs/vf_pp7.c | 4 ++-- libmpcodecs/vf_spp.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c index ef9e107455..7055e4f33f 100644 --- a/libmpcodecs/vf_fspp.c +++ b/libmpcodecs/vf_fspp.c @@ -507,7 +507,7 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi) if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change // ok, we can do pp in-place (or pp disabled): vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, - mpi->type, mpi->flags, mpi->w, mpi->h); + mpi->type, mpi->flags, mpi->width, mpi->height); mpi->planes[0]=vf->dmpi->planes[0]; mpi->stride[0]=vf->dmpi->stride[0]; mpi->width=vf->dmpi->width; @@ -528,7 +528,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) dmpi=vf_get_image(vf->next,mpi->imgfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE, - mpi->w,mpi->h); + mpi->width,mpi->height); vf_clone_mpi_attributes(dmpi, mpi); }else{ dmpi=vf->dmpi; diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c index 3fb599f408..6ca72c6ef5 100644 --- a/libmpcodecs/vf_pp.c +++ b/libmpcodecs/vf_pp.c @@ -97,7 +97,7 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ return; // colorspace differ // ok, we can do pp in-place (or pp disabled): vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, - mpi->type, mpi->flags | MP_IMGFLAG_READABLE, mpi->w, mpi->h); + mpi->type, mpi->flags | MP_IMGFLAG_READABLE, mpi->width, mpi->height); mpi->planes[0]=vf->dmpi->planes[0]; mpi->stride[0]=vf->dmpi->stride[0]; mpi->width=vf->dmpi->width; @@ -117,7 +117,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE, // MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, // mpi->w,mpi->h); - (mpi->w+7)&(~7),(mpi->h+7)&(~7)); + (mpi->width+7)&(~7),(mpi->height+7)&(~7)); vf->dmpi->w=mpi->w; vf->dmpi->h=mpi->h; // display w;h } diff --git a/libmpcodecs/vf_pp7.c b/libmpcodecs/vf_pp7.c index d9fcd80bba..16bed77e3e 100644 --- a/libmpcodecs/vf_pp7.c +++ b/libmpcodecs/vf_pp7.c @@ -356,7 +356,7 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change // ok, we can do pp in-place (or pp disabled): vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, - mpi->type, mpi->flags | MP_IMGFLAG_READABLE, mpi->w, mpi->h); + mpi->type, mpi->flags | MP_IMGFLAG_READABLE, mpi->width, mpi->height); mpi->planes[0]=vf->dmpi->planes[0]; mpi->stride[0]=vf->dmpi->stride[0]; mpi->width=vf->dmpi->width; @@ -379,7 +379,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ dmpi=vf_get_image(vf->next,mpi->imgfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE, - mpi->w,mpi->h); + mpi->width,mpi->height); vf_clone_mpi_attributes(dmpi, mpi); } diff --git a/libmpcodecs/vf_spp.c b/libmpcodecs/vf_spp.c index be89594d25..7637081822 100644 --- a/libmpcodecs/vf_spp.c +++ b/libmpcodecs/vf_spp.c @@ -453,7 +453,7 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change // ok, we can do pp in-place (or pp disabled): vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, - mpi->type, mpi->flags | MP_IMGFLAG_READABLE, mpi->w, mpi->h); + mpi->type, mpi->flags | MP_IMGFLAG_READABLE, mpi->width, mpi->height); mpi->planes[0]=vf->dmpi->planes[0]; mpi->stride[0]=vf->dmpi->stride[0]; mpi->width=vf->dmpi->width; @@ -474,7 +474,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ dmpi=vf_get_image(vf->next,mpi->imgfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE, - mpi->w,mpi->h); + mpi->width,mpi->height); vf_clone_mpi_attributes(dmpi, mpi); }else{ dmpi=vf->dmpi;