diff options
Diffstat (limited to 'libmpcodecs/vf_pp.c')
-rw-r--r-- | libmpcodecs/vf_pp.c | 45 |
1 files changed, 6 insertions, 39 deletions
diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c index 2a0c964a90..0a7975adf3 100644 --- a/libmpcodecs/vf_pp.c +++ b/libmpcodecs/vf_pp.c @@ -33,16 +33,8 @@ #include "img_format.h" #include "mp_image.h" #include "vf.h" -#include "libavutil/internal.h" #include "libpostproc/postprocess.h" -#ifdef CONFIG_LIBPOSTPROC_A -#define EMU_OLD -#include "libpostproc/postprocess_internal.h" -#endif - -#undef malloc - struct vf_priv_s { int pp; pp_mode_t *ppMode[PP_QUALITY_MAX+1]; @@ -52,7 +44,7 @@ struct vf_priv_s { //===========================================================================// -static int config(struct vf_instance *vf, +static int config(struct vf_instance* vf, int width, int height, int d_width, int d_height, unsigned int voflags, unsigned int outfmt){ int flags= @@ -73,7 +65,7 @@ static int config(struct vf_instance *vf, return vf_next_config(vf,width,height,d_width,d_height,voflags,outfmt); } -static void uninit(struct vf_instance *vf){ +static void uninit(struct vf_instance* vf){ int i; for(i=0; i<=PP_QUALITY_MAX; i++){ if(vf->priv->ppMode[i]) @@ -82,7 +74,7 @@ static void uninit(struct vf_instance *vf){ if(vf->priv->context) pp_free_context(vf->priv->context); } -static int query_format(struct vf_instance *vf, unsigned int fmt){ +static int query_format(struct vf_instance* vf, unsigned int fmt){ switch(fmt){ case IMGFMT_YV12: case IMGFMT_I420: @@ -95,7 +87,7 @@ static int query_format(struct vf_instance *vf, unsigned int fmt){ return 0; } -static int control(struct vf_instance *vf, int request, void* data){ +static int control(struct vf_instance* vf, int request, void* data){ switch(request){ case VFCTRL_QUERY_MAX_PP_LEVEL: return PP_QUALITY_MAX; @@ -106,7 +98,7 @@ static int control(struct vf_instance *vf, int request, void* data){ return vf_next_control(vf,request,data); } -static void get_image(struct vf_instance *vf, mp_image_t *mpi){ +static void get_image(struct vf_instance* vf, mp_image_t *mpi){ if(vf->priv->pp&0xFFFF) return; // non-local filters enabled if((mpi->type==MP_IMGTYPE_IPB || vf->priv->pp) && mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change @@ -127,7 +119,7 @@ static void get_image(struct vf_instance *vf, mp_image_t *mpi){ mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){ if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ // no DR, so get a new image! hope we'll get DR buffer: vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, @@ -198,35 +190,10 @@ static int vf_open(vf_instance_t *vf, char *args){ name="de"; } -#ifdef EMU_OLD - if(name){ -#endif for(i=0; i<=PP_QUALITY_MAX; i++){ vf->priv->ppMode[i]= pp_get_mode_by_name_and_quality(name, i); if(vf->priv->ppMode[i]==NULL) return -1; } -#ifdef EMU_OLD - }else{ - /* hex mode for compatibility */ - for(i=0; i<=PP_QUALITY_MAX; i++){ - PPMode *ppMode; - - ppMode= (PPMode*)memalign(8, sizeof(PPMode)); - - ppMode->lumMode= hex_mode; - ppMode->chromMode= ((hex_mode&0xFF)>>4) | (hex_mode&0xFFFFFF00); - ppMode->maxTmpNoise[0]= 700; - ppMode->maxTmpNoise[1]= 1500; - ppMode->maxTmpNoise[2]= 3000; - ppMode->maxAllowedY= 234; - ppMode->minAllowedY= 16; - ppMode->baseDcDiff= 256/4; - ppMode->flatnessThreshold=40; - - vf->priv->ppMode[i]= ppMode; - } - } -#endif vf->priv->pp=PP_QUALITY_MAX; return 1; |