Mercurial > mplayer.hg

changeset 16018:bdf1b4ecb906

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use stored dimensions instead of visible one when (vf_)get_image is called let's see where does the cola goes :)
author iive
date Wed, 20 Jul 2005 01:22:24 +0000
parents 41ca23f65baa
children 1307465ee8ff
files libmpcodecs/vf_fspp.c libmpcodecs/vf_pp.c libmpcodecs/vf_pp7.c libmpcodecs/vf_spp.c
diffstat 4 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/vf_fspp.c	Tue Jul 19 22:03:15 2005 +0000
+++ b/libmpcodecs/vf_fspp.c	Wed Jul 20 01:22:24 2005 +0000
@@ -507,7 +507,7 @@
     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 @@
 	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;
--- a/libmpcodecs/vf_pp.c	Tue Jul 19 22:03:15 2005 +0000
+++ b/libmpcodecs/vf_pp.c	Wed Jul 20 01:22:24 2005 +0000
@@ -97,7 +97,7 @@
 	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 @@
 	    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
     }
     
--- a/libmpcodecs/vf_pp7.c	Tue Jul 19 22:03:15 2005 +0000
+++ b/libmpcodecs/vf_pp7.c	Wed Jul 20 01:22:24 2005 +0000
@@ -356,7 +356,7 @@
     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 @@
         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);
     }
 
--- a/libmpcodecs/vf_spp.c	Tue Jul 19 22:03:15 2005 +0000
+++ b/libmpcodecs/vf_spp.c	Wed Jul 20 01:22:24 2005 +0000
@@ -453,7 +453,7 @@
     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 @@
                 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;