From fb5d93525132a963892787c7c95c7f20ee2e50e6 Mon Sep 17 00:00:00 2001 From: rfelker Date: Tue, 20 May 2003 18:36:55 +0000 Subject: cleanup, use vf->dmpi rather than vf->priv->dmpi for consistency git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10142 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vf_flip.c | 48 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) (limited to 'libmpcodecs/vf_flip.c') diff --git a/libmpcodecs/vf_flip.c b/libmpcodecs/vf_flip.c index 7977dd9229..aab23b01dd 100644 --- a/libmpcodecs/vf_flip.c +++ b/libmpcodecs/vf_flip.c @@ -8,11 +8,6 @@ #include "mp_image.h" #include "vf.h" -#include "../libvo/fastmemcpy.h" - -struct vf_priv_s { - mp_image_t *dmpi; -}; //===========================================================================// @@ -26,22 +21,22 @@ static int config(struct vf_instance_s* vf, static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ if(mpi->flags&MP_IMGFLAG_ACCEPT_STRIDE){ // try full DR ! - vf->priv->dmpi=vf_get_image(vf->next,mpi->imgfmt, + vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, mpi->type, mpi->flags, mpi->width, mpi->height); // set up mpi as a upside-down image of dmpi: - mpi->planes[0]=vf->priv->dmpi->planes[0]+ - vf->priv->dmpi->stride[0]*(vf->priv->dmpi->height-1); - mpi->stride[0]=-vf->priv->dmpi->stride[0]; + mpi->planes[0]=vf->dmpi->planes[0]+ + vf->dmpi->stride[0]*(vf->dmpi->height-1); + mpi->stride[0]=-vf->dmpi->stride[0]; if(mpi->flags&MP_IMGFLAG_PLANAR){ - mpi->planes[1]=vf->priv->dmpi->planes[1]+ - vf->priv->dmpi->stride[1]*((vf->priv->dmpi->height>>mpi->chroma_y_shift)-1); - mpi->stride[1]=-vf->priv->dmpi->stride[1]; - mpi->planes[2]=vf->priv->dmpi->planes[2]+ - vf->priv->dmpi->stride[2]*((vf->priv->dmpi->height>>mpi->chroma_y_shift)-1); - mpi->stride[2]=-vf->priv->dmpi->stride[2]; + mpi->planes[1]=vf->dmpi->planes[1]+ + vf->dmpi->stride[1]*((vf->dmpi->height>>mpi->chroma_y_shift)-1); + mpi->stride[1]=-vf->dmpi->stride[1]; + mpi->planes[2]=vf->dmpi->planes[2]+ + vf->dmpi->stride[2]*((vf->dmpi->height>>mpi->chroma_y_shift)-1); + mpi->stride[2]=-vf->dmpi->stride[2]; } mpi->flags|=MP_IMGFLAG_DIRECT; - mpi->priv=(void*)vf->priv->dmpi; + mpi->priv=(void*)vf->dmpi; } } @@ -53,25 +48,25 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ return vf_next_put_image(vf,(mp_image_t*)mpi->priv); } - vf->priv->dmpi=vf_get_image(vf->next,mpi->imgfmt, + vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, MP_IMGTYPE_EXPORT, MP_IMGFLAG_ACCEPT_STRIDE, mpi->width, mpi->height); // set up mpi as a upside-down image of dmpi: - vf->priv->dmpi->planes[0]=mpi->planes[0]+ + vf->dmpi->planes[0]=mpi->planes[0]+ mpi->stride[0]*(mpi->height-1); - vf->priv->dmpi->stride[0]=-mpi->stride[0]; - if(vf->priv->dmpi->flags&MP_IMGFLAG_PLANAR){ - vf->priv->dmpi->planes[1]=mpi->planes[1]+ + vf->dmpi->stride[0]=-mpi->stride[0]; + if(vf->dmpi->flags&MP_IMGFLAG_PLANAR){ + vf->dmpi->planes[1]=mpi->planes[1]+ mpi->stride[1]*((mpi->height>>mpi->chroma_y_shift)-1); - vf->priv->dmpi->stride[1]=-mpi->stride[1]; - vf->priv->dmpi->planes[2]=mpi->planes[2]+ + vf->dmpi->stride[1]=-mpi->stride[1]; + vf->dmpi->planes[2]=mpi->planes[2]+ mpi->stride[2]*((mpi->height>>mpi->chroma_y_shift)-1); - vf->priv->dmpi->stride[2]=-mpi->stride[2]; + vf->dmpi->stride[2]=-mpi->stride[2]; } else - vf->priv->dmpi->planes[1]=mpi->planes[1]; // passthru bgr8 palette!!! + vf->dmpi->planes[1]=mpi->planes[1]; // passthru bgr8 palette!!! - return vf_next_put_image(vf,vf->priv->dmpi); + return vf_next_put_image(vf,vf->dmpi); } //===========================================================================// @@ -81,7 +76,6 @@ static int open(vf_instance_t *vf, char* args){ vf->get_image=get_image; vf->put_image=put_image; vf->default_reqs=VFCAP_ACCEPT_STRIDE; - vf->priv=malloc(sizeof(struct vf_priv_s)); return 1; } -- cgit v1.2.3