diff options
Diffstat (limited to 'libmpcodecs')
86 files changed, 366 insertions, 362 deletions
diff --git a/libmpcodecs/ad_liba52.c b/libmpcodecs/ad_liba52.c index fd258e12f9..aef29b1e13 100644 --- a/libmpcodecs/ad_liba52.c +++ b/libmpcodecs/ad_liba52.c @@ -73,7 +73,8 @@ static const ad_info_t info = LIBAD_EXTERN(liba52) -static int a52_fillbuff(sh_audio_t *sh_audio){ +static int a52_fillbuff(sh_audio_t *sh_audio) +{ int length=0; int flags=0; int sample_rate=0; @@ -137,7 +138,8 @@ int channels=0; return (flags&A52_LFE) ? (channels+1) : channels; } -static sample_t dynrng_call (sample_t c, void *data) { +static sample_t dynrng_call (sample_t c, void *data) +{ // fprintf(stderr, "(%lf, %lf): %lf\n", (double)c, (double)a52_drc_level, (double)pow((double)c, a52_drc_level)); return pow((double)c, a52_drc_level); } diff --git a/libmpcodecs/ad_pcm.c b/libmpcodecs/ad_pcm.c index 060d95d437..29e78d69af 100644 --- a/libmpcodecs/ad_pcm.c +++ b/libmpcodecs/ad_pcm.c @@ -127,18 +127,18 @@ static int init(sh_audio_t * sh_audio) return 1; } -static int preinit(sh_audio_t * sh) +static int preinit(sh_audio_t *sh) { sh->audio_out_minsize = 2048; return 1; } -static void uninit(sh_audio_t * sh) +static void uninit(sh_audio_t *sh) { talloc_free(sh->context); } -static int control(sh_audio_t * sh, int cmd, void *arg, ...) +static int control(sh_audio_t *sh, int cmd, void *arg, ...) { struct ad_pcm_context *ctx = sh->context; int skip; @@ -155,7 +155,7 @@ static int control(sh_audio_t * sh, int cmd, void *arg, ...) return CONTROL_UNKNOWN; } -static int decode_audio(sh_audio_t * sh_audio, unsigned char *buf, int minlen, +static int decode_audio(sh_audio_t *sh_audio, unsigned char *buf, int minlen, int maxlen) { int len = sh_audio->channels * sh_audio->samplesize; diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index d6b5a82ccd..6bee762ed2 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -707,7 +707,8 @@ typedef struct dp_hdr_s { uint32_t chunktab; // offset to chunk offset array } dp_hdr_t; -static void swap_palette(void *pal) { +static void swap_palette(void *pal) +{ int i; uint32_t *p = pal; for (i = 0; i < AVPALETTE_COUNT; i++) diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index febfa04a45..4cd7cd778d 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -342,9 +342,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* vf, AVFrame *pic, double pts); +static int encode_frame(struct vf_instance *vf, AVFrame *pic, double pts); -static int config(struct vf_instance* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ int size, i; @@ -713,7 +713,7 @@ static int config(struct vf_instance* vf, return 1; } -static int control(struct vf_instance* vf, int request, void* data){ +static int control(struct vf_instance *vf, int request, void* data){ switch(request){ case VFCTRL_FLUSH_FRAMES: @@ -725,7 +725,7 @@ static int control(struct vf_instance* vf, int request, void* data){ } } -static int query_format(struct vf_instance* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ switch(fmt){ case IMGFMT_YV12: case IMGFMT_IYUV: @@ -762,7 +762,7 @@ static double psnr(double d){ return -10.0*log(d)/log(10); } -static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ AVFrame *pic= vf->priv->pic; pic->data[0]=mpi->planes[0]; @@ -785,7 +785,7 @@ static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){ return encode_frame(vf, pic, pts) >= 0; } -static int encode_frame(struct vf_instance* 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; @@ -890,7 +890,7 @@ static int encode_frame(struct vf_instance* vf, AVFrame *pic, double pts){ return out_size; } -static void uninit(struct vf_instance* 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 0e611fa7a0..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* 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* vf, return 1; } -static int control(struct vf_instance* 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* 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* 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 83c848ffa1..9fe25d4154 100644 --- a/libmpcodecs/ve_nuv.c +++ b/libmpcodecs/ve_nuv.c @@ -88,7 +88,7 @@ const m_option_t nuvopts_conf[] = { #define COMPDATASIZE (128*4) #define FRAMEHEADERSIZE 12 -static int config(struct vf_instance* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -110,17 +110,17 @@ static int config(struct vf_instance* vf, return 1; } -static int control(struct vf_instance* 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* 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* 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* vf, mp_image_t *mpi, double pts){ return 1; } -static void uninit(struct vf_instance* 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 f3bba153e4..a6773e31ca 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* 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* vf, return 1; } -static int control(struct vf_instance* 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* 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* 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_vfw.c b/libmpcodecs/ve_vfw.c index 40a6d6ea0b..2825502293 100644 --- a/libmpcodecs/ve_vfw.c +++ b/libmpcodecs/ve_vfw.c @@ -274,7 +274,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* vf, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -292,17 +292,17 @@ static int config(struct vf_instance* vf, return 1; } -static int control(struct vf_instance* 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* 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* 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 @@ -313,7 +313,7 @@ static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){ return 1; } -static void uninit(struct vf_instance* vf) +static void uninit(struct vf_instance *vf) { HRESULT ret; diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c index 4a84f8dead..c14b71ab55 100644 --- a/libmpcodecs/ve_x264.c +++ b/libmpcodecs/ve_x264.c @@ -135,7 +135,7 @@ void x264enc_set_param(const m_option_t* opt, char* arg) } } -static int config(struct vf_instance* 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) @@ -195,7 +195,7 @@ static int config(struct vf_instance* vf, int width, int height, int d_width, in return 1; } -static int control(struct vf_instance* 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){ @@ -208,7 +208,7 @@ static int control(struct vf_instance* vf, int request, void *data) } } -static int query_format(struct vf_instance* vf, unsigned int fmt) +static int query_format(struct vf_instance *vf, unsigned int fmt) { switch(fmt) { case IMGFMT_I420: diff --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c index d724765ce5..fc6aa2d23b 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* 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* vf, *==========================================================================*/ static void -uninit(struct vf_instance* vf) +uninit(struct vf_instance *vf) { xvid_mplayer_module_t *mod = (xvid_mplayer_module_t *)vf->priv; @@ -477,7 +477,7 @@ uninit(struct vf_instance* vf) *==========================================================================*/ static int -control(struct vf_instance* 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 @@ xvid_mplayer_module_t *mod = (xvid_mplayer_module_t *)vf->priv; *==========================================================================*/ static int -query_format(struct vf_instance* vf, unsigned int fmt) +query_format(struct vf_instance *vf, unsigned int fmt) { switch(fmt){ case IMGFMT_YV12: @@ -514,7 +514,7 @@ query_format(struct vf_instance* vf, unsigned int fmt) *==========================================================================*/ static int -put_image(struct vf_instance* 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; diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 0f2dcc75d2..98688793e8 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -435,7 +435,7 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype, //============================================================================ |