mpcodecs: remove mp_image_t.x/y

These were never used.

9 files changed, 19 insertions, 25 deletions

diff --git a/libmpcodecs/mp_image.h b/libmpcodecs/mp_image.h
index dd69788f26..6dbe3bfe02 100644
--- a/libmpcodecs/mp_image.h
+++ b/libmpcodecs/mp_image.h
@@ -103,7 +103,7 @@ typedef struct mp_image {
     unsigned char bpp;  // bits/pixel. NOT depth! for RGB it will be n*8
     unsigned int imgfmt;
     int width,height;  // stored dimensions
-    int x,y,w,h;  // visible dimensions
+    int w,h;  // visible dimensions
     unsigned char* planes[MP_MAX_PLANES];
     int stride[MP_MAX_PLANES];
     char * qscale;
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index 5a96e07783..e6ce3e8ff3 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -358,11 +358,7 @@ int mpcodecs_config_vo2(sh_video_t *sh, int w, int h,
 mp_image_t *mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag,
                                int w, int h)
 {
-    mp_image_t *mpi =
-        vf_get_image(sh->vfilter, sh->outfmt, mp_imgtype, mp_imgflag, w, h);
-    if (mpi)
-        mpi->x = mpi->y = 0;
-    return mpi;
+    return vf_get_image(sh->vfilter, sh->outfmt, mp_imgtype, mp_imgflag, w, h);
 }
 
 void mpcodecs_draw_slice(sh_video_t *sh, unsigned char **src, int *stride,
diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c
index 9c0e90bb61..b7c16a7759 100644
--- a/libmpcodecs/vf_vo.c
+++ b/libmpcodecs/vf_vo.c
@@ -213,7 +213,7 @@ static int put_image(struct vf_instance *vf,
     // blit frame:
 //    if(mpi->flags&MP_IMGFLAG_PLANAR)
     if(vf->default_caps&VFCAP_ACCEPT_STRIDE)
-        vo_draw_slice(video_out, mpi->planes,mpi->stride,mpi->w,mpi->h,mpi->x,mpi->y);
+        vo_draw_slice(video_out, mpi->planes,mpi->stride,mpi->w,mpi->h,0,0);
     else
         vo_draw_frame(video_out, mpi->planes);
   }
diff --git a/libvo/mga_template.c b/libvo/mga_template.c
index 6886ecd8f7..274be76098 100644
--- a/libvo/mga_template.c
+++ b/libvo/mga_template.c
@@ -189,7 +189,7 @@ draw_image(mp_image_t *mpi){
 
     if(mpi->flags&MP_IMGFLAG_PLANAR){
 	// copy planar:
-        draw_slice(mpi->planes,mpi->stride,mpi->w,mpi->h,mpi->x,mpi->y);
+        draw_slice(mpi->planes,mpi->stride,mpi->w,mpi->h,0,0);
     } else {
 	// copy packed:
 	mem2agpcpy_pic(vid_data, mpi->planes[0],	// dst,src
diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c
index d21c9e37c6..b50adba614 100644
--- a/libvo/vo_directfb2.c
+++ b/libvo/vo_directfb2.c
@@ -1279,7 +1279,7 @@ static uint32_t put_image(mp_image_t *mpi){
 
 	p = FFMIN(mpi->w, pitch);
 
-	src = mpi->planes[0]+mpi->y*mpi->stride[0]+mpi->x;
+	src = mpi->planes[0];
 
 	for (i=0;i<mpi->h;i++) {
             fast_memcpy(dst+i*pitch,src+i*mpi->stride[0],p);
@@ -1290,14 +1290,14 @@ static uint32_t put_image(mp_image_t *mpi){
 
             dst += pitch*height;
     	    p = p/2;
-	    src = mpi->planes[2]+mpi->y*mpi->stride[2]+mpi->x/2;
+	    src = mpi->planes[2];
 
             for (i=0;i<mpi->h/2;i++) {
 	        fast_memcpy(dst+i*pitch/2,src+i*mpi->stride[2],p);
     	    }
 
     	    dst += pitch*height/4;
-	    src = mpi->planes[1]+mpi->y*mpi->stride[1]+mpi->x/2;
+	    src = mpi->planes[1];
 
     	    for (i=0;i<mpi->h/2;i++) {
         	fast_memcpy(dst+i*pitch/2,src+i*mpi->stride[1],p);
@@ -1307,14 +1307,14 @@ static uint32_t put_image(mp_image_t *mpi){
 
     	    dst += pitch*height;
 	    p = p/2;
-	    src = mpi->planes[1]+mpi->y*mpi->stride[1]+mpi->x/2;
+	    src = mpi->planes[1];
 
     	    for (i=0;i<mpi->h/2;i++) {
         	fast_memcpy(dst+i*pitch/2,src+i*mpi->stride[1],p);
     	    }
 
     	    dst += pitch*height/4;
-	    src = mpi->planes[2]+mpi->y*mpi->stride[2]+mpi->x/2;
+	    src = mpi->planes[2];
 
     	    for (i=0;i<mpi->h/2;i++) {
         	fast_memcpy(dst+i*pitch/2,src+i*mpi->stride[2],p);
@@ -1356,11 +1356,11 @@ static uint32_t put_image(mp_image_t *mpi){
 	if (frame) {
 		DFBCHECK (frame->Lock(frame,DSLF_WRITE,(void *)&dst,&pitch));
 		framelocked = 1;
-		mem2agpcpy_pic(dst,mpi->planes[0] + mpi->y * mpi->stride[0] + mpi->x * (mpi->bpp >> 3)  ,mpi->w * (mpi->bpp >> 3),mpi->h,pitch,mpi->stride[0]);
+		mem2agpcpy_pic(dst,mpi->planes[0] ,mpi->w * (mpi->bpp >> 3),mpi->h,pitch,mpi->stride[0]);
         } else {
 		DFBCHECK (primary->Lock(primary,DSLF_WRITE,(void *)&dst,&pitch));
 		primarylocked = 1;
-		mem2agpcpy_pic(dst + yoffset * pitch + xoffset * (mpi->bpp >> 3),mpi->planes[0] + mpi->y * mpi->stride[0] + mpi->x * (mpi->bpp >> 3)  ,mpi->w * (mpi->bpp >> 3),mpi->h,pitch,mpi->stride[0]);
+		mem2agpcpy_pic(dst + yoffset * pitch + xoffset * (mpi->bpp >> 3),mpi->planes[0] ,mpi->w * (mpi->bpp >> 3),mpi->h,pitch,mpi->stride[0]);
         };
 	unlock();
 
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c
index 419c0f2b94..2036ac1803 100644
--- a/libvo/vo_directx.c
+++ b/libvo/vo_directx.c
@@ -930,8 +930,8 @@ static uint32_t put_image(mp_image_t *mpi){
 
     uint8_t   *d;
 	uint8_t   *s;
-    uint32_t x = mpi->x;
-	uint32_t y = mpi->y;
+    uint32_t x = 0;
+	uint32_t y = 0;
 	uint32_t w = mpi->w;
 	uint32_t h = mpi->h;
 
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 6010c9766b..1ad893cf52 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -1057,7 +1057,7 @@ static uint32_t draw_image(struct vo *vo, mp_image_t *mpi)
         slice = 0; // always "upload" full texture
     }
     glUploadTex(gl, p->target, p->gl_format, p->gl_type, planes[0],
-                stride[0], mpi->x, mpi->y, w, h, slice);
+                stride[0], 0, 0, w, h, slice);
     if (p->is_yuv) {
         int xs, ys;
         mp_get_chroma_shift(p->image_format, &xs, &ys, NULL);
@@ -1068,8 +1068,7 @@ static uint32_t draw_image(struct vo *vo, mp_image_t *mpi)
         }
         gl->ActiveTexture(GL_TEXTURE1);
         glUploadTex(gl, p->target, p->gl_format, p->gl_type, planes[1],
-                    stride[1], mpi->x >> xs, mpi->y >> ys, w >> xs, h >> ys,
-                    slice);
+                    stride[1], 0, 0, w >> xs, h >> ys, slice);
         if ((mpi->flags & MP_IMGFLAG_DIRECT) && !(mpi->flags & MP_IMGFLAG_COMMON_PLANE)) {
             gl->BindBuffer(GL_PIXEL_UNPACK_BUFFER, p->buffer_uv[1]);
             gl->UnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
@@ -1077,8 +1076,7 @@ static uint32_t draw_image(struct vo *vo, mp_image_t *mpi)
         }
         gl->ActiveTexture(GL_TEXTURE2);
         glUploadTex(gl, p->target, p->gl_format, p->gl_type, planes[2],
-                    stride[2], mpi->x >> xs, mpi->y >> ys, w >> xs, h >> ys,
-                    slice);
+                    stride[2], 0, 0, w >> xs, h >> ys, slice);
         gl->ActiveTexture(GL_TEXTURE0);
     }
     if (mpi->flags & MP_IMGFLAG_DIRECT) {
diff --git a/libvo/vo_kva.c b/libvo/vo_kva.c
index 878911c438..e05811c17c 100644
--- a/libvo/vo_kva.c
+++ b/libvo/vo_kva.c
@@ -820,7 +820,7 @@ static uint32_t draw_image(mp_image_t *mpi)
     if (mpi->flags & (MP_IMGFLAG_DIRECT | MP_IMGFLAG_DRAW_CALLBACK))
         return VO_TRUE;
 
-    draw_slice(mpi->planes, mpi->stride, mpi->w, mpi->h, mpi->x, mpi->y);
+    draw_slice(mpi->planes, mpi->stride, mpi->w, mpi->h, 0, 0);
 
     return VO_TRUE;
 }
diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c
index 3b8a107c7d..19a454e354 100644
--- a/libvo/vo_svga.c
+++ b/libvo/vo_svga.c
@@ -237,8 +237,8 @@ static uint32_t svga_draw_image(mp_image_t *mpi){
     PageStore[cpage].locks=PAGE_BUSY;
 
 // these variables are used in loops
-    x = mpi->x;
-    y = mpi->y;
+    x = 0;
+    y = 0;
     w = mpi->w;
     h = mpi->h;
     stride = mpi->stride[0];