From f2dee327b2797f9cf8c802274caa77ce1c39a7b1 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Sat, 4 Aug 2007 22:12:49 +0000 Subject: [PATCH] =?UTF-8?q?Move=20alloc=5Fmpi=20and=20copy=5Fmpi=20from=20?= =?UTF-8?q?libmenu/vf=5Fmenu.c=20to=20libmpcodecs/mp=5Fimage.c.=20Patch=20?= =?UTF-8?q?by=20Attila=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 ----------------------------------- libmpcodecs/Makefile | 1 + libmpcodecs/mp_image.c | 65 ++++++++++++++++++++++++++++++++++++++++++ libmpcodecs/mp_image.h | 3 ++ 4 files changed, 69 insertions(+), 54 deletions(-) create mode 100644 libmpcodecs/mp_image.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; diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index e58daf8e72..3b74b729e1 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -7,6 +7,7 @@ SRCS_COMMON = native/nuppelvideo.c \ native/RTjpegN.c \ native/xa_gsm.c \ img_format.c \ + mp_image.c \ dec_audio.c \ ad.c \ ad_alaw.c \ diff --git a/libmpcodecs/mp_image.c b/libmpcodecs/mp_image.c new file mode 100644 index 0000000000..809acce221 --- /dev/null +++ b/libmpcodecs/mp_image.c @@ -0,0 +1,65 @@ + +#include "config.h" + +#include +#include +#include + +#ifdef HAVE_MALLOC_H +#include +#endif + +#include "libmpcodecs/img_format.h" +#include "libmpcodecs/mp_image.h" + +#include "libvo/fastmemcpy.h" + +mp_image_t* alloc_mpi(int w, int h, unsigned long int 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 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]); + } +} diff --git a/libmpcodecs/mp_image.h b/libmpcodecs/mp_image.h index 1a73523f90..3d8433f56d 100644 --- a/libmpcodecs/mp_image.h +++ b/libmpcodecs/mp_image.h @@ -225,4 +225,7 @@ static inline void free_mp_image(mp_image_t* mpi){ free(mpi); } +mp_image_t* alloc_mpi(int w, int h, unsigned long int fmt); +void copy_mpi(mp_image_t *dmpi, mp_image_t *mpi); + #endif