[MPlayer-cvslog] CVS: main/libmpcodecs vf_pp.c, 1.31, 1.32 vf_spp.c, 1.28, 1.29 vf_fspp.c, 1.5, 1.6 vf_pp7.c, 1.3, 1.4

[Ivan Kalvachev CVS]

CVS change done by Ivan Kalvachev CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv22374

Modified Files:
	vf_pp.c vf_spp.c vf_fspp.c vf_pp7.c 
Log Message:
use stored dimensions instead of visible one when (vf_)get_image is called
let's see where does the cola goes :)


Index: vf_pp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_pp.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- vf_pp.c	11 Jul 2005 18:48:09 -0000	1.31
+++ vf_pp.c	20 Jul 2005 01:22:24 -0000	1.32
@@ -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
     }
     

Index: vf_spp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_spp.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- vf_spp.c	11 Jul 2005 18:48:09 -0000	1.28
+++ vf_spp.c	20 Jul 2005 01:22:24 -0000	1.29
@@ -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;

Index: vf_fspp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_fspp.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vf_fspp.c	5 Jun 2005 18:25:49 -0000	1.5
+++ vf_fspp.c	20 Jul 2005 01:22:24 -0000	1.6
@@ -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;

Index: vf_pp7.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_pp7.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vf_pp7.c	11 Jul 2005 18:48:09 -0000	1.3
+++ vf_pp7.c	20 Jul 2005 01:22:24 -0000	1.4
@@ -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);
     }