diff options
Diffstat (limited to 'libmpcodecs')
87 files changed, 383 insertions, 383 deletions
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 6f18ed3308..49acaf9315 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -368,7 +368,7 @@ mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, i } 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); diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index b3e5244bab..0dd725506a 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -345,9 +345,9 @@ struct vf_priv_s { #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 @@ static int config(struct vf_instance_s* vf, 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 control(struct vf_instance_s* vf, int request, void* 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_YV12: case IMGFMT_IYUV: @@ -765,7 +765,7 @@ static double psnr(double d){ 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 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ 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 @@ static int encode_frame(struct vf_instance_s* vf, AVFrame *pic, double pts){ 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; diff --git a/libmpcodecs/ve_libdv.c b/libmpcodecs/ve_libdv.c index b2d00aebd7..f1e265398e 100644 --- a/libmpcodecs/ve_libdv.c +++ b/libmpcodecs/ve_libdv.c @@ -55,7 +55,7 @@ struct vf_priv_s { //===========================================================================// -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 @@ static int config(struct vf_instance_s* vf, 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, diff --git a/libmpcodecs/ve_nuv.c b/libmpcodecs/ve_nuv.c index ab774e97fe..caab62aabe 100644 --- a/libmpcodecs/ve_nuv.c +++ b/libmpcodecs/ve_nuv.c @@ -88,7 +88,7 @@ m_option_t nuvopts_conf[]={ #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 @@ static int config(struct vf_instance_s* vf, 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 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ 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); diff --git a/libmpcodecs/ve_qtvideo.c b/libmpcodecs/ve_qtvideo.c index 88ceb45a64..94bd109d8b 100644 --- a/libmpcodecs/ve_qtvideo.c +++ b/libmpcodecs/ve_qtvideo.c @@ -139,7 +139,7 @@ struct vf_priv_s { //===========================================================================// -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 @@ static int config(struct vf_instance_s* vf, 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; diff --git a/libmpcodecs/ve_raw.c b/libmpcodecs/ve_raw.c index 91b87555b6..b40cae6dce 100644 --- a/libmpcodecs/ve_raw.c +++ b/libmpcodecs/ve_raw.c @@ -44,7 +44,7 @@ struct vf_priv_s { }; #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 set_format(struct vf_instance_s *vf, 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) { @@ -115,11 +115,11 @@ static int config(struct vf_instance_s *vf, 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 @@ static int query_format(struct vf_instance_s *vf, unsigned int fmt) { 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; diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c index ed8c7cebe0..c43d389ba9 100644 --- a/libmpcodecs/ve_vfw.c +++ b/libmpcodecs/ve_vfw.c @@ -275,7 +275,7 @@ static int vfw_encode_frame(BITMAPINFOHEADER* biOutput,void* OutBuf, #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 @@ static int config(struct vf_instance_s* vf, 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 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ return 1; } -static void uninit(struct vf_instance_s* vf) +static void uninit(struct vf_instance *vf) { HRESULT ret; diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c index a3e51a08f1..43cac95237 100644 --- a/libmpcodecs/ve_x264.c +++ b/libmpcodecs/ve_x264.c @@ -59,8 +59,8 @@ static int turbo = 0; 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 @@ void x264enc_set_param(const m_option_t* opt, char* arg) } } -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 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width, 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 control(struct vf_instance_s* vf, int request, void *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_I420: @@ -225,7 +225,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt) 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 @@ static int put_image(struct vf_instance_s *vf, mp_image_t *mpi, double pts) 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 @@ static int encode_frame(struct vf_instance_s *vf, x264_picture_t *pic_in) 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) diff --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c index c812e4c20a..be897dd752 100644 --- a/libmpcodecs/ve_xvid4.c +++ b/libmpcodecs/ve_xvid4.c @@ -374,7 +374,7 @@ static const char *errorstring(int err); *==========================================================================*/ 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 @@ config(struct vf_instance_s* vf, *==========================================================================*/ static void -uninit(struct vf_instance_s* vf) +uninit(struct vf_instance *vf) { xvid_mplayer_mod |