diff options
author | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-05-20 18:36:55 +0000 |
---|---|---|
committer | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-05-20 18:36:55 +0000 |
commit | fb5d93525132a963892787c7c95c7f20ee2e50e6 (patch) | |
tree | c98ccbf32a86d4bd0b7e87793f75922b29efcfec /libmpcodecs/vf_noise.c | |
parent | 8b0fe128407b9d0bfcb32d58c57a3f78d5a180cb (diff) | |
download | mpv-fb5d93525132a963892787c7c95c7f20ee2e50e6.tar.bz2 mpv-fb5d93525132a963892787c7c95c7f20ee2e50e6.tar.xz |
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
Diffstat (limited to 'libmpcodecs/vf_noise.c')
-rw-r--r-- | libmpcodecs/vf_noise.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/libmpcodecs/vf_noise.c b/libmpcodecs/vf_noise.c index 453b4ced05..14ad8f9604 100644 --- a/libmpcodecs/vf_noise.c +++ b/libmpcodecs/vf_noise.c @@ -62,7 +62,6 @@ typedef struct FilterParam{ struct vf_priv_s { FilterParam lumaParam; FilterParam chromaParam; - mp_image_t *dmpi; unsigned int outfmt; }; @@ -320,16 +319,16 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change if(mpi->imgfmt!=vf->priv->outfmt) return; // colorspace differ // ok, we can do pp in-place (or pp disabled): - vf->priv->dmpi=vf_get_image(vf->next,mpi->imgfmt, + vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, mpi->type, mpi->flags, mpi->w, mpi->h); - mpi->planes[0]=vf->priv->dmpi->planes[0]; - mpi->stride[0]=vf->priv->dmpi->stride[0]; - mpi->width=vf->priv->dmpi->width; + mpi->planes[0]=vf->dmpi->planes[0]; + mpi->stride[0]=vf->dmpi->stride[0]; + mpi->width=vf->dmpi->width; if(mpi->flags&MP_IMGFLAG_PLANAR){ - mpi->planes[1]=vf->priv->dmpi->planes[1]; - mpi->planes[2]=vf->priv->dmpi->planes[2]; - mpi->stride[1]=vf->priv->dmpi->stride[1]; - mpi->stride[2]=vf->priv->dmpi->stride[2]; + mpi->planes[1]=vf->dmpi->planes[1]; + mpi->planes[2]=vf->dmpi->planes[2]; + mpi->stride[1]=vf->dmpi->stride[1]; + mpi->stride[2]=vf->dmpi->stride[2]; } mpi->flags|=MP_IMGFLAG_DIRECT; } @@ -339,13 +338,13 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ // no DR, so get a new image! hope we'll get DR buffer: - vf->priv->dmpi=vf_get_image(vf->next,vf->priv->outfmt, + vf->dmpi=vf_get_image(vf->next,vf->priv->outfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, mpi->w,mpi->h); //printf("nodr\n"); } //else printf("dr\n"); - dmpi= vf->priv->dmpi; + dmpi= vf->dmpi; noise(dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w, mpi->h, &vf->priv->lumaParam); noise(dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w/2, mpi->h/2, &vf->priv->chromaParam); |