From f2dee327b2797f9cf8c802274caa77ce1c39a7b1 Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 4 Aug 2007 22:12:49 +0000
Subject: =?UTF-8?q?Move=20alloc=5Fmpi=20and=20copy=5Fmpi=20from=20libmenu/?=
 =?UTF-8?q?vf=5Fmenu.c=20to=20libmpcodecs/mp=5Fimage.c.=20Patch=20by=20Att?=
 =?UTF-8?q?ila=20=C3=96tv=C3=B6s.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24014 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmenu/vf_menu.c | 54 ------------------------------------------------------
 1 file changed, 54 deletions(-)

(limited to 'libmenu/vf_menu.c')

diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c
index 7996c24adc..83acbac815 100644
--- a/libmenu/vf_menu.c
+++ b/libmenu/vf_menu.c
@@ -42,41 +42,6 @@ struct vf_priv_s {
 
 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts);
 
-static mp_image_t* alloc_mpi(int w, int h, uint32_t fmt) {
-  mp_image_t* mpi = new_mp_image(w,h);
-
-  mp_image_setfmt(mpi,fmt);
-  // IF09 - allocate space for 4. plane delta info - unused
-  if (mpi->imgfmt == IMGFMT_IF09)
-    {
-      mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*(mpi->height+2)/8+
-			      mpi->chroma_width*mpi->chroma_height);
-      /* delta table, just for fun ;) */
-      mpi->planes[3]=mpi->planes[0]+2*(mpi->chroma_width*mpi->chroma_height);
-    }
-  else
-    mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*(mpi->height+2)/8);
-  if(mpi->flags&MP_IMGFLAG_PLANAR){
-    // YV12/I420/YVU9/IF09. 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->chroma_width;
-    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->chroma_width*mpi->chroma_height;
-    } else {
-      // YV12,YVU9,IF09  (Y,V,U)
-      mpi->planes[2]=mpi->planes[0]+mpi->width*mpi->height;
-      mpi->planes[1]=mpi->planes[2]+mpi->chroma_width*mpi->chroma_height;
-    }
-  } else {
-    if(!mpi->stride[0]) mpi->stride[0]=mpi->width*mpi->bpp/8;
-  }
-  mpi->flags|=MP_IMGFLAG_ALLOCATED;
-  
-  return mpi;
-}
-
 void vf_menu_pause_update(struct vf_instance_s* vf) {
   vo_functions_t *video_out = mpctx_get_video_out(vf->priv->current->ctx);
   if(pause_mpi) {
@@ -158,25 +123,6 @@ static void key_cb(int code) {
   menu_read_key(st_priv->current,code);
 }
 
-
-
-inline static void copy_mpi(mp_image_t *dmpi, mp_image_t *mpi) {
-  if(mpi->flags&MP_IMGFLAG_PLANAR){
-    memcpy_pic(dmpi->planes[0],mpi->planes[0], mpi->w, mpi->h,
-	       dmpi->stride[0],mpi->stride[0]);
-    memcpy_pic(dmpi->planes[1],mpi->planes[1], mpi->chroma_width, mpi->chroma_height,
-	       dmpi->stride[1],mpi->stride[1]);
-    memcpy_pic(dmpi->planes[2], mpi->planes[2], mpi->chroma_width, mpi->chroma_height,
-	       dmpi->stride[2],mpi->stride[2]);
-  } else {
-    memcpy_pic(dmpi->planes[0],mpi->planes[0], 
-	       mpi->w*(dmpi->bpp/8), mpi->h,
-	       dmpi->stride[0],mpi->stride[0]);
-  }
-}
-
-
-
 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
   mp_image_t *dmpi = NULL;
 
-- 
cgit v1.2.3