diff options
author | ods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-27 19:40:48 +0000 |
---|---|---|
committer | ods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-27 19:40:48 +0000 |
commit | 591f6c68bbf32853894424a4d428060ba69b236f (patch) | |
tree | 06664c80d845851738c1adcb66d69a03283a2f68 /libmpcodecs | |
parent | 0f281eb8d991ab94a23de88573709392fc397764 (diff) | |
download | mpv-591f6c68bbf32853894424a4d428060ba69b236f.tar.bz2 mpv-591f6c68bbf32853894424a4d428060ba69b236f.tar.xz |
update vf_geq to new ff_eval API
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20471 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/vf_geq.c | 83 |
1 files changed, 45 insertions, 38 deletions
diff --git a/libmpcodecs/vf_geq.c b/libmpcodecs/vf_geq.c index da33eac71d..e8b8c09187 100644 --- a/libmpcodecs/vf_geq.c +++ b/libmpcodecs/vf_geq.c @@ -27,18 +27,12 @@ #include "mp_msg.h" #include "cpudetect.h" -#if 1 -double ff_eval(char *s, double *const_value, const char **const_name, - double (**func1)(void *, double), const char **func1_name, - double (**func2)(void *, double, double), char **func2_name, - void *opaque); -#endif - // Needed to bring in lrintf. #define HAVE_AV_CONFIG_H #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" +#include "libavcodec/eval.h" #include "libavutil/common.h" /* FIXME: common.h defines printf away when HAVE_AV_CONFIG @@ -57,7 +51,7 @@ double ff_eval(char *s, double *const_value, const char **const_name, struct vf_priv_s { - char eq[3][2000]; + AVEvalExpr * e[3]; int framenum; mp_image_t *mpi; }; @@ -120,25 +114,6 @@ static double cr(struct vf_instance_s* vf, double x, double y){ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; int x,y, plane; - static const char *const_names[]={ - "PI", - "E", - "X", - "Y", - "W", - "H", - "N", - "SW", - "SH", - NULL - }; - static const char *func2_names[]={ - "lum", - "cb", - "cr", - "p", - NULL - }; if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ // no DR, so get a new image! hope we'll get DR buffer: @@ -157,13 +132,6 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ int h= mpi->h >> (plane ? mpi->chroma_y_shift : 0); uint8_t *dst = dmpi->planes[plane]; int dst_stride= dmpi->stride[plane]; - double (*func2[])(void *, double, double)={ - lum, - cb, - cr, - plane==0 ? lum : (plane==1 ? cb : cr), - NULL - }; double const_values[]={ M_PI, M_E, @@ -176,11 +144,12 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ h/(double)mpi->h, 0 }; + if (!vf->priv->e[plane]) continue; for(y=0; y<h; y++){ const_values[3]=y; for(x=0; x<w; x++){ const_values[2]=x; - dst[x+y* dst_stride]= ff_eval(vf->priv->eq[plane], const_values, const_names, NULL, NULL, func2, func2_names, vf); + dst[x+y* dst_stride]= ff_parse_eval(vf->priv->e[plane], const_values, vf); } } } @@ -199,6 +168,9 @@ static void uninit(struct vf_instance_s* vf){ //===========================================================================// static int open(vf_instance_t *vf, char* args){ + char eq[3][2000] = { { 0 }, { 0 }, { 0 } }; + int plane; + vf->config=config; vf->put_image=put_image; // vf->get_image=get_image; @@ -206,10 +178,45 @@ static int open(vf_instance_t *vf, char* args){ vf->priv=av_malloc(sizeof(struct vf_priv_s)); memset(vf->priv, 0, sizeof(struct vf_priv_s)); - if (args) sscanf(args, "%1999s:%1999s:%1999s", vf->priv->eq[0], vf->priv->eq[1], vf->priv->eq[2]); + if (args) sscanf(args, "%1999s:%1999s:%1999s", eq[0], eq[1], eq[2]); + + if (!eq[1][0]) strncpy(eq[1], eq[0], sizeof(eq[0])-1); + if (!eq[2][0]) strncpy(eq[2], eq[1], sizeof(eq[0])-1); - if(!vf->priv->eq[1][0]) strncpy(vf->priv->eq[1], vf->priv->eq[0], sizeof(vf->priv->eq[0])-1); - if(!vf->priv->eq[2][0]) strncpy(vf->priv->eq[2], vf->priv->eq[1], sizeof(vf->priv->eq[0])-1); + for(plane=0; plane<3; plane++){ + static const char *const_names[]={ + "PI", + "E", + "X", + "Y", + "W", + "H", + "N", + "SW", + "SH", + NULL + }; + static const char *func2_names[]={ + "lum", + "cb", + "cr", + "p", + NULL + }; + double (*func2[])(void *, double, double)={ + lum, + cb, + cr, + plane==0 ? lum : (plane==1 ? cb : cr), + NULL + }; + char * a; + vf->priv->e[plane] = ff_parse(eq[plane], const_names, NULL, NULL, func2, func2_names, &a); + + if (!vf->priv->e[plane]) { + mp_msg(MSGT_VFILTER, MSGL_ERR, "geq: error loading equation `%s': %s\n", eq[plane], a); + } + } return 1; } |