Mercurial > mplayer.hg
changeset 30642:a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
line wrap: on
line diff
--- a/DOCS/tech/libmpcodecs.txt Sun Feb 21 14:43:36 2010 +0000 +++ b/DOCS/tech/libmpcodecs.txt Sun Feb 21 15:48:03 2010 +0000 @@ -153,7 +153,7 @@ const char *name; // short name of the filter, must be FILTERNAME const char *author; // name and email/URL of the author(s) const char *comment; // comment, URL to papers describing algorithm etc. - int (*open)(struct vf_instance_s* vf,char* args); + int (*open)(struct vf_instance *vf,char* args); // pointer to the open() function: Sample: @@ -197,13 +197,13 @@ return 1; } -Functions in vf_instance_s: +Functions in struct vf_instance: NOTE: All these are optional, their function pointer is either NULL or points to a default implementation. If you implement them, don't forget to set vf->FUNCNAME in your open() ! - int (*query_format)(struct vf_instance_s* vf, unsigned int fmt); + int (*query_format)(struct vf_instance *vf, unsigned int fmt); The query_format() function is called one or more times before the config(), to find out the capabilities and/or support status of a given colorspace (fmt). @@ -216,7 +216,7 @@ Sample: -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { switch(fmt){ case IMGFMT_YV12: @@ -232,7 +232,7 @@ see vf_scale or vf_rgb2bgr for examples. - int (*config)(struct vf_instance_s* vf, + int (*config)(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt); @@ -257,7 +257,7 @@ Sample: -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -272,12 +272,12 @@ return vf_next_config(vf,vf->priv->w,vf->priv->h,d_width,d_height,flags,outfmt); } - void (*uninit)(struct vf_instance_s* vf); + void (*uninit)(struct vf_instance *vf); Okay, uninit() is the simplest, it's called at the end. You can free your private buffers etc here. - int (*put_image)(struct vf_instance_s* vf, mp_image_t *mpi); + int (*put_image)(struct vf_instance *vf, mp_image_t *mpi); Ah, put_image(). This is the main filter function, it should convert/filter/ transform the image data from one format/size/color/whatever to another. @@ -332,7 +332,7 @@ Ok, the rest is for advanced functionality only: - int (*control)(struct vf_instance_s* vf, int request, void* data); + int (*control)(struct vf_instance *vf, int request, void* data); You can control the filter at runtime from MPlayer/MEncoder/dec_video: #define VFCTRL_QUERY_MAX_PP_LEVEL 4 /* test for postprocessing support (max level) */ @@ -343,7 +343,7 @@ #define VFCTRL_CHANGE_RECTANGLE 9 /* Change the rectangle boundaries */ - void (*get_image)(struct vf_instance_s* vf, mp_image_t *mpi); + void (*get_image)(struct vf_instance *vf, mp_image_t *mpi); This is for direct rendering support, works the same way as in libvo drivers. It makes in-place pixel modifications possible. @@ -359,7 +359,7 @@ it is in the mpi struct itself: mpi->priv=(void*)dmpi; - void (*draw_slice)(struct vf_instance_s* vf, unsigned char** src, + void (*draw_slice)(struct vf_instance *vf, unsigned char** src, int* stride, int w,int h, int x, int y); It's the good old draw_slice callback, already known from libvo.
--- a/libmenu/menu.h Sun Feb 21 14:43:36 2010 +0000 +++ b/libmenu/menu.h Sun Feb 21 15:48:03 2010 +0000 @@ -114,6 +114,6 @@ void menu_draw_box(mp_image_t* mpi, unsigned char grey, unsigned char alpha, int x, int y, int w, int h); -void vf_menu_pause_update(struct vf_instance_s* vf); +void vf_menu_pause_update(struct vf_instance *vf); #endif /* MPLAYER_MENU_H */
--- a/libmenu/vf_menu.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmenu/vf_menu.c Sun Feb 21 15:48:03 2010 +0000 @@ -54,9 +54,9 @@ int passthrough; }; -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts); +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts); -void vf_menu_pause_update(struct vf_instance_s* vf) { +void vf_menu_pause_update(struct vf_instance *vf) { const vo_functions_t *video_out = mpctx_get_video_out(vf->priv->current->ctx); if(pause_mpi) { put_image(vf,pause_mpi, MP_NOPTS_VALUE); @@ -120,7 +120,7 @@ return 0; } -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static void get_image(struct vf_instance *vf, mp_image_t *mpi){ mp_image_t *dmpi; if(mpi->type == MP_IMGTYPE_TEMP && (!(mpi->flags&MP_IMGFLAG_PRESERVE)) ) { @@ -137,7 +137,7 @@ return menu_read_key(st_priv->current,code); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi = NULL; if (vf->priv->passthrough) { @@ -213,7 +213,7 @@ } } -static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { #ifdef CONFIG_FREETYPE // here is the right place to get screen dimensions @@ -227,7 +227,7 @@ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ return vf_next_query_format(vf,fmt); }
--- a/libmpcodecs/vd.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vd.c Sun Feb 21 15:48:03 2010 +0000 @@ -368,7 +368,7 @@ } void mpcodecs_draw_slice(sh_video_t *sh, unsigned char** src, int* stride, int w,int h, int x, int y) { - struct vf_instance_s* vf = sh->vfilter; + struct vf_instance *vf = sh->vfilter; if(vf->draw_slice) vf->draw_slice(vf,src,stride,w,h,x,y);
--- a/libmpcodecs/ve_lavc.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/ve_lavc.c Sun Feb 21 15:48:03 2010 +0000 @@ -345,9 +345,9 @@ #define mux_v (vf->priv->mux) #define lavc_venc_context (vf->priv->context) -static int encode_frame(struct vf_instance_s* vf, AVFrame *pic, double pts); +static int encode_frame(struct vf_instance *vf, AVFrame *pic, double pts); -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ int size, i; @@ -716,7 +716,7 @@ return 1; } -static int control(struct vf_instance_s* vf, int request, void* data){ +static int control(struct vf_instance *vf, int request, void* data){ switch(request){ case VFCTRL_FLUSH_FRAMES: @@ -728,7 +728,7 @@ } } -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt){ case IMGFMT_YV12: case IMGFMT_IYUV: @@ -765,7 +765,7 @@ return -10.0*log(d)/log(10); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ AVFrame *pic= vf->priv->pic; pic->data[0]=mpi->planes[0]; @@ -788,7 +788,7 @@ return encode_frame(vf, pic, pts) >= 0; } -static int encode_frame(struct vf_instance_s* vf, AVFrame *pic, double pts){ +static int encode_frame(struct vf_instance *vf, AVFrame *pic, double pts){ const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'}; int out_size; double dts; @@ -893,7 +893,7 @@ return out_size; } -static void uninit(struct vf_instance_s* vf){ +static void uninit(struct vf_instance *vf){ if(lavc_param_psnr){ double f= lavc_venc_context->width*lavc_venc_context->height*255.0*255.0;
--- a/libmpcodecs/ve_libdv.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/ve_libdv.c Sun Feb 21 15:48:03 2010 +0000 @@ -55,7 +55,7 @@ //===========================================================================// -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -77,18 +77,18 @@ return 1; } -static int control(struct vf_instance_s* vf, int request, void* data){ +static int control(struct vf_instance *vf, int request, void* data){ return CONTROL_UNKNOWN; } -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ if(fmt==IMGFMT_YUY2) return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; if(fmt==IMGFMT_RGB24) return VFCAP_CSP_SUPPORTED; return 0; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ dv_encode_full_frame(vf->priv->enc, mpi->planes, (mpi->flags&MP_IMGFLAG_YUV) ? e_dv_color_yuv : e_dv_color_rgb,
--- a/libmpcodecs/ve_nuv.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/ve_nuv.c Sun Feb 21 15:48:03 2010 +0000 @@ -88,7 +88,7 @@ #define COMPDATASIZE (128*4) #define FRAMEHEADERSIZE 12 -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -110,17 +110,17 @@ return 1; } -static int control(struct vf_instance_s* vf, int request, void* data){ +static int control(struct vf_instance *vf, int request, void* data){ return CONTROL_UNKNOWN; } -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ if(fmt==IMGFMT_I420) return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; return 0; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ uint8_t *header = vf->priv->buffer; uint8_t* data = vf->priv->buffer + FRAMEHEADERSIZE; uint8_t* zdata = vf->priv->zbuffer + FRAMEHEADERSIZE; @@ -201,7 +201,7 @@ return 1; } -static void uninit(struct vf_instance_s* vf) { +static void uninit(struct vf_instance *vf) { if(vf->priv->buffer) free(vf->priv->buffer);
--- a/libmpcodecs/ve_qtvideo.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/ve_qtvideo.c Sun Feb 21 15:48:03 2010 +0000 @@ -139,7 +139,7 @@ //===========================================================================// -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ // OSErr cres; @@ -177,19 +177,19 @@ return 1; } -static int control(struct vf_instance_s* vf, int request, void* data){ +static int control(struct vf_instance *vf, int request, void* data){ return CONTROL_UNKNOWN; } -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ if(fmt==IMGFMT_YUY2) return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; return 0; } static int codec_initialized = 0; -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ OSErr cres; long framesizemax;
--- a/libmpcodecs/ve_raw.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/ve_raw.c Sun Feb 21 15:48:03 2010 +0000 @@ -44,7 +44,7 @@ }; #define mux_v (vf->priv->mux) -static int set_format(struct vf_instance_s *vf, unsigned int fmt) { +static int set_format(struct vf_instance *vf, unsigned int fmt) { if (!force_fourcc) mux_v->bih->biCompression = fmt; @@ -100,7 +100,7 @@ } -static int config(struct vf_instance_s *vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -115,11 +115,11 @@ return 1; } -static int control(struct vf_instance_s *vf, int request, void *data) { +static int control(struct vf_instance *vf, int request, void *data) { return CONTROL_UNKNOWN; } -static int query_format(struct vf_instance_s *vf, unsigned int fmt) { +static int query_format(struct vf_instance *vf, unsigned int fmt) { if (IMGFMT_IS_RGB(fmt) || IMGFMT_IS_BGR(fmt)) return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; switch (fmt) { @@ -140,7 +140,7 @@ return 0; } -static int put_image(struct vf_instance_s *vf, mp_image_t *mpi, double pts) { +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { mux_v->buffer = mpi->planes[0]; muxer_write_chunk(mux_v, mpi->width*mpi->height*mux_v->bih->biBitCount/8, 0x10, pts, pts); return 1;
--- a/libmpcodecs/ve_vfw.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/ve_vfw.c Sun Feb 21 15:48:03 2010 +0000 @@ -275,7 +275,7 @@ #define mux_v (vf->priv->mux) #define vfw_bih (vf->priv->bih) -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -293,17 +293,17 @@ return 1; } -static int control(struct vf_instance_s* vf, int request, void* data){ +static int control(struct vf_instance *vf, int request, void* data){ return CONTROL_UNKNOWN; } -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ if(fmt==IMGFMT_BGR24) return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_FLIPPED; return 0; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ long flags=0; int ret; // flip_upside_down(vo_image_ptr,vo_image_ptr,3*vo_w,vo_h); // dirty hack @@ -314,7 +314,7 @@ return 1; } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { HRESULT ret;
--- a/libmpcodecs/ve_x264.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/ve_x264.c Sun Feb 21 15:48:03 2010 +0000 @@ -59,8 +59,8 @@ static x264_param_t param; static int parse_error = 0; -static int put_image(struct vf_instance_s *vf, mp_image_t *mpi, double pts); -static int encode_frame(struct vf_instance_s *vf, x264_picture_t *pic_in); +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts); +static int encode_frame(struct vf_instance *vf, x264_picture_t *pic_in); void x264enc_set_param(const m_option_t* opt, char* arg) { @@ -134,7 +134,7 @@ } } -static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { h264_module_t *mod=(h264_module_t*)vf->priv; if(parse_error) @@ -193,7 +193,7 @@ return 1; } -static int control(struct vf_instance_s* vf, int request, void *data) +static int control(struct vf_instance *vf, int request, void *data) { h264_module_t *mod=(h264_module_t*)vf->priv; switch(request){ @@ -206,7 +206,7 @@ } } -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { switch(fmt) { case IMGFMT_I420: @@ -225,7 +225,7 @@ return 0; } -static int put_image(struct vf_instance_s *vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { h264_module_t *mod=(h264_module_t*)vf->priv; int i; @@ -243,7 +243,7 @@ return encode_frame(vf, &mod->pic) >= 0; } -static int encode_frame(struct vf_instance_s *vf, x264_picture_t *pic_in) +static int encode_frame(struct vf_instance *vf, x264_picture_t *pic_in) { h264_module_t *mod=(h264_module_t*)vf->priv; x264_picture_t pic_out; @@ -271,7 +271,7 @@ return i_size; } -static void uninit(struct vf_instance_s *vf) +static void uninit(struct vf_instance *vf) { h264_module_t *mod=(h264_module_t*)vf->priv; if (mod->x264)
--- a/libmpcodecs/ve_xvid4.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/ve_xvid4.c Sun Feb 21 15:48:03 2010 +0000 @@ -374,7 +374,7 @@ *==========================================================================*/ static int -config(struct vf_instance_s* vf, +config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -439,7 +439,7 @@ *==========================================================================*/ static void -uninit(struct vf_instance_s* vf) +uninit(struct vf_instance *vf) { xvid_mplayer_module_t *mod = (xvid_mplayer_module_t *)vf->priv; @@ -477,7 +477,7 @@ *==========================================================================*/ static int -control(struct vf_instance_s* vf, int request, void* data) +control(struct vf_instance *vf, int request, void* data) { xvid_mplayer_module_t *mod = (xvid_mplayer_module_t *)vf->priv; @@ -495,7 +495,7 @@ *==========================================================================*/ static int -query_format(struct vf_instance_s* vf, unsigned int fmt) +query_format(struct vf_instance *vf, unsigned int fmt) { switch(fmt){ case IMGFMT_YV12: @@ -514,7 +514,7 @@ *==========================================================================*/ static int -put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { int size; xvid_enc_stats_t stats;
--- a/libmpcodecs/vf.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf.c Sun Feb 21 15:48:03 2010 +0000 @@ -426,7 +426,7 @@ //============================================================================ // By default vf doesn't accept MPEGPES -static int vf_default_query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int vf_default_query_format(struct vf_instance *vf, unsigned int fmt){ if(fmt == IMGFMT_MPEGPES) return 0; return vf_next_query_format(vf,fmt); } @@ -607,7 +607,7 @@ * are unchanged, and returns either success or error. * */ -int vf_config_wrapper(struct vf_instance_s* vf, +int vf_config_wrapper(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -630,7 +630,7 @@ return r; } -int vf_next_config(struct vf_instance_s* vf, +int vf_next_config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int voflags, unsigned int outfmt){ int miss; @@ -662,11 +662,11 @@ return vf_config_wrapper(vf->next,width,height,d_width,d_height,voflags,outfmt); } -int vf_next_control(struct vf_instance_s* vf, int request, void* data){ +int vf_next_control(struct vf_instance *vf, int request, void* data){ return vf->next->control(vf->next,request,data); } -void vf_extra_flip(struct vf_instance_s* vf) { +void vf_extra_flip(struct vf_instance *vf) { vf_next_control(vf, VFCTRL_DRAW_OSD, NULL); #ifdef CONFIG_ASS vf_next_control(vf, VFCTRL_DRAW_EOSD, NULL); @@ -674,17 +674,17 @@ vf_next_control(vf, VFCTRL_FLIP_PAGE, NULL); } -int vf_next_query_format(struct vf_instance_s* vf, unsigned int fmt){ +int vf_next_query_format(struct vf_instance *vf, unsigned int fmt){ int flags=vf->next->query_format(vf->next,fmt); if(flags) flags|=vf->default_caps; return flags; } -int vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi, double pts){ +int vf_next_put_image(struct vf_instance *vf,mp_image_t *mpi, double pts){ return vf->next->put_image(vf->next,mpi, pts); } -void vf_next_draw_slice(struct vf_instance_s* vf,unsigned char** src, int * stride,int w, int h, int x, int y){ +void vf_next_draw_slice(struct vf_instance *vf,unsigned char** src, int * stride,int w, int h, int x, int y){ if (vf->next->draw_slice) { vf->next->draw_slice(vf->next,src,stride,w,h,x,y); return;
--- a/libmpcodecs/vf.h Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf.h Sun Feb 21 15:48:03 2010 +0000 @@ -21,7 +21,7 @@ #include "mp_image.h" -struct vf_instance_s; +struct vf_instance; struct vf_priv_s; typedef struct vf_info_s { @@ -29,7 +29,7 @@ const char *name; const char *author; const char *comment; - int (*vf_open)(struct vf_instance_s* vf,char* args); + int (*vf_open)(struct vf_instance *vf,char* args); // Ptr to a struct dscribing the options const void* opts; } vf_info_t; @@ -49,27 +49,27 @@ int orig_width, orig_height, orig_fmt; } vf_format_context_t; -typedef struct vf_instance_s { +typedef struct vf_instance { const vf_info_t* info; // funcs: - int (*config)(struct vf_instance_s* vf, + int (*config)(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt); - int (*control)(struct vf_instance_s* vf, + int (*control)(struct vf_instance *vf, int request, void* data); - int (*query_format)(struct vf_instance_s* vf, + int (*query_format)(struct vf_instance *vf, unsigned int fmt); - void (*get_image)(struct vf_instance_s* vf, + void (*get_image)(struct vf_instance *vf, mp_image_t *mpi); - int (*put_image)(struct vf_instance_s* vf, + int (*put_image)(struct vf_instance *vf, mp_image_t *mpi, double pts); - void (*start_slice)(struct vf_instance_s* vf, + void (*start_slice)(struct vf_instance *vf, mp_image_t *mpi); - void (*draw_slice)(struct vf_instance_s* vf, + void (*draw_slice)(struct vf_instance *vf, unsigned char** src, int* stride, int w,int h, int x, int y); - void (*uninit)(struct vf_instance_s* vf); + void (*uninit)(struct vf_instance *vf); - int (*continue_buffered_image)(struct vf_instance_s* vf); + int (*continue_buffered_image)(struct vf_instance *vf); // caps: unsigned int default_caps; // used by default query_format() unsigned int default_reqs; // used by default config() @@ -77,7 +77,7 @@ int w, h; vf_image_context_t imgctx; vf_format_context_t fmt; - struct vf_instance_s* next; + struct vf_instance *next; mp_image_t *dmpi; struct vf_priv_s* priv; } vf_instance_t; @@ -129,21 +129,21 @@ int vf_output_queued_frame(vf_instance_t *vf); // default wrappers: -int vf_next_config(struct vf_instance_s* vf, +int vf_next_config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt); -int vf_next_control(struct vf_instance_s* vf, int request, void* data); -void vf_extra_flip(struct vf_instance_s* vf); -int vf_next_query_format(struct vf_instance_s* vf, unsigned int fmt); -int vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi, double pts); -void vf_next_draw_slice (struct vf_instance_s* vf, unsigned char** src, int* stride, int w,int h, int x, int y); +int vf_next_control(struct vf_instance *vf, int request, void* data); +void vf_extra_flip(struct vf_instance *vf); +int vf_next_query_format(struct vf_instance *vf, unsigned int fmt); +int vf_next_put_image(struct vf_instance *vf,mp_image_t *mpi, double pts); +void vf_next_draw_slice (struct vf_instance *vf, unsigned char** src, int* stride, int w,int h, int x, int y); vf_instance_t* append_filters(vf_instance_t* last); void vf_uninit_filter(vf_instance_t* vf); void vf_uninit_filter_chain(vf_instance_t* vf); -int vf_config_wrapper(struct vf_instance_s* vf, +int vf_config_wrapper(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt);
--- a/libmpcodecs/vf_1bpp.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_1bpp.c Sun Feb 21 15:48:03 2010 +0000 @@ -58,7 +58,7 @@ 0 }; -static unsigned int find_best(struct vf_instance_s* vf){ +static unsigned int find_best(struct vf_instance *vf){ unsigned int best=0; int ret; const unsigned int* p=bgr_list; @@ -78,7 +78,7 @@ unsigned int fmt; }; -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ if (!vf->priv->fmt) @@ -121,7 +121,7 @@ } } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; // hope we'll get DR buffer: @@ -172,7 +172,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ int best; if(fmt!=IMGFMT_RGB1 && fmt!=IMGFMT_BGR1) return 0; best=find_best(vf);
--- a/libmpcodecs/vf_2xsai.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_2xsai.c Sun Feb 21 15:48:03 2010 +0000 @@ -281,7 +281,7 @@ //===========================================================================// -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -290,7 +290,7 @@ return vf_next_config(vf,2*width,2*height,2*d_width,2*d_height,flags,outfmt); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; // hope we'll get DR buffer: @@ -307,7 +307,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt){ // case IMGFMT_BGR15: // case IMGFMT_BGR16:
--- a/libmpcodecs/vf_ass.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_ass.c Sun Feb 21 15:48:03 2010 +0000 @@ -74,7 +74,7 @@ extern float sub_delay; extern int sub_visibility; -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -104,7 +104,7 @@ return vf_next_config(vf, vf->priv->outw, vf->priv->outh, d_width, d_height, flags, outfmt); } -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi) +static void get_image(struct vf_instance *vf, mp_image_t *mpi) { if(mpi->type == MP_IMGTYPE_IPB) return; if(mpi->flags & MP_IMGFLAG_PRESERVE) return; @@ -163,7 +163,7 @@ } } -static int prepare_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int prepare_image(struct vf_instance *vf, mp_image_t *mpi) { if(mpi->flags&MP_IMGFLAG_DIRECT || mpi->flags&MP_IMGFLAG_DRAW_CALLBACK){ vf->dmpi = mpi->priv; @@ -211,7 +211,7 @@ /** * \brief Copy specified rows from render_context.dmpi to render_context.planes, upsampling to 4:4:4 */ -static void copy_from_image(struct vf_instance_s* vf, int first_row, int last_row) +static void copy_from_image(struct vf_instance *vf, int first_row, int last_row) { int pl; int i, j, k; @@ -257,7 +257,7 @@ /** * \brief Copy all previously copied rows back to render_context.dmpi */ -static void copy_to_image(struct vf_instance_s* vf) +static void copy_to_image(struct vf_instance *vf) { int pl; int i, j, k; @@ -288,7 +288,7 @@ } } -static void my_draw_bitmap(struct vf_instance_s* vf, unsigned char* bitmap, int bitmap_w, int bitmap_h, int stride, int dst_x, int dst_y, unsigned color) +static void my_draw_bitmap(struct vf_instance *vf, unsigned char* bitmap, int bitmap_w, int bitmap_h, int stride, int dst_x, int dst_y, unsigned color) { unsigned char y = rgba2y(color); unsigned char u = rgba2u(color); @@ -316,7 +316,7 @@ } } -static int render_frame(struct vf_instance_s* vf, mp_image_t *mpi, const ass_image_t* img) +static int render_frame(struct vf_instance *vf, mp_image_t *mpi, const ass_image_t* img) { if (img) { memset(vf->priv->dirty_rows, 0, vf->priv->outh); // reset dirty rows @@ -331,7 +331,7 @@ return 0; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { ass_image_t* images = 0; if (sub_visibility && vf->priv->ass_priv && ass_track && (pts != MP_NOPTS_VALUE)) @@ -343,7 +343,7 @@ return vf_next_put_image(vf, vf->dmpi, pts); } -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { switch(fmt){ case IMGFMT_YV12: @@ -369,7 +369,7 @@ return vf_next_control(vf, request, data); } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { if (vf->priv->ass_priv) ass_renderer_done(vf->priv->ass_priv);
--- a/libmpcodecs/vf_blackframe.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_blackframe.c Sun Feb 21 15:48:03 2010 +0000 @@ -40,12 +40,12 @@ unsigned int bamount, bthresh, frame, lastkeyframe; }; -static int config(struct vf_instance_s* vf, int width, int height, int d_width, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static int query_format(struct vf_instance_s *vf, unsigned fmt) { +static int query_format(struct vf_instance *vf, unsigned fmt) { switch(fmt) { case IMGFMT_YVU9: case IMGFMT_IF09: @@ -66,7 +66,7 @@ return 0; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; int x, y; int nblack=0, pblack=0; @@ -110,11 +110,11 @@ return vf_next_put_image(vf, dmpi, pts); } -static int control(struct vf_instance_s* vf, int request, void* data){ +static int control(struct vf_instance *vf, int request, void* data){ return vf_next_control(vf,request,data); } -static void uninit(struct vf_instance_s *vf) { +static void uninit(struct vf_instance *vf) { if (vf->priv) free(vf->priv); }
--- a/libmpcodecs/vf_bmovl.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_bmovl.c Sun Feb 21 15:48:03 2010 +0000 @@ -125,14 +125,14 @@ }; static int -query_format(struct vf_instance_s* vf, unsigned int fmt){ +query_format(struct vf_instance *vf, unsigned int fmt){ if(fmt==IMGFMT_YV12) return VFCAP_CSP_SUPPORTED; return 0; } static int -config(struct vf_instance_s* vf, +config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -162,7 +162,7 @@ } static void -uninit(struct vf_instance_s *vf) +uninit(struct vf_instance *vf) { if(vf->priv) { free(vf->priv->bitmap.y); @@ -214,7 +214,7 @@ static int -put_image(struct vf_instance_s* vf, mp_image_t* mpi, double pts){ +put_image(struct vf_instance *vf, mp_image_t* mpi, double pts){ int buf_x=0, buf_y=0, buf_pos=0; int have, got, want; int xpos=0, ypos=0, pos=0;
--- a/libmpcodecs/vf_boxblur.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_boxblur.c Sun Feb 21 15:48:03 2010 +0000 @@ -46,7 +46,7 @@ /***************************************************************************/ -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -127,7 +127,7 @@ } } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ int cw= mpi->w >> mpi->chroma_x_shift; int ch= mpi->h >> mpi->chroma_y_shift; @@ -156,7 +156,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt) { case IMGFMT_YV12:
--- a/libmpcodecs/vf_crop.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_crop.c Sun Feb 21 15:48:03 2010 +0000 @@ -44,7 +44,7 @@ //===========================================================================// -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ // calculate the missing parameters: @@ -86,7 +86,7 @@ return vf_next_config(vf,vf->priv->crop_w,vf->priv->crop_h,d_width,d_height,flags,outfmt); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; if (mpi->flags&MP_IMGFLAG_DRAW_CALLBACK) return vf_next_put_image(vf,vf->dmpi, pts); @@ -113,12 +113,12 @@ return vf_next_put_image(vf,dmpi, pts); } -static void start_slice(struct vf_instance_s* vf, mp_image_t *mpi){ +static void start_slice(struct vf_instance *vf, mp_image_t *mpi){ vf->dmpi = vf_get_image(vf->next, mpi->imgfmt, mpi->type, mpi->flags, vf->priv->crop_w, vf->priv->crop_h); } -static void draw_slice(struct vf_instance_s* vf, +static void draw_slice(struct vf_instance *vf, unsigned char** src, int* stride, int w,int h, int x, int y){ unsigned char *src2[3]; src2[0] = src[0];
--- a/libmpcodecs/vf_cropdetect.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_cropdetect.c Sun Feb 21 15:48:03 2010 +0000 @@ -61,7 +61,7 @@ //===========================================================================// -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ vf->priv->x1=width - 1; @@ -72,7 +72,7 @@ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; int bpp=mpi->bpp/8; int w,h,x,y,shrink_by; @@ -164,7 +164,7 @@ return vf_next_put_image(vf,dmpi, pts); } -static int query_format(struct vf_instance_s* vf, unsigned int fmt) { +static int query_format(struct vf_instance *vf, unsigned int fmt) { switch(fmt) { // the default limit value works only right with YV12 right now. case IMGFMT_YV12:
--- a/libmpcodecs/vf_decimate.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_decimate.c Sun Feb 21 15:48:03 2010 +0000 @@ -128,7 +128,7 @@ new->w*(new->bpp/8), new->h, old->stride[0], new->stride[0]); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; @@ -164,7 +164,7 @@ return vf_next_put_image(vf, dmpi, pts); } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { free(vf->priv); }
--- a/libmpcodecs/vf_delogo.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_delogo.c Sun Feb 21 15:48:03 2010 +0000 @@ -117,7 +117,7 @@ } } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -125,7 +125,7 @@ } -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static void get_image(struct vf_instance *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): @@ -143,7 +143,7 @@ mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ @@ -169,7 +169,7 @@ return vf_next_put_image(vf,dmpi, pts); } -static void uninit(struct vf_instance_s* vf){ +static void uninit(struct vf_instance *vf){ if(!vf->priv) return; free(vf->priv); @@ -178,7 +178,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt) { case IMGFMT_YV12:
--- a/libmpcodecs/vf_denoise3d.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_denoise3d.c Sun Feb 21 15:48:03 2010 +0000 @@ -45,7 +45,7 @@ /***************************************************************************/ -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -58,7 +58,7 @@ } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { free(vf->priv->Line); } @@ -109,7 +109,7 @@ -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ int cw= mpi->w >> mpi->chroma_x_shift; int ch= mpi->h >> mpi->chroma_y_shift; int W = mpi->w, H = mpi->h; @@ -147,7 +147,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt) { case IMGFMT_YV12:
--- a/libmpcodecs/vf_detc.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_detc.c Sun Feb 21 15:48:03 2010 +0000 @@ -285,7 +285,7 @@ } } -static int do_put_image(struct vf_instance_s* vf, mp_image_t *dmpi) +static int do_put_image(struct vf_instance *vf, mp_image_t *dmpi) { struct vf_priv_s *p = vf->priv; int dropflag; @@ -313,7 +313,7 @@ return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { int ret=0; mp_image_t *dmpi; @@ -357,7 +357,7 @@ return ret; } -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { /* FIXME - figure out which other formats work */ switch (fmt) { @@ -369,14 +369,14 @@ return 0; } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { free(vf->priv); }
--- a/libmpcodecs/vf_dint.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_dint.c Sun Feb 21 15:48:03 2010 +0000 @@ -42,7 +42,7 @@ #define MAXROWSIZE 1200 -static int config (struct vf_instance_s* vf, +static int config (struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -79,7 +79,7 @@ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static int put_image (struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image (struct vf_instance *vf, mp_image_t *mpi, double pts) { char rrow0[MAXROWSIZE]; char rrow1[MAXROWSIZE];
--- a/libmpcodecs/vf_divtc.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_divtc.c Sun Feb 21 15:48:03 2010 +0000 @@ -257,7 +257,7 @@ return m; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi, *tmpi=0; int n, m, f, newphase; @@ -568,7 +568,7 @@ return 1; } -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { switch(fmt) { @@ -583,7 +583,7 @@ return 0; } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { if(vf->priv) {
--- a/libmpcodecs/vf_down3dright.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_down3dright.c Sun Feb 21 15:48:03 2010 +0000 @@ -96,7 +96,7 @@ } } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; @@ -113,7 +113,7 @@ return vf_next_put_image(vf,dmpi, pts); } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -123,7 +123,7 @@ } -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { /* FIXME - really any YUV 4:2:0 input format should work */ switch (fmt) { @@ -135,7 +135,7 @@ return 0; } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { free(vf->priv); }
--- a/libmpcodecs/vf_dsize.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_dsize.c Sun Feb 21 15:48:03 2010 +0000 @@ -35,7 +35,7 @@ float aspect; }; -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) {
--- a/libmpcodecs/vf_dvbscale.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_dvbscale.c Sun Feb 21 15:48:03 2010 +0000 @@ -34,7 +34,7 @@ //===========================================================================// -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){
--- a/libmpcodecs/vf_eq.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_eq.c Sun Feb 21 15:48:03 2010 +0000 @@ -132,7 +132,7 @@ /* FIXME: add packed yuv version of process */ -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; @@ -161,7 +161,7 @@ return vf_next_put_image(vf,dmpi, pts); } -static int control(struct vf_instance_s* vf, int request, void* data) +static int control(struct vf_instance *vf, int request, void* data) { vf_equalizer_t *eq; @@ -192,7 +192,7 @@ return vf_next_control(vf, request, data); } -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { switch (fmt) { case IMGFMT_YVU9: @@ -213,7 +213,7 @@ return 0; } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { if (vf->priv->buf) free(vf->priv->buf); free(vf->priv);
--- a/libmpcodecs/vf_expand.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_expand.c Sun Feb 21 15:48:03 2010 +0000 @@ -76,7 +76,7 @@ //===========================================================================// #ifdef OSD_SUPPORT -static struct vf_instance_s* vf=NULL; // fixme (needs sub.c changes) +static struct vf_instance *vf=NULL; // fixme (needs sub.c changes) static int orig_w,orig_h; static void remove_func_2(int x0,int y0, int w,int h){ @@ -182,7 +182,7 @@ } } -static void draw_osd(struct vf_instance_s* vf_,int w,int h){ +static void draw_osd(struct vf_instance *vf_,int w,int h){ vf=vf_;orig_w=w;orig_h=h; // printf("======================================\n"); if(vf->priv->exp_w!=w || vf->priv->exp_h!=h || @@ -213,7 +213,7 @@ #endif //===========================================================================// -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ if(outfmt == IMGFMT_MPEGPES) { @@ -268,7 +268,7 @@ // codec -copy-> expand --DR--> vo // codec -copy-> expand -copy-> vo (worst case) -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static void get_image(struct vf_instance *vf, mp_image_t *mpi){ // if(mpi->type==MP_IMGTYPE_IPB) return; // not yet working #ifdef OSD_SUPPORT if(vf->priv->osd && (mpi->flags&MP_IMGFLAG_PRESERVE)){ @@ -313,7 +313,7 @@ } } -static void start_slice(struct vf_instance_s* vf, mp_image_t *mpi){ +static void start_slice(struct vf_instance *vf, mp_image_t *mpi){ // printf("start_slice called! flag=%d\n",mpi->flags&MP_IMGFLAG_DRAW_CALLBACK); if(!vf->next->draw_slice){ mpi->flags&=~MP_IMGFLAG_DRAW_CALLBACK; @@ -331,7 +331,7 @@ vf->priv->first_slice = 1; } -static void draw_top_blackbar_slice(struct vf_instance_s* vf, +static void draw_top_blackbar_slice(struct vf_instance *vf, unsigned char** src, int* stride, int w,int h, int x, int y){ if(vf->priv->exp_y>0 && y == 0) { vf_next_draw_slice(vf, vf->dmpi->planes, vf->dmpi->stride, @@ -340,7 +340,7 @@ } -static void draw_bottom_blackbar_slice(struct vf_instance_s* vf, +static void draw_bottom_blackbar_slice(struct vf_instance *vf, unsigned char** src, int* stride, int w,int h, int x, int y){ if(vf->priv->exp_y+vf->h<vf->dmpi->h && y+h == vf->h) { unsigned char *src2[MP_MAX_PLANES]; @@ -360,7 +360,7 @@ } } -static void draw_slice(struct vf_instance_s* vf, +static void draw_slice(struct vf_instance *vf, unsigned char** src, int* stride, int w,int h, int x, int y){ // printf("draw_slice() called %d at %d\n",h,y); @@ -383,7 +383,7 @@ vf->priv->first_slice = 0; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ if (vf->priv->passthrough) { mp_image_t *dmpi = vf_get_image(vf->next, IMGFMT_MPEGPES, MP_IMGTYPE_EXPORT, 0, mpi->w, mpi->h); @@ -438,7 +438,7 @@ //===========================================================================// -static int control(struct vf_instance_s* vf, int request, void* data){ +static int control(struct vf_instance *vf, int request, void* data){ #ifdef OSD_SUPPORT switch(request){ case VFCTRL_DRAW_OSD: @@ -448,7 +448,7 @@ return vf_next_control(vf,request,data); } -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ return vf_next_query_format(vf,fmt); }
--- a/libmpcodecs/vf_field.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_field.c Sun Feb 21 15:48:03 2010 +0000 @@ -32,13 +32,13 @@ //===========================================================================// -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ return vf_next_config(vf,width,height/2,d_width,d_height,flags,outfmt); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, MP_IMGTYPE_EXPORT, MP_IMGFLAG_ACCEPT_STRIDE, mpi->width, mpi->height/2); @@ -61,7 +61,7 @@ //===========================================================================// -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { free(vf->priv); }
--- a/libmpcodecs/vf_fil.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_fil.c Sun Feb 21 15:48:03 2010 +0000 @@ -35,7 +35,7 @@ //===========================================================================// -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ int pixel_stride= (width+15)&~15; //FIXME this is ust a guess ... especially for non planar its somewhat bad one @@ -63,7 +63,7 @@ (d_width*vf->priv->stridefactor)>>1, 2*d_height/vf->priv->stridefactor, flags, outfmt); } -static int put_image(struct vf_instance_s* 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){ // we've used DR, so we're ready... return vf_next_put_image(vf,(mp_image_t*)mpi->priv, pts); @@ -89,7 +89,7 @@ //===========================================================================// -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { free(vf->priv); }
--- a/libmpcodecs/vf_filmdint.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_filmdint.c Sun Feb 21 15:48:03 2010 +0000 @@ -934,7 +934,7 @@ return tv.tv_sec + tv.tv_usec * 1e-6; } -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi) +static void get_image(struct vf_instance *vf, mp_image_t *mpi) { struct vf_priv_s *p = vf->priv; static unsigned char **planes, planes_idx; @@ -1138,7 +1138,7 @@ #define ITOC(X) (!(X) ? ' ' : (X) + ((X)>9 ? 'a'-10 : '0')) -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; struct vf_priv_s *p = vf->priv; @@ -1336,7 +1336,7 @@ return show_fields ? vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE) : 0; } -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { /* FIXME - support more formats */ switch (fmt) { @@ -1351,7 +1351,7 @@ return 0; } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -1396,7 +1396,7 @@ return vf_next_config(vf, p->w, p->h, d_width, d_height, flags, outfmt); } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { struct vf_priv_s *p = vf->priv; mp_msg(MSGT_VFILTER, MSGL_INFO, "diff_time: %.3f, merge_time: %.3f, "
--- a/libmpcodecs/vf_flip.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_flip.c Sun Feb 21 15:48:03 2010 +0000 @@ -30,14 +30,14 @@ //===========================================================================// -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ flags&=~VOFLAG_FLIPPING; // remove the FLIP flag return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static void get_image(struct vf_instance *vf, mp_image_t *mpi){ if(mpi->flags&MP_IMGFLAG_ACCEPT_STRIDE){ // try full DR ! vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, @@ -59,7 +59,7 @@ } } -static int put_image(struct vf_instance_s* 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){ // we've used DR, so we're ready... if(!(mpi->flags&MP_IMGFLAG_PLANAR))
--- a/libmpcodecs/vf_format.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_format.c Sun Feb 21 15:48:03 2010 +0000 @@ -40,7 +40,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ if(fmt==vf->priv->fmt) return vf_next_query_format(vf,fmt); return 0;
--- a/libmpcodecs/vf_framestep.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_framestep.c Sun Feb 21 15:48:03 2010 +0000 @@ -89,7 +89,7 @@ }; /* Filter handler */ -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; struct vf_priv_s *priv; @@ -146,7 +146,7 @@ return 0; } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { /* Free private data */ free(vf->priv);
--- a/libmpcodecs/vf_fspp.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_fspp.c Sun Feb 21 15:48:03 2010 +0000 @@ -485,7 +485,7 @@ } } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -499,7 +499,7 @@ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi) +static void get_image(struct vf_instance *vf, mp_image_t *mpi) { if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change // ok, we can do pp in-place (or pp disabled): @@ -517,7 +517,7 @@ mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ @@ -571,7 +571,7 @@ return vf_next_put_image(vf,dmpi, pts); } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { if(!vf->priv) return; @@ -590,7 +590,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { switch(fmt){ case IMGFMT_YVU9: @@ -609,7 +609,7 @@ return 0; } -static int control(struct vf_instance_s* vf, int request, void* data) +static int control(struct vf_instance *vf, int request, void* data) { switch(request){ case VFCTRL_QUERY_MAX_PP_LEVEL:
--- a/libmpcodecs/vf_geq.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_geq.c Sun Feb 21 15:48:03 2010 +0000 @@ -42,13 +42,13 @@ mp_image_t *mpi; }; -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static inline double getpix(struct vf_instance_s* vf, double x, double y, int plane){ +static inline double getpix(struct vf_instance *vf, double x, double y, int plane){ int xi, yi; mp_image_t *mpi= vf->priv->mpi; int stride= mpi->stride[plane]; @@ -66,19 +66,19 @@ //FIXME cubic interpolate //FIXME keep the last few frames -static double lum(struct vf_instance_s* vf, double x, double y){ +static double lum(struct vf_instance *vf, double x, double y){ return getpix(vf, x, y, 0); } -static double cb(struct vf_instance_s* vf, double x, double y){ +static double cb(struct vf_instance *vf, double x, double y){ return getpix(vf, x, y, 1); } -static double cr(struct vf_instance_s* vf, double x, double y){ +static double cr(struct vf_instance *vf, double x, double y){ return getpix(vf, x, y, 2); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; int x,y, plane; @@ -126,7 +126,7 @@ return vf_next_put_image(vf,dmpi, pts); } -static void uninit(struct vf_instance_s* vf){ +static void uninit(struct vf_instance *vf){ if(!vf->priv) return; av_free(vf->priv);
--- a/libmpcodecs/vf_gradfun.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_gradfun.c Sun Feb 21 15:48:03 2010 +0000 @@ -273,7 +273,7 @@ } } -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi) +static void get_image(struct vf_instance *vf, mp_image_t *mpi) { if (mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change // ok, we can do pp in-place: @@ -291,7 +291,7 @@ mpi->flags |= MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi = vf->dmpi; int p; @@ -325,7 +325,7 @@ return vf_next_put_image(vf, dmpi, pts); } -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { switch (fmt){ case IMGFMT_YVU9: @@ -347,7 +347,7 @@ return 0; } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -356,7 +356,7 @@ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { if (!vf->priv) return; av_free(vf->priv->buf);
--- a/libmpcodecs/vf_halfpack.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_halfpack.c Sun Feb 21 15:48:03 2010 +0000 @@ -163,7 +163,7 @@ int dststride, int srcstride[3], int w, int h); -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { const uint8_t *src[MP_MAX_PLANES] = { mpi->planes[0] + mpi->stride[0]*vf->priv->field, @@ -190,7 +190,7 @@ return vf_next_put_image(vf,dmpi, pts); } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -208,7 +208,7 @@ } -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { /* FIXME - really any YUV 4:2:0 input format should work */ switch (fmt) { @@ -220,7 +220,7 @@ return 0; } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { sws_freeContext(vf->priv->ctx); free(vf->priv);
--- a/libmpcodecs/vf_harddup.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_harddup.c Sun Feb 21 15:48:03 2010 +0000 @@ -31,7 +31,7 @@ mp_image_t *last_mpi; }; -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; @@ -52,7 +52,7 @@ return vf_next_put_image(vf, dmpi, pts); } -static int control(struct vf_instance_s* vf, int request, void* data) +static int control(struct vf_instance *vf, int request, void* data) { switch (request) { case VFCTRL_DUPLICATE_FRAME: @@ -68,7 +68,7 @@ return vf_next_control(vf, request, data); } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { free(vf->priv); }
--- a/libmpcodecs/vf_hqdn3d.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_hqdn3d.c Sun Feb 21 15:48:03 2010 +0000 @@ -44,14 +44,14 @@ /***************************************************************************/ -static void uninit(struct vf_instance_s* vf){ +static void uninit(struct vf_instance *vf){ if(vf->priv->Line){free(vf->priv->Line);vf->priv->Line=NULL;} if(vf->priv->Frame[0]){free(vf->priv->Frame[0]);vf->priv->Frame[0]=NULL;} if(vf->priv->Frame[1]){free(vf->priv->Frame[1]);vf->priv->Frame[1]=NULL;} if(vf->priv->Frame[2]){free(vf->priv->Frame[2]);vf->priv->Frame[2]=NULL;} } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -202,7 +202,7 @@ } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ int cw= mpi->w >> mpi->chroma_x_shift; int ch= mpi->h >> mpi->chroma_y_shift; int W = mpi->w, H = mpi->h; @@ -237,7 +237,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt) { case IMGFMT_YV12:
--- a/libmpcodecs/vf_hue.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_hue.c Sun Feb 21 15:48:03 2010 +0000 @@ -76,7 +76,7 @@ /* FIXME: add packed yuv version of process */ -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; @@ -110,7 +110,7 @@ return vf_next_put_image(vf,dmpi, pts); } -static int control(struct vf_instance_s* vf, int request, void* data) +static int control(struct vf_instance *vf, int request, void* data) { vf_equalizer_t *eq; @@ -139,7 +139,7 @@ return vf_next_control(vf, request, data); } -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { switch (fmt) { case IMGFMT_YVU9: @@ -156,7 +156,7 @@ return 0; } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { if (vf->priv->buf[0]) free(vf->priv->buf[0]); if (vf->priv->buf[1]) free(vf->priv->buf[1]);
--- a/libmpcodecs/vf_il.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_il.c Sun Feb 21 15:48:03 2010 +0000 @@ -73,7 +73,7 @@ } } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ int w; FilterParam *luma = &vf->priv->lumaParam; FilterParam *chroma= &vf->priv->chromaParam;
--- a/libmpcodecs/vf_ilpack.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_ilpack.c Sun Feb 21 15:48:03 2010 +0000 @@ -369,7 +369,7 @@ } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; @@ -383,7 +383,7 @@ return vf_next_put_image(vf,dmpi, pts); } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -392,7 +392,7 @@ } -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { /* FIXME - really any YUV 4:2:0 input format should work */ switch (fmt) {
--- a/libmpcodecs/vf_ivtc.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_ivtc.c Sun Feb 21 15:48:03 2010 +0000 @@ -426,7 +426,7 @@ } } -static int do_put_image(struct vf_instance_s* vf, mp_image_t *dmpi) +static int do_put_image(struct vf_instance *vf, mp_image_t *dmpi) { struct vf_priv_s *p = vf->priv; int dropflag=0; @@ -455,7 +455,7 @@ return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { int ret=0; struct vf_priv_s *p = vf->priv; @@ -506,7 +506,7 @@ return ret; } -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { switch (fmt) { case IMGFMT_YV12: @@ -517,7 +517,7 @@ return 0; } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { free(vf->priv); }
--- a/libmpcodecs/vf_kerndeint.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_kerndeint.c Sun Feb 21 15:48:03 2010 +0000 @@ -47,7 +47,7 @@ /***************************************************************************/ -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -55,7 +55,7 @@ } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { free(vf->priv); } @@ -74,7 +74,7 @@ #define PLANAR_U 1 #define PLANAR_V 2 -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ int cw= mpi->w >> mpi->chroma_x_shift; int ch= mpi->h >> mpi->chroma_y_shift; int W = mpi->w, H = mpi->h; @@ -278,7 +278,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt) { case IMGFMT_YV12: @@ -289,7 +289,7 @@ return 0; } -static int control(struct vf_instance_s* vf, int request, void* data){ +static int control(struct vf_instance *vf, int request, void* data){ switch (request) { case VFCTRL_GET_DEINTERLACE:
--- a/libmpcodecs/vf_lavc.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_lavc.c Sun Feb 21 15:48:03 2010 +0000 @@ -45,7 +45,7 @@ //===========================================================================// -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ if(vf_next_query_format(vf,IMGFMT_MPEGPES)<=0) return 0; @@ -87,7 +87,7 @@ return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_MPEGPES); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t* dmpi; int out_size; AVFrame *pic= vf->priv->pic; @@ -120,7 +120,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt){ case IMGFMT_YV12: case IMGFMT_I420:
--- a/libmpcodecs/vf_lavcdeint.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_lavcdeint.c Sun Feb 21 15:48:03 2010 +0000 @@ -88,7 +88,7 @@ static int -config (struct vf_instance_s* vf, +config (struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -114,7 +114,7 @@ } static int -put_image (struct vf_instance_s* vf, mp_image_t *mpi, double pts) +put_image (struct vf_instance *vf, mp_image_t *mpi, double pts) { struct vf_priv_s *priv = vf->priv; mp_image_t* dmpi; @@ -151,7 +151,7 @@ static int -query_format (struct vf_instance_s* vf, unsigned int fmt) +query_format (struct vf_instance *vf, unsigned int fmt) { if(imgfmt_to_pixfmt(fmt) == -1) return 0;
--- a/libmpcodecs/vf_mcdeint.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_mcdeint.c Sun Feb 21 15:48:03 2010 +0000 @@ -178,7 +178,7 @@ } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ int i; @@ -235,7 +235,7 @@ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static void get_image(struct vf_instance *vf, mp_image_t *mpi){ if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change return; //caused problems, dunno why // ok, we can do pp in-place (or pp disabled): @@ -253,7 +253,7 @@ mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ @@ -272,7 +272,7 @@ return vf_next_put_image(vf,dmpi, pts); } -static void uninit(struct vf_instance_s* vf){ +static void uninit(struct vf_instance *vf){ if(!vf->priv) return; #if 0 @@ -294,7 +294,7 @@ } //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt){ case IMGFMT_YV12: case IMGFMT_I420:
--- a/libmpcodecs/vf_mirror.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_mirror.c Sun Feb 21 15:48:03 2010 +0000 @@ -83,7 +83,7 @@ //===========================================================================// -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; // hope we'll get DR buffer:
--- a/libmpcodecs/vf_noformat.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_noformat.c Sun Feb 21 15:48:03 2010 +0000 @@ -40,7 +40,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ if(fmt!=vf->priv->fmt) return vf_next_query_format(vf,fmt); return 0;
--- a/libmpcodecs/vf_noise.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_noise.c Sun Feb 21 15:48:03 2010 +0000 @@ -312,14 +312,14 @@ if (fp->shiftptr == 3) fp->shiftptr = 0; } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static void get_image(struct vf_instance *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): @@ -337,7 +337,7 @@ mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ @@ -366,7 +366,7 @@ return vf_next_put_image(vf,dmpi, pts); } -static void uninit(struct vf_instance_s* vf){ +static void uninit(struct vf_instance *vf){ if(!vf->priv) return; if(vf->priv->chromaParam.noise) free(vf->priv->chromaParam.noise); @@ -381,7 +381,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt) { case IMGFMT_YV12:
--- a/libmpcodecs/vf_ow.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_ow.c Sun Feb 21 15:48:03 2010 +0000 @@ -203,7 +203,7 @@ // printf("%f\n", sum/height/width); } -static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ int h= (height+15)&(~15); int i,j; @@ -216,7 +216,7 @@ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static void get_image(struct vf_instance *vf, mp_image_t *mpi){ if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change // ok, we can do pp in-place (or pp disabled): vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, @@ -233,7 +233,7 @@ mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ @@ -254,7 +254,7 @@ return vf_next_put_image(vf,dmpi, pts); } -static void uninit(struct vf_instance_s* vf){ +static void uninit(struct vf_instance *vf){ int i,j; if(!vf->priv) return; @@ -270,7 +270,7 @@ } //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt){ case IMGFMT_YVU9: case IMGFMT_IF09:
--- a/libmpcodecs/vf_palette.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_palette.c Sun Feb 21 15:48:03 2010 +0000 @@ -54,7 +54,7 @@ static unsigned int gray_pal[256]; -static unsigned int find_best(struct vf_instance_s* vf, unsigned int fmt){ +static unsigned int find_best(struct vf_instance *vf, unsigned int fmt){ unsigned int best=0; int ret; unsigned int* p; @@ -78,7 +78,7 @@ int pal_msg; }; -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ if (!vf->priv->fmt) @@ -92,7 +92,7 @@ return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; uint8_t *old_palette = mpi->planes[1]; @@ -178,7 +178,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ int best=find_best(vf,fmt); if(!best) return 0; // no match return vf->next->query_format(vf->next,best);
--- a/libmpcodecs/vf_perspective.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_perspective.c Sun Feb 21 15:48:03 2010 +0000 @@ -102,7 +102,7 @@ return coeff; } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ int i, j; @@ -129,7 +129,7 @@ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static void uninit(struct vf_instance_s* vf){ +static void uninit(struct vf_instance *vf){ if(!vf->priv) return; if(vf->priv->pv) free(vf->priv->pv); @@ -258,7 +258,7 @@ } } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ int cw= mpi->w >> mpi->chroma_x_shift; int ch= mpi->h >> mpi->chroma_y_shift; @@ -289,7 +289,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt) { case IMGFMT_YV12:
--- a/libmpcodecs/vf_phase.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_phase.c Sun Feb 21 15:48:03 2010 +0000 @@ -196,7 +196,7 @@ return mode; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; int w; @@ -240,7 +240,7 @@ return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { free(vf->priv->buf[0]); free(vf->priv->buf[1]);
--- a/libmpcodecs/vf_pp.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_pp.c Sun Feb 21 15:48:03 2010 +0000 @@ -52,7 +52,7 @@ //===========================================================================// -static int config(struct vf_instance_s* 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 +73,7 @@ return vf_next_config(vf,width,height,d_width,d_height,voflags,outfmt); } -static void uninit(struct vf_instance_s* 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 +82,7 @@ if(vf->priv->context) pp_free_context(vf->priv->context); } -static int query_format(struct vf_instance_s* 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 +95,7 @@ return 0; } -static int control(struct vf_instance_s* 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 +106,7 @@ return vf_next_control(vf,request,data); } -static void get_image(struct vf_instance_s* 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 +127,7 @@ mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* 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,
--- a/libmpcodecs/vf_pp7.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_pp7.c Sun Feb 21 15:48:03 2010 +0000 @@ -344,7 +344,7 @@ } } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ int h= (height+16+15)&(~15); @@ -355,7 +355,7 @@ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static void get_image(struct vf_instance *vf, mp_image_t *mpi){ if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change // ok, we can do pp in-place (or pp disabled): vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, @@ -372,7 +372,7 @@ mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; if(mpi->flags&MP_IMGFLAG_DIRECT){ @@ -407,7 +407,7 @@ return vf_next_put_image(vf,dmpi, pts); } -static void uninit(struct vf_instance_s* vf){ +static void uninit(struct vf_instance *vf){ if(!vf->priv) return; if(vf->priv->src) free(vf->priv->src); @@ -418,7 +418,7 @@ } //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt){ case IMGFMT_YVU9: case IMGFMT_IF09: @@ -436,7 +436,7 @@ return 0; } -static int control(struct vf_instance_s* vf, int request, void* data){ +static int control(struct vf_instance *vf, int request, void* data){ return vf_next_control(vf,request,data); }
--- a/libmpcodecs/vf_pullup.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_pullup.c Sun Feb 21 15:48:03 2010 +0000 @@ -42,7 +42,7 @@ char *qbuf; }; -static void init_pullup(struct vf_instance_s* vf, mp_image_t *mpi) +static void init_pullup(struct vf_instance *vf, mp_image_t *mpi) { struct pullup_context *c = vf->priv->ctx; @@ -78,7 +78,7 @@ #if 0 -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi) +static void get_image(struct vf_instance *vf, mp_image_t *mpi) { struct pullup_context *c = vf->priv->ctx; struct pullup_buffer *b; @@ -104,7 +104,7 @@ } #endif -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { struct pullup_context *c = vf->priv->ctx; struct pullup_buffer *b; @@ -254,7 +254,7 @@ return ret; } -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { /* FIXME - support more formats */ switch (fmt) { @@ -266,7 +266,7 @@ return 0; } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -274,7 +274,7 @@ return vf_next_config(vf, width, height, d_width, d_height, flags, outfmt); } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { pullup_free_context(vf->priv->ctx); free(vf->priv);
--- a/libmpcodecs/vf_qp.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_qp.c Sun Feb 21 15:48:03 2010 +0000 @@ -42,7 +42,7 @@ int qp_stride; }; -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ int h= (height+15)>>4; @@ -76,7 +76,7 @@ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static void get_image(struct vf_instance *vf, mp_image_t *mpi){ if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change // ok, we can do pp in-place (or pp disabled): vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, @@ -93,7 +93,7 @@ mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; int x,y; @@ -136,7 +136,7 @@ return vf_next_put_image(vf,dmpi, pts); } -static void uninit(struct vf_instance_s* vf){ +static void uninit(struct vf_instance *vf){ if(!vf->priv) return; if(vf->priv->qp) av_free(vf->priv->qp);
--- a/libmpcodecs/vf_rectangle.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_rectangle.c Sun Feb 21 15:48:03 2010 +0000 @@ -31,7 +31,7 @@ }; static int -config(struct vf_instance_s* vf, +config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -52,7 +52,7 @@ } static int -control(struct vf_instance_s* vf, int request, void *data) +control(struct vf_instance *vf, int request, void *data) { const int *const tmp = data; switch(request){ @@ -83,7 +83,7 @@ return 0; } static int -put_image(struct vf_instance_s* vf, mp_image_t* mpi, double pts){ +put_image(struct vf_instance *vf, mp_image_t* mpi, double pts){ mp_image_t* dmpi; unsigned int bpp = mpi->bpp / 8; int x, y, w, h;
--- a/libmpcodecs/vf_remove_logo.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_remove_logo.c Sun Feb 21 15:48:03 2010 +0000 @@ -670,7 +670,7 @@ /** * \brief Checks if YV12 is supported by the next filter. */ -static unsigned int find_best(struct vf_instance_s* vf){ +static unsigned int find_best(struct vf_instance *vf){ int is_format_okay = vf->next->query_format(vf->next, IMGFMT_YV12); if ((is_format_okay & VFCAP_CSP_SUPPORTED_BY_HW) || (is_format_okay & VFCAP_CSP_SUPPORTED)) return IMGFMT_YV12; @@ -683,7 +683,7 @@ /** * \brief Configure the filter and call the next filter's config function. */ -static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { if(!(((vf_priv_s *)vf->priv)->fmt=find_best(vf))) return 0; @@ -764,7 +764,7 @@ * filter, has the logo removed by the filter, and is then sent to the next * filter. */ -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; dmpi=vf_get_image(vf->next,((vf_priv_s *)vf->priv)->fmt, @@ -811,7 +811,7 @@ /** * \brief Checks to see if the next filter accepts YV12 images. */ -static int query_format(struct vf_instance_s * vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { if (fmt == IMGFMT_YV12) return vf->next->query_format(vf->next, IMGFMT_YV12);
--- a/libmpcodecs/vf_rgb2bgr.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_rgb2bgr.c Sun Feb 21 15:48:03 2010 +0000 @@ -54,14 +54,14 @@ return 0; } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ vf->priv->fmt=getfmt(outfmt,vf->priv->forced); return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; // hope we'll get DR buffer: @@ -94,7 +94,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int outfmt){ +static int query_format(struct vf_instance *vf, unsigned int outfmt){ unsigned int fmt=getfmt(outfmt,vf->priv->forced); if(!fmt) return 0; return vf_next_query_format(vf,fmt) & (~VFCAP_CSP_SUPPORTED_BY_HW);
--- a/libmpcodecs/vf_rgbtest.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_rgbtest.c Sun Feb 21 15:48:03 2010 +0000 @@ -95,7 +95,7 @@ } } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ if (vf->priv->w > 0) { d_width = width = vf->priv->w; } @@ -105,7 +105,7 @@ return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; int x, y; int w = vf->priv->w > 0 ? vf->priv->w : mpi->w; @@ -134,7 +134,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int outfmt){ +static int query_format(struct vf_instance *vf, unsigned int outfmt){ unsigned int fmt=getfmt(outfmt); if(!fmt) return 0; return vf_next_query_format(vf,fmt) & (~VFCAP_CSP_SUPPORTED_BY_HW);
--- a/libmpcodecs/vf_rotate.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_rotate.c Sun Feb 21 15:48:03 2010 +0000 @@ -68,7 +68,7 @@ //===========================================================================// -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ if (vf->priv->direction & 4) { @@ -84,7 +84,7 @@ return vf_next_config(vf,height,width,d_height,d_width,flags,outfmt); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; // hope we'll get DR buffer: @@ -114,7 +114,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ if(IMGFMT_IS_RGB(fmt) || IMGFMT_IS_BGR(fmt)) return vf_next_query_format(vf, fmt); // we can support only symmetric (chroma_x_shift==chroma_y_shift) YUV formats: switch(fmt) {
--- a/libmpcodecs/vf_sab.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_sab.c Sun Feb 21 15:48:03 2010 +0000 @@ -135,7 +135,7 @@ return 0; } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -160,7 +160,7 @@ f->distCoeff=NULL; } -static void uninit(struct vf_instance_s* vf){ +static void uninit(struct vf_instance *vf){ if(!vf->priv) return; freeBuffers(&vf->priv->luma); @@ -238,7 +238,7 @@ } } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ int cw= mpi->w >> mpi->chroma_x_shift; int ch= mpi->h >> mpi->chroma_y_shift; @@ -257,7 +257,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt) { case IMGFMT_YV12:
--- a/libmpcodecs/vf_scale.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_scale.c Sun Feb 21 15:48:03 2010 +0000 @@ -166,7 +166,7 @@ return best; } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ unsigned int best=find_best_out(vf, outfmt); @@ -366,7 +366,7 @@ return vf_next_config(vf,vf->priv->w,vf->priv->h,d_width,d_height,flags,best); } -static void start_slice(struct vf_instance_s* vf, mp_image_t *mpi){ +static void start_slice(struct vf_instance *vf, mp_image_t *mpi){ // printf("start_slice called! flag=%d\n",mpi->flags&MP_IMGFLAG_DRAW_CALLBACK); if(!(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK)) return; // shouldn't happen // they want slices!!! allocate the buffer. @@ -406,7 +406,7 @@ } } -static void draw_slice(struct vf_instance_s* vf, +static void draw_slice(struct vf_instance *vf, unsigned char** src, int* stride, int w,int h, int x, int y){ mp_image_t *dmpi=vf->dmpi; if(!dmpi){ @@ -417,7 +417,7 @@ scale(vf->priv->ctx, vf->priv->ctx2, src, stride, y, h, dmpi->planes, dmpi->stride, vf->priv->interlaced); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi=mpi->priv; // printf("vf_scale::put_image(): processing whole frame! dmpi=%p flag=%d\n", @@ -444,7 +444,7 @@ return vf_next_put_image(vf,dmpi, pts); } -static int control(struct vf_instance_s* vf, int request, void* data){ +static int control(struct vf_instance *vf, int request, void* data){ int *table; int *inv_table; int r; @@ -507,7 +507,7 @@ // supported Input formats: YV12, I420, IYUV, YUY2, UYVY, BGR32, BGR24, BGR16, BGR15, RGB32, RGB24, Y8, Y800 -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt){ case IMGFMT_YV12: case IMGFMT_I420: @@ -556,7 +556,7 @@ return 0; // nomatching in-fmt } -static void uninit(struct vf_instance_s *vf){ +static void uninit(struct vf_instance *vf){ if(vf->priv->ctx) sws_freeContext(vf->priv->ctx); if(vf->priv->ctx2) sws_freeContext(vf->priv->ctx2); if(vf->priv->palette) free(vf->priv->palette);
--- a/libmpcodecs/vf_screenshot.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_screenshot.c Sun Feb 21 15:48:03 2010 +0000 @@ -58,7 +58,7 @@ //===========================================================================// -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -137,7 +137,7 @@ sws_scale(priv->ctx, mpi->planes, mpi->stride, 0, priv->dh, dst, dst_stride); } -static void start_slice(struct vf_instance_s* vf, mp_image_t *mpi) +static void start_slice(struct vf_instance *vf, mp_image_t *mpi) { vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, mpi->type, mpi->flags, mpi->width, mpi->height); @@ -149,7 +149,7 @@ } -static void draw_slice(struct vf_instance_s* vf, unsigned char** src, +static void draw_slice(struct vf_instance *vf, unsigned char** src, int* stride, int w,int h, int x, int y) { if (vf->priv->store_slices) { @@ -162,7 +162,7 @@ vf_next_draw_slice(vf,src,stride,w,h,x,y); } -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi) +static void get_image(struct vf_instance *vf, mp_image_t *mpi) { // FIXME: should vf.c really call get_image when using slices?? if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK) @@ -185,7 +185,7 @@ mpi->priv=(void*)vf->dmpi; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi = (mp_image_t *)mpi->priv; @@ -246,7 +246,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { switch(fmt){ case IMGFMT_YV12:
--- a/libmpcodecs/vf_smartblur.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_smartblur.c Sun Feb 21 15:48:03 2010 +0000 @@ -94,7 +94,7 @@ return 0; } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -113,7 +113,7 @@ f->filterContext=NULL; } -static void uninit(struct vf_instance_s* vf){ +static void uninit(struct vf_instance *vf){ if(!vf->priv) return; freeBuffers(&vf->priv->luma); @@ -180,7 +180,7 @@ } } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ int cw= mpi->w >> mpi->chroma_x_shift; int ch= mpi->h >> mpi->chroma_y_shift; FilterParam *f= &vf->priv; @@ -201,7 +201,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt) { case IMGFMT_YV12:
--- a/libmpcodecs/vf_softpulldown.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_softpulldown.c Sun Feb 21 15:48:03 2010 +0000 @@ -35,7 +35,7 @@ long long out; }; -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; int ret = 0; @@ -129,14 +129,14 @@ return ret; } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { mp_msg(MSGT_VFILTER, MSGL_INFO, "softpulldown: %lld frames in, %lld frames out\n", vf->priv->in, vf->priv->out); free(vf->priv);
--- a/libmpcodecs/vf_softskip.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_softskip.c Sun Feb 21 15:48:03 2010 +0000 @@ -31,7 +31,7 @@ int skipflag; }; -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; @@ -54,7 +54,7 @@ return vf_next_put_image(vf, dmpi, pts); } -static int control(struct vf_instance_s* vf, int request, void* data) +static int control(struct vf_instance *vf, int request, void* data) { switch (request) { case VFCTRL_SKIP_NEXT_FRAME: @@ -65,7 +65,7 @@ } #if 0 -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { /* FIXME - figure out which other formats work */ switch (fmt) { @@ -78,7 +78,7 @@ } #endif -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { free(vf->priv); }
--- a/libmpcodecs/vf_spp.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_spp.c Sun Feb 21 15:48:03 2010 +0000 @@ -435,7 +435,7 @@ //FIXME reorder for better caching } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ int h= (height+16+15)&(~15); @@ -447,7 +447,7 @@ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static void get_image(struct vf_instance *vf, mp_image_t *mpi){ if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change // ok, we can do pp in-place (or pp disabled): vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, @@ -464,7 +464,7 @@ mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ @@ -516,7 +516,7 @@ return vf_next_put_image(vf,dmpi, pts); } -static void uninit(struct vf_instance_s* vf){ +static void uninit(struct vf_instance *vf){ if(!vf->priv) return; if(vf->priv->temp) free(vf->priv->temp); @@ -533,7 +533,7 @@ } //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt){ case IMGFMT_YVU9: case IMGFMT_IF09: @@ -551,7 +551,7 @@ return 0; } -static int control(struct vf_instance_s* 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 6;
--- a/libmpcodecs/vf_swapuv.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_swapuv.c Sun Feb 21 15:48:03 2010 +0000 @@ -32,7 +32,7 @@ //===========================================================================// -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static void get_image(struct vf_instance *vf, mp_image_t *mpi){ mp_image_t *dmpi= vf_get_image(vf->next, mpi->imgfmt, mpi->type, mpi->flags, mpi->w, mpi->h); @@ -48,7 +48,7 @@ mpi->priv=(void*)dmpi; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; if(mpi->flags&MP_IMGFLAG_DIRECT){ @@ -72,7 +72,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt) { case IMGFMT_YV12:
--- a/libmpcodecs/vf_telecine.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_telecine.c Sun Feb 21 15:48:03 2010 +0000 @@ -33,7 +33,7 @@ int frame; }; -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; int ret; @@ -106,7 +106,7 @@ } #if 0 -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { /* FIXME - figure out which other formats work */ switch (fmt) { @@ -118,7 +118,7 @@ return 0; } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -126,7 +126,7 @@ } #endif -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { free(vf->priv); }
--- a/libmpcodecs/vf_test.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_test.c Sun Feb 21 15:48:03 2010 +0000 @@ -47,7 +47,7 @@ int frame_num; }; -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -269,7 +269,7 @@ } } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; int frame= vf->priv->frame_num; @@ -307,7 +307,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ return vf_next_query_format(vf,IMGFMT_YV12) & (~VFCAP_CSP_SUPPORTED_BY_HW); }
--- a/libmpcodecs/vf_tfields.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_tfields.c Sun Feb 21 15:48:03 2010 +0000 @@ -325,10 +325,10 @@ static void (*qpel_li)(unsigned char *d, unsigned char *s, int w, int h, int ds, int ss, int up); static void (*qpel_4tap)(unsigned char *d, unsigned char *s, int w, int h, int ds, int ss, int up); -static int continue_buffered_image(struct vf_instance_s *); +static int continue_buffered_image(struct vf_instance *vf); extern int correct_pts; -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { vf->priv->buffered_mpi = mpi; vf->priv->buffered_pts = pts; @@ -342,7 +342,7 @@ return base_pts + 0.02 * field; } -static int continue_buffered_image(struct vf_instance_s *vf) +static int continue_buffered_image(struct vf_instance *vf) { int i=vf->priv->buffered_i; double pts = vf->priv->buffered_pts; @@ -460,7 +460,7 @@ return ret; } -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { /* FIXME - figure out which formats exactly work */ switch (fmt) { @@ -475,7 +475,7 @@ return 0; } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -491,7 +491,7 @@ return 0; } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { free(vf->priv); }
--- a/libmpcodecs/vf_tile.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_tile.c Sun Feb 21 15:48:03 2010 +0000 @@ -84,7 +84,7 @@ }; -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -107,7 +107,7 @@ } /* Filter handler */ -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; struct vf_priv_s *priv; @@ -192,14 +192,14 @@ } } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { /* free local data */ free(vf->priv); } /* rgb/bgr 15->32 supported & some Yxxx */ -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { switch (fmt) { /* rgb 15 -> 32 bit */
--- a/libmpcodecs/vf_tinterlace.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_tinterlace.c Sun Feb 21 15:48:03 2010 +0000 @@ -37,7 +37,7 @@ mp_image_t *dmpi; }; -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { int ret = 0; mp_image_t *dmpi; @@ -176,7 +176,7 @@ return ret; } -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { /* FIXME - figure out which other formats work */ switch (fmt) { @@ -188,7 +188,7 @@ return 0; } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -204,7 +204,7 @@ return 0; } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { free(vf->priv); }
--- a/libmpcodecs/vf_unsharp.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_unsharp.c Sun Feb 21 15:48:03 2010 +0000 @@ -126,7 +126,7 @@ //===========================================================================// -static int config( struct vf_instance_s* vf, +static int config( struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt ) { @@ -159,7 +159,7 @@ //===========================================================================// -static void get_image( struct vf_instance_s* vf, mp_image_t *mpi ) { +static void get_image( struct vf_instance *vf, mp_image_t *mpi ) { if( mpi->flags & MP_IMGFLAG_PRESERVE ) return; // don't change if( mpi->imgfmt!=vf->priv->outfmt ) @@ -178,7 +178,7 @@ mpi->flags |= MP_IMGFLAG_DIRECT; } -static int put_image( struct vf_instance_s* vf, mp_image_t *mpi, double pts) { +static int put_image( struct vf_instance *vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; if( !(mpi->flags & MP_IMGFLAG_DIRECT) ) @@ -204,7 +204,7 @@ return vf_next_put_image( vf, dmpi, pts); } -static void uninit( struct vf_instance_s* vf ) { +static void uninit( struct vf_instance *vf ) { unsigned int z; FilterParam *fp; @@ -227,7 +227,7 @@ //===========================================================================// -static int query_format( struct vf_instance_s* vf, unsigned int fmt ) { +static int query_format( struct vf_instance *vf, unsigned int fmt ) { switch(fmt) { case IMGFMT_YV12: case IMGFMT_I420:
--- a/libmpcodecs/vf_uspp.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_uspp.c Sun Feb 21 15:48:03 2010 +0000 @@ -204,7 +204,7 @@ } } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ int i; @@ -245,7 +245,7 @@ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static void get_image(struct vf_instance *vf, mp_image_t *mpi){ if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change // ok, we can do pp in-place (or pp disabled): vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, @@ -262,7 +262,7 @@ mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ @@ -297,7 +297,7 @@ return vf_next_put_image(vf,dmpi, pts); } -static void uninit(struct vf_instance_s* vf){ +static void uninit(struct vf_instance *vf){ int i; if(!vf->priv) return; @@ -316,7 +316,7 @@ } //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt){ case IMGFMT_YV12: case IMGFMT_I420: @@ -328,7 +328,7 @@ return 0; } -static int control(struct vf_instance_s* 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 8;
--- a/libmpcodecs/vf_vo.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_vo.c Sun Feb 21 15:48:03 2010 +0000 @@ -48,10 +48,10 @@ }; #define video_out (vf->priv->vo) -static int query_format(struct vf_instance_s* vf, unsigned int fmt); /* forward declaration */ -static void draw_slice(struct vf_instance_s* vf, unsigned char** src, int* stride, int w,int h, int x, int y); +static int query_format(struct vf_instance *vf, unsigned int fmt); /* forward declaration */ +static void draw_slice(struct vf_instance *vf, unsigned char** src, int* stride, int w,int h, int x, int y); -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -93,7 +93,7 @@ return 1; } -static int control(struct vf_instance_s* vf, int request, void* data) +static int control(struct vf_instance *vf, int request, void* data) { switch(request){ case VFCTRL_GET_DEINTERLACE: @@ -178,7 +178,7 @@ return CONTROL_UNKNOWN; } -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ int flags=video_out->control(VOCTRL_QUERY_FORMAT,&fmt); // draw_slice() accepts stride, draw_frame() doesn't: if(flags) @@ -187,7 +187,7 @@ return flags; } -static void get_image(struct vf_instance_s* vf, +static void get_image(struct vf_instance *vf, mp_image_t *mpi){ if(!vo_config_count) return; // GET_IMAGE is required for hardware-accelerated formats @@ -196,7 +196,7 @@ video_out->control(VOCTRL_GET_IMAGE,mpi); } -static int put_image(struct vf_instance_s* vf, +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ if(!vo_config_count) return 0; // vo not configured? // record pts (potentially modified by filters) for main loop @@ -215,19 +215,19 @@ return 1; } -static void start_slice(struct vf_instance_s* vf, +static void start_slice(struct vf_instance *vf, mp_image_t *mpi) { if(!vo_config_count) return; // vo not configured? video_out->control(VOCTRL_START_SLICE,mpi); } -static void draw_slice(struct vf_instance_s* vf, +static void draw_slice(struct vf_instance *vf, unsigned char** src, int* stride, int w,int h, int x, int y){ if(!vo_config_count) return; // vo not configured? video_out->draw_slice(src,stride,w,h,x,y); } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { if (vf->priv) { #ifdef CONFIG_ASS
--- a/libmpcodecs/vf_yadif.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_yadif.c Sun Feb 21 15:48:03 2010 +0000 @@ -363,7 +363,7 @@ #endif } -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ int i, j; @@ -381,10 +381,10 @@ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static int continue_buffered_image(struct vf_instance_s *vf); +static int continue_buffered_image(struct vf_instance *vf); extern int correct_pts; -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ int tff; if(vf->priv->parity < 0) { @@ -411,7 +411,7 @@ return continue_buffered_image(vf); } -static int continue_buffered_image(struct vf_instance_s *vf) +static int continue_buffered_image(struct vf_instance *vf) { mp_image_t *mpi = vf->priv->buffered_mpi; int tff = vf->priv->buffered_tff; @@ -441,7 +441,7 @@ return ret; } -static void uninit(struct vf_instance_s* vf){ +static void uninit(struct vf_instance *vf){ int i; if(!vf->priv) return; @@ -455,7 +455,7 @@ } //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt){ case IMGFMT_YV12: case IMGFMT_I420: @@ -467,7 +467,7 @@ return 0; } -static int control(struct vf_instance_s* vf, int request, void* data){ +static int control(struct vf_instance *vf, int request, void* data){ switch (request){ case VFCTRL_GET_DEINTERLACE: *(int*)data = vf->priv->do_deinterlace;
--- a/libmpcodecs/vf_yuvcsp.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_yuvcsp.c Sun Feb 21 15:48:03 2010 +0000 @@ -34,7 +34,7 @@ //===========================================================================// -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ return vf_next_config(vf, width, height, d_width, d_height, flags, outfmt); @@ -48,7 +48,7 @@ return (x > 240) ? 240 : (x < 16) ? 16 : x; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ int i,j; uint8_t *y_in, *cb_in, *cr_in; uint8_t *y_out, *cb_out, *cr_out; @@ -82,12 +82,12 @@ //===========================================================================// /* -static void uninit(struct vf_instance_s* vf){ +static void uninit(struct vf_instance *vf){ free(vf->priv); } */ -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt){ case IMGFMT_YV12: case IMGFMT_I420:
--- a/libmpcodecs/vf_yuy2.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_yuy2.c Sun Feb 21 15:48:03 2010 +0000 @@ -34,7 +34,7 @@ //===========================================================================// -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -48,7 +48,7 @@ return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_YUY2); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; // hope we'll get DR buffer: @@ -70,7 +70,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt){ case IMGFMT_YV12: case IMGFMT_I420:
--- a/libmpcodecs/vf_yvu9.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_yvu9.c Sun Feb 21 15:48:03 2010 +0000 @@ -33,7 +33,7 @@ //===========================================================================// -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -45,7 +45,7 @@ return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_YV12); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; int y,w,h; @@ -80,7 +80,7 @@ //===========================================================================// -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ if (fmt == IMGFMT_YVU9 || fmt == IMGFMT_IF09) return vf_next_query_format(vf,IMGFMT_YV12) & (~VFCAP_CSP_SUPPORTED_BY_HW); return 0;
--- a/libmpcodecs/vf_zrmjpeg.c Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpcodecs/vf_zrmjpeg.c Sun Feb 21 15:48:03 2010 +0000 @@ -667,7 +667,7 @@ * arrange to dispatch to the config() entry pointer for the one * selected. */ -static int config(struct vf_instance_s* vf, int width, int height, int d_width, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ struct vf_priv_s *priv = vf->priv; float aspect_decision; @@ -827,7 +827,7 @@ * \param mpi pointer to mp_image_t structure * \param pts */ -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ struct vf_priv_s *priv = vf->priv; int size = 0; int i; @@ -856,7 +856,7 @@ * Given the image format specified by \a fmt, this routine is called * to ask if the format is supported or not. */ -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ VERBOSE("query_format() called\n"); switch (fmt) {
--- a/libmpdemux/stheader.h Sun Feb 21 14:43:36 2010 +0000 +++ b/libmpdemux/stheader.h Sun Feb 21 15:48:03 2010 +0000 @@ -108,7 +108,7 @@ int disp_w,disp_h; // display size (filled by fileformat parser) // output driver/filters: (set by libmpcodecs core) unsigned int outfmtidx; - struct vf_instance_s *vfilter; // the video filter chain, used for this video stream + struct vf_instance *vfilter; // the video filter chain, used for this video stream int vf_initialized; #ifdef CONFIG_DYNAMIC_PLUGINS void *dec_handle;