From cce52c2a7a811d0a68b08f294ce5aa30636a6e61 Mon Sep 17 00:00:00 2001 From: c0ntrol Date: Tue, 22 Mar 2016 20:43:42 +0100 Subject: [PATCH] cleanup, update email addr, fix compile warnings --- veejay-current/sendVIMS/sendVIMS.c | 2 +- veejay-current/veejay-server/libel/avilib.c | 3 +- .../veejay-server/libplugger/frei0r-loader.c | 1 + .../veejay-server/libplugger/livido-loader.c | 2 +- .../veejay-server/libplugger/livido-loader.h | 7 + .../veejay-server/libplugger/plugload.h | 24 +- .../veejay-server/libqrwrap/qrwrap.c | 2 +- .../veejay-server/libsample/sampleadm.c | 16 +- .../veejay-server/libsample/sampleadm.h | 3 + .../veejay-server/libstream/Makefile.am | 5 +- .../veejay-server/libstream/frequencies.c | 1309 ----------------- .../veejay-server/libstream/v4l2utils.c | 1 - .../veejay-server/libstream/v4l2utils.h | 12 +- .../veejay-server/libstream/v4lvideo.c | 1 - .../veejay-server/libstream/vj-net.c | 5 +- .../veejay-server/libstream/vj-tag.c | 18 +- .../veejay-server/libstream/vj-tag.h | 5 +- .../veejay-server/libstream/vj-vloopback.c | 2 + .../veejay-server/libstream/vj-yuv4mpeg.c | 2 +- .../veejay-server/libsubsample/subsample.c | 4 +- .../veejay-server/libvevo/libvevo.h | 12 +- veejay-current/veejay-server/libvevo/pool.h | 1 + veejay-current/veejay-server/libvevo/vevo.c | 39 +- .../veejay-server/libvje/ctmf/ctmf.c | 2 + .../veejay-server/libvje/effects/alphafill.c | 2 +- .../libvje/effects/alphaselect.c | 48 +- .../libvje/effects/alphaselect2.c | 10 +- .../veejay-server/libvje/effects/autoeq.c | 2 +- .../veejay-server/libvje/effects/autoeq.h | 2 +- .../veejay-server/libvje/effects/baltantv.h | 2 +- .../veejay-server/libvje/effects/bathroom.c | 37 +- .../veejay-server/libvje/effects/bgsubtract.c | 7 +- .../libvje/effects/binaryoverlays.c | 2 +- .../libvje/effects/binaryoverlays.h | 2 +- .../veejay-server/libvje/effects/boids.c | 2 +- .../veejay-server/libvje/effects/borders.c | 2 +- .../veejay-server/libvje/effects/borders.h | 2 +- .../veejay-server/libvje/effects/bwselect.c | 2 +- .../veejay-server/libvje/effects/bwselect.h | 2 +- .../veejay-server/libvje/effects/cali.c | 7 +- .../veejay-server/libvje/effects/cali.h | 6 +- .../veejay-server/libvje/effects/chameleon.h | 2 +- .../libvje/effects/chameleonblend.c | 2 +- .../libvje/effects/chameleonblend.h | 4 +- .../libvje/effects/chromamagick.c | 65 +- .../libvje/effects/chromamagick.h | 4 +- .../libvje/effects/chromamagickalpha.c | 85 +- .../libvje/effects/chromapalette.c | 16 +- .../libvje/effects/chromascratcher.c | 4 +- .../libvje/effects/chromascratcher.h | 2 +- .../veejay-server/libvje/effects/chromium.c | 2 +- .../veejay-server/libvje/effects/colflash.c | 2 +- .../veejay-server/libvje/effects/colflash.h | 2 +- .../libvje/effects/colmorphology.h | 2 +- .../veejay-server/libvje/effects/color.c | 2 +- .../veejay-server/libvje/effects/color.h | 2 +- .../libvje/effects/coloradjust.c | 2 +- .../libvje/effects/coloradjust.h | 2 +- .../veejay-server/libvje/effects/colorhis.c | 2 +- .../veejay-server/libvje/effects/colorhis.h | 2 +- .../veejay-server/libvje/effects/colormap.c | 2 +- .../veejay-server/libvje/effects/colormap.h | 2 +- .../veejay-server/libvje/effects/colorshift.c | 25 +- .../veejay-server/libvje/effects/colorshift.h | 2 +- .../veejay-server/libvje/effects/common.c | 129 +- .../veejay-server/libvje/effects/common.h | 34 +- .../libvje/effects/complexinvert.c | 2 +- .../libvje/effects/complexinvert.h | 2 +- .../libvje/effects/complexopacity.c | 2 +- .../libvje/effects/complexsaturate.c | 2 +- .../libvje/effects/complexsaturate.h | 2 +- .../libvje/effects/complexsync.c | 2 +- .../libvje/effects/complexsync.h | 2 +- .../libvje/effects/complexthreshold.c | 4 +- .../libvje/effects/complexthreshold.h | 2 +- .../libvje/effects/contourextract.c | 13 +- .../libvje/effects/contourextract.h | 7 +- .../veejay-server/libvje/effects/contrast.c | 6 +- .../veejay-server/libvje/effects/contrast.h | 2 +- .../veejay-server/libvje/effects/crosspixel.c | 2 +- .../veejay-server/libvje/effects/crosspixel.h | 2 +- .../veejay-server/libvje/effects/cutstop.c | 10 +- .../veejay-server/libvje/effects/cutstop.h | 1 - .../libvje/effects/deinterlace.c | 2 +- .../libvje/effects/deinterlace.h | 2 +- .../veejay-server/libvje/effects/dices.c | 7 - .../veejay-server/libvje/effects/dices.h | 2 +- .../veejay-server/libvje/effects/diff.c | 2 +- .../veejay-server/libvje/effects/diff.h | 2 +- .../veejay-server/libvje/effects/diffimg.c | 2 +- .../veejay-server/libvje/effects/diffimg.h | 2 +- .../veejay-server/libvje/effects/diffmap.h | 2 +- .../veejay-server/libvje/effects/dissolve.c | 2 +- .../veejay-server/libvje/effects/dissolve.h | 2 +- .../veejay-server/libvje/effects/distort.c | 2 +- .../veejay-server/libvje/effects/distort.h | 2 +- .../veejay-server/libvje/effects/dither.c | 2 +- .../veejay-server/libvje/effects/dither.h | 2 +- .../veejay-server/libvje/effects/dummy.h | 2 +- .../veejay-server/libvje/effects/dupmagic.c | 2 +- .../veejay-server/libvje/effects/dupmagic.h | 2 +- .../veejay-server/libvje/effects/emboss.c | 2 +- .../veejay-server/libvje/effects/emboss.h | 2 +- .../libvje/effects/enhancemask.c | 2 +- .../libvje/effects/enhancemask.h | 2 +- .../libvje/effects/feathermask.c | 5 +- .../libvje/effects/fibdownscale.c | 2 +- .../libvje/effects/fibdownscale.h | 2 +- .../veejay-server/libvje/effects/fisheye.c | 3 +- .../veejay-server/libvje/effects/fisheye.h | 2 +- .../veejay-server/libvje/effects/flare.c | 14 +- .../veejay-server/libvje/effects/flip.c | 2 +- .../veejay-server/libvje/effects/flip.h | 2 +- .../libvje/effects/frameborder.c | 2 +- .../libvje/effects/frameborder.h | 2 +- .../veejay-server/libvje/effects/gamma.c | 2 +- .../veejay-server/libvje/effects/gamma.h | 2 +- .../veejay-server/libvje/effects/greyselect.c | 2 +- .../veejay-server/libvje/effects/greyselect.h | 2 +- .../veejay-server/libvje/effects/isolate.c | 2 +- .../veejay-server/libvje/effects/isolate.h | 2 +- .../veejay-server/libvje/effects/keyselect.c | 27 +- .../veejay-server/libvje/effects/keyselect.h | 2 +- .../veejay-server/libvje/effects/killchroma.c | 2 +- .../veejay-server/libvje/effects/killchroma.h | 2 +- .../veejay-server/libvje/effects/lumablend.c | 12 +- .../veejay-server/libvje/effects/lumablend.h | 4 +- .../veejay-server/libvje/effects/lumakey.c | 11 +- .../veejay-server/libvje/effects/lumakey.h | 2 +- .../veejay-server/libvje/effects/lumamagick.c | 2 +- .../veejay-server/libvje/effects/lumamagick.h | 2 +- .../veejay-server/libvje/effects/lumamask.c | 2 +- .../veejay-server/libvje/effects/lumamask.h | 2 +- .../libvje/effects/magicalphaoverlays.c | 94 +- .../libvje/effects/magicmirror.h | 2 +- .../libvje/effects/magicoverlays.c | 2 +- .../libvje/effects/magicoverlays.h | 2 +- .../libvje/effects/magicoverlaysalpha.c | 111 +- .../libvje/effects/magicscratcher.c | 4 +- .../libvje/effects/magicscratcher.h | 2 +- .../veejay-server/libvje/effects/mask.c | 70 +- .../veejay-server/libvje/effects/mask.h | 2 +- .../veejay-server/libvje/effects/maskstop.c | 7 +- .../veejay-server/libvje/effects/maskstop.h | 6 +- .../veejay-server/libvje/effects/mirrors.c | 2 +- .../veejay-server/libvje/effects/mirrors.h | 2 +- .../veejay-server/libvje/effects/mirrors2.c | 16 +- .../veejay-server/libvje/effects/mirrors2.h | 2 +- .../veejay-server/libvje/effects/morphology.c | 2 +- .../veejay-server/libvje/effects/morphology.h | 2 +- .../veejay-server/libvje/effects/motionblur.c | 2 +- .../veejay-server/libvje/effects/motionblur.h | 2 +- .../libvje/effects/motiondetect.c | 2 +- .../veejay-server/libvje/effects/motionmap.c | 6 +- .../veejay-server/libvje/effects/motionmap.h | 2 +- .../veejay-server/libvje/effects/mtracer.c | 4 +- .../veejay-server/libvje/effects/mtracer.h | 2 +- .../veejay-server/libvje/effects/negation.c | 2 +- .../veejay-server/libvje/effects/negation.h | 2 +- .../libvje/effects/neighbours4.c | 12 +- .../veejay-server/libvje/effects/nervous.c | 2 +- .../veejay-server/libvje/effects/nervous.h | 2 +- .../veejay-server/libvje/effects/noiseadd.c | 12 +- .../veejay-server/libvje/effects/noiseadd.h | 2 +- .../libvje/effects/noisepencil.c | 14 +- .../libvje/effects/noisepencil.h | 2 +- .../veejay-server/libvje/effects/opacity.c | 2 +- .../veejay-server/libvje/effects/opacity.h | 2 +- .../veejay-server/libvje/effects/opacityadv.c | 2 +- .../veejay-server/libvje/effects/opacityadv.h | 2 +- .../libvje/effects/opacitythreshold.c | 2 +- .../libvje/effects/opacitythreshold.h | 2 +- .../veejay-server/libvje/effects/overclock.c | 2 +- .../veejay-server/libvje/effects/overclock.h | 2 +- .../libvje/effects/pencilsketch.c | 6 +- .../libvje/effects/pencilsketch.h | 2 +- .../libvje/effects/perspective.c | 4 +- .../veejay-server/libvje/effects/photoplay.h | 2 +- .../veejay-server/libvje/effects/pixelate.c | 2 +- .../veejay-server/libvje/effects/pixelate.h | 2 +- .../veejay-server/libvje/effects/posterize.c | 2 +- .../veejay-server/libvje/effects/posterize.h | 2 +- .../veejay-server/libvje/effects/radcor.h | 2 +- .../veejay-server/libvje/effects/radialblur.c | 2 +- .../veejay-server/libvje/effects/radialblur.h | 2 +- .../libvje/effects/radioactive.c | 3 +- .../libvje/effects/radioactive.h | 2 +- .../veejay-server/libvje/effects/randnoise.c | 2 +- .../veejay-server/libvje/effects/randnoise.h | 2 +- .../veejay-server/libvje/effects/raster.c | 2 +- .../veejay-server/libvje/effects/raster.h | 2 +- .../veejay-server/libvje/effects/rawman.c | 2 +- .../veejay-server/libvje/effects/rawman.h | 2 +- .../veejay-server/libvje/effects/rawval.c | 2 +- .../veejay-server/libvje/effects/rawval.h | 2 +- .../veejay-server/libvje/effects/reflection.c | 2 +- .../veejay-server/libvje/effects/reflection.h | 2 +- .../veejay-server/libvje/effects/revtv.c | 2 +- .../veejay-server/libvje/effects/revtv.h | 2 +- .../veejay-server/libvje/effects/rgbchannel.c | 2 +- .../veejay-server/libvje/effects/rgbchannel.h | 2 +- .../veejay-server/libvje/effects/rgbkey.h | 2 +- .../libvje/effects/rgbkeysmooth.c | 4 +- .../libvje/effects/rgbkeysmooth.h | 2 +- .../veejay-server/libvje/effects/ripple.c | 2 +- .../veejay-server/libvje/effects/ripple.h | 2 +- .../veejay-server/libvje/effects/rippletv.h | 2 +- .../veejay-server/libvje/effects/rotozoom.c | 8 +- .../veejay-server/libvje/effects/rotozoom.h | 2 +- .../veejay-server/libvje/effects/scratcher.c | 4 +- .../veejay-server/libvje/effects/scratcher.h | 2 +- .../veejay-server/libvje/effects/sinoids.c | 4 +- .../veejay-server/libvje/effects/sinoids.h | 2 +- .../veejay-server/libvje/effects/slice.h | 2 +- .../veejay-server/libvje/effects/slicer.c | 2 +- .../veejay-server/libvje/effects/slicer.h | 2 +- .../veejay-server/libvje/effects/smear.c | 2 +- .../veejay-server/libvje/effects/smear.h | 2 +- .../veejay-server/libvje/effects/smuck.c | 2 +- .../veejay-server/libvje/effects/smuck.h | 2 +- .../veejay-server/libvje/effects/softblur.c | 2 +- .../veejay-server/libvje/effects/softblur.h | 2 +- .../veejay-server/libvje/effects/solarize.c | 2 +- .../veejay-server/libvje/effects/solarize.h | 2 +- .../veejay-server/libvje/effects/split.c | 2 +- .../veejay-server/libvje/effects/split.h | 2 +- .../veejay-server/libvje/effects/swirl.c | 3 +- .../veejay-server/libvje/effects/swirl.h | 2 +- .../veejay-server/libvje/effects/threshold.h | 2 +- .../libvje/effects/timedistort.h | 2 +- .../veejay-server/libvje/effects/toalpha.c | 2 +- .../veejay-server/libvje/effects/tracer.c | 4 +- .../veejay-server/libvje/effects/tracer.h | 2 +- .../veejay-server/libvje/effects/transform.c | 2 +- .../veejay-server/libvje/effects/transform.h | 2 +- .../libvje/effects/tripplicity.h | 2 +- .../veejay-server/libvje/effects/uvcorrect.c | 16 +- .../veejay-server/libvje/effects/videomask.c | 2 +- .../veejay-server/libvje/effects/videoplay.h | 2 +- .../veejay-server/libvje/effects/videowall.h | 2 +- .../veejay-server/libvje/effects/water.c | 2 +- .../libvje/effects/waterrippletv.c | 2 +- .../libvje/effects/waterrippletv.h | 2 +- .../veejay-server/libvje/effects/whiteframe.c | 2 +- .../veejay-server/libvje/effects/whiteframe.h | 2 +- .../libvje/effects/widthmirror.c | 2 +- .../libvje/effects/widthmirror.h | 2 +- .../veejay-server/libvje/effects/zoom.c | 2 +- .../veejay-server/libvje/effects/zoom.h | 2 +- .../veejay-server/libvje/internal.h | 6 +- .../veejay-server/libvje/transitions/3bar.c | 3 +- .../veejay-server/libvje/transitions/3bar.h | 4 +- .../libvje/transitions/fadecolor.c | 3 +- .../libvje/transitions/fadecolor.h | 34 +- .../libvje/transitions/fadecolorrgb.c | 3 +- .../libvje/transitions/fadecolorrgb.h | 34 +- .../libvje/transitions/slidingdoor.c | 2 +- .../libvje/transitions/slidingdoor.h | 2 +- .../libvje/transitions/transblend.c | 2 +- .../libvje/transitions/transblend.h | 4 +- .../libvje/transitions/transcarot.c | 8 +- .../libvje/transitions/transcarot.h | 2 +- .../libvje/transitions/transline.c | 8 +- .../libvje/transitions/transline.h | 2 +- .../libvje/transitions/transop.c | 4 - .../libvje/transitions/transop.h | 2 +- .../veejay-server/libvje/transitions/vbar.c | 2 +- .../veejay-server/libvje/transitions/vbar.h | 2 +- .../veejay-server/libvje/transitions/wipe.c | 1 - .../veejay-server/libvje/transitions/wipe.h | 2 +- .../veejay-server/libvje/vj-effect.c | 22 +- .../veejay-server/libvje/vj-effman.c | 8 +- veejay-current/veejay-server/libvje/vje.h | 3 +- .../veejay-server/libvjmem/memcpy.c | 3 +- .../veejay-server/libvjmem/vj-x86.c | 2 +- veejay-current/veejay-server/libvjmem/vjmem.h | 53 +- .../veejay-server/libvjnet/packet.c | 13 +- .../veejay-server/thirdparty/liblzo/lzo.c | 15 - .../thirdparty/libresample/resample2.c | 6 - .../veejay-server/veejay/liblavplayvj.c | 3 +- veejay-current/veejay-server/veejay/veejay.h | 2 +- veejay-current/veejay-server/veejay/vj-OSC.h | 2 +- .../veejay-server/veejay/vj-event.c | 34 +- veejay-current/veejay-server/veejay/vj-lib.h | 2 +- veejay-current/veejay-server/veejay/vj-misc.h | 2 +- .../veejay-server/veejay/vj-pjack.c | 2 +- veejay-current/veejay-server/veejay/vj-shm.c | 8 +- veejay-current/veejay-server/veejay/vj-task.c | 6 +- veejay-current/veejay-server/veejay/vj-task.h | 2 +- .../veejay-server/veejay/vj-viewport.c | 10 +- .../veejay-server/veejay/vj-viewport.h | 23 +- veejay-current/veejay-server/veejay/vjkf.c | 2 +- veejay-current/veejay-server/veejay/vjkf.h | 2 +- 293 files changed, 805 insertions(+), 2393 deletions(-) delete mode 100644 veejay-current/veejay-server/libstream/frequencies.c diff --git a/veejay-current/sendVIMS/sendVIMS.c b/veejay-current/sendVIMS/sendVIMS.c index f2fcf490..a187c431 100644 --- a/veejay-current/sendVIMS/sendVIMS.c +++ b/veejay-current/sendVIMS/sendVIMS.c @@ -1,5 +1,5 @@ /* sendVIMS - very simple client for VeeJay - * (C) 2002-2004 Niels Elburg + * (C) 2002-2004 Niels Elburg * * puredata module by Tom Schouten * diff --git a/veejay-current/veejay-server/libel/avilib.c b/veejay-current/veejay-server/libel/avilib.c index cfd55977..36ee10ef 100644 --- a/veejay-current/veejay-server/libel/avilib.c +++ b/veejay-current/veejay-server/libel/avilib.c @@ -2520,7 +2520,6 @@ int avi_parse_input_file(avi_t *AVI, int getIndex) } else if(strncasecmp((char*)hdrl_data+i,"indx",4) == 0) { unsigned char *a; - int j; if(lasttag == 1) // V I D E O { @@ -2765,7 +2764,7 @@ int avi_parse_input_file(avi_t *AVI, int getIndex) // read extended index chunks if (AVI->is_opendml) { uint64_t offset = 0; - int hdrl_len = 4+4+2+1+1+4+4+8+4; + hdrl_len = 4+4+2+1+1+4+4+8+4; unsigned char *en, *chunk_start; int k = 0, audtr = 0; uint32_t nrEntries = 0; diff --git a/veejay-current/veejay-server/libplugger/frei0r-loader.c b/veejay-current/veejay-server/libplugger/frei0r-loader.c index 04a0ff63..280ff6f0 100644 --- a/veejay-current/veejay-server/libplugger/frei0r-loader.c +++ b/veejay-current/veejay-server/libplugger/frei0r-loader.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #define RUP8(num)(((num)+8)&~8) diff --git a/veejay-current/veejay-server/libplugger/livido-loader.c b/veejay-current/veejay-server/libplugger/livido-loader.c index 09c08820..02d4f71c 100644 --- a/veejay-current/veejay-server/libplugger/livido-loader.c +++ b/veejay-current/veejay-server/libplugger/livido-loader.c @@ -1201,7 +1201,7 @@ static void *livido_get_parameter_template(void *plugin, unsigned int pos ) return param_templ; } -int livido_read_plug_configuration(void *filter_template, const char *name) +static int livido_read_plug_configuration(void *filter_template, const char *name) { FILE *f = plug_open_config( "livido", name, "r",0 ); unsigned int i; diff --git a/veejay-current/veejay-server/libplugger/livido-loader.h b/veejay-current/veejay-server/libplugger/livido-loader.h index 148aa565..d66ae20a 100644 --- a/veejay-current/veejay-server/libplugger/livido-loader.h +++ b/veejay-current/veejay-server/libplugger/livido-loader.h @@ -74,4 +74,11 @@ int livido_plug_parameter_get_range_dbl( void *fx_instance,const char *key, int int livido_set_parameter_from_string( void *instance, int p, const char *str, void *fx_values ); int livido_plug_get_number_parameter_as_dbl( void *fx_instance,const char *key, int k, double *res ); int livido_plug_get_index_parameter_as_dbl( void *fx_instance, const char *key,int k, double *res ); +int livido_plug_parameter_set_text( void *parameter, void *value ); +int livido_plug_parameter_set_number( void *parameter, void *value ); +int livido_plug_parameter_set_index( void *parameter, void *value); +int livido_plug_parameter_set_bool( void *parameter, void *value ); +int livido_plug_parameter_set_color( void *parameter,void *value ); +int livido_plug_parameter_set_coord( void *parameter, void *value ); + #endif diff --git a/veejay-current/veejay-server/libplugger/plugload.h b/veejay-current/veejay-server/libplugger/plugload.h index 752f1597..c37ec1bc 100644 --- a/veejay-current/veejay-server/libplugger/plugload.h +++ b/veejay-current/veejay-server/libplugger/plugload.h @@ -20,8 +20,7 @@ */ /* - veejay plugin loader - * library to wrap up all kinds of "plugin standards" + veejay plugin loader, library that wraps up all kinds of "plugin standards" */ void plug_sys_free(void); void plug_sys_init( int fmt, int w, int h ); @@ -43,11 +42,9 @@ void plug_set_parameter( void *instance, int seq_num, int n_elements,void *value void plug_set_parameters( void *instance, int n_arg, void *darg ); int plug_clone_from_output_parameters( void *instance, void *fx_values ); char *plug_get_osc_format(void *fx_instance, int p); -//@ see generic_osc_cb_f in defs.h -void plug_build_name_space( int fx_id, void *fx_instance, void *data, int entry_id, int sample_id, - void(*cb)(void *ud, void *p, void *v), void *cb_data ); +void plug_build_name_space( int fx_id, void *fx_instance, void *data, int entry_id, int sample_id, void(*cb)(void *ud, void *p, void *v), void *cb_data); char *plug_get_osc_path_parameter(void *instance, int k); -int *plug_find_all_generator_plugins( int *total ); +int *plug_find_all_generator_plugins( int *total ); void plug_clear_namespace( void *fx_instance, void *data ); int plug_find_generator_plugins(int *total, int seq ); void *plug_get( int fd_id ); @@ -56,6 +53,17 @@ void *plug_get_by_so_name( char *soname ); int plug_get_idx_by_name( char *name); int plug_get_idx_by_so_name( char *soname ); int plug_is_frei0r( void *instance ); -void plug_get_parameters( void *instance, int *args, int *n_args); - +void plug_get_parameters( void *instance, int *args, int *n_args); +char *plug_describe_param( void *plugin, int p ); +char *list_plugins(); +void plug_clone_from_parameters(void *instance, void *fx_values); +void plug_clone_parameters( void *instance, void *fx_values ); +void plug_set_defaults( void *instance, void *fx_values ); +char *plug_describe( int fx_id ); +void plug_concatenate_all(void *osc, void *msg); +void *plug_get_name_space( void *instance ); +int plug_parameter_get_range_dbl( void *fx_instance,const char *key, int k, double *min, double *max , int *kind ); +int plug_get_index_parameter_as_dbl( void *fx_instance,const char *key, int k , double *res); +int plug_get_number_parameter_as_dbl( void *fx_instance, const char *key, int k , double *res); +int plug_get_coord_parameter_as_dbl( void *fx_instance,const char *key, int k, double *res_x, double *res_y ); #endif diff --git a/veejay-current/veejay-server/libqrwrap/qrwrap.c b/veejay-current/veejay-server/libqrwrap/qrwrap.c index 346db914..8dab2a7d 100644 --- a/veejay-current/veejay-server/libqrwrap/qrwrap.c +++ b/veejay-current/veejay-server/libqrwrap/qrwrap.c @@ -49,7 +49,7 @@ #include #include #include - +#include static int qrcode_open(const char *filename, const char *data, const int len); #ifdef HAVE_QRENCODE diff --git a/veejay-current/veejay-server/libsample/sampleadm.c b/veejay-current/veejay-server/libsample/sampleadm.c index 87efe7fe..589352bc 100644 --- a/veejay-current/veejay-server/libsample/sampleadm.c +++ b/veejay-current/veejay-server/libsample/sampleadm.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg / + * Copyright(C)2002-2016 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -2136,7 +2136,6 @@ int sample_chain_add(int s1, int c, int effect_nr) if(vj_effect_initialized( sample->effect_chain[c]->effect_id, sample->effect_chain[c]->fx_instance ) ) { if(!vj_effect_is_plugin( sample->effect_chain[c]->effect_id ) ) { - int i = 0; int frm = 1; for( i = 0; i < SAMPLE_MAX_EFFECTS ; i ++ ) { @@ -2169,7 +2168,6 @@ int sample_chain_add(int s1, int c, int effect_nr) //@ clear sample->effect_chain[c]->effect_id = -1; sample->effect_chain[c]->e_flag = 1; - int i; for( i = 0; i < SAMPLE_MAX_PARAMETERS; i ++ ) sample->effect_chain[c]->arg[i] = 0; @@ -2925,11 +2923,11 @@ void ParseEffects(xmlDocPtr doc, xmlNodePtr cur, sample_info * skel, int start_a cur = cur->next; } } -void ParseCalibration( xmlDocPtr doc, xmlNodePtr cur, sample_info *skel , void *vp) +static void ParseCalibration( xmlDocPtr doc, xmlNodePtr cur, sample_info *skel , void *vp) { } -void LoadCurrentPlaying( xmlDocPtr doc, xmlNodePtr cur , int *id, int *mode ) +static void LoadCurrentPlaying( xmlDocPtr doc, xmlNodePtr cur , int *id, int *mode ) { char *chTemp = NULL; unsigned char *xmlTemp = NULL; @@ -2963,7 +2961,7 @@ void LoadCurrentPlaying( xmlDocPtr doc, xmlNodePtr cur , int *id, int *mode ) } -void LoadSequences( xmlDocPtr doc, xmlNodePtr cur, void *seq, int n_samples ) +static void LoadSequences( xmlDocPtr doc, xmlNodePtr cur, void *seq, int n_samples ) { seq_t *s = (seq_t*) seq; @@ -3617,7 +3615,7 @@ void CreateEffects(xmlNodePtr node, sample_eff_chain ** effects) } -void SaveSequences( xmlNodePtr node, void *seq ) +static void SaveSequences( xmlNodePtr node, void *seq ) { char buffer[100]; int i = 0; @@ -3631,7 +3629,7 @@ void SaveSequences( xmlNodePtr node, void *seq ) } -void SaveCurrentPlaying( xmlNodePtr node, int id, int mode ) +static void SaveCurrentPlaying( xmlNodePtr node, int id, int mode ) { char buffer[100]; sprintf(buffer, "%d", id ); @@ -3767,7 +3765,7 @@ static int sample_write_edl(sample_info *sample) return 0; } -void WriteSubtitles( sample_info *next_sample, void *font, char *file ) +static void WriteSubtitles( sample_info *next_sample, void *font, char *file ) { char tmp[512]; diff --git a/veejay-current/veejay-server/libsample/sampleadm.h b/veejay-current/veejay-server/libsample/sampleadm.h index f4f3c28f..3503b644 100644 --- a/veejay-current/veejay-server/libsample/sampleadm.h +++ b/veejay-current/veejay-server/libsample/sampleadm.h @@ -324,6 +324,9 @@ extern void sample_set_fade_method(int t1, int method ); extern int sample_reset_offset(int s1); extern int sample_get_fade_method(int t1); extern void sample_set_fade_alpha(int t1, int alpha); +extern int sample_get_fade_alpha(int s1); +extern int sample_set_fader_inc(int s1, float inc); +extern int sample_cached(sample_info *s, int b_sample ); extern int sample_get_effect_status(int s1); extern int sample_get_selected_entry(int s1); diff --git a/veejay-current/veejay-server/libstream/Makefile.am b/veejay-current/veejay-server/libstream/Makefile.am index 5fce082e..54456767 100644 --- a/veejay-current/veejay-server/libstream/Makefile.am +++ b/veejay-current/veejay-server/libstream/Makefile.am @@ -18,7 +18,6 @@ AM_CPPFLAGS += $(XML2_CFLAGS) $(FFMPEG_CFLAGS) $(PTHREAD_CFLAGS) $(MJPEGTOOLS_CF STREAM_LIB_FILE = libstream.la noinst_LTLIBRARIES = $(STREAM_LIB_FILE) -libstream_la_SOURCES = frequencies.c v4lutils.c v4lvideo.c vj-yuv4mpeg.c vj-net.c vj-dv1394.c vj-vloopback.c vj-tag.c v4l2utils.c +libstream_la_SOURCES = v4lutils.c v4lvideo.c vj-yuv4mpeg.c vj-net.c vj-dv1394.c vj-vloopback.c vj-tag.c v4l2utils.c pkginclude_HEADERS = vj-net.h -EXTRA_DIST = dv1394.h v4lutils.h v4l2utils.h vj-dv1394.h vj-tag.h vj-vloopback.h \ - frequencies.h v4lvideo.h vj-net.h vj-yuv4mpeg.h +EXTRA_DIST = dv1394.h v4lutils.h v4l2utils.h vj-dv1394.h vj-tag.h vj-vloopback.h v4lvideo.h vj-net.h vj-yuv4mpeg.h diff --git a/veejay-current/veejay-server/libstream/frequencies.c b/veejay-current/veejay-server/libstream/frequencies.c deleted file mode 100644 index d3378a46..00000000 --- a/veejay-current/veejay-server/libstream/frequencies.c +++ /dev/null @@ -1,1309 +0,0 @@ -#include -/* -#include -#include -*/ - -#include "frequencies.h" -/* -#include "grab-ng.h" -*/ - -/* --------------------------------------------------------------------- */ - -/* US broadcast */ -static struct CHANLIST ntsc_bcast[] = { - { "2", 55250 }, - { "3", 61250 }, - { "4", 67250 }, - { "5", 77250 }, - { "6", 83250 }, - { "7", 175250 }, - { "8", 181250 }, - { "9", 187250 }, - { "10", 193250 }, - { "11", 199250 }, - { "12", 205250 }, - { "13", 211250 }, - { "14", 471250 }, - { "15", 477250 }, - { "16", 483250 }, - { "17", 489250 }, - { "18", 495250 }, - { "19", 501250 }, - { "20", 507250 }, - { "21", 513250 }, - { "22", 519250 }, - { "23", 525250 }, - { "24", 531250 }, - { "25", 537250 }, - { "26", 543250 }, - { "27", 549250 }, - { "28", 555250 }, - { "29", 561250 }, - { "30", 567250 }, - { "31", 573250 }, - { "32", 579250 }, - { "33", 585250 }, - { "34", 591250 }, - { "35", 597250 }, - { "36", 603250 }, - { "37", 609250 }, - { "38", 615250 }, - { "39", 621250 }, - { "40", 627250 }, - { "41", 633250 }, - { "42", 639250 }, - { "43", 645250 }, - { "44", 651250 }, - { "45", 657250 }, - { "46", 663250 }, - { "47", 669250 }, - { "48", 675250 }, - { "49", 681250 }, - { "50", 687250 }, - { "51", 693250 }, - { "52", 699250 }, - { "53", 705250 }, - { "54", 711250 }, - { "55", 717250 }, - { "56", 723250 }, - { "57", 729250 }, - { "58", 735250 }, - { "59", 741250 }, - { "60", 747250 }, - { "61", 753250 }, - { "62", 759250 }, - { "63", 765250 }, - { "64", 771250 }, - { "65", 777250 }, - { "66", 783250 }, - { "67", 789250 }, - { "68", 795250 }, - { "69", 801250 }, - - { "70", 807250 }, - { "71", 813250 }, - { "72", 819250 }, - { "73", 825250 }, - { "74", 831250 }, - { "75", 837250 }, - { "76", 843250 }, - { "77", 849250 }, - { "78", 855250 }, - { "79", 861250 }, - { "80", 867250 }, - { "81", 873250 }, - { "82", 879250 }, - { "83", 885250 }, -}; - -/* US cable */ -static struct CHANLIST ntsc_cable[] = { - { "1", 73250 }, - { "2", 55250 }, - { "3", 61250 }, - { "4", 67250 }, - { "5", 77250 }, - { "6", 83250 }, - { "7", 175250 }, - { "8", 181250 }, - { "9", 187250 }, - { "10", 193250 }, - { "11", 199250 }, - { "12", 205250 }, - - { "13", 211250 }, - { "14", 121250 }, - { "15", 127250 }, - { "16", 133250 }, - { "17", 139250 }, - { "18", 145250 }, - { "19", 151250 }, - { "20", 157250 }, - - { "21", 163250 }, - { "22", 169250 }, - { "23", 217250 }, - { "24", 223250 }, - { "25", 229250 }, - { "26", 235250 }, - { "27", 241250 }, - { "28", 247250 }, - { "29", 253250 }, - { "30", 259250 }, - { "31", 265250 }, - { "32", 271250 }, - { "33", 277250 }, - { "34", 283250 }, - { "35", 289250 }, - { "36", 295250 }, - { "37", 301250 }, - { "38", 307250 }, - { "39", 313250 }, - { "40", 319250 }, - { "41", 325250 }, - { "42", 331250 }, - { "43", 337250 }, - { "44", 343250 }, - { "45", 349250 }, - { "46", 355250 }, - { "47", 361250 }, - { "48", 367250 }, - { "49", 373250 }, - { "50", 379250 }, - { "51", 385250 }, - { "52", 391250 }, - { "53", 397250 }, - { "54", 403250 }, - { "55", 409250 }, - { "56", 415250 }, - { "57", 421250 }, - { "58", 427250 }, - { "59", 433250 }, - { "60", 439250 }, - { "61", 445250 }, - { "62", 451250 }, - { "63", 457250 }, - { "64", 463250 }, - { "65", 469250 }, - { "66", 475250 }, - { "67", 481250 }, - { "68", 487250 }, - { "69", 493250 }, - - { "70", 499250 }, - { "71", 505250 }, - { "72", 511250 }, - { "73", 517250 }, - { "74", 523250 }, - { "75", 529250 }, - { "76", 535250 }, - { "77", 541250 }, - { "78", 547250 }, - { "79", 553250 }, - { "80", 559250 }, - { "81", 565250 }, - { "82", 571250 }, - { "83", 577250 }, - { "84", 583250 }, - { "85", 589250 }, - { "86", 595250 }, - { "87", 601250 }, - { "88", 607250 }, - { "89", 613250 }, - { "90", 619250 }, - { "91", 625250 }, - { "92", 631250 }, - { "93", 637250 }, - { "94", 643250 }, - { "95", 91250 }, - { "96", 97250 }, - { "97", 103250 }, - { "98", 109250 }, - { "99", 115250 }, - { "100", 649250 }, - { "101", 655250 }, - { "102", 661250 }, - { "103", 667250 }, - { "104", 673250 }, - { "105", 679250 }, - { "106", 685250 }, - { "107", 691250 }, - { "108", 697250 }, - { "109", 703250 }, - { "110", 709250 }, - { "111", 715250 }, - { "112", 721250 }, - { "113", 727250 }, - { "114", 733250 }, - { "115", 739250 }, - { "116", 745250 }, - { "117", 751250 }, - { "118", 757250 }, - { "119", 763250 }, - { "120", 769250 }, - { "121", 775250 }, - { "122", 781250 }, - { "123", 787250 }, - { "124", 793250 }, - { "125", 799250 }, - - { "T7", 8250 }, - { "T8", 14250 }, - { "T9", 20250 }, - { "T10", 26250 }, - { "T11", 32250 }, - { "T12", 38250 }, - { "T13", 44250 }, - { "T14", 50250 } -}; - -/* US HRC */ -static struct CHANLIST ntsc_hrc[] = { - { "1", 72000 }, - { "2", 54000 }, - { "3", 60000 }, - { "4", 66000 }, - { "5", 78000 }, - { "6", 84000 }, - { "7", 174000 }, - { "8", 180000 }, - { "9", 186000 }, - { "10", 192000 }, - { "11", 198000 }, - { "12", 204000 }, - - { "13", 210000 }, - { "14", 120000 }, - { "15", 126000 }, - { "16", 132000 }, - { "17", 138000 }, - { "18", 144000 }, - { "19", 150000 }, - { "20", 156000 }, - - { "21", 162000 }, - { "22", 168000 }, - { "23", 216000 }, - { "24", 222000 }, - { "25", 228000 }, - { "26", 234000 }, - { "27", 240000 }, - { "28", 246000 }, - { "29", 252000 }, - { "30", 258000 }, - { "31", 264000 }, - { "32", 270000 }, - { "33", 276000 }, - { "34", 282000 }, - { "35", 288000 }, - { "36", 294000 }, - { "37", 300000 }, - { "38", 306000 }, - { "39", 312000 }, - { "40", 318000 }, - { "41", 324000 }, - { "42", 330000 }, - { "43", 336000 }, - { "44", 342000 }, - { "45", 348000 }, - { "46", 354000 }, - { "47", 360000 }, - { "48", 366000 }, - { "49", 372000 }, - { "50", 378000 }, - { "51", 384000 }, - { "52", 390000 }, - { "53", 396000 }, - { "54", 402000 }, - { "55", 408000 }, - { "56", 414000 }, - { "57", 420000 }, - { "58", 426000 }, - { "59", 432000 }, - { "60", 438000 }, - { "61", 444000 }, - { "62", 450000 }, - { "63", 456000 }, - { "64", 462000 }, - { "65", 468000 }, - { "66", 474000 }, - { "67", 480000 }, - { "68", 486000 }, - { "69", 492000 }, - - { "70", 498000 }, - { "71", 504000 }, - { "72", 510000 }, - { "73", 516000 }, - { "74", 522000 }, - { "75", 528000 }, - { "76", 534000 }, - { "77", 540000 }, - { "78", 546000 }, - { "79", 552000 }, - { "80", 558000 }, - { "81", 564000 }, - { "82", 570000 }, - { "83", 576000 }, - { "84", 582000 }, - { "85", 588000 }, - { "86", 594000 }, - { "87", 600000 }, - { "88", 606000 }, - { "89", 612000 }, - { "90", 618000 }, - { "91", 624000 }, - { "92", 630000 }, - { "93", 636000 }, - { "94", 642000 }, - { "95", 900000 }, - { "96", 960000 }, - { "97", 102000 }, - { "98", 108000 }, - { "99", 114000 }, - { "100", 648000 }, - { "101", 654000 }, - { "102", 660000 }, - { "103", 666000 }, - { "104", 672000 }, - { "105", 678000 }, - { "106", 684000 }, - { "107", 690000 }, - { "108", 696000 }, - { "109", 702000 }, - { "110", 708000 }, - { "111", 714000 }, - { "112", 720000 }, - { "113", 726000 }, - { "114", 732000 }, - { "115", 738000 }, - { "116", 744000 }, - { "117", 750000 }, - { "118", 756000 }, - { "119", 762000 }, - { "120", 768000 }, - { "121", 774000 }, - { "122", 780000 }, - { "123", 786000 }, - { "124", 792000 }, - { "125", 798000 }, - - { "T7", 7000 }, - { "T8", 13000 }, - { "T9", 19000 }, - { "T10", 25000 }, - { "T11", 31000 }, - { "T12", 37000 }, - { "T13", 43000 }, - { "T14", 49000 }, -}; - -/* --------------------------------------------------------------------- */ - -/* Canada cable */ -static struct CHANLIST ntsc_cable_ca[] = { - { "2", 61750 }, - { "3", 67750 }, - { "4", 73750 }, - { "5", 83750 }, - { "6", 89750 }, - { "7", 181750 }, - { "8", 187750 }, - { "9", 193750 }, - { "10", 199750 }, - { "11", 205750 }, - { "12", 211750 }, - - { "13", 217750 }, - { "14", 127750 }, - { "15", 133750 }, - { "16", 139750 }, - { "17", 145750 }, - { "18", 151750 }, - { "19", 157750 }, - { "20", 163750 }, - - { "21", 169750 }, - { "22", 175750 }, - { "23", 223750 }, - { "24", 229750 }, - { "25", 235750 }, - { "26", 241750 }, - { "27", 247750 }, - { "28", 253750 }, - { "29", 259750 }, - { "30", 265750 }, - { "31", 271750 }, - { "32", 277750 }, - { "33", 283750 }, - { "34", 289750 }, - { "35", 295750 }, - { "36", 301750 }, - { "37", 307750 }, - { "38", 313750 }, - { "39", 319750 }, - { "40", 325750 }, - { "41", 331750 }, - { "42", 337750 }, - { "43", 343750 }, - { "44", 349750 }, - { "45", 355750 }, - { "46", 361750 }, - { "47", 367750 }, - { "48", 373750 }, - { "49", 379750 }, - { "50", 385750 }, - { "51", 391750 }, - { "52", 397750 }, - { "53", 403750 }, - { "54", 409750 }, - { "55", 415750 }, - { "56", 421750 }, - { "57", 427750 }, - { "58", 433750 }, - { "59", 439750 }, - { "60", 445750 }, - { "61", 451750 }, - { "62", 457750 }, - { "63", 463750 }, - { "64", 469750 }, - { "65", 475750 }, - { "66", 481750 }, - { "67", 487750 }, - { "68", 493750 }, - { "69", 499750 }, - - { "70", 505750 }, - { "71", 511750 }, - { "72", 517750 }, - { "73", 523750 }, - { "74", 529750 }, - { "75", 535750 }, - { "76", 541750 }, - { "77", 547750 }, - { "78", 553750 }, - { "79", 559750 }, - { "80", 565750 }, - { "81", 571750 }, - { "82", 577750 }, - { "83", 583750 }, - { "84", 589750 }, - { "85", 595750 }, - { "86", 601750 }, - { "87", 607750 }, - { "88", 613750 }, - { "89", 619750 }, - { "90", 625750 }, - { "91", 631750 }, - { "92", 637750 }, - { "93", 643750 }, - { "94", 649750 }, - { "95", 97750 }, - { "96", 103750 }, - { "97", 109750 }, - { "98", 115750 }, - { "99", 121750 }, - { "100", 655750 }, - { "101", 661750 }, - { "102", 667750 }, - { "103", 673750 }, - { "104", 679750 }, - { "105", 685750 }, - { "106", 691750 }, - { "107", 697750 }, - { "108", 703750 }, - { "109", 709750 }, - { "110", 715750 }, - { "111", 721750 }, - { "112", 727750 }, - { "113", 733750 }, - { "114", 739750 }, - { "115", 745750 }, - { "116", 751750 }, - { "117", 757750 }, - { "118", 763750 }, - { "119", 769750 }, - { "120", 775750 }, - { "121", 781750 }, - { "122", 787750 }, - { "123", 793750 }, - { "124", 799750 }, - { "125", 805750 } -}; - -/* --------------------------------------------------------------------- */ - -/* JP broadcast */ -static struct CHANLIST ntsc_bcast_jp[] = { - { "1", 91250 }, - { "2", 97250 }, - { "3", 103250 }, - { "4", 171250 }, - { "5", 177250 }, - { "6", 183250 }, - { "7", 189250 }, - { "8", 193250 }, - { "9", 199250 }, - { "10", 205250 }, - { "11", 211250 }, - { "12", 217250 }, - - { "13", 471250 }, - { "14", 477250 }, - { "15", 483250 }, - { "16", 489250 }, - { "17", 495250 }, - { "18", 501250 }, - { "19", 507250 }, - { "20", 513250 }, - { "21", 519250 }, - { "22", 525250 }, - { "23", 531250 }, - { "24", 537250 }, - { "25", 543250 }, - { "26", 549250 }, - { "27", 555250 }, - { "28", 561250 }, - { "29", 567250 }, - { "30", 573250 }, - { "31", 579250 }, - { "32", 585250 }, - { "33", 591250 }, - { "34", 597250 }, - { "35", 603250 }, - { "36", 609250 }, - { "37", 615250 }, - { "38", 621250 }, - { "39", 627250 }, - { "40", 633250 }, - { "41", 639250 }, - { "42", 645250 }, - { "43", 651250 }, - { "44", 657250 }, - - { "45", 663250 }, - { "46", 669250 }, - { "47", 675250 }, - { "48", 681250 }, - { "49", 687250 }, - { "50", 693250 }, - { "51", 699250 }, - { "52", 705250 }, - { "53", 711250 }, - { "54", 717250 }, - { "55", 723250 }, - { "56", 729250 }, - { "57", 735250 }, - { "58", 741250 }, - { "59", 747250 }, - { "60", 753250 }, - { "61", 759250 }, - { "62", 765250 }, -}; - -/* JP cable */ -static struct CHANLIST ntsc_cable_jp[] = { - { "13", 109250 }, - { "14", 115250 }, - { "15", 121250 }, - { "16", 127250 }, - { "17", 133250 }, - { "18", 139250 }, - { "19", 145250 }, - { "20", 151250 }, - - { "21", 157250 }, - { "22", 165250 }, - { "23", 223250 }, - { "24", 231250 }, - { "25", 237250 }, - { "26", 243250 }, - { "27", 249250 }, - { "28", 253250 }, - { "29", 259250 }, - { "30", 265250 }, - { "31", 271250 }, - { "32", 277250 }, - { "33", 283250 }, - { "34", 289250 }, - { "35", 295250 }, - { "36", 301250 }, - { "37", 307250 }, - { "38", 313250 }, - { "39", 319250 }, - { "40", 325250 }, - { "41", 331250 }, - { "42", 337250 }, - { "43", 343250 }, - { "44", 349250 }, - { "45", 355250 }, - { "46", 361250 }, - { "47", 367250 }, - { "48", 373250 }, - { "49", 379250 }, - { "50", 385250 }, - { "51", 391250 }, - { "52", 397250 }, - { "53", 403250 }, - { "54", 409250 }, - { "55", 415250 }, - { "56", 421250 }, - { "57", 427250 }, - { "58", 433250 }, - { "59", 439250 }, - { "60", 445250 }, - { "61", 451250 }, - { "62", 457250 }, - { "63", 463250 }, -}; - -/* --------------------------------------------------------------------- */ - -/* australia */ -static struct CHANLIST pal_australia[] = { - { "0", 46250 }, - { "1", 57250 }, - { "2", 64250 }, - { "3", 86250 }, - { "4", 95250 }, - { "5", 102250 }, - { "5A", 138250 }, - { "6", 175250 }, - { "7", 182250 }, - { "8", 189250 }, - { "9", 196250 }, - { "10", 209250 }, - { "11", 216250 }, - { "28", 527250 }, - { "29", 534250 }, - { "30", 541250 }, - { "31", 548250 }, - { "32", 555250 }, - { "33", 562250 }, - { "34", 569250 }, - { "35", 576250 }, - { "36", 591250 }, - { "39", 604250 }, - { "40", 611250 }, - { "41", 618250 }, - { "42", 625250 }, - { "43", 632250 }, - { "44", 639250 }, - { "45", 646250 }, - { "46", 653250 }, - { "47", 660250 }, - { "48", 667250 }, - { "49", 674250 }, - { "50", 681250 }, - { "51", 688250 }, - { "52", 695250 }, - { "53", 702250 }, - { "54", 709250 }, - { "55", 716250 }, - { "56", 723250 }, - { "57", 730250 }, - { "58", 737250 }, - { "59", 744250 }, - { "60", 751250 }, - { "61", 758250 }, - { "62", 765250 }, - { "63", 772250 }, - { "64", 779250 }, - { "65", 786250 }, - { "66", 793250 }, - { "67", 800250 }, - { "68", 807250 }, - { "69", 814250 }, -}; - -static struct CHANLIST pal_australia_optus[] = { - { "1", 138250 }, - { "2", 147250 }, - { "3", 154250 }, - { "4", 161250 }, - { "5", 168250 }, - { "6", 175250 }, - { "7", 182250 }, - { "8", 189250 }, - { "9", 196250 }, - { "10", 209250 }, - { "11", 216250 }, - { "12", 224250 }, - { "13", 231250 }, - { "14", 238250 }, - { "15", 245250 }, - { "16", 252250 }, - { "17", 259250 }, - { "18", 266250 }, - { "19", 273250 }, - { "20", 280250 }, - { "21", 287250 }, - { "22", 294250 }, - { "23", 303250 }, - { "24", 310250 }, - { "25", 317250 }, - { "26", 324250 }, - { "27", 338250 }, - { "28", 345250 }, - { "29", 352250 }, - { "30", 359250 }, - { "31", 366250 }, - { "32", 373250 }, - { "33", 380250 }, - { "34", 387250 }, - { "35", 394250 }, - { "36", 401250 }, - { "37", 408250 }, - { "38", 415250 }, - { "39", 422250 }, - { "40", 429250 }, - { "41", 436250 }, - { "42", 443250 }, - { "43", 450250 }, - { "44", 457250 }, - { "45", 464250 }, - { "46", 471250 }, - { "47", 478250 }, - { "48", 485250 }, - }; - -/* --------------------------------------------------------------------- */ -/* europe */ - -/* CCIR frequencies */ - -#define FREQ_CCIR_I_III \ - { "E2", 48250 }, \ - { "E3", 55250 }, \ - { "E4", 62250 }, \ - \ - { "S01", 69250 }, \ - { "S02", 76250 }, \ - { "S03", 83250 }, \ - \ - { "E5", 175250 }, \ - { "E6", 182250 }, \ - { "E7", 189250 }, \ - { "E8", 196250 }, \ - { "E9", 203250 }, \ - { "E10", 210250 }, \ - { "E11", 217250 }, \ - { "E12", 224250 } - -#define FREQ_CCIR_SL_SH \ - { "SE1", 105250 }, \ - { "SE2", 112250 }, \ - { "SE3", 119250 }, \ - { "SE4", 126250 }, \ - { "SE5", 133250 }, \ - { "SE6", 140250 }, \ - { "SE7", 147250 }, \ - { "SE8", 154250 }, \ - { "SE9", 161250 }, \ - { "SE10", 168250 }, \ - \ - { "SE11", 231250 }, \ - { "SE12", 238250 }, \ - { "SE13", 245250 }, \ - { "SE14", 252250 }, \ - { "SE15", 259250 }, \ - { "SE16", 266250 }, \ - { "SE17", 273250 }, \ - { "SE18", 280250 }, \ - { "SE19", 287250 }, \ - { "SE20", 294250 } - -#define FREQ_CCIR_H \ - { "S21", 303250 }, \ - { "S22", 311250 }, \ - { "S23", 319250 }, \ - { "S24", 327250 }, \ - { "S25", 335250 }, \ - { "S26", 343250 }, \ - { "S27", 351250 }, \ - { "S28", 359250 }, \ - { "S29", 367250 }, \ - { "S30", 375250 }, \ - { "S31", 383250 }, \ - { "S32", 391250 }, \ - { "S33", 399250 }, \ - { "S34", 407250 }, \ - { "S35", 415250 }, \ - { "S36", 423250 }, \ - { "S37", 431250 }, \ - { "S38", 439250 }, \ - { "S39", 447250 }, \ - { "S40", 455250 }, \ - { "S41", 463250 } - -/* OIRT frequencies */ - -#define FREQ_OIRT_I_III \ - { "R1", 49750 }, \ - { "R2", 59250 }, \ - \ - { "R3", 77250 }, \ - { "R4", 85250 }, \ - { "R5", 93250 }, \ - \ - { "R6", 175250 }, \ - { "R7", 183250 }, \ - { "R8", 191250 }, \ - { "R9", 199250 }, \ - { "R10", 207250 }, \ - { "R11", 215250 }, \ - { "R12", 223250 } - -#define FREQ_OIRT_SL_SH \ - { "SR1", 111250 }, \ - { "SR2", 119250 }, \ - { "SR3", 127250 }, \ - { "SR4", 135250 }, \ - { "SR5", 143250 }, \ - { "SR6", 151250 }, \ - { "SR7", 159250 }, \ - { "SR8", 167250 }, \ - \ - { "SR11", 231250 }, \ - { "SR12", 239250 }, \ - { "SR13", 247250 }, \ - { "SR14", 255250 }, \ - { "SR15", 263250 }, \ - { "SR16", 271250 }, \ - { "SR17", 279250 }, \ - { "SR18", 287250 }, \ - { "SR19", 295250 } - -#define FREQ_UHF \ - { "21", 471250 }, \ - { "22", 479250 }, \ - { "23", 487250 }, \ - { "24", 495250 }, \ - { "25", 503250 }, \ - { "26", 511250 }, \ - { "27", 519250 }, \ - { "28", 527250 }, \ - { "29", 535250 }, \ - { "30", 543250 }, \ - { "31", 551250 }, \ - { "32", 559250 }, \ - { "33", 567250 }, \ - { "34", 575250 }, \ - { "35", 583250 }, \ - { "36", 591250 }, \ - { "37", 599250 }, \ - { "38", 607250 }, \ - { "39", 615250 }, \ - { "40", 623250 }, \ - { "41", 631250 }, \ - { "42", 639250 }, \ - { "43", 647250 }, \ - { "44", 655250 }, \ - { "45", 663250 }, \ - { "46", 671250 }, \ - { "47", 679250 }, \ - { "48", 687250 }, \ - { "49", 695250 }, \ - { "50", 703250 }, \ - { "51", 711250 }, \ - { "52", 719250 }, \ - { "53", 727250 }, \ - { "54", 735250 }, \ - { "55", 743250 }, \ - { "56", 751250 }, \ - { "57", 759250 }, \ - { "58", 767250 }, \ - { "59", 775250 }, \ - { "60", 783250 }, \ - { "61", 791250 }, \ - { "62", 799250 }, \ - { "63", 807250 }, \ - { "64", 815250 }, \ - { "65", 823250 }, \ - { "66", 831250 }, \ - { "67", 839250 }, \ - { "68", 847250 }, \ - { "69", 855250 } - -static struct CHANLIST europe_west[] = { - FREQ_CCIR_I_III, - FREQ_CCIR_SL_SH, - FREQ_CCIR_H, - FREQ_UHF -}; - -static struct CHANLIST europe_east[] = { - FREQ_OIRT_I_III, - FREQ_OIRT_SL_SH, - FREQ_CCIR_I_III, - FREQ_CCIR_SL_SH, - FREQ_CCIR_H, - FREQ_UHF -}; - -static struct CHANLIST pal_italy[] = { - { "A", 53750 }, - { "B", 62250 }, - { "C", 82250 }, - { "D", 175250 }, - { "E", 183750 }, - { "F", 192250 }, - { "G", 201250 }, - { "H", 210250 }, - { "H1", 217250 }, - { "H2", 224250 }, - FREQ_UHF -}; - -static struct CHANLIST pal_ireland[] = { - { "A0", 45750 }, - { "A1", 48000 }, - { "A2", 53750 }, - { "A3", 56000 }, - { "A4", 61750 }, - { "A5", 64000 }, - { "A6", 175250 }, - { "A7", 176000 }, - { "A8", 183250 }, - { "A9", 184000 }, - { "A10", 191250 }, - { "A11", 192000 }, - { "A12", 199250 }, - { "A13", 200000 }, - { "A14", 207250 }, - { "A15", 208000 }, - { "A16", 215250 }, - { "A17", 216000 }, - { "A18", 224000 }, - { "A19", 232000 }, - { "A20", 248000 }, - { "A21", 256000 }, - { "A22", 264000 }, - { "A23", 272000 }, - { "A24", 280000 }, - { "A25", 288000 }, - { "A26", 296000 }, - { "A27", 304000 }, - { "A28", 312000 }, - { "A29", 320000 }, - { "A30", 344000 }, - { "A31", 352000 }, - { "A32", 408000 }, - { "A33", 416000 }, - { "A34", 448000 }, - { "A35", 480000 }, - { "A36", 520000 }, - FREQ_UHF, -}; - -static struct CHANLIST secam_france[] = { - { "K01", 47750 }, - { "K02", 55750 }, - { "K03", 60500 }, - { "K04", 63750 }, - { "K05", 176000 }, - { "K06", 184000 }, - { "K07", 192000 }, - { "K08", 200000 }, - { "K09", 208000 }, - { "K10", 216000 }, - { "KB", 116750 }, - { "KC", 128750 }, - { "KD", 140750 }, - { "KE", 159750 }, - { "KF", 164750 }, - { "KG", 176750 }, - { "KH", 188750 }, - { "KI", 200750 }, - { "KJ", 212750 }, - { "KK", 224750 }, - { "KL", 236750 }, - { "KM", 248750 }, - { "KN", 260750 }, - { "KO", 272750 }, - { "KP", 284750 }, - { "KQ", 296750 }, - { "H01", 303250 }, - { "H02", 311250 }, - { "H03", 319250 }, - { "H04", 327250 }, - { "H05", 335250 }, - { "H06", 343250 }, - { "H07", 351250 }, - { "H08", 359250 }, - { "H09", 367250 }, - { "H10", 375250 }, - { "H11", 383250 }, - { "H12", 391250 }, - { "H13", 399250 }, - { "H14", 407250 }, - { "H15", 415250 }, - { "H16", 423250 }, - { "H17", 431250 }, - { "H18", 439250 }, - { "H19", 447250 }, - FREQ_UHF, -}; - -/* --------------------------------------------------------------------- */ - -static struct CHANLIST pal_newzealand[] = { - { "1", 45250 }, - { "2", 55250 }, - { "3", 62250 }, - { "4", 175250 }, - { "5", 182250 }, - { "6", 189250 }, - { "7", 196250 }, - { "8", 203250 }, - { "9", 210250 }, - { "10", 217250 }, - { "11", 224250 }, - FREQ_UHF, -}; - -/* --------------------------------------------------------------------- */ - -/* China broadcast */ -static struct CHANLIST pal_bcast_cn[] = { - { "1", 49750 }, - { "2", 57750 }, - { "3", 65750 }, - { "4", 77250 }, - { "5", 85250 }, - { "6", 112250 }, - { "7", 120250 }, - { "8", 128250 }, - { "9", 136250 }, - { "10", 144250 }, - { "11", 152250 }, - { "12", 160250 }, - { "13", 168250 }, - { "14", 176250 }, - { "15", 184250 }, - { "16", 192250 }, - { "17", 200250 }, - { "18", 208250 }, - { "19", 216250 }, - { "20", 224250 }, - { "21", 232250 }, - { "22", 240250 }, - { "23", 248250 }, - { "24", 256250 }, - { "25", 264250 }, - { "26", 272250 }, - { "27", 280250 }, - { "28", 288250 }, - { "29", 296250 }, - { "30", 304250 }, - { "31", 312250 }, - { "32", 320250 }, - { "33", 328250 }, - { "34", 336250 }, - { "35", 344250 }, - { "36", 352250 }, - { "37", 360250 }, - { "38", 368250 }, - { "39", 376250 }, - { "40", 384250 }, - { "41", 392250 }, - { "42", 400250 }, - { "43", 408250 }, - { "44", 416250 }, - { "45", 424250 }, - { "46", 432250 }, - { "47", 440250 }, - { "48", 448250 }, - { "49", 456250 }, - { "50", 463250 }, - { "51", 471250 }, - { "52", 479250 }, - { "53", 487250 }, - { "54", 495250 }, - { "55", 503250 }, - { "56", 511250 }, - { "57", 519250 }, - { "58", 527250 }, - { "59", 535250 }, - { "60", 543250 }, - { "61", 551250 }, - { "62", 559250 }, - { "63", 607250 }, - { "64", 615250 }, - { "65", 623250 }, - { "66", 631250 }, - { "67", 639250 }, - { "68", 647250 }, - { "69", 655250 }, - { "70", 663250 }, - { "71", 671250 }, - { "72", 679250 }, - { "73", 687250 }, - { "74", 695250 }, - { "75", 703250 }, - { "76", 711250 }, - { "77", 719250 }, - { "78", 727250 }, - { "79", 735250 }, - { "80", 743250 }, - { "81", 751250 }, - { "82", 759250 }, - { "83", 767250 }, - { "84", 775250 }, - { "85", 783250 }, - { "86", 791250 }, - { "87", 799250 }, - { "88", 807250 }, - { "89", 815250 }, - { "90", 823250 }, - { "91", 831250 }, - { "92", 839250 }, - { "93", 847250 }, - { "94", 855250 }, -}; - -/* --------------------------------------------------------------------- */ -/* South Africa Broadcast */ - -static struct CHANLIST pal_bcast_za[] ={ - { "1", 175250 }, - { "2", 183250 }, - { "3", 191250 }, - { "4", 199250 }, - { "5", 207250 }, - { "6", 215250 }, - { "7", 223250 }, - { "8", 231250 }, - FREQ_UHF -}; - -/* --------------------------------------------------------------------- */ - -static struct CHANLIST argentina[] = { - { "001", 56250 }, - { "002", 62250 }, - { "003", 68250 }, - { "004", 78250 }, - { "005", 84250 }, - { "006", 176250 }, - { "007", 182250 }, - { "008", 188250 }, - { "009", 194250 }, - { "010", 200250 }, - { "011", 206250 }, - { "012", 212250 }, - { "013", 122250 }, - { "014", 128250 }, - { "015", 134250 }, - { "016", 140250 }, - { "017", 146250 }, - { "018", 152250 }, - { "019", 158250 }, - { "020", 164250 }, - { "021", 170250 }, - { "022", 218250 }, - { "023", 224250 }, - { "024", 230250 }, - { "025", 236250 }, - { "026", 242250 }, - { "027", 248250 }, - { "028", 254250 }, - { "029", 260250 }, - { "030", 266250 }, - { "031", 272250 }, - { "032", 278250 }, - { "033", 284250 }, - { "034", 290250 }, - { "035", 296250 }, - { "036", 302250 }, - { "037", 308250 }, - { "038", 314250 }, - { "039", 320250 }, - { "040", 326250 }, - { "041", 332250 }, - { "042", 338250 }, - { "043", 344250 }, - { "044", 350250 }, - { "045", 356250 }, - { "046", 362250 }, - { "047", 368250 }, - { "048", 374250 }, - { "049", 380250 }, - { "050", 386250 }, - { "051", 392250 }, - { "052", 398250 }, - { "053", 404250 }, - { "054", 410250 }, - { "055", 416250 }, - { "056", 422250 }, - { "057", 428250 }, - { "058", 434250 }, - { "059", 440250 }, - { "060", 446250 }, - { "061", 452250 }, - { "062", 458250 }, - { "063", 464250 }, - { "064", 470250 }, - { "065", 476250 }, - { "066", 482250 }, - { "067", 488250 }, - { "068", 494250 }, - { "069", 500250 }, - { "070", 506250 }, - { "071", 512250 }, - { "072", 518250 }, - { "073", 524250 }, - { "074", 530250 }, - { "075", 536250 }, - { "076", 542250 }, - { "077", 548250 }, - { "078", 554250 }, - { "079", 560250 }, - { "080", 566250 }, - { "081", 572250 }, - { "082", 578250 }, - { "083", 584250 }, - { "084", 590250 }, - { "085", 596250 }, - { "086", 602250 }, - { "087", 608250 }, - { "088", 614250 }, - { "089", 620250 }, - { "090", 626250 }, - { "091", 632250 }, - { "092", 638250 }, - { "093", 644250 }, -}; - -/* --------------------------------------------------------------------- */ - -struct CHANLISTS chanlists[] = { - { "us-bcast", ntsc_bcast, CHAN_COUNT(ntsc_bcast) }, - { "us-cable", ntsc_cable, CHAN_COUNT(ntsc_cable) }, - { "us-cable-hrc", ntsc_hrc, CHAN_COUNT(ntsc_hrc) }, - { "japan-bcast", ntsc_bcast_jp, CHAN_COUNT(ntsc_bcast_jp) }, - { "japan-cable", ntsc_cable_jp, CHAN_COUNT(ntsc_cable_jp) }, - { "europe-west", europe_west, CHAN_COUNT(europe_west) }, - { "europe-east", europe_east, CHAN_COUNT(europe_east) }, - { "italy", pal_italy, CHAN_COUNT(pal_italy) }, - { "newzealand", pal_newzealand, CHAN_COUNT(pal_newzealand) }, - { "australia", pal_australia, CHAN_COUNT(pal_australia) }, - { "ireland", pal_ireland, CHAN_COUNT(pal_ireland) }, - { "france", secam_france, CHAN_COUNT(secam_france) }, - { "china-bcast", pal_bcast_cn, CHAN_COUNT(pal_bcast_cn) }, - { "southafrica", pal_bcast_za, CHAN_COUNT(pal_bcast_za) }, - { "argentina", argentina, CHAN_COUNT(argentina) }, - { "canada-cable", ntsc_cable_ca, CHAN_COUNT(ntsc_cable_ca) }, - { "australia-optus", pal_australia_optus, CHAN_COUNT(pal_australia_optus) }, - { NULL, NULL, 0 } /* EOF */ -}; - -/* -struct STRTAB chanlist_names[] = { - { 0, "us-bcast" }, - { 1, "us-cable" }, - { 2, "us-cable-hrc" }, - { 3, "japan-bcast" }, - { 4, "japan-cable" }, - { 5, "europe-west" }, - { 6, "europe-east" }, - { 7, "italy" }, - { 8, "newzealand" }, - { 9, "australia" }, - { 10, "ireland" }, - { 11, "france" }, - { 12, "china-bcast" }, - { 13, "southafrica" }, - { 14, "argentina" }, - { 15, "canada-cable" }, - { 16, "australia-optus" }, - { -1, NULL } -}; - -int chantab = 5; -struct CHANLIST *chanlist = europe_west; -int chancount = CHAN_COUNT(europe_west); - -*/ diff --git a/veejay-current/veejay-server/libstream/v4l2utils.c b/veejay-current/veejay-server/libstream/v4l2utils.c index ff44256a..51d459e5 100644 --- a/veejay-current/veejay-server/libstream/v4l2utils.c +++ b/veejay-current/veejay-server/libstream/v4l2utils.c @@ -1052,7 +1052,6 @@ void *v4l2open ( const char *file, const int input_channel, int host_fmt, int wi v->buffers = (bufs*) calloc( v->reqbuf.count, sizeof(*v->buffers)); - int i; for( i = 0; i < v->reqbuf.count; i ++ ) { memset( &(v->buffer), 0, sizeof(v->buffer)); v->buffer.type = v->reqbuf.type; diff --git a/veejay-current/veejay-server/libstream/v4l2utils.h b/veejay-current/veejay-server/libstream/v4l2utils.h index 746071e1..43fd9ad6 100644 --- a/veejay-current/veejay-server/libstream/v4l2utils.h +++ b/veejay-current/veejay-server/libstream/v4l2utils.h @@ -47,12 +47,12 @@ const char* v4l2_get_property_name( const int id ); uint32_t v4l2_get_property_id( const char *name ); void v4l2_get_controls( void *d, void *port ); int32_t v4l2_get_control( void *d, int32_t type ); -int v4l2_set_roi( void *d, int w, int h, int x, int y ); -int v4l2_reset_roi( void *d ); -int v4l2_get_currentscaling_factor_and_pixel_aspect(void *d, int *w, int *h, double *aspect); -int v4l2_num_devices(); +int v4l2_set_roi( void *d, int w, int h, int x, int y ); +int v4l2_reset_roi( void *d ); +int v4l2_get_currentscaling_factor_and_pixel_aspect(void *d, int *w, int *h, double *aspect); +int v4l2_num_devices(); char **v4l2_get_device_list(); -int v4l2_get_composite_status( void *d ); +int v4l2_get_composite_status( void *d ); void v4l2_set_composite_status( void *d, int status); void v4l2_set_input_channel( void *d, int num ); void v4l2_set_brightness( void *d, int32_t value ); @@ -105,5 +105,7 @@ void *v4l2_thread_new( char *file, int channel, int host_fmt, int wid, int hei, v4l2_thread_info *v4l2_thread_info_get( void *vv); void v4l2_set_status( void *d , int status); void v4l2_thread_set_status( v4l2_thread_info *i, int status ); +int v4l2_pixelformat2ffmpeg(int pf); + #endif diff --git a/veejay-current/veejay-server/libstream/v4lvideo.c b/veejay-current/veejay-server/libstream/v4lvideo.c index 5461a35d..008d9358 100644 --- a/veejay-current/veejay-server/libstream/v4lvideo.c +++ b/veejay-current/veejay-server/libstream/v4lvideo.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include diff --git a/veejay-current/veejay-server/libstream/vj-net.c b/veejay-current/veejay-server/libstream/vj-net.c index 5c8b8dee..1804ded4 100644 --- a/veejay-current/veejay-server/libstream/vj-net.c +++ b/veejay-current/veejay-server/libstream/vj-net.c @@ -89,7 +89,7 @@ void net_set_screen_id(int id) veejay_msg(VEEJAY_MSG_DEBUG,"Network stream bound to screen %d", id ); } -void *reader_thread(void *data) +static void *reader_thread(void *data) { vj_tag *tag = (vj_tag*) data; threaded_t *t = tag->priv; @@ -151,7 +151,6 @@ void *reader_thread(void *data) if(!error && retrieve == 2) { - int ret = 0; int strides[3] = { 0,0,0}; int compr_len = 0; @@ -209,8 +208,6 @@ NETTHREADRETRY: if( error ) { - int success = 0; - vj_client_close(v); veejay_msg(VEEJAY_MSG_INFO, " ZZzzzzz ... waiting for Link %s:%d to become ready", tag->source_name, tag->video_channel ); diff --git a/veejay-current/veejay-server/libstream/vj-tag.c b/veejay-current/veejay-server/libstream/vj-tag.c index c0528184..ed9b1d75 100644 --- a/veejay-current/veejay-server/libstream/vj-tag.c +++ b/veejay-current/veejay-server/libstream/vj-tag.c @@ -394,7 +394,7 @@ static struct { }; #endif -int _vj_tag_new_unicap( vj_tag * tag, int stream_nr, int width, int height, int device_num, +static int _vj_tag_new_unicap( vj_tag * tag, int stream_nr, int width, int height, int device_num, char norm, int palette,int pixfmt, int freq, int channel, int has_composite, int driver) { char refname[100]; @@ -455,7 +455,7 @@ int _vj_tag_new_unicap( vj_tag * tag, int stream_nr, int width, int height, int } #ifdef USE_GDK_PIXBUF -int _vj_tag_new_picture( vj_tag *tag, int stream_nr, int width, int height, float fps) +static int _vj_tag_new_picture( vj_tag *tag, int stream_nr, int width, int height, float fps) { if(stream_nr < 0 || stream_nr > VJ_TAG_MAX_STREAM_IN) return 0; vj_picture *p = NULL; @@ -658,7 +658,7 @@ CALIREADERR: return 0; } -int _vj_tag_new_cali( vj_tag *tag, int stream_nr, int w, int h ) +static int _vj_tag_new_cali( vj_tag *tag, int stream_nr, int w, int h ) { if(stream_nr < 0 || stream_nr > VJ_TAG_MAX_STREAM_IN) return 0; @@ -1302,10 +1302,10 @@ int vj_tag_del(int id) #endif case VJ_TAG_TYPE_CALI: { - cali_tag_t *pic = (cali_tag_t*) vj_tag_input->cali[tag->index]; - if(pic) { - if(pic->lf) free(pic->data); - free(pic); + cali_tag_t *calpic = (cali_tag_t*) vj_tag_input->cali[tag->index]; + if(calpic) { + if(calpic->lf) free(calpic->data); + free(calpic); } vj_tag_input->cali[tag->index] = NULL; } @@ -2171,7 +2171,6 @@ int vj_tag_set_effect(int t1, int position, int effect_id) if(vj_effect_initialized( tag->effect_chain[position]->effect_id, tag->effect_chain[position]->fx_instance )) { if(!vj_effect_is_plugin( tag->effect_chain[position]->effect_id )) { - int i = 0; int frm = 1; for( i =0; i < SAMPLE_MAX_EFFECTS; i ++ ) { if( i == position ) @@ -2207,7 +2206,6 @@ int vj_tag_set_effect(int t1, int position, int effect_id) veejay_msg(VEEJAY_MSG_ERROR, "Cannot activate FX %d", effect_id ); tag->effect_chain[position]->effect_id = -1; tag->effect_chain[position]->e_flag = 1; - int i; for( i = 0; i < SAMPLE_MAX_PARAMETERS; i ++ ) tag->effect_chain[position]->arg[i] = 0; @@ -3125,7 +3123,6 @@ static void whiteframe_new(uint8_t *buf, int w, int h, int uv_len, uint8_t *Y, u ctmf( Y, ptr, w,h,w,w,median_radius,1,512*1024); ctmf( U, ptr + (w*h),w/2,h,w/2,w/2,median_radius,1,512*1024); ctmf( V, ptr + (w*h)+uv_len,w/2,h,w/2,w/2,median_radius,1,512*1024); - int i; for(i = 0; i < (w*h); i ++ ) { tag->lf[i] = 0.0f + (double) ptr[i] - bf[i]; mean_of_y += tag->lf[i]; @@ -3508,7 +3505,6 @@ int vj_tag_get_frame(int t1, VJFrame *dst, uint8_t * abuffer) { case VJ_TAG_TYPE_V4L: if( tag->capture_type == 1 ) { - int res = 0; #ifdef HAVE_V4L res = v4lvideo_copy_framebuffer_to(vj_tag_input->unicap[tag->index],buffer[0],buffer[1],buffer[2]); #endif diff --git a/veejay-current/veejay-server/libstream/vj-tag.h b/veejay-current/veejay-server/libstream/vj-tag.h index 434fcd48..07d36cea 100644 --- a/veejay-current/veejay-server/libstream/vj-tag.h +++ b/veejay-current/veejay-server/libstream/vj-tag.h @@ -281,8 +281,8 @@ int vj_tag_set_saturation(int t1, int value); void vj_tag_set_veejay_t(void *info); int vj_tag_v4l_set_control( int t1, uint32_t id, int value ); int vj_tag_set_manual_fader(int t1, int value ); -int vj_tag_get_fade_entry(int t1); -int vj_tag_get_fade_method(int t1); +int vj_tag_get_fade_entry(int t1); +int vj_tag_get_fade_method(int t1); void vj_tag_set_fade_entry(int t1, int entry); void vj_tag_set_fade_method(int t1, int method); int vj_tag_get_fader_direction(int t1); @@ -296,6 +296,7 @@ float vj_tag_get_fader_val(int t1); float vj_tag_get_fader_inc(int t1); int vj_tag_reset_fader(int t1); void vj_tag_set_fade_alpha(int t1, int alpha); +int vj_tag_get_fade_alpha( int t1, int alpha); int vj_tag_get_effect_status(int s1); int vj_tag_get_selected_entry(int s1); diff --git a/veejay-current/veejay-server/libstream/vj-vloopback.c b/veejay-current/veejay-server/libstream/vj-vloopback.c index d075e36f..183cc038 100644 --- a/veejay-current/veejay-server/libstream/vj-vloopback.c +++ b/veejay-current/veejay-server/libstream/vj-vloopback.c @@ -46,12 +46,14 @@ #endif #ifdef HAVE_V4L2 #include +#include #endif #include #include #include #include #include +#include #define VLOOPBACK_MMAP 0 // commented out #define VLOOPBACK_PIPE 1 #define VLOOPBACK_N_BUFS 2 diff --git a/veejay-current/veejay-server/libstream/vj-yuv4mpeg.c b/veejay-current/veejay-server/libstream/vj-yuv4mpeg.c index 5ac47e92..d02fab46 100644 --- a/veejay-current/veejay-server/libstream/vj-yuv4mpeg.c +++ b/veejay-current/veejay-server/libstream/vj-yuv4mpeg.c @@ -195,7 +195,7 @@ int vj_yuv_stream_header_pipe(vj_yuv *yuv4mpeg,VJFrame *frame) return 0; } -void *y4m_writer_thread( void *data ) +static void *y4m_writer_thread( void *data ) { vj_yuv *y4m = (vj_yuv*)data; diff --git a/veejay-current/veejay-server/libsubsample/subsample.c b/veejay-current/veejay-server/libsubsample/subsample.c index b7b6fa9c..ef693a87 100644 --- a/veejay-current/veejay-server/libsubsample/subsample.c +++ b/veejay-current/veejay-server/libsubsample/subsample.c @@ -497,7 +497,7 @@ static void tr_422_to_444( uint8_t *buffer, int width, int height) } #else const int mmx_stride = stride >> 3; - int left = (mmx_stride % 16); /* FIXME */ +// int left = (mmx_stride % 16); /* FIXME */ for( y = height -1 ; y > 0; y -- ) { uint8_t *src = buffer + (y* stride); uint8_t *dst = buffer + (y* width); @@ -530,7 +530,7 @@ static void tr_422_to_444t(uint8_t *out, uint8_t *in, int width, int height) } #else const int mmx_stride = stride >> 3; - int left = (mmx_stride % 16); /* FIXME */ +// int left = (mmx_stride % 16); /* FIXME */ int x1 = 0; for( y = height -1 ; y > 0; y -- ) { uint8_t *src = in + (y* stride); diff --git a/veejay-current/veejay-server/libvevo/libvevo.h b/veejay-current/veejay-server/libvevo/libvevo.h index 93be06cd..d559d58a 100644 --- a/veejay-current/veejay-server/libvevo/libvevo.h +++ b/veejay-current/veejay-server/libvevo/libvevo.h @@ -31,7 +31,7 @@ typedef void vevo_port_t; #endif -int vevo_property_num_elements( vevo_port_t *p, const char *key); +int vevo_property_num_elements( vevo_port_t *p, const char *key); int vevo_property_atom_type( vevo_port_t *p, const char *key); @@ -39,10 +39,10 @@ size_t vevo_property_element_size( vevo_port_t * p, const char *key, const int #ifdef STRICT_CHECKING vevo_port_t *vevo_port_new( int port_type, const char *func,const int line_no ); -void vevo_port_free( vevo_port_t *port, const char *func, const int line_no ); +void vevo_port_free( vevo_port_t *port, const char *func, const int line_no ); #else vevo_port_t *vevo_port_new(int port_type); -void vevo_port_free( vevo_port_t *port ); +void vevo_port_free( vevo_port_t *port ); #endif #ifdef STRICT_CHECKING @@ -121,6 +121,12 @@ int vevo_port_get_total_size( vevo_port_t *port ); char **vevo_property_get_string_arr( vevo_port_t *p, const char *key ); +int vv_property_get(vevo_port_t * p, uint64_t hash_key, int idx, void *dst); + +int vv_property_set(vevo_port_t * p, uint64_t hash_key, int atom_type, int num_elements, void *src ); + +int vevo_num_properties(vevo_port_t * p); + #define VEVO_ATOM_TYPE_FUNCPTR 11 #define VEVO_ATOM_TYPE_VOIDPTR 65 #define VEVO_ATOM_TYPE_INT 1 diff --git a/veejay-current/veejay-server/libvevo/pool.h b/veejay-current/veejay-server/libvevo/pool.h index eee25101..9c24d033 100644 --- a/veejay-current/veejay-server/libvevo/pool.h +++ b/veejay-current/veejay-server/libvevo/pool.h @@ -51,6 +51,7 @@ void vevo_pool_slice_destroy( void *p ); //void *vevo_pool_slice_init( size_t node_size ); void *vevo_pool_slice_alloc( void *pool, size_t bs); void vevo_pool_slice_free( void *pool, void *ptr ); +int vevo_pool_size( void *p ); #define vevo_pool_alloc_property(type,pool) vevo_pool_alloc(pool,sizeof(type),Mprop ) #define vevo_pool_alloc_storage(type,pool) vevo_pool_alloc( pool, sizeof(type),Mstor ) diff --git a/veejay-current/veejay-server/libvevo/vevo.c b/veejay-current/veejay-server/libvevo/vevo.c index 2104a93c..24cf4439 100644 --- a/veejay-current/veejay-server/libvevo/vevo.c +++ b/veejay-current/veejay-server/libvevo/vevo.c @@ -828,7 +828,7 @@ static int vevo_storage_size( vevo_storage_t *stor ) { return msize; } -int vevo_property_atom_size(vevo_port_t * p, const char *key) +static int vevo_property_atom_size(vevo_port_t * p, const char *key) { __vevo_port_t *port = (__vevo_port_t *) p; ukey_t hash_key = hash_key_code(key); @@ -838,7 +838,8 @@ int vevo_property_atom_size(vevo_port_t * p, const char *key) if ((node = prop_node_get(port, hash_key)) != NULL) { return vevo_storage_size( node->st ); } - else { + } + else { hnode_t *node = NULL; if ((node = property_exists(port, hash_key)) != NULL) { vevo_storage_t *stor = (vevo_storage_t *) hnode_get(node); @@ -846,8 +847,6 @@ int vevo_property_atom_size(vevo_port_t * p, const char *key) return vevo_storage_size( stor ); } } - - } } return -1; } @@ -2499,26 +2498,26 @@ vevo_property_del(vevo_port_t * p, } if(port->list) { - vevo_property_t *tmp = port->list; - vevo_property_t *prev = NULL; - while (tmp != NULL) { - if( tmp->key == hash_key ) + vevo_property_t *node = port->list; + vevo_property_t *pnode = NULL; + while (node != NULL) { + if( node->key == hash_key ) break; - prev = tmp; - tmp = tmp->next; + pnode = node; + node = node->next; } - if( tmp != NULL ) { - if( tmp->key == hash_key ) { - if( prev ) - prev->next = tmp->next; + if( node != NULL ) { + if( node->key == hash_key ) { + if( pnode ) + pnode->next = node->next; else - port->list = tmp->next; + port->list = node->next; - tmp->key = 0; + node->key = 0; if(!port->table) { - vevo_free_storage( port, tmp->st ); - prop_node_free( port, tmp ); + vevo_free_storage( port, node->st ); + prop_node_free( port, node ); } else { hnode_t *old_node = NULL; @@ -2536,7 +2535,7 @@ vevo_property_del(vevo_port_t * p, return VEVO_ERROR_NOSUCH_PROPERTY; } -char *vevo_tabs( int lvl ) { +static char *vevo_tabs( int lvl ) { char tmp[32]; int i; if( lvl > 31 ) @@ -2562,7 +2561,7 @@ void vevo_port_dump( void *p, int lvl ) int err = 0; char *tabs = NULL; - if( lvl > 0 ) + if( lvl > 0 ) tabs = vevo_tabs( lvl ); veejay_msg( VEEJAY_MSG_DEBUG, "%s%p", (tabs == NULL ? "/" : tabs ), p ); diff --git a/veejay-current/veejay-server/libvje/ctmf/ctmf.c b/veejay-current/veejay-server/libvje/ctmf/ctmf.c index 2722e1b6..a7cef304 100644 --- a/veejay-current/veejay-server/libvje/ctmf/ctmf.c +++ b/veejay-current/veejay-server/libvje/ctmf/ctmf.c @@ -85,6 +85,8 @@ typedef UINT32 uint32_t; #define MAX(a,b) ((a) < (b) ? (b) : (a)) #endif +#include + /** * This structure represents a two-tier histogram. The first tier (known as the * "coarse" level) is 4 bit wide and the second tier (known as the "fine" level) diff --git a/veejay-current/veejay-server/libvje/effects/alphafill.c b/veejay-current/veejay-server/libvje/effects/alphafill.c index 1e18bf17..2f5ce0a2 100644 --- a/veejay-current/veejay-server/libvje/effects/alphafill.c +++ b/veejay-current/veejay-server/libvje/effects/alphafill.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/alphaselect.c b/veejay-current/veejay-server/libvje/effects/alphaselect.c index d479ca4c..5d0ebdd1 100644 --- a/veejay-current/veejay-server/libvje/effects/alphaselect.c +++ b/veejay-current/veejay-server/libvje/effects/alphaselect.c @@ -25,36 +25,36 @@ #include #include #include -#include "rgbkey.h" #include #include "common.h" +#include "alphaselect.h" vj_effect *alphaselect_init(int w, int h) { - vj_effect *ve; - ve = (vj_effect *) vj_calloc(sizeof(vj_effect)); - ve->num_params = 6; - ve->defaults = (int *) vj_calloc(sizeof(int) * ve->num_params); /* default values */ - ve->limits[0] = (int *) vj_calloc(sizeof(int) * ve->num_params); /* min */ - ve->limits[1] = (int *) vj_calloc(sizeof(int) * ve->num_params); /* max */ - ve->defaults[0] = 4500; /* angle */ - ve->defaults[1] = 255; /* r */ - ve->defaults[2] = 0; /* g */ - ve->defaults[3] = 0; /* b */ + vj_effect *ve; + ve = (vj_effect *) vj_calloc(sizeof(vj_effect)); + ve->num_params = 6; + ve->defaults = (int *) vj_calloc(sizeof(int) * ve->num_params); /* default values */ + ve->limits[0] = (int *) vj_calloc(sizeof(int) * ve->num_params); /* min */ + ve->limits[1] = (int *) vj_calloc(sizeof(int) * ve->num_params); /* max */ + ve->defaults[0] = 4500; /* angle */ + ve->defaults[1] = 255; /* r */ + ve->defaults[2] = 0; /* g */ + ve->defaults[3] = 0; /* b */ ve->defaults[4] = 0; /* swap */ ve->defaults[5] = 0; /* to alpha */ - ve->limits[0][0] = 1; - ve->limits[1][0] = 9000; + ve->limits[0][0] = 1; + ve->limits[1][0] = 9000; - ve->limits[0][1] = 0; - ve->limits[1][1] = 255; + ve->limits[0][1] = 0; + ve->limits[1][1] = 255; - ve->limits[0][2] = 0; - ve->limits[1][2] = 255; + ve->limits[0][2] = 0; + ve->limits[1][2] = 255; - ve->limits[0][3] = 0; - ve->limits[1][3] = 255; + ve->limits[0][3] = 0; + ve->limits[1][3] = 255; ve->limits[0][4] = 0; ve->limits[1][4] = 1; @@ -63,17 +63,17 @@ vj_effect *alphaselect_init(int w, int h) ve->limits[1][5] = 1; ve->has_user = 0; - ve->parallel = 1; + ve->parallel = 1; ve->description = "Alpha: Set by chroma key"; - ve->extra_frame = 0; - ve->sub_format = 1; - ve->rgb_conv = 1; + ve->extra_frame = 0; + ve->sub_format = 1; + ve->rgb_conv = 1; ve->alpha = FLAG_ALPHA_OUT | FLAG_ALPHA_OPTIONAL | FLAG_ALPHA_SRC_A; ve->param_description = vje_build_param_list(ve->num_params,"Angle","Red","Green","Blue", "Invert", "To Alpha"); - return ve; + return ve; } void alphaselect_apply( VJFrame *frame, int width, diff --git a/veejay-current/veejay-server/libvje/effects/alphaselect2.c b/veejay-current/veejay-server/libvje/effects/alphaselect2.c index 84c0e405..c16fd97c 100644 --- a/veejay-current/veejay-server/libvje/effects/alphaselect2.c +++ b/veejay-current/veejay-server/libvje/effects/alphaselect2.c @@ -25,9 +25,9 @@ #include #include #include -#include "rgbkey.h" #include #include "common.h" +#include "alphaselect2.h" vj_effect *alphaselect2_init(int w, int h) { @@ -106,17 +106,17 @@ void alphaselect2_apply( VJFrame *frame,int tola, int r, int g, if(alpha == 0 ) { for (pos = len; pos != 0; pos--) { double d = color_distance( Cb[pos],Cr[pos],iu,iv,dtola,dtolb ); - uint8_t alpha = (uint8_t) (d * 255.0); - if( alpha < 0xff ) { + uint8_t av = (uint8_t) (d * 255.0); + if( av < 0xff ) { Cb[pos] = 128; Cr[pos] = 128; } - else if (alpha == 0) { + else if (av == 0) { Cb[pos] = 128; Cr[pos] = 128; Y[pos] = pixel_Y_lo_; } - A[pos] = alpha; + A[pos] = av; } return; } diff --git a/veejay-current/veejay-server/libvje/effects/autoeq.c b/veejay-current/veejay-server/libvje/effects/autoeq.c index bcf11094..f1c1d142 100644 --- a/veejay-current/veejay-server/libvje/effects/autoeq.c +++ b/veejay-current/veejay-server/libvje/effects/autoeq.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2007 Niels Elburg + * Copyright(C)2007 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/autoeq.h b/veejay-current/veejay-server/libvje/effects/autoeq.h index 9ac16fef..9a5f175e 100644 --- a/veejay-current/veejay-server/libvje/effects/autoeq.h +++ b/veejay-current/veejay-server/libvje/effects/autoeq.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2007 Niels Elburg + * Copyright(C)2007 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/baltantv.h b/veejay-current/veejay-server/libvje/effects/baltantv.h index 7c0f5a3b..a8d8581e 100644 --- a/veejay-current/veejay-server/libvje/effects/baltantv.h +++ b/veejay-current/veejay-server/libvje/effects/baltantv.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/bathroom.c b/veejay-current/veejay-server/libvje/effects/bathroom.c index 12f64c13..db89bef2 100644 --- a/veejay-current/veejay-server/libvje/effects/bathroom.c +++ b/veejay-current/veejay-server/libvje/effects/bathroom.c @@ -35,27 +35,26 @@ static uint8_t *bathroom_frame[4] = { NULL,NULL,NULL,NULL }; vj_effect *bathroom_init(int width,int height) { - vj_effect *ve = (vj_effect *) vj_calloc(sizeof(vj_effect)); - ve->num_params = 4; - - ve->defaults = (int *) vj_calloc(sizeof(int) * ve->num_params); /* default values */ - ve->limits[0] = (int *) vj_calloc(sizeof(int) * ve->num_params); /* min */ - ve->limits[1] = (int *) vj_calloc(sizeof(int) * ve->num_params); /* max */ - ve->limits[0][0] = 0; - ve->limits[1][0] = 3; - ve->limits[0][1] = 1; - ve->limits[1][1] = 64; + vj_effect *ve = (vj_effect *) vj_calloc(sizeof(vj_effect)); + ve->num_params = 4; + ve->defaults = (int *) vj_calloc(sizeof(int) * ve->num_params); /* default values */ + ve->limits[0] = (int *) vj_calloc(sizeof(int) * ve->num_params); /* min */ + ve->limits[1] = (int *) vj_calloc(sizeof(int) * ve->num_params); /* max */ + ve->limits[0][0] = 0; + ve->limits[1][0] = 3; + ve->limits[0][1] = 1; + ve->limits[1][1] = 64; ve->limits[0][2] = 0; ve->limits[1][2] = width; ve->limits[0][3] = 0; ve->limits[1][3] = width; - ve->defaults[0] = 1; - ve->defaults[1] = 32; + ve->defaults[0] = 1; + ve->defaults[1] = 32; ve->defaults[2] = 0; ve->defaults[3] = width; - ve->description = "Bathroom Window"; - ve->sub_format = 1; - ve->extra_frame = 0; + ve->description = "Bathroom Window"; + ve->sub_format = 1; + ve->extra_frame = 0; ve->has_user = 0; ve->motion = 1; @@ -96,7 +95,7 @@ void bathroom_free() { } } -void bathroom_verti_apply(VJFrame *frame, int width, int height, int val, int x0, int x1) +static void bathroom_verti_apply(VJFrame *frame, int width, int height, int val, int x0, int x1) { const unsigned int len = frame->len; unsigned int y_val = val; @@ -122,7 +121,7 @@ void bathroom_verti_apply(VJFrame *frame, int width, int height, int val, int x0 } } -void bathroom_alpha_verti_apply(VJFrame *frame, int width, int height, int val, int x0, int x1) +static void bathroom_alpha_verti_apply(VJFrame *frame, int width, int height, int val, int x0, int x1) { const unsigned int len = frame->len; unsigned int y_val = val; @@ -151,7 +150,7 @@ void bathroom_alpha_verti_apply(VJFrame *frame, int width, int height, int val, } } -void bathroom_hori_apply(VJFrame *frame, int width, int height, int val, int x0, int x1) +static void bathroom_hori_apply(VJFrame *frame, int width, int height, int val, int x0, int x1) { unsigned int len = (width * height); unsigned int y_val = val; @@ -176,7 +175,7 @@ void bathroom_hori_apply(VJFrame *frame, int width, int height, int val, int x0, } } -void bathroom_alpha_hori_apply(VJFrame *frame, int width, int height, int val, int x0, int x1) +static void bathroom_alpha_hori_apply(VJFrame *frame, int width, int height, int val, int x0, int x1) { unsigned int len = (width * height); unsigned int y_val = val; diff --git a/veejay-current/veejay-server/libvje/effects/bgsubtract.c b/veejay-current/veejay-server/libvje/effects/bgsubtract.c index 55023fff..4e756f2c 100644 --- a/veejay-current/veejay-server/libvje/effects/bgsubtract.c +++ b/veejay-current/veejay-server/libvje/effects/bgsubtract.c @@ -110,10 +110,9 @@ int bgsubtract_prepare(VJFrame *frame) veejay_memcpy( bg_frame__[1], frame->data[1], frame->uv_len ); veejay_memcpy( bg_frame__[2], frame->data[2], frame->uv_len ); chroma_supersample( SSM_422_444, frame, bg_frame__ ); + bg_ssm = 1; } - bg_ssm = 1; - veejay_msg(2, "Subtract background: Snapped background frame"); return 1; } @@ -129,10 +128,10 @@ void bgsubtract_apply(VJFrame *frame,int width, int height, int threshold, int m if( mode ) { veejay_memcpy( frame->data[0], bg_frame__[0], frame->len ); - if( frame->ssm ) { + if( bg_ssm ) { veejay_memcpy( frame->data[1], bg_frame__[1], frame->len ); veejay_memcpy( frame->data[2], bg_frame__[2], frame->len ); - } else { /* if chain is still subsampled, copy only greyscale image */ + } else { /* subsampling does not match */ veejay_memset( frame->data[1], 128, frame->uv_len ); veejay_memset( frame->data[2], 128, frame->uv_len ); } diff --git a/veejay-current/veejay-server/libvje/effects/binaryoverlays.c b/veejay-current/veejay-server/libvje/effects/binaryoverlays.c index 7383a667..8997c7c3 100644 --- a/veejay-current/veejay-server/libvje/effects/binaryoverlays.c +++ b/veejay-current/veejay-server/libvje/effects/binaryoverlays.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/binaryoverlays.h b/veejay-current/veejay-server/libvje/effects/binaryoverlays.h index 63eb2842..a6e9d5ff 100644 --- a/veejay-current/veejay-server/libvje/effects/binaryoverlays.h +++ b/veejay-current/veejay-server/libvje/effects/binaryoverlays.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/boids.c b/veejay-current/veejay-server/libvje/effects/boids.c index 02b4c30d..3482422d 100644 --- a/veejay-current/veejay-server/libvje/effects/boids.c +++ b/veejay-current/veejay-server/libvje/effects/boids.c @@ -62,7 +62,7 @@ #include #include #include "common.h" -#include "blob.h" +#include "boids.h" typedef struct diff --git a/veejay-current/veejay-server/libvje/effects/borders.c b/veejay-current/veejay-server/libvje/effects/borders.c index 12ad0673..e63595a9 100644 --- a/veejay-current/veejay-server/libvje/effects/borders.c +++ b/veejay-current/veejay-server/libvje/effects/borders.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/borders.h b/veejay-current/veejay-server/libvje/effects/borders.h index 6149dcff..48b179aa 100644 --- a/veejay-current/veejay-server/libvje/effects/borders.h +++ b/veejay-current/veejay-server/libvje/effects/borders.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/bwselect.c b/veejay-current/veejay-server/libvje/effects/bwselect.c index 4aedf535..4809c5f4 100644 --- a/veejay-current/veejay-server/libvje/effects/bwselect.c +++ b/veejay-current/veejay-server/libvje/effects/bwselect.c @@ -2,7 +2,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/bwselect.h b/veejay-current/veejay-server/libvje/effects/bwselect.h index 8045b83f..d479ae2e 100644 --- a/veejay-current/veejay-server/libvje/effects/bwselect.h +++ b/veejay-current/veejay-server/libvje/effects/bwselect.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/cali.c b/veejay-current/veejay-server/libvje/effects/cali.c index e2565f57..ca416ee6 100644 --- a/veejay-current/veejay-server/libvje/effects/cali.c +++ b/veejay-current/veejay-server/libvje/effects/cali.c @@ -20,14 +20,15 @@ #include #include #include -#include -#include "diff.h" -#include "common.h" #include #include +#include #include +#include #include #include +#include "common.h" +#include "cali.h" #include "softblur.h" typedef struct diff --git a/veejay-current/veejay-server/libvje/effects/cali.h b/veejay-current/veejay-server/libvje/effects/cali.h index f03fc51a..f60e582f 100644 --- a/veejay-current/veejay-server/libvje/effects/cali.h +++ b/veejay-current/veejay-server/libvje/effects/cali.h @@ -20,13 +20,9 @@ #ifndef CALIEFFECT_H #define CALIEFFECT_H -#include -#include -#include - vj_effect *cali_init(int width, int height); void cali_free(void *d); int cali_malloc(void **c, int w, int h); -int cali_prepare(void *userd, double *a, double *b, double *c, uint8_t *d, int e , int f); +int cali_prepare( void *ed, double meanY, double meanU, double meanV, uint8_t *data, int len, int uv_len ); void cali_apply(void *d , VJFrame *frame,int width, int height, int mode, int full); #endif diff --git a/veejay-current/veejay-server/libvje/effects/chameleon.h b/veejay-current/veejay-server/libvje/effects/chameleon.h index cf52aaf2..524c61da 100644 --- a/veejay-current/veejay-server/libvje/effects/chameleon.h +++ b/veejay-current/veejay-server/libvje/effects/chameleon.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/chameleonblend.c b/veejay-current/veejay-server/libvje/effects/chameleonblend.c index 6e424b5f..1adbe34e 100644 --- a/veejay-current/veejay-server/libvje/effects/chameleonblend.c +++ b/veejay-current/veejay-server/libvje/effects/chameleonblend.c @@ -27,7 +27,7 @@ #include #include #include "softblur.h" -#include "chameleon.h" +#include "chameleonblend.h" #include "common.h" vj_effect *chameleonblend_init(int w, int h) diff --git a/veejay-current/veejay-server/libvje/effects/chameleonblend.h b/veejay-current/veejay-server/libvje/effects/chameleonblend.h index 3c3746f2..1b36cf77 100644 --- a/veejay-current/veejay-server/libvje/effects/chameleonblend.h +++ b/veejay-current/veejay-server/libvje/effects/chameleonblend.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002-2016 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -27,6 +27,6 @@ vj_effect *chameleonblend_init(int w, int h); void chameleonblend_apply( VJFrame *frame, VJFrame *source, int width, int height, int mode); int chameleonblend_malloc(int w, int h ); -int chameleonblend_prepare( uint8_t *bg[4],int w, int h ); +int chameleonblend_prepare( uint8_t *bg[4],int w, int h ); void chameleonblend_free(); #endif diff --git a/veejay-current/veejay-server/libvje/effects/chromamagick.c b/veejay-current/veejay-server/libvje/effects/chromamagick.c index 2ac96980..f178ff1d 100644 --- a/veejay-current/veejay-server/libvje/effects/chromamagick.c +++ b/veejay-current/veejay-server/libvje/effects/chromamagick.c @@ -1,7 +1,7 @@ /* * VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -67,7 +67,7 @@ vj_effect *chromamagick_init(int w, int h) return ve; } -void chromamagic_selectmin(VJFrame *frame, VJFrame *frame2, int width, +static void chromamagic_selectmin(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -92,7 +92,7 @@ void chromamagic_selectmin(VJFrame *frame, VJFrame *frame2, int width, } } -void chromamagic_addsubselectlum(VJFrame *frame, VJFrame *frame2, +static void chromamagic_addsubselectlum(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -126,8 +126,7 @@ void chromamagic_addsubselectlum(VJFrame *frame, VJFrame *frame2, } } - -void chromamagic_selectmax(VJFrame *frame, VJFrame *frame2, int width, +static void chromamagic_selectmax(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -151,7 +150,7 @@ void chromamagic_selectmax(VJFrame *frame, VJFrame *frame2, int width, } } } -void chromamagic_selectdiff(VJFrame *frame, VJFrame *frame2, +static void chromamagic_selectdiff(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -176,7 +175,7 @@ void chromamagic_selectdiff(VJFrame *frame, VJFrame *frame2, } } -void chromamagic_diffreplace(VJFrame *frame, VJFrame *frame2, int width, int height, int threshold) +static void chromamagic_diffreplace(VJFrame *frame, VJFrame *frame2, int width, int height, int threshold) { /* op_a = threshold */ const int len = frame->len; @@ -217,7 +216,7 @@ void chromamagic_diffreplace(VJFrame *frame, VJFrame *frame2, int width, int hei } } -void chromamagic_selectdiffneg(VJFrame *frame, VJFrame *frame2, +static void chromamagic_selectdiffneg(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -242,7 +241,7 @@ void chromamagic_selectdiffneg(VJFrame *frame, VJFrame *frame2, } } -void chromamagic_selectunfreeze(VJFrame *frame, VJFrame *frame2, +static void chromamagic_selectunfreeze(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -268,7 +267,7 @@ void chromamagic_selectunfreeze(VJFrame *frame, VJFrame *frame2, } } -void chromamagic_addlum(VJFrame *frame, VJFrame *frame2, int width, +static void chromamagic_addlum(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -292,7 +291,7 @@ void chromamagic_addlum(VJFrame *frame, VJFrame *frame2, int width, } } -void chromamagic_exclusive(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { +static void chromamagic_exclusive(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -325,7 +324,7 @@ void chromamagic_exclusive(VJFrame *frame, VJFrame *frame2, int width, int heigh } -void chromamagic_diffnegate(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { +static void chromamagic_diffnegate(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; const int len = frame->len; @@ -363,7 +362,7 @@ void chromamagic_diffnegate(VJFrame *frame, VJFrame *frame2, int width, int heig } } -void chromamagic_additive(VJFrame *frame, VJFrame *frame2, int width, +static void chromamagic_additive(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -396,7 +395,7 @@ void chromamagic_additive(VJFrame *frame, VJFrame *frame2, int width, } -void chromamagic_basecolor(VJFrame *frame, VJFrame *frame2, +static void chromamagic_basecolor(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -434,8 +433,7 @@ void chromamagic_basecolor(VJFrame *frame, VJFrame *frame2, } } - -void chromamagic_freeze(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { +static void chromamagic_freeze(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { const int len = frame->len; uint8_t *Y = frame->data[0]; uint8_t *Cb = frame->data[1]; @@ -482,7 +480,7 @@ void chromamagic_freeze(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) } -void chromamagic_unfreeze( VJFrame *frame, VJFrame *frame2, int w, int h, int op_a ) { +static void chromamagic_unfreeze( VJFrame *frame, VJFrame *frame2, int w, int h, int op_a ) { unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -515,7 +513,7 @@ void chromamagic_unfreeze( VJFrame *frame, VJFrame *frame2, int w, int h, int op } -void chromamagic_hardlight( VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { +static void chromamagic_hardlight( VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -555,8 +553,7 @@ void chromamagic_hardlight( VJFrame *frame, VJFrame *frame2, int w, int h, int o } } - -void chromamagic_multiply( VJFrame *frame, VJFrame *frame2, int w, int h,int op_a ) { +static void chromamagic_multiply( VJFrame *frame, VJFrame *frame2, int w, int h,int op_a ) { unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -589,8 +586,7 @@ void chromamagic_multiply( VJFrame *frame, VJFrame *frame2, int w, int h,int op_ } } - -void chromamagic_divide(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a ) { +static void chromamagic_divide(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a ) { unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -621,7 +617,7 @@ void chromamagic_divide(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a } } -void chromamagic_substract(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { +static void chromamagic_substract(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -653,8 +649,7 @@ void chromamagic_substract(VJFrame *frame, VJFrame *frame2, int w, int h, int op } - -void chromamagic_add(VJFrame *frame, VJFrame *frame2, int width, +static void chromamagic_add(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -686,7 +681,7 @@ void chromamagic_add(VJFrame *frame, VJFrame *frame2, int width, } } -void chromamagic_screen(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { +static void chromamagic_screen(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -714,7 +709,7 @@ void chromamagic_screen(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) } } -void chromamagic_difference(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { +static void chromamagic_difference(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -747,7 +742,7 @@ void chromamagic_difference(VJFrame *frame, VJFrame *frame2, int w, int h, int o } /* not really softlight but still cool */ -void chromamagic_softlightmode(VJFrame *frame,VJFrame *frame2, +static void chromamagic_softlightmode(VJFrame *frame,VJFrame *frame2, int width,int height, int op_a) { unsigned int i; @@ -784,8 +779,7 @@ void chromamagic_softlightmode(VJFrame *frame,VJFrame *frame2, } } -void chromamagic_dodge(VJFrame *frame, VJFrame *frame2, int w, int h, - int op_a) { +static void chromamagic_dodge(VJFrame *frame, VJFrame *frame2, int w, int h,int op_a) { unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -820,8 +814,7 @@ void chromamagic_dodge(VJFrame *frame, VJFrame *frame2, int w, int h, } } - -void chromamagic_darken(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) +static void chromamagic_darken(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { unsigned int i; @@ -847,7 +840,7 @@ void chromamagic_darken(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) } } -void chromamagic_lighten(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) +static void chromamagic_lighten(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { unsigned int i; @@ -873,8 +866,7 @@ void chromamagic_lighten(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a } } - -void chromamagic_reflect(VJFrame *frame, VJFrame *frame2, +static void chromamagic_reflect(VJFrame *frame, VJFrame *frame2, int width,int height, int op_a) { unsigned int i; @@ -918,8 +910,7 @@ void chromamagic_reflect(VJFrame *frame, VJFrame *frame2, } } - -void chromamagic_modadd(VJFrame *frame, VJFrame *frame2, int width, +static void chromamagic_modadd(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; diff --git a/veejay-current/veejay-server/libvje/effects/chromamagick.h b/veejay-current/veejay-server/libvje/effects/chromamagick.h index 650f1174..88106b6d 100644 --- a/veejay-current/veejay-server/libvje/effects/chromamagick.h +++ b/veejay-current/veejay-server/libvje/effects/chromamagick.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -27,6 +27,4 @@ vj_effect *chromamagick_init(); void chromamagick_apply(VJFrame *frame, VJFrame *frame2 , int width, int height, int type, int op0); - -void chromamagick_free(); #endif diff --git a/veejay-current/veejay-server/libvje/effects/chromamagickalpha.c b/veejay-current/veejay-server/libvje/effects/chromamagickalpha.c index c41b4953..d0f2bc62 100644 --- a/veejay-current/veejay-server/libvje/effects/chromamagickalpha.c +++ b/veejay-current/veejay-server/libvje/effects/chromamagickalpha.c @@ -69,7 +69,7 @@ vj_effect *chromamagickalpha_init(int w, int h) return ve; } -void chromamagicalpha_selectmin(VJFrame *frame, VJFrame *frame2, int width, +static void chromamagicalpha_selectmin(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -97,7 +97,7 @@ void chromamagicalpha_selectmin(VJFrame *frame, VJFrame *frame2, int width, } } -void chromamagicalpha_addsubselectlum(VJFrame *frame, VJFrame *frame2, +static void chromamagicalpha_addsubselectlum(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -136,7 +136,7 @@ void chromamagicalpha_addsubselectlum(VJFrame *frame, VJFrame *frame2, } } -void chromamagicalpha_selectmax(VJFrame *frame, VJFrame *frame2, int width, +static void chromamagicalpha_selectmax(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -166,7 +166,7 @@ void chromamagicalpha_selectmax(VJFrame *frame, VJFrame *frame2, int width, } } -void chromamagicalpha_selectdiff(VJFrame *frame, VJFrame *frame2, +static void chromamagicalpha_selectdiff(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -196,7 +196,7 @@ void chromamagicalpha_selectdiff(VJFrame *frame, VJFrame *frame2, } } -void chromamagicalpha_diffreplace(VJFrame *frame, VJFrame *frame2, int width, int height, int threshold) +static void chromamagicalpha_diffreplace(VJFrame *frame, VJFrame *frame2, int width, int height, int threshold) { /* op_a = threshold */ const int len = frame->len; @@ -244,7 +244,7 @@ void chromamagicalpha_diffreplace(VJFrame *frame, VJFrame *frame2, int width, in } } -void chromamagicalpha_selectdiffneg(VJFrame *frame, VJFrame *frame2, +static void chromamagicalpha_selectdiffneg(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -274,7 +274,7 @@ void chromamagicalpha_selectdiffneg(VJFrame *frame, VJFrame *frame2, } } -void chromamagicalpha_selectunfreeze(VJFrame *frame, VJFrame *frame2, +static void chromamagicalpha_selectunfreeze(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -305,7 +305,7 @@ void chromamagicalpha_selectunfreeze(VJFrame *frame, VJFrame *frame2, } } -void chromamagicalpha_addlum(VJFrame *frame, VJFrame *frame2, int width, +static void chromamagicalpha_addlum(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -334,7 +334,8 @@ void chromamagicalpha_addlum(VJFrame *frame, VJFrame *frame2, int width, } } -void chromamagicalpha_exclusive(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { +static void chromamagicalpha_exclusive(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) +{ unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -371,8 +372,8 @@ void chromamagicalpha_exclusive(VJFrame *frame, VJFrame *frame2, int width, int } -void chromamagicalpha_diffnegate(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { - +static void chromamagicalpha_diffnegate(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) +{ unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -414,9 +415,9 @@ void chromamagicalpha_diffnegate(VJFrame *frame, VJFrame *frame2, int width, int } } -void chromamagicalpha_additive(VJFrame *frame, VJFrame *frame2, int width, - int height, int op_a) { - +static void chromamagicalpha_additive(VJFrame *frame, VJFrame *frame2, int width, + int height, int op_a) +{ unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -451,7 +452,7 @@ void chromamagicalpha_additive(VJFrame *frame, VJFrame *frame2, int width, } -void chromamagicalpha_basecolor(VJFrame *frame, VJFrame *frame2, +static void chromamagicalpha_basecolor(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -493,8 +494,8 @@ void chromamagicalpha_basecolor(VJFrame *frame, VJFrame *frame2, } } - -void chromamagicalpha_freeze(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { +static void chromamagicalpha_freeze(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) +{ const int len = frame->len; uint8_t *Y = frame->data[0]; uint8_t *Cb = frame->data[1]; @@ -546,7 +547,8 @@ void chromamagicalpha_freeze(VJFrame *frame, VJFrame *frame2, int w, int h, int } -void chromamagicalpha_unfreeze( VJFrame *frame, VJFrame *frame2, int w, int h, int op_a ) { +static void chromamagicalpha_unfreeze( VJFrame *frame, VJFrame *frame2, int w, int h, int op_a ) +{ unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -582,8 +584,8 @@ void chromamagicalpha_unfreeze( VJFrame *frame, VJFrame *frame2, int w, int h, i } } - -void chromamagicalpha_hardlight( VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { +static void chromamagicalpha_hardlight( VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) +{ unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -627,8 +629,8 @@ void chromamagicalpha_hardlight( VJFrame *frame, VJFrame *frame2, int w, int h, } } - -void chromamagicalpha_multiply( VJFrame *frame, VJFrame *frame2, int w, int h,int op_a ) { +static void chromamagicalpha_multiply( VJFrame *frame, VJFrame *frame2, int w, int h,int op_a ) +{ unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -666,8 +668,8 @@ void chromamagicalpha_multiply( VJFrame *frame, VJFrame *frame2, int w, int h,in } } - -void chromamagicalpha_divide(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a ) { +static void chromamagicalpha_divide(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a ) +{ unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -703,7 +705,8 @@ void chromamagicalpha_divide(VJFrame *frame, VJFrame *frame2, int w, int h, int } } -void chromamagicalpha_substract(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { +static void chromamagicalpha_substract(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) +{ unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -740,10 +743,8 @@ void chromamagicalpha_substract(VJFrame *frame, VJFrame *frame2, int w, int h, i } - -void chromamagicalpha_add(VJFrame *frame, VJFrame *frame2, int width, - int height, int op_a) { - +static void chromamagicalpha_add(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) +{ unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -778,7 +779,8 @@ void chromamagicalpha_add(VJFrame *frame, VJFrame *frame2, int width, } } -void chromamagicalpha_screen(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { +static void chromamagicalpha_screen(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) +{ unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -811,7 +813,8 @@ void chromamagicalpha_screen(VJFrame *frame, VJFrame *frame2, int w, int h, int } } -void chromamagicalpha_difference(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { +static void chromamagicalpha_difference(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) +{ unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -849,9 +852,8 @@ void chromamagicalpha_difference(VJFrame *frame, VJFrame *frame2, int w, int h, } /* not really softlight but still cool */ -void chromamagicalpha_softlightmode(VJFrame *frame,VJFrame *frame2, - int width,int height, int op_a) { - +static void chromamagicalpha_softlightmode(VJFrame *frame,VJFrame *frame2,int width,int height, int op_a) +{ unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -932,8 +934,7 @@ void chromamagicalpha_dodge(VJFrame *frame, VJFrame *frame2, int w, int h, } } - -void chromamagicalpha_darken(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) +static void chromamagicalpha_darken(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { unsigned int i; const int len = frame->len; @@ -962,7 +963,7 @@ void chromamagicalpha_darken(VJFrame *frame, VJFrame *frame2, int w, int h, int } } -void chromamagicalpha_lighten(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) +static void chromamagicalpha_lighten(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { unsigned int i; @@ -992,10 +993,8 @@ void chromamagicalpha_lighten(VJFrame *frame, VJFrame *frame2, int w, int h, int } } - -void chromamagicalpha_reflect(VJFrame *frame, VJFrame *frame2, - int width,int height, int op_a) { - +static void chromamagicalpha_reflect(VJFrame *frame, VJFrame *frame2,int width,int height, int op_a) +{ unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -1041,9 +1040,7 @@ void chromamagicalpha_reflect(VJFrame *frame, VJFrame *frame2, } } - -void chromamagicalpha_modadd(VJFrame *frame, VJFrame *frame2, int width, - int height, int op_a) +static void chromamagicalpha_modadd(VJFrame *frame, VJFrame *frame2, int width,int height, int op_a) { unsigned int i; const int len = frame->len; diff --git a/veejay-current/veejay-server/libvje/effects/chromapalette.c b/veejay-current/veejay-server/libvje/effects/chromapalette.c index 6815961d..42f3feb7 100644 --- a/veejay-current/veejay-server/libvje/effects/chromapalette.c +++ b/veejay-current/veejay-server/libvje/effects/chromapalette.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -68,20 +68,6 @@ vj_effect *chromapalette_init(int w, int h) return ve; } -void chromapalette_help() -{ -/* veejay_msg(1, "Chrominance Palette"); - veejay_msg(1, "Select a color and set a new chroma value for the entire selection"); - veejay_msg(1, "one or both of the parameters p4 and p5"); - veejay_msg(1, "p0 = Accept angle"); - veejay_msg(1, "p1 = Red"); - veejay_msg(1, "p2 = Green"); - veejay_msg(1, "p3 = Blue"); - veejay_msg(1, "p4 = New chroma Blue value"); - veejay_msg(1, "p5 = New chroma Red value"); -*/ -} - static inline int _chroma_key( uint8_t fg_cb, uint8_t fg_cr, uint8_t cb, uint8_t cr, int angle) { // see rgbkey.c diff --git a/veejay-current/veejay-server/libvje/effects/chromascratcher.c b/veejay-current/veejay-server/libvje/effects/chromascratcher.c index 2e376fcc..d9297eb4 100644 --- a/veejay-current/veejay-server/libvje/effects/chromascratcher.c +++ b/veejay-current/veejay-server/libvje/effects/chromascratcher.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -97,7 +97,7 @@ void chromascratcher_free() { cframe[2] = NULL; } -void chromastore_frame(VJFrame *src, int w, int h, int n, int no_reverse) +static void chromastore_frame(VJFrame *src, int w, int h, int n, int no_reverse) { int strides[4] = { (w * h), (w*h), (w*h) , 0 }; uint8_t *dest[4] = { diff --git a/veejay-current/veejay-server/libvje/effects/chromascratcher.h b/veejay-current/veejay-server/libvje/effects/chromascratcher.h index ef3143c8..848d72a2 100644 --- a/veejay-current/veejay-server/libvje/effects/chromascratcher.h +++ b/veejay-current/veejay-server/libvje/effects/chromascratcher.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/chromium.c b/veejay-current/veejay-server/libvje/effects/chromium.c index ac5f8958..a0831b17 100644 --- a/veejay-current/veejay-server/libvje/effects/chromium.c +++ b/veejay-current/veejay-server/libvje/effects/chromium.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/colflash.c b/veejay-current/veejay-server/libvje/effects/colflash.c index e2dde5fc..d705f379 100644 --- a/veejay-current/veejay-server/libvje/effects/colflash.c +++ b/veejay-current/veejay-server/libvje/effects/colflash.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2006 Niels Elburg + * Copyright(C)2006 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/colflash.h b/veejay-current/veejay-server/libvje/effects/colflash.h index 4623ff0c..6264bc33 100644 --- a/veejay-current/veejay-server/libvje/effects/colflash.h +++ b/veejay-current/veejay-server/libvje/effects/colflash.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/colmorphology.h b/veejay-current/veejay-server/libvje/effects/colmorphology.h index c8d9c4ca..a87afa01 100644 --- a/veejay-current/veejay-server/libvje/effects/colmorphology.h +++ b/veejay-current/veejay-server/libvje/effects/colmorphology.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2006 Niels Elburg + * Copyright(C)2006 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/color.c b/veejay-current/veejay-server/libvje/effects/color.c index 9d02ab57..2c73a74d 100644 --- a/veejay-current/veejay-server/libvje/effects/color.c +++ b/veejay-current/veejay-server/libvje/effects/color.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/color.h b/veejay-current/veejay-server/libvje/effects/color.h index 38724277..4ddf57f7 100644 --- a/veejay-current/veejay-server/libvje/effects/color.h +++ b/veejay-current/veejay-server/libvje/effects/color.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/coloradjust.c b/veejay-current/veejay-server/libvje/effects/coloradjust.c index ca4a34b9..fc5bd850 100644 --- a/veejay-current/veejay-server/libvje/effects/coloradjust.c +++ b/veejay-current/veejay-server/libvje/effects/coloradjust.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/coloradjust.h b/veejay-current/veejay-server/libvje/effects/coloradjust.h index 5c0f148f..b9fc6350 100644 --- a/veejay-current/veejay-server/libvje/effects/coloradjust.h +++ b/veejay-current/veejay-server/libvje/effects/coloradjust.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/colorhis.c b/veejay-current/veejay-server/libvje/effects/colorhis.c index 5dd67985..75973dae 100644 --- a/veejay-current/veejay-server/libvje/effects/colorhis.c +++ b/veejay-current/veejay-server/libvje/effects/colorhis.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2007 Niels Elburg + * Copyright(C)2007 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/colorhis.h b/veejay-current/veejay-server/libvje/effects/colorhis.h index 554ea63d..343abee6 100644 --- a/veejay-current/veejay-server/libvje/effects/colorhis.h +++ b/veejay-current/veejay-server/libvje/effects/colorhis.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2007 Niels Elburg + * Copyright(C)2007 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/colormap.c b/veejay-current/veejay-server/libvje/effects/colormap.c index d25e95df..9297b7b2 100644 --- a/veejay-current/veejay-server/libvje/effects/colormap.c +++ b/veejay-current/veejay-server/libvje/effects/colormap.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/colormap.h b/veejay-current/veejay-server/libvje/effects/colormap.h index 0b95b1cd..706014be 100644 --- a/veejay-current/veejay-server/libvje/effects/colormap.h +++ b/veejay-current/veejay-server/libvje/effects/colormap.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/colorshift.c b/veejay-current/veejay-server/libvje/effects/colorshift.c index 6ef1d2f6..5d3e0b41 100644 --- a/veejay-current/veejay-server/libvje/effects/colorshift.c +++ b/veejay-current/veejay-server/libvje/effects/colorshift.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -58,8 +58,7 @@ vj_effect *colorshift_init(int w, int h) /* bitwise and test */ - -void softmask2_apply(VJFrame *frame, int width, int height, int paramt) +static void softmask2_apply(VJFrame *frame, int width, int height, int paramt) { const unsigned int len = frame->len; unsigned int x; @@ -68,7 +67,7 @@ void softmask2_apply(VJFrame *frame, int width, int height, int paramt) Y[x] &= paramt; } -void softmask2_applycb(VJFrame *frame, int width, int height, +static void softmask2_applycb(VJFrame *frame, int width, int height, int paramt) { const unsigned int len = (frame->ssm ? frame->len : frame->uv_len); @@ -78,7 +77,7 @@ void softmask2_applycb(VJFrame *frame, int width, int height, Cb[x] &= paramt; } -void softmask2_applycr(VJFrame *frame, int width, int height, +static void softmask2_applycr(VJFrame *frame, int width, int height, int paramt) { uint8_t *Cr = frame->data[2]; @@ -88,7 +87,7 @@ void softmask2_applycr(VJFrame *frame, int width, int height, Cr[x] &= paramt; } -void softmask2_applycbcr(VJFrame *frame, int width, int height, +static void softmask2_applycbcr(VJFrame *frame, int width, int height, int paramt) { const unsigned int len = (frame->ssm ? frame->len : frame->uv_len); @@ -101,7 +100,7 @@ void softmask2_applycbcr(VJFrame *frame, int width, int height, } } -void softmask2_applyycbcr(VJFrame *frame, int width, int height, +static void softmask2_applyycbcr(VJFrame *frame, int width, int height, int paramt) { const unsigned int len = frame->len; @@ -122,7 +121,7 @@ void softmask2_applyycbcr(VJFrame *frame, int width, int height, } } -void softmask_apply(VJFrame *frame, int width, int height, int paramt) +static void softmask_apply(VJFrame *frame, int width, int height, int paramt) { const unsigned int len = frame->len; unsigned int x; @@ -134,7 +133,7 @@ void softmask_apply(VJFrame *frame, int width, int height, int paramt) } -void softmask_applycb(VJFrame *frame, int width, int height, int paramt) +static void softmask_applycb(VJFrame *frame, int width, int height, int paramt) { const unsigned int len = (frame->ssm ? frame->len : frame->uv_len); uint8_t *Cb = frame->data[1]; @@ -145,7 +144,7 @@ void softmask_applycb(VJFrame *frame, int width, int height, int paramt) } -void softmask_applycr(VJFrame *frame, int width, int height, int paramt) +static void softmask_applycr(VJFrame *frame, int width, int height, int paramt) { const unsigned int len = (frame->ssm ? frame->len : frame->uv_len); uint8_t *Cr = frame->data[2]; @@ -156,7 +155,7 @@ void softmask_applycr(VJFrame *frame, int width, int height, int paramt) } -void softmask_applycbcr(VJFrame *frame, int width, int height, +static void softmask_applycbcr(VJFrame *frame, int width, int height, int paramt) { const unsigned int len = (frame->ssm ? frame->len : frame->uv_len); @@ -171,10 +170,10 @@ void softmask_applycbcr(VJFrame *frame, int width, int height, } } -void softmask_applyycbcr(VJFrame *frame, int width, int height, +static void softmask_applyycbcr(VJFrame *frame, int width, int height, int paramt) { - const int len = frame->len; + const int len = frame->len; uint8_t *Y = frame->data[0]; uint8_t *Cb = frame->data[1]; uint8_t *Cr = frame->data[2]; diff --git a/veejay-current/veejay-server/libvje/effects/colorshift.h b/veejay-current/veejay-server/libvje/effects/colorshift.h index d5cb92a1..8ab73602 100644 --- a/veejay-current/veejay-server/libvje/effects/colorshift.h +++ b/veejay-current/veejay-server/libvje/effects/colorshift.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/common.c b/veejay-current/veejay-server/libvje/effects/common.c index 77b6cfe7..f6f2ff10 100644 --- a/veejay-current/veejay-server/libvje/effects/common.c +++ b/veejay-current/veejay-server/libvje/effects/common.c @@ -262,139 +262,12 @@ void deinterlace(uint8_t *data, int w, int h, int v) } } - -void frameborder_yuvdata(uint8_t * input_y, uint8_t * input_u, - uint8_t * input_v, uint8_t * putin_y, - uint8_t * putin_u, uint8_t * putin_v, int width, - int height, int top, int bottom, int left, - int right, int shift_h, int shift_v) -{ - - int line, x; - int input_active_width; - int input_active_height; - uint8_t *rightvector; - shift_h = 0; - shift_v = 0; - input_active_height = height - top - bottom; - input_active_width = width - left - right; - - /* Y component TOP */ - for (line = 0; line < top; line++) { - for (x = 0; x < width; x++) { - *(input_y + x) = *(putin_y + x); - } - //memcpy (input_y, putin_y, width); - input_y += width; - putin_y += width; - } - rightvector = input_y + left + input_active_width; - /* Y component LEFT AND RIGHT */ - for (line = 0; line < input_active_height; line++) { - for (x = 0; x < left; x++) { - *(input_y + x) = *(putin_y + x); - } - //memcpy (input_y, putin_y, left); - for (x = 0; x < right; x++) { - *(rightvector + x) = - *(putin_y + left + input_active_width + x); - } - //memcpy (rightvector, putin_y + left + input_active_width, right); - input_y += width; - rightvector += width; - putin_y += width; - } - /* Y component BOTTOM */ - for (line = 0; line < bottom; line++) { - for (x = 0; x < width; x++) - *(input_y + x) = *(putin_y + x); - - //memcpy (input_y, putin_y, width); - input_y += width; - putin_y += width; - } - - - /* U component TOP */ - for (line = 0; line < (top >> shift_v); line++) { - for (x = 0; x < (width >> shift_h); x++) { - *(input_u + x) = *(putin_u + x); - } - //memcpy (input_u, putin_u, width >> 1); - input_u += width >> shift_h; - putin_u += width >> shift_h; - } - - rightvector = input_u + ((left + input_active_width) >> shift_h); - for (line = 0; line < (input_active_height >> shift_v); line++) { - //memcpy (input_u, putin_u, left >> 1); - for (x = 0; x < (left >> shift_h); x++) { - *(input_u + x) = *(putin_u + x); - } - //memcpy (rightvector, putin_u + ((left + input_active_width)>>1) , right >> 1); - for (x = 0; x < (right >> shift_h); x++) { - *(rightvector + x) = *(putin_u + - ((left + input_active_width + x) >> shift_h)); - - } - input_u += width >> shift_h; - rightvector += width >> shift_h; - putin_u += width >> shift_h; - } - - for (line = 0; line < (bottom >> shift_v); line++) { - for (x = 0; x < (width >> shift_h); x++) - *(input_u + x) = *(putin_u + x); - //memcpy (input_u, putin_u, width >> 1); - input_u += width >> shift_h; - putin_u += width >> shift_h; - } - - /* V component Top */ - for (line = 0; line < (top >> shift_v); line++) { - //memcpy (input_v, putin_v, width >> 1); - for (x = 0; x < (width >> shift_h); x++) { - *(input_v + x) = *(putin_v + x); - } - input_v += width >> shift_h; - putin_v += width >> shift_h; - } - /* Left and Right */ - rightvector = input_v + ((left + input_active_width) >> shift_h); - for (line = 0; line < (input_active_height >> shift_v); line++) { - for (x = 0; x < (left >> shift_h); x++) - *(input_v + x) = *(putin_v + x); - - //memcpy (input_v, putin_v, left >> 1); - //memcpy (rightvector, putin_v + ((left+input_active_width)>>1), right >> 1); - for (x = 0; x < (right >> shift_h); x++) - *(rightvector + x) = - *(putin_v + ((left + input_active_width + x) >> shift_h)); - - input_v += width >> shift_h; - rightvector += width >> shift_h; - putin_v += width >> shift_h; - } - /* Bottom */ - for (line = 0; line < (bottom >> shift_v); line++) { - //memcpy (input_v, putin_v, width >> 1); - for (x = 0; x < (width >> shift_h); x++) - *(input_v + x) = *(putin_v + x); - input_v += width >> shift_h; - putin_v += width >> shift_h; - } - - -} - - - /********************************************************************************************** * * frameborder_yuvdata, based upon blackborder_yuvdata. * instead of making the borders black, fill it with pixels coming from the second YUV420 frame. **********************************************************************************************/ -void ffframeborder_yuvdata(uint8_t * input_y, uint8_t * input_u, +void frameborder_yuvdata(uint8_t * input_y, uint8_t * input_u, uint8_t * input_v, uint8_t * putin_y, uint8_t * putin_u, uint8_t * putin_v, int width, int height, int top, int bottom, int left, diff --git a/veejay-current/veejay-server/libvje/effects/common.h b/veejay-current/veejay-server/libvje/effects/common.h index 01f65187..e42d3cf5 100644 --- a/veejay-current/veejay-server/libvje/effects/common.h +++ b/veejay-current/veejay-server/libvje/effects/common.h @@ -48,10 +48,10 @@ #define RUP8(num)(((num)+8)&~8) -extern int pixel_Y_hi_; -extern int pixel_U_hi_; -extern int pixel_Y_lo_; -extern int pixel_U_lo_; +extern uint8_t pixel_Y_hi_; +extern uint8_t pixel_U_hi_; +extern uint8_t pixel_Y_lo_; +extern uint8_t pixel_U_lo_; #define CLAMP_Y( a ) ( a < pixel_Y_lo_ ? pixel_Y_lo_ : (a > pixel_Y_hi_ ? pixel_Y_hi_ : a ) ) #define CLAMP_UV( a )( a < pixel_U_lo_ ? pixel_U_lo_ : (a > pixel_U_hi_ ? pixel_U_hi_ : a ) ) @@ -241,11 +241,19 @@ typedef struct } matrix_t; typedef matrix_t (*matrix_f)(int i, int s, int w, int h); + matrix_t matrix_placementA(int photoindex, int size, int w , int h); matrix_t matrix_placementB(int photoindex, int size, int w , int h); -matrix_f get_matrix_func(int type); -int get_matrix_func_n(); -void fx_shuffle_int_array( int *A, unsigned int n ); +matrix_t matrix_placementC(int photoindex, int size, int w , int h); +matrix_t matrix_placementD(int photoindex, int size, int w , int h); +matrix_t matrix_placementE(int photoindex, int size, int w , int h); +matrix_t matrix_placementF(int photoindex, int size, int w , int h); +matrix_t matrix_placementG(int photoindex, int size, int w , int h); +matrix_t matrix_placementH(int photoindex, int size, int w , int h); + +matrix_f get_matrix_func(int type); +int get_matrix_func_n(); +void fx_shuffle_int_array( int *A, unsigned int n ); int power_of(int size); int max_power(int w); @@ -316,6 +324,18 @@ double m_get_radius(int x, int y); double m_get_angle(int x, int y); double m_get_polar_x(double r, double a); double m_get_polar_y(double r, double a); +uint8_t _pf_dneg(uint8_t a, uint8_t b); +uint8_t _pf_lghtn(uint8_t a, uint8_t b); +uint8_t _pf_dneg2(uint8_t a,uint8_t b); +uint8_t _pf_min(uint8_t a, uint8_t b); +uint8_t _pf_max(uint8_t a,uint8_t b); +uint8_t _pf_pq(uint8_t a,uint8_t b); +uint8_t _pf_none(uint8_t a, uint8_t b); +int calculate_luma_value(uint8_t *Y, int w , int h); +int calculate_cbcr_value(uint8_t *Cb,uint8_t *Cr, int w, int h); +uint32_t veejay_component_labeling(int w, int h, uint32_t *I , uint32_t *M); +int i_cmp( const void *a, const void *b ); +int compare_l8( const void *a, const void *b ); void blur(uint8_t *dst, uint8_t *src, int w, int radius, int dstStep, int srcStep); void blur2(uint8_t *dst, uint8_t *src, int w, int radius, int power, int dstStep, int srcStep); extern void viewport_destroy(void *v); diff --git a/veejay-current/veejay-server/libvje/effects/complexinvert.c b/veejay-current/veejay-server/libvje/effects/complexinvert.c index dbd64b8a..16e65120 100644 --- a/veejay-current/veejay-server/libvje/effects/complexinvert.c +++ b/veejay-current/veejay-server/libvje/effects/complexinvert.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/complexinvert.h b/veejay-current/veejay-server/libvje/effects/complexinvert.h index e1f629d2..166ac0c1 100644 --- a/veejay-current/veejay-server/libvje/effects/complexinvert.h +++ b/veejay-current/veejay-server/libvje/effects/complexinvert.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/complexopacity.c b/veejay-current/veejay-server/libvje/effects/complexopacity.c index 3c813e1c..3cf4738c 100644 --- a/veejay-current/veejay-server/libvje/effects/complexopacity.c +++ b/veejay-current/veejay-server/libvje/effects/complexopacity.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/complexsaturate.c b/veejay-current/veejay-server/libvje/effects/complexsaturate.c index a299d50d..5b8b80c9 100644 --- a/veejay-current/veejay-server/libvje/effects/complexsaturate.c +++ b/veejay-current/veejay-server/libvje/effects/complexsaturate.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/complexsaturate.h b/veejay-current/veejay-server/libvje/effects/complexsaturate.h index c85de617..f3441cfd 100644 --- a/veejay-current/veejay-server/libvje/effects/complexsaturate.h +++ b/veejay-current/veejay-server/libvje/effects/complexsaturate.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/complexsync.c b/veejay-current/veejay-server/libvje/effects/complexsync.c index 8d3d7dc0..bcef32b8 100644 --- a/veejay-current/veejay-server/libvje/effects/complexsync.c +++ b/veejay-current/veejay-server/libvje/effects/complexsync.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/complexsync.h b/veejay-current/veejay-server/libvje/effects/complexsync.h index c9e426a0..0d05b233 100644 --- a/veejay-current/veejay-server/libvje/effects/complexsync.h +++ b/veejay-current/veejay-server/libvje/effects/complexsync.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/complexthreshold.c b/veejay-current/veejay-server/libvje/effects/complexthreshold.c index 48aea4b7..1afa1abe 100644 --- a/veejay-current/veejay-server/libvje/effects/complexthreshold.c +++ b/veejay-current/veejay-server/libvje/effects/complexthreshold.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -70,7 +70,7 @@ vj_effect *complexthreshold_init(int w, int h) } /* this method decides whether or not a pixel from the fg will be accepted for keying */ -int accept_tpixel(uint8_t fg_cb, uint8_t fg_cr, int cb, int cr, +static int accept_tpixel(uint8_t fg_cb, uint8_t fg_cr, int cb, int cr, int accept_angle_tg) { short xx, yy; diff --git a/veejay-current/veejay-server/libvje/effects/complexthreshold.h b/veejay-current/veejay-server/libvje/effects/complexthreshold.h index ebfc3db3..1a06843b 100644 --- a/veejay-current/veejay-server/libvje/effects/complexthreshold.h +++ b/veejay-current/veejay-server/libvje/effects/complexthreshold.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/contourextract.c b/veejay-current/veejay-server/libvje/effects/contourextract.c index 88ff691e..237b9ddf 100644 --- a/veejay-current/veejay-server/libvje/effects/contourextract.c +++ b/veejay-current/veejay-server/libvje/effects/contourextract.c @@ -20,18 +20,17 @@ */ #include #include -#include -#include "diff.h" -#include "common.h" -#include -#include #include +#include +#include #include -#include #include #include - +#include "common.h" #include "softblur.h" +#include "diff.h" +#include "contourextract.h" + static uint8_t *static_bg = NULL; static int take_bg_ = 0; static uint32_t *dt_map = NULL; diff --git a/veejay-current/veejay-server/libvje/effects/contourextract.h b/veejay-current/veejay-server/libvje/effects/contourextract.h index f9e4e9d2..bfb573ef 100644 --- a/veejay-current/veejay-server/libvje/effects/contourextract.h +++ b/veejay-current/veejay-server/libvje/effects/contourextract.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -27,8 +27,7 @@ vj_effect *contourextract_init(int width, int height); void contourextract_free(void *d); int contourextract_malloc(void **c, int w, int h); -int contourextract_prepare(uint8_t *map[4], int w, int h); -void contourextract_apply(void *d , VJFrame *frame,int width, int height, - int th, int reverse, int show, int feather, int blob); +int contourextract_prepare(uint8_t *map[4], int w, int h); +void contourextract_apply(void *ed, VJFrame *frame,int width, int height, int threshold, int reverse,int mode, int take_bg, int feather, int min_blob_weight); void contourextract_destroy(); #endif diff --git a/veejay-current/veejay-server/libvje/effects/contrast.c b/veejay-current/veejay-server/libvje/effects/contrast.c index 5f4e2ccb..b8ef3546 100644 --- a/veejay-current/veejay-server/libvje/effects/contrast.c +++ b/veejay-current/veejay-server/libvje/effects/contrast.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -56,7 +56,7 @@ vj_effect *contrast_init(int w, int h) } /* also from yuvdenoise */ -void contrast_cb_apply(VJFrame *frame, int width,int height, int *s) { +static void contrast_cb_apply(VJFrame *frame, int width,int height, int *s) { unsigned int r; register int cb; register int cr; @@ -82,7 +82,7 @@ void contrast_cb_apply(VJFrame *frame, int width,int height, int *s) { } } -void contrast_y_apply(VJFrame *frame, int width, int height, int *s) { +static void contrast_y_apply(VJFrame *frame, int width, int height, int *s) { unsigned int r; register int m; const int len = frame->len; diff --git a/veejay-current/veejay-server/libvje/effects/contrast.h b/veejay-current/veejay-server/libvje/effects/contrast.h index 89be1eb6..48596404 100644 --- a/veejay-current/veejay-server/libvje/effects/contrast.h +++ b/veejay-current/veejay-server/libvje/effects/contrast.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/crosspixel.c b/veejay-current/veejay-server/libvje/effects/crosspixel.c index c71a38ca..59b2b741 100644 --- a/veejay-current/veejay-server/libvje/effects/crosspixel.c +++ b/veejay-current/veejay-server/libvje/effects/crosspixel.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/crosspixel.h b/veejay-current/veejay-server/libvje/effects/crosspixel.h index 07fc3b94..53916df1 100644 --- a/veejay-current/veejay-server/libvje/effects/crosspixel.h +++ b/veejay-current/veejay-server/libvje/effects/crosspixel.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/cutstop.c b/veejay-current/veejay-server/libvje/effects/cutstop.c index 331a2240..2c3dab87 100644 --- a/veejay-current/veejay-server/libvje/effects/cutstop.c +++ b/veejay-current/veejay-server/libvje/effects/cutstop.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002-2016 Niels Elburg * * vvCutStop - ported from vvFFPP_basic * Copyright(C)2005 Maciek Szczesniak @@ -22,10 +22,12 @@ */ #include #include -#include "common.h" -#include "split.h" -#include #include +#include +#include +#include +#include "common.h" +#include "cutstop.h" static uint8_t *vvcutstop_buffer[4] = { NULL,NULL,NULL,NULL }; static unsigned int frq_cnt = 0; diff --git a/veejay-current/veejay-server/libvje/effects/cutstop.h b/veejay-current/veejay-server/libvje/effects/cutstop.h index bbacf957..8e9571b7 100644 --- a/veejay-current/veejay-server/libvje/effects/cutstop.h +++ b/veejay-current/veejay-server/libvje/effects/cutstop.h @@ -1,6 +1,5 @@ #ifndef CUTSTOP_H #define CUTSTOP_H -#include void cutstop_free() ; vj_effect *cutstop_init(int width , int height); diff --git a/veejay-current/veejay-server/libvje/effects/deinterlace.c b/veejay-current/veejay-server/libvje/effects/deinterlace.c index 14c496e4..78559c33 100644 --- a/veejay-current/veejay-server/libvje/effects/deinterlace.c +++ b/veejay-current/veejay-server/libvje/effects/deinterlace.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/deinterlace.h b/veejay-current/veejay-server/libvje/effects/deinterlace.h index eee7de8c..4d7421eb 100644 --- a/veejay-current/veejay-server/libvje/effects/deinterlace.h +++ b/veejay-current/veejay-server/libvje/effects/deinterlace.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/dices.c b/veejay-current/veejay-server/libvje/effects/dices.c index e2d24c42..15ed8385 100644 --- a/veejay-current/veejay-server/libvje/effects/dices.c +++ b/veejay-current/veejay-server/libvje/effects/dices.c @@ -95,13 +95,6 @@ void dices_free() { g_dicemap = NULL; } -unsigned int dices_fastrand_val; -/* effectv's rand val */ -static unsigned int dices_fastrand() -{ - return (dices_fastrand_val = dices_fastrand_val * 1103515245 + 12345); -} - void dice_create_map(int w, int h) { int k,x, y, i = 0; diff --git a/veejay-current/veejay-server/libvje/effects/dices.h b/veejay-current/veejay-server/libvje/effects/dices.h index efc2a61e..be874300 100644 --- a/veejay-current/veejay-server/libvje/effects/dices.h +++ b/veejay-current/veejay-server/libvje/effects/dices.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/diff.c b/veejay-current/veejay-server/libvje/effects/diff.c index 784eeac5..9532bda4 100644 --- a/veejay-current/veejay-server/libvje/effects/diff.c +++ b/veejay-current/veejay-server/libvje/effects/diff.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/diff.h b/veejay-current/veejay-server/libvje/effects/diff.h index 8b5c6d29..7a006552 100644 --- a/veejay-current/veejay-server/libvje/effects/diff.h +++ b/veejay-current/veejay-server/libvje/effects/diff.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/diffimg.c b/veejay-current/veejay-server/libvje/effects/diffimg.c index c98f46dc..fd019992 100644 --- a/veejay-current/veejay-server/libvje/effects/diffimg.c +++ b/veejay-current/veejay-server/libvje/effects/diffimg.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/diffimg.h b/veejay-current/veejay-server/libvje/effects/diffimg.h index addab2ca..a7a9e2ee 100644 --- a/veejay-current/veejay-server/libvje/effects/diffimg.h +++ b/veejay-current/veejay-server/libvje/effects/diffimg.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/diffmap.h b/veejay-current/veejay-server/libvje/effects/diffmap.h index 91964d94..d6f65572 100644 --- a/veejay-current/veejay-server/libvje/effects/diffmap.h +++ b/veejay-current/veejay-server/libvje/effects/diffmap.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/dissolve.c b/veejay-current/veejay-server/libvje/effects/dissolve.c index 16551b4c..75a37e0e 100644 --- a/veejay-current/veejay-server/libvje/effects/dissolve.c +++ b/veejay-current/veejay-server/libvje/effects/dissolve.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/dissolve.h b/veejay-current/veejay-server/libvje/effects/dissolve.h index 3c0a6851..0d3571a4 100644 --- a/veejay-current/veejay-server/libvje/effects/dissolve.h +++ b/veejay-current/veejay-server/libvje/effects/dissolve.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/distort.c b/veejay-current/veejay-server/libvje/effects/distort.c index 86099a5c..f60c57bf 100644 --- a/veejay-current/veejay-server/libvje/effects/distort.c +++ b/veejay-current/veejay-server/libvje/effects/distort.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/distort.h b/veejay-current/veejay-server/libvje/effects/distort.h index adf204d4..cd8333d3 100644 --- a/veejay-current/veejay-server/libvje/effects/distort.h +++ b/veejay-current/veejay-server/libvje/effects/distort.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/dither.c b/veejay-current/veejay-server/libvje/effects/dither.c index 144e7df8..a2ff5f43 100644 --- a/veejay-current/veejay-server/libvje/effects/dither.c +++ b/veejay-current/veejay-server/libvje/effects/dither.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/dither.h b/veejay-current/veejay-server/libvje/effects/dither.h index 7640cced..88f26c7d 100644 --- a/veejay-current/veejay-server/libvje/effects/dither.h +++ b/veejay-current/veejay-server/libvje/effects/dither.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/dummy.h b/veejay-current/veejay-server/libvje/effects/dummy.h index f202d504..23a4025e 100644 --- a/veejay-current/veejay-server/libvje/effects/dummy.h +++ b/veejay-current/veejay-server/libvje/effects/dummy.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/dupmagic.c b/veejay-current/veejay-server/libvje/effects/dupmagic.c index b2519f1d..9a3a9c5c 100644 --- a/veejay-current/veejay-server/libvje/effects/dupmagic.c +++ b/veejay-current/veejay-server/libvje/effects/dupmagic.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/dupmagic.h b/veejay-current/veejay-server/libvje/effects/dupmagic.h index 7a0f8192..1c653129 100644 --- a/veejay-current/veejay-server/libvje/effects/dupmagic.h +++ b/veejay-current/veejay-server/libvje/effects/dupmagic.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/emboss.c b/veejay-current/veejay-server/libvje/effects/emboss.c index 1f604156..418bd2c6 100644 --- a/veejay-current/veejay-server/libvje/effects/emboss.c +++ b/veejay-current/veejay-server/libvje/effects/emboss.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/emboss.h b/veejay-current/veejay-server/libvje/effects/emboss.h index 2caf4fae..f255a74c 100644 --- a/veejay-current/veejay-server/libvje/effects/emboss.h +++ b/veejay-current/veejay-server/libvje/effects/emboss.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/enhancemask.c b/veejay-current/veejay-server/libvje/effects/enhancemask.c index f6ea34f7..a1498901 100644 --- a/veejay-current/veejay-server/libvje/effects/enhancemask.c +++ b/veejay-current/veejay-server/libvje/effects/enhancemask.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/enhancemask.h b/veejay-current/veejay-server/libvje/effects/enhancemask.h index f092bf11..03e31d87 100644 --- a/veejay-current/veejay-server/libvje/effects/enhancemask.h +++ b/veejay-current/veejay-server/libvje/effects/enhancemask.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/feathermask.c b/veejay-current/veejay-server/libvje/effects/feathermask.c index d9780636..3c3f2447 100644 --- a/veejay-current/veejay-server/libvje/effects/feathermask.c +++ b/veejay-current/veejay-server/libvje/effects/feathermask.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -53,7 +53,8 @@ void feathermask_free() mask = NULL; } } -void feathermask1_apply( VJFrame *frame, uint8_t *alpha, int width, int height) + +static void feathermask1_apply( VJFrame *frame, uint8_t *alpha, int width, int height) { int r, c; int len = (width * height) - width; diff --git a/veejay-current/veejay-server/libvje/effects/fibdownscale.c b/veejay-current/veejay-server/libvje/effects/fibdownscale.c index 338a78f3..2351a46f 100644 --- a/veejay-current/veejay-server/libvje/effects/fibdownscale.c +++ b/veejay-current/veejay-server/libvje/effects/fibdownscale.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/fibdownscale.h b/veejay-current/veejay-server/libvje/effects/fibdownscale.h index f02213c9..bfc39716 100644 --- a/veejay-current/veejay-server/libvje/effects/fibdownscale.h +++ b/veejay-current/veejay-server/libvje/effects/fibdownscale.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/fisheye.c b/veejay-current/veejay-server/libvje/effects/fisheye.c index b349ee24..48d9babb 100644 --- a/veejay-current/veejay-server/libvje/effects/fisheye.c +++ b/veejay-current/veejay-server/libvje/effects/fisheye.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -142,7 +142,6 @@ void fisheye_apply(VJFrame *frame, int w, int h, int v, int alpha ) const unsigned int R = h/2; const double coeef = R / log(curve * R + 1); /* pre calculate */ - unsigned int i; int px,py; double r,a,co,si; const int w2 = w/2; diff --git a/veejay-current/veejay-server/libvje/effects/fisheye.h b/veejay-current/veejay-server/libvje/effects/fisheye.h index c5a947ae..b4a4aa60 100644 --- a/veejay-current/veejay-server/libvje/effects/fisheye.h +++ b/veejay-current/veejay-server/libvje/effects/fisheye.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/flare.c b/veejay-current/veejay-server/libvje/effects/flare.c index f3791971..03490a45 100644 --- a/veejay-current/veejay-server/libvje/effects/flare.c +++ b/veejay-current/veejay-server/libvje/effects/flare.c @@ -85,7 +85,7 @@ void flare_free(void) } } -void flare_exclusive(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { +static void flare_exclusive(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; const int len = frame->len; @@ -127,7 +127,7 @@ void flare_exclusive(VJFrame *frame, VJFrame *frame2, int width, int height, int } } -void flare_additive(VJFrame *frame, VJFrame *frame2, int width, +static void flare_additive(VJFrame *frame, VJFrame *frame2, int width, int height, int op_a) { unsigned int i; @@ -161,7 +161,7 @@ void flare_additive(VJFrame *frame, VJFrame *frame2, int width, } } -void flare_unfreeze( VJFrame *frame, VJFrame *frame2, int w, int h, int op_a ) { +static void flare_unfreeze( VJFrame *frame, VJFrame *frame2, int w, int h, int op_a ) { unsigned int i; const int len = frame->len; uint8_t *Y = frame->data[0]; @@ -195,8 +195,7 @@ void flare_unfreeze( VJFrame *frame, VJFrame *frame2, int w, int h, int op_a ) { } } - -void flare_darken(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) +static void flare_darken(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { unsigned int i; @@ -222,7 +221,7 @@ void flare_darken(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) } } -void flare_simple( VJFrame *frame, VJFrame *frame2, int w, int h, int op_a ) +static void flare_simple( VJFrame *frame, VJFrame *frame2, int w, int h, int op_a ) { unsigned int i; unsigned int len = w* h; @@ -239,7 +238,7 @@ void flare_simple( VJFrame *frame, VJFrame *frame2, int w, int h, int op_a ) } -void flare_lighten(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) +static void flare_lighten(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) { unsigned int i; @@ -265,7 +264,6 @@ void flare_lighten(VJFrame *frame, VJFrame *frame2, int w, int h, int op_a) } } - void flare_apply(VJFrame *A, int width, int height, int type, int op_a, int radius) { diff --git a/veejay-current/veejay-server/libvje/effects/flip.c b/veejay-current/veejay-server/libvje/effects/flip.c index a174906d..a12eab23 100644 --- a/veejay-current/veejay-server/libvje/effects/flip.c +++ b/veejay-current/veejay-server/libvje/effects/flip.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/flip.h b/veejay-current/veejay-server/libvje/effects/flip.h index dbe5b283..e65404d6 100644 --- a/veejay-current/veejay-server/libvje/effects/flip.h +++ b/veejay-current/veejay-server/libvje/effects/flip.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/frameborder.c b/veejay-current/veejay-server/libvje/effects/frameborder.c index 34ef00b5..8cbb1867 100644 --- a/veejay-current/veejay-server/libvje/effects/frameborder.c +++ b/veejay-current/veejay-server/libvje/effects/frameborder.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/frameborder.h b/veejay-current/veejay-server/libvje/effects/frameborder.h index cbd69c4a..ba328226 100644 --- a/veejay-current/veejay-server/libvje/effects/frameborder.h +++ b/veejay-current/veejay-server/libvje/effects/frameborder.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/gamma.c b/veejay-current/veejay-server/libvje/effects/gamma.c index c68f5f26..5065a56a 100644 --- a/veejay-current/veejay-server/libvje/effects/gamma.c +++ b/veejay-current/veejay-server/libvje/effects/gamma.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/gamma.h b/veejay-current/veejay-server/libvje/effects/gamma.h index d035208c..0019cc12 100644 --- a/veejay-current/veejay-server/libvje/effects/gamma.h +++ b/veejay-current/veejay-server/libvje/effects/gamma.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/greyselect.c b/veejay-current/veejay-server/libvje/effects/greyselect.c index c836613c..b712195b 100644 --- a/veejay-current/veejay-server/libvje/effects/greyselect.c +++ b/veejay-current/veejay-server/libvje/effects/greyselect.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/greyselect.h b/veejay-current/veejay-server/libvje/effects/greyselect.h index 9825081c..85fdd32f 100644 --- a/veejay-current/veejay-server/libvje/effects/greyselect.h +++ b/veejay-current/veejay-server/libvje/effects/greyselect.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/isolate.c b/veejay-current/veejay-server/libvje/effects/isolate.c index 47e878b0..83eeceab 100644 --- a/veejay-current/veejay-server/libvje/effects/isolate.c +++ b/veejay-current/veejay-server/libvje/effects/isolate.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/isolate.h b/veejay-current/veejay-server/libvje/effects/isolate.h index dfd47e02..9d9ca385 100644 --- a/veejay-current/veejay-server/libvje/effects/isolate.h +++ b/veejay-current/veejay-server/libvje/effects/isolate.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/keyselect.c b/veejay-current/veejay-server/libvje/effects/keyselect.c index ef02b367..f8331899 100644 --- a/veejay-current/veejay-server/libvje/effects/keyselect.c +++ b/veejay-current/veejay-server/libvje/effects/keyselect.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,7 +20,7 @@ #include #include #include -#include "rgbkey.h" +#include "keyselect.h" #include #include "common.h" @@ -66,13 +66,13 @@ vj_effect *keyselect_init(int w, int h) } typedef uint8_t(*blend_func)(uint8_t y1, uint8_t y2); -blend_func get_blend_func(const int mode); +static blend_func get_blend_func(const int mode); -uint8_t blend_func1(uint8_t a, uint8_t b) { +static uint8_t blend_func1(uint8_t a, uint8_t b) { return (uint8_t) 255 - (abs(255-a-b)); } -uint8_t blend_func2(uint8_t a, uint8_t b) { +static uint8_t blend_func2(uint8_t a, uint8_t b) { uint8_t val; if( a == 0 ) a = 0xff; @@ -80,12 +80,12 @@ uint8_t blend_func2(uint8_t a, uint8_t b) { return CLAMP_Y(val); } -uint8_t blend_func3(uint8_t a , uint8_t b) { +static uint8_t blend_func3(uint8_t a , uint8_t b) { return (uint8_t) (a * b)>>8; } -uint8_t blend_func4(uint8_t a, uint8_t b) { +static uint8_t blend_func4(uint8_t a, uint8_t b) { uint8_t c = 0xff - b; if( c == 0 ) return CLAMP_Y(c); @@ -93,7 +93,7 @@ uint8_t blend_func4(uint8_t a, uint8_t b) { return CLAMP_Y( (a*a)/c ); } -uint8_t blend_func5(uint8_t a, uint8_t b) { +static uint8_t blend_func5(uint8_t a, uint8_t b) { uint8_t val; uint8_t c = 0xff - b; if( c == 0 ) @@ -102,25 +102,23 @@ uint8_t blend_func5(uint8_t a, uint8_t b) { return CLAMP_Y(val); } -uint8_t blend_func6(uint8_t a, uint8_t b) { +static uint8_t blend_func6(uint8_t a, uint8_t b) { uint8_t val = a + (2 * (b)) - 255; return CLAMP_Y(val); } -uint8_t blend_func7(uint8_t a, uint8_t b) { +static uint8_t blend_func7(uint8_t a, uint8_t b) { return (uint8_t) ( a + ( b - 255) ); } -uint8_t blend_func8(uint8_t a, uint8_t b) { +static uint8_t blend_func8(uint8_t a, uint8_t b) { int c; if(b < 128) c = (a * b) >> 7; else c = 255 - ((255-b)*(255-a)>>7); return CLAMP_Y(c); } - - -blend_func get_blend_func(const int mode) { +static blend_func get_blend_func(const int mode) { switch(mode) { case 0: return &blend_func1; case 1: return &blend_func2; @@ -240,4 +238,3 @@ void keyselect_apply( VJFrame *frame, VJFrame *frame2, int width, } -void keyselect_free(){} diff --git a/veejay-current/veejay-server/libvje/effects/keyselect.h b/veejay-current/veejay-server/libvje/effects/keyselect.h index 8837aa15..7167e192 100644 --- a/veejay-current/veejay-server/libvje/effects/keyselect.h +++ b/veejay-current/veejay-server/libvje/effects/keyselect.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * -* Copyright(C)2004 Niels Elburg +* Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/killchroma.c b/veejay-current/veejay-server/libvje/effects/killchroma.c index f037ef80..3b608840 100644 --- a/veejay-current/veejay-server/libvje/effects/killchroma.c +++ b/veejay-current/veejay-server/libvje/effects/killchroma.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/killchroma.h b/veejay-current/veejay-server/libvje/effects/killchroma.h index 47c6993e..06761e27 100644 --- a/veejay-current/veejay-server/libvje/effects/killchroma.h +++ b/veejay-current/veejay-server/libvje/effects/killchroma.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/lumablend.c b/veejay-current/veejay-server/libvje/effects/lumablend.c index 58120059..a981e500 100644 --- a/veejay-current/veejay-server/libvje/effects/lumablend.c +++ b/veejay-current/veejay-server/libvje/effects/lumablend.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -64,7 +64,7 @@ vj_effect *lumablend_init(int w, int h) } -void opacity_by_threshold(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, +static void opacity_by_threshold(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, int height, int threshold, int threshold2, int opacity) { @@ -92,8 +92,7 @@ void opacity_by_threshold(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, } - -void opacity_by_threshold_(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, +static void opacity_by_threshold_(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, int height, int threshold, int threshold2, int opacity) { @@ -119,9 +118,7 @@ void opacity_by_threshold_(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, } } - - -void opacity_by_threshold_blur(uint8_t * yuv1[3], uint8_t * yuv2[3], +static void opacity_by_threshold_blur(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, int height, int threshold, int threshold2, int opacity) { @@ -219,4 +216,3 @@ void lumablend_apply(VJFrame *frame, VJFrame *frame2, int width, } } -void lumablend_free(){} diff --git a/veejay-current/veejay-server/libvje/effects/lumablend.h b/veejay-current/veejay-server/libvje/effects/lumablend.h index 004bb4ba..14b9075f 100644 --- a/veejay-current/veejay-server/libvje/effects/lumablend.h +++ b/veejay-current/veejay-server/libvje/effects/lumablend.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -28,6 +28,4 @@ vj_effect *lumablend_init(); void lumablend_apply( VJFrame *frame, VJFrame *frame2, int width, int height, int threhold1, int threshold2, int opacity, int type); - -void lumablend_free(); #endif diff --git a/veejay-current/veejay-server/libvje/effects/lumakey.c b/veejay-current/veejay-server/libvje/effects/lumakey.c index d835ea9b..560815b0 100644 --- a/veejay-current/veejay-server/libvje/effects/lumakey.c +++ b/veejay-current/veejay-server/libvje/effects/lumakey.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -59,7 +59,7 @@ vj_effect *lumakey_init(int width, int height) return ve; } -void lumakey_simple(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, +static void lumakey_simple(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, int height, int threshold, int threshold2, int opacity) { @@ -95,8 +95,7 @@ void lumakey_simple(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, } } - -void lumakey_smooth(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, +static void lumakey_smooth(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, int height, int threshold, int threshold2, int opacity, int distance) { @@ -216,7 +215,7 @@ void lumakey_smooth(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, } -void lumakey_smooth_white(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, +static void lumakey_smooth_white(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, int height, int threshold, int threshold2, int opacity, int distance) { @@ -304,8 +303,6 @@ void lumakey_smooth_white(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, } } - - void lumakey_apply( VJFrame *frame, VJFrame *frame2, int width, int height, int type, int threshold, int threshold2, int feather, int d) diff --git a/veejay-current/veejay-server/libvje/effects/lumakey.h b/veejay-current/veejay-server/libvje/effects/lumakey.h index ec1aad5c..7bc047a1 100644 --- a/veejay-current/veejay-server/libvje/effects/lumakey.h +++ b/veejay-current/veejay-server/libvje/effects/lumakey.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/lumamagick.c b/veejay-current/veejay-server/libvje/effects/lumamagick.c index eb0982a8..d3b044bd 100644 --- a/veejay-current/veejay-server/libvje/effects/lumamagick.c +++ b/veejay-current/veejay-server/libvje/effects/lumamagick.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/lumamagick.h b/veejay-current/veejay-server/libvje/effects/lumamagick.h index 82764088..c5ecfb27 100644 --- a/veejay-current/veejay-server/libvje/effects/lumamagick.h +++ b/veejay-current/veejay-server/libvje/effects/lumamagick.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/lumamask.c b/veejay-current/veejay-server/libvje/effects/lumamask.c index 488cd455..2030a38a 100644 --- a/veejay-current/veejay-server/libvje/effects/lumamask.c +++ b/veejay-current/veejay-server/libvje/effects/lumamask.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/lumamask.h b/veejay-current/veejay-server/libvje/effects/lumamask.h index a142199c..3f825dcb 100644 --- a/veejay-current/veejay-server/libvje/effects/lumamask.h +++ b/veejay-current/veejay-server/libvje/effects/lumamask.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/magicalphaoverlays.c b/veejay-current/veejay-server/libvje/effects/magicalphaoverlays.c index 243df673..93c9f717 100644 --- a/veejay-current/veejay-server/libvje/effects/magicalphaoverlays.c +++ b/veejay-current/veejay-server/libvje/effects/magicalphaoverlays.c @@ -21,10 +21,11 @@ #include #include #include -#include "magicoverlays.h" #include -#include "common.h" #include +#include "magicalphaoverlays.h" +#include "common.h" + vj_effect *overlayalphamagic_init(int w, int h) { vj_effect *ve = (vj_effect *) vj_calloc(sizeof(vj_effect)); @@ -62,10 +63,7 @@ vj_effect *overlayalphamagic_init(int w, int h) return ve; } -/* rename methods in lumamagick and chromamagick */ - - -void _overlayalphamagic_adddistorted(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_adddistorted(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -83,7 +81,7 @@ void _overlayalphamagic_adddistorted(VJFrame *frame, VJFrame *frame2,int width, } -void _overlayalphamagic_add_distorted(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_add_distorted(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; @@ -100,7 +98,7 @@ void _overlayalphamagic_add_distorted(VJFrame *frame, VJFrame *frame2,int width, } -void _overlayalphamagic_subdistorted(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_subdistorted(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -116,7 +114,7 @@ void _overlayalphamagic_subdistorted(VJFrame *frame, VJFrame *frame2,int width, } } -void _overlayalphamagic_sub_distorted(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_sub_distorted(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i ; @@ -132,7 +130,7 @@ void _overlayalphamagic_sub_distorted(VJFrame *frame, VJFrame *frame2,int width, } } -void _overlayalphamagic_multiply(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_multiply(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -142,7 +140,7 @@ void _overlayalphamagic_multiply(VJFrame *frame, VJFrame *frame2,int width, int A[i] = (A[i] * A2[i]) >> 8; } -void _overlayalphamagic_simpledivide(VJFrame *frame, VJFrame *frame2, int width,int height) +static void _overlayalphamagic_simpledivide(VJFrame *frame, VJFrame *frame2, int width,int height) { unsigned int i; unsigned int len = width * height; @@ -154,7 +152,7 @@ void _overlayalphamagic_simpledivide(VJFrame *frame, VJFrame *frame2, int width, } } -void _overlayalphamagic_divide(VJFrame *frame, VJFrame *frame2, int width,int height) +static void _overlayalphamagic_divide(VJFrame *frame, VJFrame *frame2, int width,int height) { unsigned int i; int a, b, c; @@ -171,7 +169,7 @@ void _overlayalphamagic_divide(VJFrame *frame, VJFrame *frame2, int width,int he } } -void _overlayalphamagic_additive(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_additive(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int len = width * height; @@ -185,8 +183,7 @@ void _overlayalphamagic_additive(VJFrame *frame, VJFrame *frame2,int width, int } } - -void _overlayalphamagic_substractive(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_substractive(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; @@ -198,7 +195,7 @@ void _overlayalphamagic_substractive(VJFrame *frame, VJFrame *frame2,int width, A[i] = CLAMP_Y( A[i] - A2[i] ); } -void _overlayalphamagic_softburn(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_softburn(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -225,7 +222,7 @@ void _overlayalphamagic_softburn(VJFrame *frame, VJFrame *frame2,int width, int } } -void _overlayalphamagic_inverseburn(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_inverseburn(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -244,8 +241,7 @@ void _overlayalphamagic_inverseburn(VJFrame *frame, VJFrame *frame2,int width, i } } - -void _overlayalphamagic_colordodge(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_colordodge(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -267,7 +263,7 @@ void _overlayalphamagic_colordodge(VJFrame *frame, VJFrame *frame2,int width, in } } -void _overlayalphamagic_mulsub(VJFrame *frame, VJFrame *frame2, int width, int height) +static void _overlayalphamagic_mulsub(VJFrame *frame, VJFrame *frame2, int width, int height) { unsigned int i; unsigned int len = width * height; @@ -283,7 +279,7 @@ void _overlayalphamagic_mulsub(VJFrame *frame, VJFrame *frame2, int width, int h } } -void _overlayalphamagic_lighten(VJFrame *frame, VJFrame *frame2, int width,int height) +static void _overlayalphamagic_lighten(VJFrame *frame, VJFrame *frame2, int width,int height) { unsigned int i; unsigned int len = width * height; @@ -302,7 +298,7 @@ void _overlayalphamagic_lighten(VJFrame *frame, VJFrame *frame2, int width,int h } } -void _overlayalphamagic_difference(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_difference(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -317,7 +313,7 @@ void _overlayalphamagic_difference(VJFrame *frame, VJFrame *frame2,int width, in } } -void _overlayalphamagic_diffnegate(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_diffnegate(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -332,7 +328,7 @@ void _overlayalphamagic_diffnegate(VJFrame *frame, VJFrame *frame2,int width, in } } -void _overlayalphamagic_exclusive(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_exclusive(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -346,7 +342,7 @@ void _overlayalphamagic_exclusive(VJFrame *frame, VJFrame *frame2,int width, int } } -void _overlayalphamagic_basecolor(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_basecolor(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; int a, b, c, d; @@ -363,7 +359,7 @@ void _overlayalphamagic_basecolor(VJFrame *frame, VJFrame *frame2,int width, int } } -void _overlayalphamagic_freeze(VJFrame *frame, VJFrame *frame2, int width,int height) +static void _overlayalphamagic_freeze(VJFrame *frame, VJFrame *frame2, int width,int height) { unsigned int i; unsigned int len = width * height; @@ -379,7 +375,7 @@ void _overlayalphamagic_freeze(VJFrame *frame, VJFrame *frame2, int width,int he } } -void _overlayalphamagic_unfreeze(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_unfreeze(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -395,7 +391,7 @@ void _overlayalphamagic_unfreeze(VJFrame *frame, VJFrame *frame2,int width, int } } -void _overlayalphamagic_hardlight(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_hardlight(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -414,7 +410,8 @@ void _overlayalphamagic_hardlight(VJFrame *frame, VJFrame *frame2,int width, int A[i] = c; } } -void _overlayalphamagic_relativeaddlum(VJFrame *frame, VJFrame *frame2,int width, int height) + +static void _overlayalphamagic_relativeaddlum(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; int a, b, c, d; @@ -431,7 +428,7 @@ void _overlayalphamagic_relativeaddlum(VJFrame *frame, VJFrame *frame2,int width } } -void _overlayalphamagic_relativesublum(VJFrame *frame, VJFrame *frame2, int width, int height) +static void _overlayalphamagic_relativesublum(VJFrame *frame, VJFrame *frame2, int width, int height) { unsigned int i; unsigned int len = width * height; @@ -446,7 +443,7 @@ void _overlayalphamagic_relativesublum(VJFrame *frame, VJFrame *frame2, int widt } } -void _overlayalphamagic_relativeadd(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_relativeadd(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -463,7 +460,7 @@ void _overlayalphamagic_relativeadd(VJFrame *frame, VJFrame *frame2,int width, i } } -void _overlayalphamagic_relativesub(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_relativesub(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -478,7 +475,8 @@ void _overlayalphamagic_relativesub(VJFrame *frame, VJFrame *frame2,int width, i } } -void _overlayalphamagic_minsubselect(VJFrame *frame, VJFrame *frame2,int width, int height) + +static void _overlayalphamagic_minsubselect(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -496,7 +494,7 @@ void _overlayalphamagic_minsubselect(VJFrame *frame, VJFrame *frame2,int width, } } -void _overlayalphamagic_maxsubselect(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_maxsubselect(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -514,9 +512,7 @@ void _overlayalphamagic_maxsubselect(VJFrame *frame, VJFrame *frame2,int width, } } - - -void _overlayalphamagic_addsubselect(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_addsubselect(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -535,8 +531,7 @@ void _overlayalphamagic_addsubselect(VJFrame *frame, VJFrame *frame2,int width, } } - -void _overlayalphamagic_maxselect(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_maxselect(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -552,7 +547,7 @@ void _overlayalphamagic_maxselect(VJFrame *frame, VJFrame *frame2,int width, int } } -void _overlayalphamagic_minselect(VJFrame *frame, VJFrame *frame2,int width, int height) +static void _overlayalphamagic_minselect(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -568,7 +563,7 @@ void _overlayalphamagic_minselect(VJFrame *frame, VJFrame *frame2,int width, int } } -void _overlayalphamagic_addtest(VJFrame *frame, VJFrame *frame2, int width,int height) +static void _overlayalphamagic_addtest(VJFrame *frame, VJFrame *frame2, int width,int height) { unsigned int i; unsigned int len = width * height; @@ -583,7 +578,8 @@ void _overlayalphamagic_addtest(VJFrame *frame, VJFrame *frame2, int width,int h A[i] = CLAMP_Y(c); } } -void _overlayalphamagic_addtest2(VJFrame *frame, VJFrame *frame2,int width, int height) + +static void _overlayalphamagic_addtest2(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -597,10 +593,9 @@ void _overlayalphamagic_addtest2(VJFrame *frame, VJFrame *frame2,int width, int c = a + (2 * b) - 255; A[i] = CLAMP_Y(c); } - - } -void _overlayalphamagic_addtest4(VJFrame *frame, VJFrame *frame2,int width, int height) + +static void _overlayalphamagic_addtest4(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -618,7 +613,7 @@ void _overlayalphamagic_addtest4(VJFrame *frame, VJFrame *frame2,int width, int } } -void _overlayalphamagic_try +static void _overlayalphamagic_try (VJFrame *frame, VJFrame *frame2, int width, int height) { unsigned int i; unsigned int len = width * height; @@ -760,11 +755,10 @@ void overlayalphamagic_apply(VJFrame *frame, VJFrame *frame2, int width,int heig } if(visible) { - veejay_memcpy( frame->data[0], frame->data[3], frame->len ); - veejay_memset( frame->data[1], 128, frame->uv_len ); - veejay_memset( frame->data[2], 128, frame->uv_len ); + veejay_memcpy( frame->data[0], frame->data[3], frame->len ); + veejay_memset( frame->data[1], 128, frame->uv_len ); + veejay_memset( frame->data[2], 128, frame->uv_len ); } } -void overlayalphamagic_free(){} diff --git a/veejay-current/veejay-server/libvje/effects/magicmirror.h b/veejay-current/veejay-server/libvje/effects/magicmirror.h index a1072d79..7e3425f1 100644 --- a/veejay-current/veejay-server/libvje/effects/magicmirror.h +++ b/veejay-current/veejay-server/libvje/effects/magicmirror.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/magicoverlays.c b/veejay-current/veejay-server/libvje/effects/magicoverlays.c index c8ed63e7..e38e31a9 100644 --- a/veejay-current/veejay-server/libvje/effects/magicoverlays.c +++ b/veejay-current/veejay-server/libvje/effects/magicoverlays.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/magicoverlays.h b/veejay-current/veejay-server/libvje/effects/magicoverlays.h index d0cdb49a..092e34cc 100644 --- a/veejay-current/veejay-server/libvje/effects/magicoverlays.h +++ b/veejay-current/veejay-server/libvje/effects/magicoverlays.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/magicoverlaysalpha.c b/veejay-current/veejay-server/libvje/effects/magicoverlaysalpha.c index 7a342e3c..cefce5f2 100644 --- a/veejay-current/veejay-server/libvje/effects/magicoverlaysalpha.c +++ b/veejay-current/veejay-server/libvje/effects/magicoverlaysalpha.c @@ -21,7 +21,7 @@ #include #include #include -#include "magicoverlays.h" +#include "magicoverlaysalpha.h" #include #include "common.h" #include @@ -61,10 +61,7 @@ vj_effect *overlaymagicalpha_init(int w, int h) return ve; } -/* fixme */ - - -void _overlaymagicalpha_adddistorted(VJFrame *frame, VJFrame *frame2, +static void _overlaymagicalpha_adddistorted(VJFrame *frame, VJFrame *frame2, int width, int height) { unsigned int i; @@ -87,7 +84,7 @@ void _overlaymagicalpha_adddistorted(VJFrame *frame, VJFrame *frame2, } -void _overlaymagicalpha_add_distorted(VJFrame *frame, VJFrame *frame2, +static void _overlaymagicalpha_add_distorted(VJFrame *frame, VJFrame *frame2, int width, int height) { @@ -109,7 +106,7 @@ void _overlaymagicalpha_add_distorted(VJFrame *frame, VJFrame *frame2, } -void _overlaymagicalpha_subdistorted(VJFrame *frame, VJFrame *frame2, +static void _overlaymagicalpha_subdistorted(VJFrame *frame, VJFrame *frame2, int width, int height) { unsigned int i; @@ -129,7 +126,7 @@ void _overlaymagicalpha_subdistorted(VJFrame *frame, VJFrame *frame2, } } -void _overlaymagicalpha_sub_distorted(VJFrame *frame, VJFrame *frame2, +static void _overlaymagicalpha_sub_distorted(VJFrame *frame, VJFrame *frame2, int width, int height) { @@ -150,7 +147,7 @@ void _overlaymagicalpha_sub_distorted(VJFrame *frame, VJFrame *frame2, } } -void _overlaymagicalpha_multiply(VJFrame *frame, VJFrame *frame2, +static void _overlaymagicalpha_multiply(VJFrame *frame, VJFrame *frame2, int width, int height) { unsigned int i; @@ -166,8 +163,8 @@ void _overlaymagicalpha_multiply(VJFrame *frame, VJFrame *frame2, Y[i] = (Y[i] * Y2[i]) >> 8; } } -void _overlaymagicalpha_simpledivide(VJFrame *frame, VJFrame *frame2, int width, - int height) + +static void _overlaymagicalpha_simpledivide(VJFrame *frame, VJFrame *frame2, int width,int height) { unsigned int i; unsigned int len = width * height; @@ -185,7 +182,7 @@ void _overlaymagicalpha_simpledivide(VJFrame *frame, VJFrame *frame2, int width, } } -void _overlaymagicalpha_divide(VJFrame *frame, VJFrame *frame2, int width, +static void _overlaymagicalpha_divide(VJFrame *frame, VJFrame *frame2, int width, int height) { unsigned int i; @@ -209,8 +206,7 @@ void _overlaymagicalpha_divide(VJFrame *frame, VJFrame *frame2, int width, } } -void _overlaymagicalpha_additive(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_additive(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int len = width * height; @@ -229,9 +225,7 @@ void _overlaymagicalpha_additive(VJFrame *frame, VJFrame *frame2, } } - -void _overlaymagicalpha_substractive(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_substractive(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -248,8 +242,7 @@ void _overlaymagicalpha_substractive(VJFrame *frame, VJFrame *frame2, } } -void _overlaymagicalpha_softburn(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_softburn(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -281,8 +274,7 @@ void _overlaymagicalpha_softburn(VJFrame *frame, VJFrame *frame2, } } -void _overlaymagicalpha_inverseburn(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_inverseburn(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -306,9 +298,7 @@ void _overlaymagicalpha_inverseburn(VJFrame *frame, VJFrame *frame2, } } - -void _overlaymagicalpha_colordodge(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_colordodge(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -335,8 +325,7 @@ void _overlaymagicalpha_colordodge(VJFrame *frame, VJFrame *frame2, } } -void _overlaymagicalpha_mulsub(VJFrame *frame, VJFrame *frame2, int width, - int height) +static void _overlaymagicalpha_mulsub(VJFrame *frame, VJFrame *frame2, int width,int height) { unsigned int i; unsigned int len = width * height; @@ -356,8 +345,7 @@ void _overlaymagicalpha_mulsub(VJFrame *frame, VJFrame *frame2, int width, } } -void _overlaymagicalpha_lighten(VJFrame *frame, VJFrame *frame2, int width, - int height) +static void _overlaymagicalpha_lighten(VJFrame *frame, VJFrame *frame2, int width,int height) { unsigned int i; unsigned int len = width * height; @@ -381,8 +369,7 @@ void _overlaymagicalpha_lighten(VJFrame *frame, VJFrame *frame2, int width, } } -void _overlaymagicalpha_difference(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_difference(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -402,8 +389,7 @@ void _overlaymagicalpha_difference(VJFrame *frame, VJFrame *frame2, } } -void _overlaymagicalpha_diffnegate(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_diffnegate(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -423,8 +409,7 @@ void _overlaymagicalpha_diffnegate(VJFrame *frame, VJFrame *frame2, } } -void _overlaymagicalpha_exclusive(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_exclusive(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -443,8 +428,7 @@ void _overlaymagicalpha_exclusive(VJFrame *frame, VJFrame *frame2, } } -void _overlaymagicalpha_basecolor(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_basecolor(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; int a, b, c, d; @@ -465,8 +449,7 @@ void _overlaymagicalpha_basecolor(VJFrame *frame, VJFrame *frame2, } } -void _overlaymagicalpha_freeze(VJFrame *frame, VJFrame *frame2, int width, - int height) +static void _overlaymagicalpha_freeze(VJFrame *frame, VJFrame *frame2, int width,int height) { unsigned int i; unsigned int len = width * height; @@ -487,8 +470,7 @@ void _overlaymagicalpha_freeze(VJFrame *frame, VJFrame *frame2, int width, } } -void _overlaymagicalpha_unfreeze(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_unfreeze(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -509,8 +491,7 @@ void _overlaymagicalpha_unfreeze(VJFrame *frame, VJFrame *frame2, } } -void _overlaymagicalpha_hardlight(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_hardlight(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -534,8 +515,8 @@ void _overlaymagicalpha_hardlight(VJFrame *frame, VJFrame *frame2, Y[i] = c; } } -void _overlaymagicalpha_relativeaddlum(VJFrame *frame, VJFrame *frame2, - int width, int height) + +static void _overlaymagicalpha_relativeaddlum(VJFrame *frame, VJFrame *frame2, int width, int height) { unsigned int i; int a, b, c, d; @@ -557,8 +538,7 @@ void _overlaymagicalpha_relativeaddlum(VJFrame *frame, VJFrame *frame2, } } -void _overlaymagicalpha_relativesublum(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_relativesublum(VJFrame *frame, VJFrame *frame2, int width, int height) { unsigned int i; unsigned int len = width * height; @@ -578,8 +558,7 @@ void _overlaymagicalpha_relativesublum(VJFrame *frame, VJFrame *frame2, } } -void _overlaymagicalpha_relativeadd(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_relativeadd(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -601,8 +580,7 @@ void _overlaymagicalpha_relativeadd(VJFrame *frame, VJFrame *frame2, } } -void _overlaymagicalpha_relativesub(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_relativesub(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -622,8 +600,8 @@ void _overlaymagicalpha_relativesub(VJFrame *frame, VJFrame *frame2, } } -void _overlaymagicalpha_minsubselect(VJFrame *frame, VJFrame *frame2, - int width, int height) + +static void _overlaymagicalpha_minsubselect(VJFrame *frame, VJFrame *frame2, int width, int height) { unsigned int i; unsigned int len = width * height; @@ -646,8 +624,7 @@ void _overlaymagicalpha_minsubselect(VJFrame *frame, VJFrame *frame2, } } -void _overlaymagicalpha_maxsubselect(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_maxsubselect(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -670,10 +647,7 @@ void _overlaymagicalpha_maxsubselect(VJFrame *frame, VJFrame *frame2, } } - - -void _overlaymagicalpha_addsubselect(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_addsubselect(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -697,9 +671,7 @@ void _overlaymagicalpha_addsubselect(VJFrame *frame, VJFrame *frame2, } } - -void _overlaymagicalpha_maxselect(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_maxselect(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -720,8 +692,7 @@ void _overlaymagicalpha_maxselect(VJFrame *frame, VJFrame *frame2, } } -void _overlaymagicalpha_minselect(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_minselect(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -742,8 +713,7 @@ void _overlaymagicalpha_minselect(VJFrame *frame, VJFrame *frame2, } } -void _overlaymagicalpha_addtest(VJFrame *frame, VJFrame *frame2, int width, - int height) +static void _overlaymagicalpha_addtest(VJFrame *frame, VJFrame *frame2, int width,int height) { unsigned int i; unsigned int len = width * height; @@ -763,8 +733,8 @@ void _overlaymagicalpha_addtest(VJFrame *frame, VJFrame *frame2, int width, Y[i] = CLAMP_Y(c); } } -void _overlaymagicalpha_addtest2(VJFrame *frame, VJFrame *frame2, - int width, int height) + +static void _overlaymagicalpha_addtest2(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -785,8 +755,7 @@ void _overlaymagicalpha_addtest2(VJFrame *frame, VJFrame *frame2, } } -void _overlaymagicalpha_addtest4(VJFrame *frame, VJFrame *frame2, - int width, int height) +static void _overlaymagicalpha_addtest4(VJFrame *frame, VJFrame *frame2,int width, int height) { unsigned int i; unsigned int len = width * height; @@ -811,8 +780,8 @@ void _overlaymagicalpha_addtest4(VJFrame *frame, VJFrame *frame2, } -void _overlaymagicalpha_try - (VJFrame *frame, VJFrame *frame2, int width, int height) { +static void _overlaymagicalpha_try(VJFrame *frame, VJFrame *frame2, int width, int height) +{ unsigned int i; unsigned int len = width * height; int a, b, p, q; diff --git a/veejay-current/veejay-server/libvje/effects/magicscratcher.c b/veejay-current/veejay-server/libvje/effects/magicscratcher.c index 24618a37..ca5f3714 100644 --- a/veejay-current/veejay-server/libvje/effects/magicscratcher.c +++ b/veejay-current/veejay-server/libvje/effects/magicscratcher.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -75,7 +75,7 @@ void magicscratcher_free() { m_rerun = 0; } -void store_mframe(uint8_t * yuv1[3], int w, int h, int n, int no_reverse) +static void store_mframe(uint8_t * yuv1[3], int w, int h, int n, int no_reverse) { if (!m_reverse) { veejay_memcpy(mframe + (w * h * m_frame), yuv1[0], (w * h)); diff --git a/veejay-current/veejay-server/libvje/effects/magicscratcher.h b/veejay-current/veejay-server/libvje/effects/magicscratcher.h index 9dc872eb..8bcf5167 100644 --- a/veejay-current/veejay-server/libvje/effects/magicscratcher.h +++ b/veejay-current/veejay-server/libvje/effects/magicscratcher.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/mask.c b/veejay-current/veejay-server/libvje/effects/mask.c index dce44e1f..62101b9e 100644 --- a/veejay-current/veejay-server/libvje/effects/mask.c +++ b/veejay-current/veejay-server/libvje/effects/mask.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -26,20 +26,20 @@ vj_effect *simplemask_init(int w, int h ) { - vj_effect *ve = (vj_effect *) vj_calloc(sizeof(vj_effect)); - ve->num_params = 2; - ve->defaults = (int *) vj_calloc(sizeof(int) * ve->num_params); /* default values */ - ve->limits[0] = (int *) vj_calloc(sizeof(int) * ve->num_params); /* min */ - ve->limits[1] = (int *) vj_calloc(sizeof(int) * ve->num_params); /* max */ - ve->limits[0][0] = 0; - ve->limits[1][0] = 255; - ve->limits[0][1] = 0; - ve->limits[1][1] = 1; - ve->defaults[0] = 128; - ve->defaults[1] = 0; - ve->description = "Binary Threshold Mask"; - ve->sub_format = 1; - ve->extra_frame = 1; + vj_effect *ve = (vj_effect *) vj_calloc(sizeof(vj_effect)); + ve->num_params = 2; + ve->defaults = (int *) vj_calloc(sizeof(int) * ve->num_params); /* default values */ + ve->limits[0] = (int *) vj_calloc(sizeof(int) * ve->num_params); /* min */ + ve->limits[1] = (int *) vj_calloc(sizeof(int) * ve->num_params); /* max */ + ve->limits[0][0] = 0; + ve->limits[1][0] = 255; + ve->limits[0][1] = 0; + ve->limits[1][1] = 2; + ve->defaults[0] = 128; + ve->defaults[1] = 0; + ve->description = "Binary Threshold Mask"; + ve->sub_format = 1; + ve->extra_frame = 1; ve->has_user =0; ve->param_description = vje_build_param_list( ve->num_params, "Threshold", "Mode" ); @@ -47,13 +47,12 @@ vj_effect *simplemask_init(int w, int h ) ve->hints = vje_init_value_hint_list( ve->num_params ); vje_build_value_hint_list( ve->hints, ve->limits[1][1], 1, - "Normal", "Preview" ); + "Normal", "Threshold Black", "Threshold White" ); return ve; } - -void mask_replace_black(uint8_t *yuv1[3], uint8_t *yuv2[3], int w, int h, int threshold) { +static void mask_replace_black(uint8_t *yuv1[3], uint8_t *yuv2[3], int w, int h, int threshold) { unsigned int len = w * h; unsigned int i=0; for(i=0; i < len; i++) { @@ -64,7 +63,8 @@ void mask_replace_black(uint8_t *yuv1[3], uint8_t *yuv2[3], int w, int h, int th } } } -void mask_replace_black_fill(uint8_t *yuv1[3], uint8_t *yuv2[3], int w, int h, int threshold) { + +static void mask_replace_black_fill(uint8_t *yuv1[3], uint8_t *yuv2[3], int w, int h, int threshold) { unsigned int len = w * h; unsigned int i=0; for(i=0; i < len; i++) { @@ -81,14 +81,32 @@ void mask_replace_black_fill(uint8_t *yuv1[3], uint8_t *yuv2[3], int w, int h, i } } +static void mask_replace_white_fill(uint8_t *yuv1[3], uint8_t *yuv2[3], int w, int h, int threshold) { + unsigned int len = w * h; + unsigned int i=0; + for(i=0; i < len; i++) { + if (yuv1[0][i] > threshold) { + yuv1[0][i] = yuv2[0][i]; + yuv1[1][i] = yuv2[1][i]; + yuv1[2][i] = yuv2[2][i]; + } + else { + yuv1[0][i] = pixel_Y_hi_; + yuv1[1][i] = 128; + yuv1[2][i] = 128; + } + } +} + void simplemask_apply( VJFrame *frame, VJFrame *frame2, int width, int height, int threshold, int invert) { - - switch(invert) { - case 0 : mask_replace_black(frame->data,frame2->data,width,height,threshold); break; - case 1 : mask_replace_black_fill(frame->data,frame2->data,width,height,threshold); break; - } - + switch(invert) { + case 0 : mask_replace_black(frame->data,frame2->data,width,height,threshold); + break; + case 1 : mask_replace_black_fill(frame->data,frame2->data,width,height,threshold); + break; + case 2: mask_replace_white_fill(frame->data,frame2->data,width,height,threshold); + break; + } } -void mask_free(){} diff --git a/veejay-current/veejay-server/libvje/effects/mask.h b/veejay-current/veejay-server/libvje/effects/mask.h index b79f6675..96f1f995 100644 --- a/veejay-current/veejay-server/libvje/effects/mask.h +++ b/veejay-current/veejay-server/libvje/effects/mask.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/maskstop.c b/veejay-current/veejay-server/libvje/effects/maskstop.c index f727e3a7..f6945113 100644 --- a/veejay-current/veejay-server/libvje/effects/maskstop.c +++ b/veejay-current/veejay-server/libvje/effects/maskstop.c @@ -22,10 +22,11 @@ */ #include #include +#include +#include +#include #include "common.h" -#include "split.h" -#include -#include +#include "maskstop.h" static uint8_t *vvmaskstop_buffer[6]; static unsigned int frq_frame; diff --git a/veejay-current/veejay-server/libvje/effects/maskstop.h b/veejay-current/veejay-server/libvje/effects/maskstop.h index 48c24798..0e03f62d 100644 --- a/veejay-current/veejay-server/libvje/effects/maskstop.h +++ b/veejay-current/veejay-server/libvje/effects/maskstop.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,10 +20,6 @@ #ifndef MASKSTOP_H #define MASKSTOP_H -#include -#include -#include - vj_effect *maskstop_init(int width, int height); int maskstop_malloc(int w, int h); void maskstop_free(); diff --git a/veejay-current/veejay-server/libvje/effects/mirrors.c b/veejay-current/veejay-server/libvje/effects/mirrors.c index fcff4d1f..8ffc6cae 100644 --- a/veejay-current/veejay-server/libvje/effects/mirrors.c +++ b/veejay-current/veejay-server/libvje/effects/mirrors.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/mirrors.h b/veejay-current/veejay-server/libvje/effects/mirrors.h index b1654e3e..7d1fb777 100644 --- a/veejay-current/veejay-server/libvje/effects/mirrors.h +++ b/veejay-current/veejay-server/libvje/effects/mirrors.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/mirrors2.c b/veejay-current/veejay-server/libvje/effects/mirrors2.c index beee2c32..779c7b92 100644 --- a/veejay-current/veejay-server/libvje/effects/mirrors2.c +++ b/veejay-current/veejay-server/libvje/effects/mirrors2.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -43,7 +43,7 @@ vj_effect *mirrors2_init(int w, int h) -void mirror_multi_dr(uint8_t * yuv[3], int width, int height) +static void mirror_multi_dr(uint8_t * yuv[3], int width, int height) { unsigned int x, y; @@ -72,7 +72,7 @@ void mirror_multi_dr(uint8_t * yuv[3], int width, int height) } } -void mirror_multi_u(uint8_t * yuv[3], int width, int height) +static void mirror_multi_u(uint8_t * yuv[3], int width, int height) { unsigned int x, y; @@ -95,7 +95,7 @@ void mirror_multi_u(uint8_t * yuv[3], int width, int height) } } -void mirror_multi_d(uint8_t * yuv[3], int width, int height) +static void mirror_multi_d(uint8_t * yuv[3], int width, int height) { unsigned int x, y; unsigned int yi1 = 0; @@ -118,7 +118,7 @@ void mirror_multi_d(uint8_t * yuv[3], int width, int height) } } -void mirror_multi_l(uint8_t * yuv[3], int width, int height) +static void mirror_multi_l(uint8_t * yuv[3], int width, int height) { unsigned int x, y; @@ -138,12 +138,10 @@ void mirror_multi_l(uint8_t * yuv[3], int width, int height) } } -void mirror_multi_r(uint8_t * yuv[3], int width, int height) +static void mirror_multi_r(uint8_t * yuv[3], int width, int height) { unsigned int x, y; - unsigned int yi; - uint8_t p, cb, cr; for (y = 0; y < height; y++) { @@ -159,7 +157,7 @@ void mirror_multi_r(uint8_t * yuv[3], int width, int height) } } -void mirror_multi_ur(uint8_t * yuv[3], int width, int height) +static void mirror_multi_ur(uint8_t * yuv[3], int width, int height) { unsigned int x, y; diff --git a/veejay-current/veejay-server/libvje/effects/mirrors2.h b/veejay-current/veejay-server/libvje/effects/mirrors2.h index 9660afe1..f260f161 100644 --- a/veejay-current/veejay-server/libvje/effects/mirrors2.h +++ b/veejay-current/veejay-server/libvje/effects/mirrors2.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/morphology.c b/veejay-current/veejay-server/libvje/effects/morphology.c index d72d480d..13533a91 100644 --- a/veejay-current/veejay-server/libvje/effects/morphology.c +++ b/veejay-current/veejay-server/libvje/effects/morphology.c @@ -89,7 +89,7 @@ static uint8_t _erode_kernel3x3( uint8_t *kernel, uint8_t img[9]) return pixel_Y_hi_; } -morph_func _morphology_function(int i) +static morph_func _morphology_function(int i) { if( i == 0 ) return _dilate_kernel3x3; diff --git a/veejay-current/veejay-server/libvje/effects/morphology.h b/veejay-current/veejay-server/libvje/effects/morphology.h index 46d00fb7..baf3b7b9 100644 --- a/veejay-current/veejay-server/libvje/effects/morphology.h +++ b/veejay-current/veejay-server/libvje/effects/morphology.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/motionblur.c b/veejay-current/veejay-server/libvje/effects/motionblur.c index 5180b5fd..116e20ce 100644 --- a/veejay-current/veejay-server/libvje/effects/motionblur.c +++ b/veejay-current/veejay-server/libvje/effects/motionblur.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/motionblur.h b/veejay-current/veejay-server/libvje/effects/motionblur.h index b2f9b37c..a73dcd55 100644 --- a/veejay-current/veejay-server/libvje/effects/motionblur.h +++ b/veejay-current/veejay-server/libvje/effects/motionblur.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/motiondetect.c b/veejay-current/veejay-server/libvje/effects/motiondetect.c index 6c3f7f05..bd44c382 100644 --- a/veejay-current/veejay-server/libvje/effects/motiondetect.c +++ b/veejay-current/veejay-server/libvje/effects/motiondetect.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/motionmap.c b/veejay-current/veejay-server/libvje/effects/motionmap.c index 7e1788f2..6194789e 100644 --- a/veejay-current/veejay-server/libvje/effects/motionmap.c +++ b/veejay-current/veejay-server/libvje/effects/motionmap.c @@ -314,7 +314,7 @@ static int32_t motionmap_activity_level( uint8_t *I, int width, int height ) return (level>>8); } -void motionmap_calc_diff( const uint8_t *bg, uint8_t *prev_img, const uint8_t *img, uint8_t *pI1, uint8_t *pI2, uint8_t *bDst, const int len, const int threshold ) +static void motionmap_calc_diff( const uint8_t *bg, uint8_t *pimg, const uint8_t *img, uint8_t *pI1, uint8_t *pI2, uint8_t *bDst, const int len, const int threshold ) { unsigned int i; @@ -329,7 +329,7 @@ void motionmap_calc_diff( const uint8_t *bg, uint8_t *prev_img, const uint8_t *i else I1[i] = 0xff; - I2[i] = abs( bg[i] - prev_img[i] ); + I2[i] = abs( bg[i] - pimg[i] ); if( I2[i] < threshold ) I2[i] = 0; else @@ -343,7 +343,7 @@ void motionmap_calc_diff( const uint8_t *bg, uint8_t *prev_img, const uint8_t *i for( i = 0; i < len; i ++ ) { bDst[i] = I1[i] + I2[i]; - prev_img[i] = img[i]; + pimg[i] = img[i]; } } diff --git a/veejay-current/veejay-server/libvje/effects/motionmap.h b/veejay-current/veejay-server/libvje/effects/motionmap.h index 87f7473c..9ab12c44 100644 --- a/veejay-current/veejay-server/libvje/effects/motionmap.h +++ b/veejay-current/veejay-server/libvje/effects/motionmap.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2007 Niels Elburg + * Copyright(C)2007 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/mtracer.c b/veejay-current/veejay-server/libvje/effects/mtracer.c index b8ebbaa2..045035ae 100644 --- a/veejay-current/veejay-server/libvje/effects/mtracer.c +++ b/veejay-current/veejay-server/libvje/effects/mtracer.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,7 +21,7 @@ #include #include #include -#include "scratcher.h" +#include "mtracer.h" #include "common.h" #include "magicoverlays.h" diff --git a/veejay-current/veejay-server/libvje/effects/mtracer.h b/veejay-current/veejay-server/libvje/effects/mtracer.h index 24e81f38..0af4b4fa 100644 --- a/veejay-current/veejay-server/libvje/effects/mtracer.h +++ b/veejay-current/veejay-server/libvje/effects/mtracer.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/negation.c b/veejay-current/veejay-server/libvje/effects/negation.c index c773f6c8..0499b0f4 100644 --- a/veejay-current/veejay-server/libvje/effects/negation.c +++ b/veejay-current/veejay-server/libvje/effects/negation.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/negation.h b/veejay-current/veejay-server/libvje/effects/negation.h index 431699e3..22266134 100644 --- a/veejay-current/veejay-server/libvje/effects/negation.h +++ b/veejay-current/veejay-server/libvje/effects/negation.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/neighbours4.c b/veejay-current/veejay-server/libvje/effects/neighbours4.c index 4605feff..c30d5988 100644 --- a/veejay-current/veejay-server/libvje/effects/neighbours4.c +++ b/veejay-current/veejay-server/libvje/effects/neighbours4.c @@ -135,7 +135,7 @@ static inline pixel_t evaluate_pixel_bc( const uint8_t *image, /* image data */ const uint8_t *image_cb, const uint8_t *image_cr, - const relpoint_t *points /* relative coordinate map */ + const relpoint_t *pts /* relative coordinate map */ ) { unsigned int brightness; /* scaled brightnes */ @@ -162,8 +162,8 @@ static inline pixel_t evaluate_pixel_bc( /* loop over perimter of circle (!) */ for( i = 0; i < brush_size; i ++) { - dx = points[i].x + x; - dy = points[i].y + y; + dx = pts[i].x + x; + dy = pts[i].y + y; if(dx < 0) dx = 0; else if (dx >= w) dx = w-1; if(dy < 0) dy = 0; else if (dy >= h) dy = h-1; @@ -212,7 +212,7 @@ static inline uint8_t evaluate_pixel_b( const int h, /* height of image */ const uint8_t *premul, /* map data */ const uint8_t *image, /* image data */ - const relpoint_t *points /* relative coordinate map*/ + const relpoint_t *pts /* relative coordinate map*/ ) { unsigned int brightness; /* scaled brightnes */ @@ -240,8 +240,8 @@ static inline uint8_t evaluate_pixel_b( // points in circle for( i = 0; i < brush_size; i ++) { - dx = points[i].x + x; - dy = points[i].y + y; + dx = pts[i].x + x; + dy = pts[i].y + y; if(dx < 0) dx = 0; else if (dx > w) dx = w; if(dy < 0) dy = 0; else if (dy >= h) dy = h-1; diff --git a/veejay-current/veejay-server/libvje/effects/nervous.c b/veejay-current/veejay-server/libvje/effects/nervous.c index 32cd4b01..90401fe6 100644 --- a/veejay-current/veejay-server/libvje/effects/nervous.c +++ b/veejay-current/veejay-server/libvje/effects/nervous.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/nervous.h b/veejay-current/veejay-server/libvje/effects/nervous.h index e1e741cc..c8355090 100644 --- a/veejay-current/veejay-server/libvje/effects/nervous.h +++ b/veejay-current/veejay-server/libvje/effects/nervous.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/noiseadd.c b/veejay-current/veejay-server/libvje/effects/noiseadd.c index 696d639b..e6f12a86 100644 --- a/veejay-current/veejay-server/libvje/effects/noiseadd.c +++ b/veejay-current/veejay-server/libvje/effects/noiseadd.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -69,7 +69,7 @@ void noiseadd_free() { Yb_frame = NULL; } -void noiseblur1x3_maskapply(uint8_t *src[3], int width, int height, int coeef ) { +static void noiseblur1x3_maskapply(uint8_t *src[3], int width, int height, int coeef ) { int r, c; double k = (coeef/100.0); @@ -94,7 +94,8 @@ void noiseblur1x3_maskapply(uint8_t *src[3], int width, int height, int coeef ) } } -void noiseblur3x3_maskapply(uint8_t *src[3], int width, int height, int coeef ) { + +static void noiseblur3x3_maskapply(uint8_t *src[3], int width, int height, int coeef ) { int r, c; const double k = (coeef/1000.0); @@ -127,7 +128,7 @@ void noiseblur3x3_maskapply(uint8_t *src[3], int width, int height, int coeef ) } -void noiseneg3x3_maskapply(uint8_t *src[3], int width, int height, int coeef ) { +static void noiseneg3x3_maskapply(uint8_t *src[3], int width, int height, int coeef ) { int r, c; const double k = (coeef/1000.0); @@ -160,7 +161,7 @@ void noiseneg3x3_maskapply(uint8_t *src[3], int width, int height, int coeef ) { } -void noiseadd3x3_maskapply(uint8_t *src[3], int width, int height, int coeef ) { +static void noiseadd3x3_maskapply(uint8_t *src[3], int width, int height, int coeef ) { int r, c; const double k = (coeef/1000.0); @@ -193,7 +194,6 @@ void noiseadd3x3_maskapply(uint8_t *src[3], int width, int height, int coeef ) { } - void noiseadd_apply( VJFrame *frame, int width, int height, int type, int coeef) { switch(type) { diff --git a/veejay-current/veejay-server/libvje/effects/noiseadd.h b/veejay-current/veejay-server/libvje/effects/noiseadd.h index f5554017..4adc7e3e 100644 --- a/veejay-current/veejay-server/libvje/effects/noiseadd.h +++ b/veejay-current/veejay-server/libvje/effects/noiseadd.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/noisepencil.c b/veejay-current/veejay-server/libvje/effects/noisepencil.c index 08879259..4ccb351c 100644 --- a/veejay-current/veejay-server/libvje/effects/noisepencil.c +++ b/veejay-current/veejay-server/libvje/effects/noisepencil.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -74,7 +74,7 @@ void noisepencil_free() { Yb_frame = NULL; } -void noisepencil_1_apply(uint8_t *src[3], int width, int height, int coeef, int min_t, int max_t ) { +static void noisepencil_1_apply(uint8_t *src[3], int width, int height, int coeef, int min_t, int max_t ) { int r, c; double k = (coeef/100.0); @@ -115,7 +115,8 @@ void noisepencil_1_apply(uint8_t *src[3], int width, int height, int coeef, int } } -void noisepencil_2_apply(uint8_t *src[3], int width, int height, int coeef , int min_t, int max_t) { + +static void noisepencil_2_apply(uint8_t *src[3], int width, int height, int coeef , int min_t, int max_t) { int r, c; double k = (coeef/1000.0); @@ -163,7 +164,7 @@ void noisepencil_2_apply(uint8_t *src[3], int width, int height, int coeef , int } -void noisepencil_3_apply(uint8_t *src[3], int width, int height, int coeef, int min_t , int max_t ) { +static void noisepencil_3_apply(uint8_t *src[3], int width, int height, int coeef, int min_t , int max_t ) { int r, c; double k = (coeef/1000.0); @@ -210,7 +211,7 @@ void noisepencil_3_apply(uint8_t *src[3], int width, int height, int coeef, int } -void noisepencil_4_apply(uint8_t *src[3], int width, int height, int coeef, int min_t, int max_t ) { +static void noisepencil_4_apply(uint8_t *src[3], int width, int height, int coeef, int min_t, int max_t ) { int r, c; double k = (coeef/1000.0); @@ -260,8 +261,7 @@ void noisepencil_4_apply(uint8_t *src[3], int width, int height, int coeef, int } - -void noisepencil_5_apply(uint8_t *src[3], int width, int height, int coeef, int min_t , int max_t ) { +static void noisepencil_5_apply(uint8_t *src[3], int width, int height, int coeef, int min_t , int max_t ) { int r, c; double k = (coeef/1000.0); diff --git a/veejay-current/veejay-server/libvje/effects/noisepencil.h b/veejay-current/veejay-server/libvje/effects/noisepencil.h index f003278d..ff3ed1af 100644 --- a/veejay-current/veejay-server/libvje/effects/noisepencil.h +++ b/veejay-current/veejay-server/libvje/effects/noisepencil.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/opacity.c b/veejay-current/veejay-server/libvje/effects/opacity.c index d33ce02f..5f2b2854 100644 --- a/veejay-current/veejay-server/libvje/effects/opacity.c +++ b/veejay-current/veejay-server/libvje/effects/opacity.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/opacity.h b/veejay-current/veejay-server/libvje/effects/opacity.h index de81a60b..5427ea4e 100644 --- a/veejay-current/veejay-server/libvje/effects/opacity.h +++ b/veejay-current/veejay-server/libvje/effects/opacity.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/opacityadv.c b/veejay-current/veejay-server/libvje/effects/opacityadv.c index fca82db7..e6af0095 100644 --- a/veejay-current/veejay-server/libvje/effects/opacityadv.c +++ b/veejay-current/veejay-server/libvje/effects/opacityadv.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/opacityadv.h b/veejay-current/veejay-server/libvje/effects/opacityadv.h index 26a84f9f..4dee36a3 100644 --- a/veejay-current/veejay-server/libvje/effects/opacityadv.h +++ b/veejay-current/veejay-server/libvje/effects/opacityadv.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/opacitythreshold.c b/veejay-current/veejay-server/libvje/effects/opacitythreshold.c index 3c11f2b3..aab0f1bb 100644 --- a/veejay-current/veejay-server/libvje/effects/opacitythreshold.c +++ b/veejay-current/veejay-server/libvje/effects/opacitythreshold.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/opacitythreshold.h b/veejay-current/veejay-server/libvje/effects/opacitythreshold.h index 95829603..f231c617 100644 --- a/veejay-current/veejay-server/libvje/effects/opacitythreshold.h +++ b/veejay-current/veejay-server/libvje/effects/opacitythreshold.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/overclock.c b/veejay-current/veejay-server/libvje/effects/overclock.c index 1f873ec7..9643d443 100644 --- a/veejay-current/veejay-server/libvje/effects/overclock.c +++ b/veejay-current/veejay-server/libvje/effects/overclock.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/overclock.h b/veejay-current/veejay-server/libvje/effects/overclock.h index 892ff307..f826f739 100644 --- a/veejay-current/veejay-server/libvje/effects/overclock.h +++ b/veejay-current/veejay-server/libvje/effects/overclock.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/pencilsketch.c b/veejay-current/veejay-server/libvje/effects/pencilsketch.c index 3b6d2ef3..b5779e2b 100644 --- a/veejay-current/veejay-server/libvje/effects/pencilsketch.c +++ b/veejay-current/veejay-server/libvje/effects/pencilsketch.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -135,7 +135,7 @@ typedef uint8_t (*_pcbcr) (uint8_t a, uint8_t b); } /* get a pointer to a pixel function */ - _pcf _get_pcf(int type) + static _pcf _get_pcf(int type) { switch(type) { @@ -172,7 +172,7 @@ void pencilsketch_apply( uint8_t *Cr= frame->data[2]; /* get a pointer to a pixel blend function */ - _pcf _pff = (_pcf) _get_pf(type); + _pcf _pff = (_pcf) _get_pcf(type); _pcbcr _pcbcrff = &_pcbcr_color; if(mode == 1 ) { diff --git a/veejay-current/veejay-server/libvje/effects/pencilsketch.h b/veejay-current/veejay-server/libvje/effects/pencilsketch.h index abb6317b..6c9eadb3 100644 --- a/veejay-current/veejay-server/libvje/effects/pencilsketch.h +++ b/veejay-current/veejay-server/libvje/effects/pencilsketch.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/perspective.c b/veejay-current/veejay-server/libvje/effects/perspective.c index 28f8ad03..55b521a6 100644 --- a/veejay-current/veejay-server/libvje/effects/perspective.c +++ b/veejay-current/veejay-server/libvje/effects/perspective.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002-2016 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,6 +24,8 @@ #include #include #include "common.h" +#include "perspective.h" + vj_effect *perspective_init(int width , int height) { vj_effect *ve = (vj_effect *) vj_calloc(sizeof(vj_effect)); diff --git a/veejay-current/veejay-server/libvje/effects/photoplay.h b/veejay-current/veejay-server/libvje/effects/photoplay.h index 52ff0859..5084f1a7 100644 --- a/veejay-current/veejay-server/libvje/effects/photoplay.h +++ b/veejay-current/veejay-server/libvje/effects/photoplay.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/pixelate.c b/veejay-current/veejay-server/libvje/effects/pixelate.c index c65a252c..69755a83 100644 --- a/veejay-current/veejay-server/libvje/effects/pixelate.c +++ b/veejay-current/veejay-server/libvje/effects/pixelate.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/pixelate.h b/veejay-current/veejay-server/libvje/effects/pixelate.h index 0c2de417..6d72de99 100644 --- a/veejay-current/veejay-server/libvje/effects/pixelate.h +++ b/veejay-current/veejay-server/libvje/effects/pixelate.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/posterize.c b/veejay-current/veejay-server/libvje/effects/posterize.c index 5cc8cb31..fcad936e 100644 --- a/veejay-current/veejay-server/libvje/effects/posterize.c +++ b/veejay-current/veejay-server/libvje/effects/posterize.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/posterize.h b/veejay-current/veejay-server/libvje/effects/posterize.h index 1b13ad0f..17400e5e 100644 --- a/veejay-current/veejay-server/libvje/effects/posterize.h +++ b/veejay-current/veejay-server/libvje/effects/posterize.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/radcor.h b/veejay-current/veejay-server/libvje/effects/radcor.h index 560f38c9..c788976d 100644 --- a/veejay-current/veejay-server/libvje/effects/radcor.h +++ b/veejay-current/veejay-server/libvje/effects/radcor.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/radialblur.c b/veejay-current/veejay-server/libvje/effects/radialblur.c index c5761e6f..7d845f33 100644 --- a/veejay-current/veejay-server/libvje/effects/radialblur.c +++ b/veejay-current/veejay-server/libvje/effects/radialblur.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/radialblur.h b/veejay-current/veejay-server/libvje/effects/radialblur.h index f09e4d7f..60b37ea1 100644 --- a/veejay-current/veejay-server/libvje/effects/radialblur.h +++ b/veejay-current/veejay-server/libvje/effects/radialblur.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/radioactive.c b/veejay-current/veejay-server/libvje/effects/radioactive.c index 0d5aad60..78727177 100644 --- a/veejay-current/veejay-server/libvje/effects/radioactive.c +++ b/veejay-current/veejay-server/libvje/effects/radioactive.c @@ -169,7 +169,8 @@ static void zoom(void) } } } -void blurzoomcore(void) + +static void blurzoomcore(void) { kentaro_blur(); zoom(); diff --git a/veejay-current/veejay-server/libvje/effects/radioactive.h b/veejay-current/veejay-server/libvje/effects/radioactive.h index 0538b8c2..b22af432 100644 --- a/veejay-current/veejay-server/libvje/effects/radioactive.h +++ b/veejay-current/veejay-server/libvje/effects/radioactive.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2007 Niels Elburg + * Copyright(C)2007 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/randnoise.c b/veejay-current/veejay-server/libvje/effects/randnoise.c index 52b5ceb5..2bde41e0 100644 --- a/veejay-current/veejay-server/libvje/effects/randnoise.c +++ b/veejay-current/veejay-server/libvje/effects/randnoise.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2015 Niels Elburg + * Copyright(C)2015 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/randnoise.h b/veejay-current/veejay-server/libvje/effects/randnoise.h index bccf7658..63214d09 100644 --- a/veejay-current/veejay-server/libvje/effects/randnoise.h +++ b/veejay-current/veejay-server/libvje/effects/randnoise.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2015 Niels Elburg + * Copyright(C)2015 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/raster.c b/veejay-current/veejay-server/libvje/effects/raster.c index 13c60d3a..9e12b5e0 100644 --- a/veejay-current/veejay-server/libvje/effects/raster.c +++ b/veejay-current/veejay-server/libvje/effects/raster.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/raster.h b/veejay-current/veejay-server/libvje/effects/raster.h index 14ed9eae..4eb5a2f5 100644 --- a/veejay-current/veejay-server/libvje/effects/raster.h +++ b/veejay-current/veejay-server/libvje/effects/raster.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/rawman.c b/veejay-current/veejay-server/libvje/effects/rawman.c index 8dd437ab..c1d9bc46 100644 --- a/veejay-current/veejay-server/libvje/effects/rawman.c +++ b/veejay-current/veejay-server/libvje/effects/rawman.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/rawman.h b/veejay-current/veejay-server/libvje/effects/rawman.h index 35d64ed2..d643c7c8 100644 --- a/veejay-current/veejay-server/libvje/effects/rawman.h +++ b/veejay-current/veejay-server/libvje/effects/rawman.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/rawval.c b/veejay-current/veejay-server/libvje/effects/rawval.c index 3c66d878..22014e60 100644 --- a/veejay-current/veejay-server/libvje/effects/rawval.c +++ b/veejay-current/veejay-server/libvje/effects/rawval.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/rawval.h b/veejay-current/veejay-server/libvje/effects/rawval.h index 274ca11a..7224e8ec 100644 --- a/veejay-current/veejay-server/libvje/effects/rawval.h +++ b/veejay-current/veejay-server/libvje/effects/rawval.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/reflection.c b/veejay-current/veejay-server/libvje/effects/reflection.c index 32c28288..54dfffc5 100644 --- a/veejay-current/veejay-server/libvje/effects/reflection.c +++ b/veejay-current/veejay-server/libvje/effects/reflection.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/reflection.h b/veejay-current/veejay-server/libvje/effects/reflection.h index c3b01e68..b6f2ff6b 100644 --- a/veejay-current/veejay-server/libvje/effects/reflection.h +++ b/veejay-current/veejay-server/libvje/effects/reflection.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/revtv.c b/veejay-current/veejay-server/libvje/effects/revtv.c index 6f3e5266..b735ff43 100644 --- a/veejay-current/veejay-server/libvje/effects/revtv.c +++ b/veejay-current/veejay-server/libvje/effects/revtv.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/revtv.h b/veejay-current/veejay-server/libvje/effects/revtv.h index c2871171..650bd81a 100644 --- a/veejay-current/veejay-server/libvje/effects/revtv.h +++ b/veejay-current/veejay-server/libvje/effects/revtv.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/rgbchannel.c b/veejay-current/veejay-server/libvje/effects/rgbchannel.c index 788367ca..9917c40e 100644 --- a/veejay-current/veejay-server/libvje/effects/rgbchannel.c +++ b/veejay-current/veejay-server/libvje/effects/rgbchannel.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/rgbchannel.h b/veejay-current/veejay-server/libvje/effects/rgbchannel.h index da659924..1a82ea92 100644 --- a/veejay-current/veejay-server/libvje/effects/rgbchannel.h +++ b/veejay-current/veejay-server/libvje/effects/rgbchannel.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002-2007 Niels Elburg + * Copyright(C)2002-2007 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/rgbkey.h b/veejay-current/veejay-server/libvje/effects/rgbkey.h index 542ba4bd..cd478b21 100644 --- a/veejay-current/veejay-server/libvje/effects/rgbkey.h +++ b/veejay-current/veejay-server/libvje/effects/rgbkey.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/rgbkeysmooth.c b/veejay-current/veejay-server/libvje/effects/rgbkeysmooth.c index 2ba209e5..379cef9d 100644 --- a/veejay-current/veejay-server/libvje/effects/rgbkeysmooth.c +++ b/veejay-current/veejay-server/libvje/effects/rgbkeysmooth.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,7 +24,7 @@ #include #include #include "common.h" -#include "rgbkey.h" +#include "rgbkeysmooth.h" vj_effect *rgbkeysmooth_init(int w,int h) diff --git a/veejay-current/veejay-server/libvje/effects/rgbkeysmooth.h b/veejay-current/veejay-server/libvje/effects/rgbkeysmooth.h index 84b2064e..d1fa4c9e 100644 --- a/veejay-current/veejay-server/libvje/effects/rgbkeysmooth.h +++ b/veejay-current/veejay-server/libvje/effects/rgbkeysmooth.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/ripple.c b/veejay-current/veejay-server/libvje/effects/ripple.c index 430ff8ff..54cb5d8e 100644 --- a/veejay-current/veejay-server/libvje/effects/ripple.c +++ b/veejay-current/veejay-server/libvje/effects/ripple.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/ripple.h b/veejay-current/veejay-server/libvje/effects/ripple.h index a5afbef0..ade99ad3 100644 --- a/veejay-current/veejay-server/libvje/effects/ripple.h +++ b/veejay-current/veejay-server/libvje/effects/ripple.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/rippletv.h b/veejay-current/veejay-server/libvje/effects/rippletv.h index 4cf6bc5f..6f884334 100644 --- a/veejay-current/veejay-server/libvje/effects/rippletv.h +++ b/veejay-current/veejay-server/libvje/effects/rippletv.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/rotozoom.c b/veejay-current/veejay-server/libvje/effects/rotozoom.c index 8c54e67b..2098f2e7 100644 --- a/veejay-current/veejay-server/libvje/effects/rotozoom.c +++ b/veejay-current/veejay-server/libvje/effects/rotozoom.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -164,7 +164,7 @@ void rotozoom_free() { /* rotozoomer, from the demo effects collection, works in supersampled YCbCr space. printf("Retro Rotozoom Effect - B. Ellacott, W.P. van Paassen - 2002\n"); */ -void draw_tile(int stepx, int stepy, int zoom, int w, int h, +static void draw_tile(int stepx, int stepy, int zoom, int w, int h, uint8_t * src1[3], uint8_t * src2[3]) { @@ -191,7 +191,7 @@ void draw_tile(int stepx, int stepy, int zoom, int w, int h, } } -void rotozoom2_apply(VJFrame *frame, uint8_t *data[3], int width, +static void rotozoom2_apply(VJFrame *frame, uint8_t *data[3], int width, int height, int n, int p, int z) { draw_tile(test_roto[n][p], @@ -199,7 +199,7 @@ void rotozoom2_apply(VJFrame *frame, uint8_t *data[3], int width, test_roto2[n][z], width, height, frame->data, data); } -void rotozoom1_apply(VJFrame *frame, uint8_t *data[3], int w, int h, +static void rotozoom1_apply(VJFrame *frame, uint8_t *data[3], int w, int h, int n, int p, int z) { diff --git a/veejay-current/veejay-server/libvje/effects/rotozoom.h b/veejay-current/veejay-server/libvje/effects/rotozoom.h index 58de653d..0f476298 100644 --- a/veejay-current/veejay-server/libvje/effects/rotozoom.h +++ b/veejay-current/veejay-server/libvje/effects/rotozoom.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/scratcher.c b/veejay-current/veejay-server/libvje/effects/scratcher.c index 103d046b..a0a76c53 100644 --- a/veejay-current/veejay-server/libvje/effects/scratcher.c +++ b/veejay-current/veejay-server/libvje/effects/scratcher.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -84,7 +84,7 @@ int scratcher_malloc(int w, int h) } -void store_frame(VJFrame *src, int w, int h, int n, int no_reverse) +static void store_frame(VJFrame *src, int w, int h, int n, int no_reverse) { int uv_len = src->uv_len; int strides[4] = { (w * h), uv_len, uv_len , 0 }; diff --git a/veejay-current/veejay-server/libvje/effects/scratcher.h b/veejay-current/veejay-server/libvje/effects/scratcher.h index 7402aeed..422afbd3 100644 --- a/veejay-current/veejay-server/libvje/effects/scratcher.h +++ b/veejay-current/veejay-server/libvje/effects/scratcher.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/sinoids.c b/veejay-current/veejay-server/libvje/effects/sinoids.c index 51b7df55..b6baf613 100644 --- a/veejay-current/veejay-server/libvje/effects/sinoids.c +++ b/veejay-current/veejay-server/libvje/effects/sinoids.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -93,7 +93,7 @@ void sinoids_free() { } -void sinoids_recalc(int width, int z) { +static void sinoids_recalc(int width, int z) { int i=0; double zoom = ( (double)z / 10.0); for(i=0; i < width; i++ ) { diff --git a/veejay-current/veejay-server/libvje/effects/sinoids.h b/veejay-current/veejay-server/libvje/effects/sinoids.h index 810765e6..e76338ba 100644 --- a/veejay-current/veejay-server/libvje/effects/sinoids.h +++ b/veejay-current/veejay-server/libvje/effects/sinoids.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/slice.h b/veejay-current/veejay-server/libvje/effects/slice.h index 99c14388..f5eb00e1 100644 --- a/veejay-current/veejay-server/libvje/effects/slice.h +++ b/veejay-current/veejay-server/libvje/effects/slice.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/slicer.c b/veejay-current/veejay-server/libvje/effects/slicer.c index 0a7d0d1a..4874b8f8 100644 --- a/veejay-current/veejay-server/libvje/effects/slicer.c +++ b/veejay-current/veejay-server/libvje/effects/slicer.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/slicer.h b/veejay-current/veejay-server/libvje/effects/slicer.h index 2cff0065..8402ba1b 100644 --- a/veejay-current/veejay-server/libvje/effects/slicer.h +++ b/veejay-current/veejay-server/libvje/effects/slicer.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/smear.c b/veejay-current/veejay-server/libvje/effects/smear.c index 4edcf545..16b64d58 100644 --- a/veejay-current/veejay-server/libvje/effects/smear.c +++ b/veejay-current/veejay-server/libvje/effects/smear.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/smear.h b/veejay-current/veejay-server/libvje/effects/smear.h index 2bddf94f..90d09e91 100644 --- a/veejay-current/veejay-server/libvje/effects/smear.h +++ b/veejay-current/veejay-server/libvje/effects/smear.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/smuck.c b/veejay-current/veejay-server/libvje/effects/smuck.c index 8ca36fbd..e1ccbc55 100644 --- a/veejay-current/veejay-server/libvje/effects/smuck.c +++ b/veejay-current/veejay-server/libvje/effects/smuck.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/smuck.h b/veejay-current/veejay-server/libvje/effects/smuck.h index e6bd6ff7..de454acd 100644 --- a/veejay-current/veejay-server/libvje/effects/smuck.h +++ b/veejay-current/veejay-server/libvje/effects/smuck.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/softblur.c b/veejay-current/veejay-server/libvje/effects/softblur.c index eb87cd5e..7e8f95dd 100644 --- a/veejay-current/veejay-server/libvje/effects/softblur.c +++ b/veejay-current/veejay-server/libvje/effects/softblur.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/softblur.h b/veejay-current/veejay-server/libvje/effects/softblur.h index 994b5309..9d63bf95 100644 --- a/veejay-current/veejay-server/libvje/effects/softblur.h +++ b/veejay-current/veejay-server/libvje/effects/softblur.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/solarize.c b/veejay-current/veejay-server/libvje/effects/solarize.c index 7cbe77cd..97c27d6f 100644 --- a/veejay-current/veejay-server/libvje/effects/solarize.c +++ b/veejay-current/veejay-server/libvje/effects/solarize.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/solarize.h b/veejay-current/veejay-server/libvje/effects/solarize.h index b974d8cc..86aac281 100644 --- a/veejay-current/veejay-server/libvje/effects/solarize.h +++ b/veejay-current/veejay-server/libvje/effects/solarize.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/split.c b/veejay-current/veejay-server/libvje/effects/split.c index 586d7300..9eba9c3c 100644 --- a/veejay-current/veejay-server/libvje/effects/split.c +++ b/veejay-current/veejay-server/libvje/effects/split.c @@ -1,6 +1,6 @@ /* Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 diff --git a/veejay-current/veejay-server/libvje/effects/split.h b/veejay-current/veejay-server/libvje/effects/split.h index c3febc8f..9678fec9 100644 --- a/veejay-current/veejay-server/libvje/effects/split.h +++ b/veejay-current/veejay-server/libvje/effects/split.h @@ -2,7 +2,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/swirl.c b/veejay-current/veejay-server/libvje/effects/swirl.c index 745a7e99..a99a160a 100644 --- a/veejay-current/veejay-server/libvje/effects/swirl.c +++ b/veejay-current/veejay-server/libvje/effects/swirl.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -124,7 +124,6 @@ void swirl_apply(VJFrame *frame, int w, int h, int v) //const double coeef = R / log(curve * R + 1); //const double coeef = R / log( curve * R + 2); /* pre calculate */ - unsigned int i; int px,py; double r,a; double si,co; diff --git a/veejay-current/veejay-server/libvje/effects/swirl.h b/veejay-current/veejay-server/libvje/effects/swirl.h index 9ad054bf..ad286c81 100644 --- a/veejay-current/veejay-server/libvje/effects/swirl.h +++ b/veejay-current/veejay-server/libvje/effects/swirl.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/threshold.h b/veejay-current/veejay-server/libvje/effects/threshold.h index c05203b3..27588c15 100644 --- a/veejay-current/veejay-server/libvje/effects/threshold.h +++ b/veejay-current/veejay-server/libvje/effects/threshold.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/timedistort.h b/veejay-current/veejay-server/libvje/effects/timedistort.h index 73376524..87a441ca 100644 --- a/veejay-current/veejay-server/libvje/effects/timedistort.h +++ b/veejay-current/veejay-server/libvje/effects/timedistort.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/toalpha.c b/veejay-current/veejay-server/libvje/effects/toalpha.c index 0a251610..19d0ab15 100644 --- a/veejay-current/veejay-server/libvje/effects/toalpha.c +++ b/veejay-current/veejay-server/libvje/effects/toalpha.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/tracer.c b/veejay-current/veejay-server/libvje/effects/tracer.c index 3e7bf002..89391fc1 100644 --- a/veejay-current/veejay-server/libvje/effects/tracer.c +++ b/veejay-current/veejay-server/libvje/effects/tracer.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,7 +20,7 @@ #include #include #include -#include "scratcher.h" +#include "tracer.h" #include "common.h" static uint8_t *trace_buffer[4] = { NULL,NULL,NULL,NULL}; diff --git a/veejay-current/veejay-server/libvje/effects/tracer.h b/veejay-current/veejay-server/libvje/effects/tracer.h index 549001d8..712a5f71 100644 --- a/veejay-current/veejay-server/libvje/effects/tracer.h +++ b/veejay-current/veejay-server/libvje/effects/tracer.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/transform.c b/veejay-current/veejay-server/libvje/effects/transform.c index 24918e7f..966cddac 100644 --- a/veejay-current/veejay-server/libvje/effects/transform.c +++ b/veejay-current/veejay-server/libvje/effects/transform.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/transform.h b/veejay-current/veejay-server/libvje/effects/transform.h index 4daf5b44..8aaa097f 100644 --- a/veejay-current/veejay-server/libvje/effects/transform.h +++ b/veejay-current/veejay-server/libvje/effects/transform.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/tripplicity.h b/veejay-current/veejay-server/libvje/effects/tripplicity.h index 415c7e5a..3a8245a9 100644 --- a/veejay-current/veejay-server/libvje/effects/tripplicity.h +++ b/veejay-current/veejay-server/libvje/effects/tripplicity.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2005 Niels Elburg + * Copyright(C)2005 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/uvcorrect.c b/veejay-current/veejay-server/libvje/effects/uvcorrect.c index 4afe262f..fdc27017 100644 --- a/veejay-current/veejay-server/libvje/effects/uvcorrect.c +++ b/veejay-current/veejay-server/libvje/effects/uvcorrect.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2004 Niels Elburg + * Copyright(C)2004 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -103,20 +103,6 @@ void uvcorrect_free() chrominance= NULL; } -void uvcorrect_help() -{ - /*veejay_msg(1, "UV Correct (portion of yuvcorrect by Xavier Biquard"); - veejay_msg(1, "Select a color and set a new chroma value for the entire selection"); - veejay_msg(1, "one or both of the parameters p4 and p5"); - veejay_msg(1, "p0 = UV rotation angle"); - veejay_msg(1, "p1 = U rotate center"); - veejay_msg(1, "p2 = V rotate center"); - veejay_msg(1, "p3 = U factor"); - veejay_msg(1, "p4 = V factor"); - veejay_msg(1, "p5 = UV min"); - veejay_msg(1, "p6 = UV max"); */ -} - static inline void _chrominance_treatment(uint8_t *u,uint8_t *v, const int len) { uint8_t *Uu_c_p, *Vu_c_p; diff --git a/veejay-current/veejay-server/libvje/effects/videomask.c b/veejay-current/veejay-server/libvje/effects/videomask.c index 01ec4c6c..4f7529b9 100644 --- a/veejay-current/veejay-server/libvje/effects/videomask.c +++ b/veejay-current/veejay-server/libvje/effects/videomask.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/videoplay.h b/veejay-current/veejay-server/libvje/effects/videoplay.h index 773e793e..59a80fa1 100644 --- a/veejay-current/veejay-server/libvje/effects/videoplay.h +++ b/veejay-current/veejay-server/libvje/effects/videoplay.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/videowall.h b/veejay-current/veejay-server/libvje/effects/videowall.h index c973a209..ab9e5ba3 100644 --- a/veejay-current/veejay-server/libvje/effects/videowall.h +++ b/veejay-current/veejay-server/libvje/effects/videowall.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/water.c b/veejay-current/veejay-server/libvje/effects/water.c index ec5ed227..96376b87 100644 --- a/veejay-current/veejay-server/libvje/effects/water.c +++ b/veejay-current/veejay-server/libvje/effects/water.c @@ -80,7 +80,7 @@ static int bgIsSet = 0; * You should use high-order bits. */ -unsigned int wfastrand(water_t *w) +static unsigned int wfastrand(water_t *w) { return (w->wfastrand_val=w->wfastrand_val*1103515245+12345); } diff --git a/veejay-current/veejay-server/libvje/effects/waterrippletv.c b/veejay-current/veejay-server/libvje/effects/waterrippletv.c index 0c2c0254..1a1375d2 100644 --- a/veejay-current/veejay-server/libvje/effects/waterrippletv.c +++ b/veejay-current/veejay-server/libvje/effects/waterrippletv.c @@ -27,7 +27,7 @@ #include #include #include -#include "rippletv.h" +#include "waterrippletv.h" #include #include #include "common.h" diff --git a/veejay-current/veejay-server/libvje/effects/waterrippletv.h b/veejay-current/veejay-server/libvje/effects/waterrippletv.h index a8d87f08..e4467053 100644 --- a/veejay-current/veejay-server/libvje/effects/waterrippletv.h +++ b/veejay-current/veejay-server/libvje/effects/waterrippletv.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002-2016 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/whiteframe.c b/veejay-current/veejay-server/libvje/effects/whiteframe.c index 31f71cc7..042baca4 100644 --- a/veejay-current/veejay-server/libvje/effects/whiteframe.c +++ b/veejay-current/veejay-server/libvje/effects/whiteframe.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/whiteframe.h b/veejay-current/veejay-server/libvje/effects/whiteframe.h index ec399d8c..af735791 100644 --- a/veejay-current/veejay-server/libvje/effects/whiteframe.h +++ b/veejay-current/veejay-server/libvje/effects/whiteframe.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/widthmirror.c b/veejay-current/veejay-server/libvje/effects/widthmirror.c index c3dc0cac..03a9b862 100644 --- a/veejay-current/veejay-server/libvje/effects/widthmirror.c +++ b/veejay-current/veejay-server/libvje/effects/widthmirror.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/widthmirror.h b/veejay-current/veejay-server/libvje/effects/widthmirror.h index bd2e740d..5a19c39d 100644 --- a/veejay-current/veejay-server/libvje/effects/widthmirror.h +++ b/veejay-current/veejay-server/libvje/effects/widthmirror.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/zoom.c b/veejay-current/veejay-server/libvje/effects/zoom.c index 2a6c36ad..af0a83bc 100644 --- a/veejay-current/veejay-server/libvje/effects/zoom.c +++ b/veejay-current/veejay-server/libvje/effects/zoom.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/effects/zoom.h b/veejay-current/veejay-server/libvje/effects/zoom.h index 31a5da10..21108255 100644 --- a/veejay-current/veejay-server/libvje/effects/zoom.h +++ b/veejay-current/veejay-server/libvje/effects/zoom.h @@ -2,7 +2,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/internal.h b/veejay-current/veejay-server/libvje/internal.h index 3c7684b4..e87b7a2f 100644 --- a/veejay-current/veejay-server/libvje/internal.h +++ b/veejay-current/veejay-server/libvje/internal.h @@ -405,9 +405,9 @@ extern void whiteframe_apply(VJFrame *frame, VJFrame *frame2, extern void texmap_apply(void *dd, VJFrame *frame, VJFrame *frame2, int width, int height, int mode, int threshold, int c , int feather, int blob); -extern void contourextract_apply(void *dd, VJFrame *frame, - int width, int height, - int mode, int threshold, int c , int feather, int blob); + +extern void contourextract_apply(void *ed, VJFrame *frame,int width, int height, + int threshold, int reverse,int mode, int take_bg, int feather, int min_blob_weight); extern void diff_apply(void *dd, VJFrame *frame, VJFrame *frame2, int width, int height, diff --git a/veejay-current/veejay-server/libvje/transitions/3bar.c b/veejay-current/veejay-server/libvje/transitions/3bar.c index ce122fe4..a13f37e7 100644 --- a/veejay-current/veejay-server/libvje/transitions/3bar.c +++ b/veejay-current/veejay-server/libvje/transitions/3bar.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -114,4 +114,3 @@ void bar_apply(VJFrame *frame, VJFrame *frame2, int width, int height,int divide bar_top_vert += top_x; bar_bot_vert += bot_x; } -void bar_free(){} diff --git a/veejay-current/veejay-server/libvje/transitions/3bar.h b/veejay-current/veejay-server/libvje/transitions/3bar.h index feb2594b..2f580ce4 100644 --- a/veejay-current/veejay-server/libvje/transitions/3bar.h +++ b/veejay-current/veejay-server/libvje/transitions/3bar.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -31,7 +31,7 @@ void bar_apply(VJFrame *frame, VJFrame *frame2, /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/transitions/fadecolor.c b/veejay-current/veejay-server/libvje/transitions/fadecolor.c index 41e3b380..0b323d94 100644 --- a/veejay-current/veejay-server/libvje/transitions/fadecolor.c +++ b/veejay-current/veejay-server/libvje/transitions/fadecolor.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -122,4 +122,3 @@ void colorfade_apply(VJFrame *frame, int width, int height, int opacity, Cr[i] = (op0 * Cr[i] + op1 * colorCr) >> 8; } } -void fadecolor_free(){} diff --git a/veejay-current/veejay-server/libvje/transitions/fadecolor.h b/veejay-current/veejay-server/libvje/transitions/fadecolor.h index 460d09ec..dc5f2a04 100644 --- a/veejay-current/veejay-server/libvje/transitions/fadecolor.h +++ b/veejay-current/veejay-server/libvje/transitions/fadecolor.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -29,35 +29,3 @@ void colorfade_apply( VJFrame *frame, int width, int height, int opacity, int n); #endif -/* - * Linux VeeJay - * - * Copyright(C)2002 Niels Elburg - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License , or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 , USA. - */ - -#ifndef FADECOLOR_H -#define FADECOLOR_H -#include "../vj-effect.h" -#include -#include - -vj_effect *fadecolor_init(int w, int h); -void colorfade_apply(uint8_t * yuv1[3], int width, int height, int opacity, - int n); - -void fadecolor_free(); -#endif diff --git a/veejay-current/veejay-server/libvje/transitions/fadecolorrgb.c b/veejay-current/veejay-server/libvje/transitions/fadecolorrgb.c index 6f72d0aa..f86189b9 100644 --- a/veejay-current/veejay-server/libvje/transitions/fadecolorrgb.c +++ b/veejay-current/veejay-server/libvje/transitions/fadecolorrgb.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002-2016 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -87,4 +87,3 @@ void colorfadergb_apply( VJFrame *frame, int width, int height, Cr[i] = (op0 * Cr[i] + op1 * colorCr) >> 8; } } -void fadecolorrgb_free(){} diff --git a/veejay-current/veejay-server/libvje/transitions/fadecolorrgb.h b/veejay-current/veejay-server/libvje/transitions/fadecolorrgb.h index 4dcd475e..7235f004 100644 --- a/veejay-current/veejay-server/libvje/transitions/fadecolorrgb.h +++ b/veejay-current/veejay-server/libvje/transitions/fadecolorrgb.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -29,35 +29,3 @@ void colorfadergb_apply(VJFrame *frame, int width, int height, int opacity, int r, int g, int b); #endif -/* - * Linux VeeJay - * - * Copyright(C)2002 Niels Elburg - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License , or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 , USA. - */ - -#ifndef FADECOLORRGB_H -#define FADECOLORRGB_H -#include "../vj-effect.h" -#include -#include - -vj_effect *fadecolorrgb_init(int w, int h); -void colorfadergb_apply(uint8_t * yuv1[3], int width, int height, - int opacity, int r, int g, int b); - -void fadecolorrgb_free(); -#endif diff --git a/veejay-current/veejay-server/libvje/transitions/slidingdoor.c b/veejay-current/veejay-server/libvje/transitions/slidingdoor.c index 0537858f..c949d11a 100644 --- a/veejay-current/veejay-server/libvje/transitions/slidingdoor.c +++ b/veejay-current/veejay-server/libvje/transitions/slidingdoor.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/transitions/slidingdoor.h b/veejay-current/veejay-server/libvje/transitions/slidingdoor.h index cdc431a3..0e5a1e94 100644 --- a/veejay-current/veejay-server/libvje/transitions/slidingdoor.h +++ b/veejay-current/veejay-server/libvje/transitions/slidingdoor.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/transitions/transblend.c b/veejay-current/veejay-server/libvje/transitions/transblend.c index 1d42a97d..571d0ac7 100644 --- a/veejay-current/veejay-server/libvje/transitions/transblend.c +++ b/veejay-current/veejay-server/libvje/transitions/transblend.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/transitions/transblend.h b/veejay-current/veejay-server/libvje/transitions/transblend.h index d57d2f44..77ce9995 100644 --- a/veejay-current/veejay-server/libvje/transitions/transblend.h +++ b/veejay-current/veejay-server/libvje/transitions/transblend.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -35,7 +35,7 @@ void transblend_apply( VJFrame *frame, VJFrame *frame2, int w, int h, /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/transitions/transcarot.c b/veejay-current/veejay-server/libvje/transitions/transcarot.c index 1faa9d72..51d1bc76 100644 --- a/veejay-current/veejay-server/libvje/transitions/transcarot.c +++ b/veejay-current/veejay-server/libvje/transitions/transcarot.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -57,7 +57,8 @@ vj_effect *transcarot_init(int width, int height) ve->extra_frame = 1; return ve; } -void transcarot1_apply( VJFrame *frame, VJFrame *frame2, int width, + +static void transcarot1_apply( VJFrame *frame, VJFrame *frame2, int width, int height, int point_size, int dy, int dye, int row_start, int opacity) { @@ -142,7 +143,7 @@ void transcarot1_apply( VJFrame *frame, VJFrame *frame2, int width, } /* carot transistion. like translate, but different form and with mirroring */ -void transcarot2_apply( VJFrame *frame, VJFrame *frame2, int width, +static void transcarot2_apply( VJFrame *frame, VJFrame *frame2, int width, int height, int point_size, int dy, int dye, int row_start, int opacity) { @@ -269,4 +270,3 @@ void transcarot_apply( VJFrame *frame, VJFrame *frame2, int width, transcarot2_apply(frame, frame2, width, height, p, dy, dye, row, opacity); } -void transcarot_free(){} diff --git a/veejay-current/veejay-server/libvje/transitions/transcarot.h b/veejay-current/veejay-server/libvje/transitions/transcarot.h index 5e208ae0..51a64a99 100644 --- a/veejay-current/veejay-server/libvje/transitions/transcarot.h +++ b/veejay-current/veejay-server/libvje/transitions/transcarot.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/transitions/transline.c b/veejay-current/veejay-server/libvje/transitions/transline.c index 5e74be5d..831c65ed 100644 --- a/veejay-current/veejay-server/libvje/transitions/transline.c +++ b/veejay-current/veejay-server/libvje/transitions/transline.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -51,7 +51,7 @@ vj_effect *transline_init(int width, int height) return ve; } -void transline1_apply(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, +static void transline1_apply(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, int height, int distance, int line_width) { unsigned int uv_width = width >> 1; @@ -91,9 +91,7 @@ void transline1_apply(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, } - - -void transline2_apply(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, +static void transline2_apply(uint8_t * yuv1[3], uint8_t * yuv2[3], int width, int height, int distance, int line_width, int opacity) { diff --git a/veejay-current/veejay-server/libvje/transitions/transline.h b/veejay-current/veejay-server/libvje/transitions/transline.h index 1b0774dd..60911a71 100644 --- a/veejay-current/veejay-server/libvje/transitions/transline.h +++ b/veejay-current/veejay-server/libvje/transitions/transline.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/transitions/transop.c b/veejay-current/veejay-server/libvje/transitions/transop.c index 1a6ef13e..fa51fb4b 100644 --- a/veejay-current/veejay-server/libvje/transitions/transop.c +++ b/veejay-current/veejay-server/libvje/transitions/transop.c @@ -110,8 +110,4 @@ void transop_apply( VJFrame *frame, VJFrame *frame2, } } - - } - -void transop_free(){} diff --git a/veejay-current/veejay-server/libvje/transitions/transop.h b/veejay-current/veejay-server/libvje/transitions/transop.h index 9bca815b..f3905760 100644 --- a/veejay-current/veejay-server/libvje/transitions/transop.h +++ b/veejay-current/veejay-server/libvje/transitions/transop.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/transitions/vbar.c b/veejay-current/veejay-server/libvje/transitions/vbar.c index bdcde184..2940b818 100644 --- a/veejay-current/veejay-server/libvje/transitions/vbar.c +++ b/veejay-current/veejay-server/libvje/transitions/vbar.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/transitions/vbar.h b/veejay-current/veejay-server/libvje/transitions/vbar.h index 861a812c..ac587a4a 100644 --- a/veejay-current/veejay-server/libvje/transitions/vbar.h +++ b/veejay-current/veejay-server/libvje/transitions/vbar.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/transitions/wipe.c b/veejay-current/veejay-server/libvje/transitions/wipe.c index f805a869..6437aa1e 100644 --- a/veejay-current/veejay-server/libvje/transitions/wipe.c +++ b/veejay-current/veejay-server/libvje/transitions/wipe.c @@ -61,4 +61,3 @@ void wipe_apply( VJFrame *frame, VJFrame *frame2, g_wipe_height = 0; } } -void wipe_free(){} diff --git a/veejay-current/veejay-server/libvje/transitions/wipe.h b/veejay-current/veejay-server/libvje/transitions/wipe.h index e8e0b6af..5976cb24 100644 --- a/veejay-current/veejay-server/libvje/transitions/wipe.h +++ b/veejay-current/veejay-server/libvje/transitions/wipe.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg + * Copyright(C)2002 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/libvje/vj-effect.c b/veejay-current/veejay-server/libvje/vj-effect.c index 4d4eacb6..1e39f788 100644 --- a/veejay-current/veejay-server/libvje/vj-effect.c +++ b/veejay-current/veejay-server/libvje/vj-effect.c @@ -196,13 +196,14 @@ #include "effects/passthrough.h" #include "effects/alphatransition.h" #include "effects/randnoise.h" +#include "effects/common.h" #include #include -unsigned int pixel_Y_hi_ = 235; -unsigned int pixel_U_hi_ = 240; -unsigned int pixel_Y_lo_ = 16; -unsigned int pixel_U_lo_ = 16; +uint8_t pixel_Y_hi_ = 235; +uint8_t pixel_U_hi_ = 240; +uint8_t pixel_Y_lo_ = 16; +uint8_t pixel_U_lo_ = 16; unsigned int get_pixel_range_min_Y() { return pixel_Y_lo_; @@ -490,7 +491,7 @@ int vj_effect_deactivate(int effect_id, void *ptr) return 0; } -void vj_effect_deactivate_all() +static void vj_effect_deactivate_all() { int i; for(i = 0 ; i < FX_LIMIT; i ++ ) @@ -727,7 +728,7 @@ static void vj_effect_free_parameters( vj_effect *v ) free( v->param_description ); } -void vj_effect_free(vj_effect *ve) { +static void vj_effect_free(vj_effect *ve) { if( ve ) { if(ve->limits[0]) free(ve->limits[0]); if(ve->limits[1]) free(ve->limits[1]); @@ -914,15 +915,6 @@ int vj_effect_get_extra_frame(int effect_id) return 0; } -int vj_effect_get_help(int entry) -{ - if(!vj_effects[entry]) - return 0; - - return 0; -} - - static int vj_effect_get_hints_length( vj_effect *fx, int p, int limit ) { if( fx->hints == NULL ) diff --git a/veejay-current/veejay-server/libvje/vj-effman.c b/veejay-current/veejay-server/libvje/vj-effman.c index ade8d9e6..9ae0bdcf 100644 --- a/veejay-current/veejay-server/libvje/vj-effman.c +++ b/veejay-current/veejay-server/libvje/vj-effman.c @@ -33,7 +33,7 @@ extern vj_effect *vj_effects[]; #define VEVO_PLUG_FF 0x00ff #define VEVO_PLUG_FR 0xffbb -void vj_effman_apply_plug_effect( +static void vj_effman_apply_plug_effect( VJFrame **frames, VJFrameInfo *frameinfo, vjp_kf *todo_info, @@ -70,7 +70,7 @@ void vj_effman_apply_plug_effect( plug_process( instance, (double) frameinfo->timecode ); } -void vj_effman_apply_image_effect( +static void vj_effman_apply_image_effect( VJFrame **frames, vjp_kf *todo_info, int *arg, @@ -395,7 +395,7 @@ void vj_effman_apply_image_effect( break; case VJ_IMAGE_EFFECT_CONTOUR: contourextract_apply( vj_effects[entry]->user_data, frames[0], - frames[0]->width,frames[0]->height,arg[0],arg[1],arg[2],arg[3],arg[4] ); + frames[0]->width,frames[0]->height,arg[0],arg[1],arg[2],arg[3],arg[4],arg[5] ); break; case VJ_IMAGE_EFFECT_SLICE: if(arg[2] > 0) { @@ -453,7 +453,7 @@ void vj_effman_apply_image_effect( } } -void vj_effman_apply_video_effect( VJFrame **frames, vjp_kf *todo_info,int *arg, int entry, int e) { +static void vj_effman_apply_video_effect( VJFrame **frames, vjp_kf *todo_info,int *arg, int entry, int e) { switch(e) { case VJ_VIDEO_EFFECT_CHAMBLEND: diff --git a/veejay-current/veejay-server/libvje/vje.h b/veejay-current/veejay-server/libvje/vje.h index e4efeafb..fd30996a 100644 --- a/veejay-current/veejay-server/libvje/vje.h +++ b/veejay-current/veejay-server/libvje/vje.h @@ -84,7 +84,7 @@ typedef struct { #define FLAG_ALPHA_IN_BLEND (1<<6) /* blend operator */ typedef struct vj_effect_t { - char *description; + const char *description; int num_params; char **param_description; vj_value_hint_t **hints; @@ -140,4 +140,5 @@ extern int vj_effect_is_plugin( int fx_id ); extern void *vj_effect_get_data( int seq_id ); extern int vj_effect_is_parallel(int effect_id); extern int vj_effect_get_info( int effect_id, int *is_mixer, int *n_params ); +extern int vj_effect_get_static_bg(int effect_id); #endif diff --git a/veejay-current/veejay-server/libvjmem/memcpy.c b/veejay-current/veejay-server/libvjmem/memcpy.c index b93b75b8..a0f077bc 100644 --- a/veejay-current/veejay-server/libvjmem/memcpy.c +++ b/veejay-current/veejay-server/libvjmem/memcpy.c @@ -311,7 +311,7 @@ static __inline__ void * __memcpy(void * to, const void * from, size_t n) #endif #undef MOVNTQ -#if HAVE_MMX2 +#if HAVE_ASM_MMX2 #define MOVNTQ "movntq" #else #define MOVNTQ "movq" @@ -1944,7 +1944,6 @@ void benchmark_tasks(unsigned int n_tasks, long n_frames, int w, int h) free(dst); } - void init_parallel_tasks(int n_tasks) { if( n_tasks > 1 ) { diff --git a/veejay-current/veejay-server/libvjmem/vj-x86.c b/veejay-current/veejay-server/libvjmem/vj-x86.c index 2bf92ed6..a8917cec 100644 --- a/veejay-current/veejay-server/libvjmem/vj-x86.c +++ b/veejay-current/veejay-server/libvjmem/vj-x86.c @@ -111,7 +111,7 @@ int get_cache_line_size() } -void mymemset_generic(void * s, char c,size_t count) +static void mymemset_generic(void * s, char c,size_t count) { int d0, d1; __asm__ __volatile__( diff --git a/veejay-current/veejay-server/libvjmem/vjmem.h b/veejay-current/veejay-server/libvjmem/vjmem.h index 9ad8f2fe..82d0727d 100644 --- a/veejay-current/veejay-server/libvjmem/vjmem.h +++ b/veejay-current/veejay-server/libvjmem/vjmem.h @@ -25,42 +25,43 @@ extern void *(* veejay_memcpy)(void *to, const void *from, size_t len); extern void *(* veejay_memset)(void *to, uint8_t val, size_t len); extern void vj_mem_init(void); -extern int vj_mem_threaded_init(int w, int h); +extern int vj_mem_threaded_init(int w, int h); extern void vj_mem_threaded_stop(void); extern char *get_memcpy_descr( void ); -extern char *get_memset_descr( void ); -extern void *vj_malloc_(size_t size); +extern char *get_memset_descr( void ); +extern void *vj_malloc_(size_t size); extern void *vj_calloc_(size_t size ); -extern void memcpy_report(); +extern void memcpy_report(); +extern void init_parallel_tasks(int n_tasks); #define vj_malloc(i) vj_malloc_(i) #define vj_calloc(i) vj_calloc_(i) extern void fast_memset_dirty(void * to, int val, size_t len); extern void fast_memset_finish(); -extern void packed_plane_clear( size_t len, void *to ); -extern void yuyv_plane_clear( size_t len, void *to ); -extern int cpu_cache_size(); -extern int get_cache_line_size(); -extern char *veejay_strncat( char *s1, char *s2, size_t n ); -extern char *veejay_strncpy( char *s1, const char *s2, size_t n ); +extern void packed_plane_clear( size_t len, void *to ); +extern void yuyv_plane_clear( size_t len, void *to ); +extern int cpu_cache_size(); +extern int get_cache_line_size(); +extern char *veejay_strncat( char *s1, char *s2, size_t n ); +extern char *veejay_strncpy( char *s1, const char *s2, size_t n ); extern void yuyv_plane_init(); extern void yuyv_plane_clear( size_t len, void *to ); -extern char **vje_build_param_list( int num, ... ); -extern void *(*vj_frame_copy)( uint8_t **input, uint8_t **output, int *strides ); -extern void *(*vj_frame_clear)( uint8_t **input, int *strides, unsigned int val ); -extern void vj_frame_copy1( uint8_t *input, uint8_t *output, int size ); -extern void vj_frame_clear1( uint8_t *input, unsigned int value, int size ); -extern uint8_t num_threaded_tasks(); -extern void vj_frame_slow_threaded( uint8_t **p0_buffer, uint8_t **p1_buffer, uint8_t **img, int len, int uv_len,const float frac ); -extern void benchmark_veejay(int w, int h); -extern void *vj_hmalloc(size_t sze, const char *name); -extern char *vj_strdup(const char *s); -extern char *vj_strndup(const char *s, size_t n ); +extern char **vje_build_param_list( int num, ... ); +extern void *(*vj_frame_copy)( uint8_t **input, uint8_t **output, int *strides ); +extern void *(*vj_frame_clear)( uint8_t **input, int *strides, unsigned int val ); +extern void vj_frame_copy1( uint8_t *input, uint8_t *output, int size ); +extern void vj_frame_clear1( uint8_t *input, unsigned int value, int size ); +extern uint8_t num_threaded_tasks(); +extern void vj_frame_slow_threaded( uint8_t **p0_buffer, uint8_t **p1_buffer, uint8_t **img, int len, int uv_len,const float frac ); +extern void benchmark_veejay(int w, int h); +extern void *vj_hmalloc(size_t sze, const char *name); +extern char *vj_strdup(const char *s); +extern char *vj_strndup(const char *s, size_t n ); extern char *vj_sprintf(char *dst, int value); -extern void vj_simple_pool_free( void *ptr ); -extern void *vj_simple_pool_alloc( void *ptr, size_t s ); -extern void *vj_simple_pool_init( size_t s ); -extern void vj_simple_pool_reset( void *ptr ); -extern void vj_mem_destroy(); +extern void vj_simple_pool_free( void *ptr ); +extern void *vj_simple_pool_alloc( void *ptr, size_t s ); +extern void *vj_simple_pool_init( size_t s ); +extern void vj_simple_pool_reset( void *ptr ); +extern void vj_mem_destroy(); #endif diff --git a/veejay-current/veejay-server/libvjnet/packet.c b/veejay-current/veejay-server/libvjnet/packet.c index c7b0f120..b17c02a5 100644 --- a/veejay-current/veejay-server/libvjnet/packet.c +++ b/veejay-current/veejay-server/libvjnet/packet.c @@ -63,25 +63,28 @@ packet_header_t packet_get_header(const void *data) int packet_get_data(packet_header_t *h, const void *data, uint8_t *plane ) { + const char *addr = (const char*) data; size_t len = sizeof(packet_header_t); len += sizeof( frame_info_t ); - veejay_memcpy( plane , data + len, CHUNK_SIZE ); + veejay_memcpy( plane , addr + len, CHUNK_SIZE ); return 1; } int packet_get_info(frame_info_t *i, const void *data ) { - veejay_memcpy(i, data + sizeof(packet_header_t), sizeof(frame_info_t)); + const char *dst = (const char*) data; + veejay_memcpy(i, dst + sizeof(packet_header_t), sizeof(frame_info_t)); return 1; } int packet_put_padded_data(packet_header_t *h, frame_info_t *i , void *payload, const uint8_t *plane, int bytes ) { + const char *dst = (const char*) payload; size_t len = sizeof( packet_header_t ); - veejay_memcpy( payload, h , len ); - veejay_memcpy( payload + len, i , sizeof( frame_info_t )); + veejay_memcpy( dst, h , len ); + veejay_memcpy( dst + len, i , sizeof( frame_info_t )); len += sizeof(frame_info_t ); - veejay_memcpy( payload + len, plane, bytes ); + veejay_memcpy( dst + len, plane, bytes ); return (len + bytes); } int packet_put_data(packet_header_t *h, frame_info_t *i , void *payload, const uint8_t *plane ) diff --git a/veejay-current/veejay-server/thirdparty/liblzo/lzo.c b/veejay-current/veejay-server/thirdparty/liblzo/lzo.c index c3cff6d4..0b1e2fde 100644 --- a/veejay-current/veejay-server/thirdparty/liblzo/lzo.c +++ b/veejay-current/veejay-server/thirdparty/liblzo/lzo.c @@ -305,18 +305,3 @@ long lzo_decompress420into422( void *lzo, uint8_t *linbuf, int linbuf_len, uint return (long)sum; } - -long lzo_decompress2( void *lzo, uint8_t *linbuf, int linbuf_len, uint8_t *dst ) -{ - lzo_uint len = linbuf_len; - lzot *l = (lzot*) lzo; - lzo_uint result_len = 0; - - const lzo_bytep src = (lzo_bytep) linbuf; - int r = lzo1x_decompress( src, len, dst, &result_len, l->wrkmem ); - - if( r != LZO_E_OK ) - return 0; - return (long)result_len; -} - diff --git a/veejay-current/veejay-server/thirdparty/libresample/resample2.c b/veejay-current/veejay-server/thirdparty/libresample/resample2.c index a54bee15..5ba98248 100644 --- a/veejay-current/veejay-server/thirdparty/libresample/resample2.c +++ b/veejay-current/veejay-server/thirdparty/libresample/resample2.c @@ -227,12 +227,6 @@ void vj_av_resample_close(void *ptr){ av_freep(&c); } -void vj_av_resample_compensate(AVResampleContext *c, int sample_delta, int compensation_distance){ -// sample_delta += (c->ideal_dst_incr - c->dst_incr)*(int64_t)c->compensation_distance / c->ideal_dst_incr; - c->compensation_distance= compensation_distance; - c->dst_incr = c->ideal_dst_incr - c->ideal_dst_incr * (int64_t)sample_delta / compensation_distance; -} - int vj_av_resample(void *ptr, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx){ AVResampleContext *c = (AVResampleContext*) ptr; int dst_index, i; diff --git a/veejay-current/veejay-server/veejay/liblavplayvj.c b/veejay-current/veejay-server/veejay/liblavplayvj.c index 0c715318..9decf3b6 100644 --- a/veejay-current/veejay-server/veejay/liblavplayvj.c +++ b/veejay-current/veejay-server/veejay/liblavplayvj.c @@ -2257,7 +2257,6 @@ static void veejay_playback_cycle(veejay_t * info) { case VJ_PLAYBACK_MODE_PLAIN: info->current_edit_list = info->edit_list; - video_playback_setup *settings = info->settings; settings->min_frame_num = 0; settings->max_frame_num = info->edit_list->total_frames; veejay_msg(VEEJAY_MSG_INFO, "Playing plain video, frames %d - %d", @@ -2788,7 +2787,7 @@ int prepare_cache_line(int perc, int n_slots) return 1; } -int smp_check() +static int smp_check() { return get_nprocs(); } diff --git a/veejay-current/veejay-server/veejay/veejay.h b/veejay-current/veejay-server/veejay/veejay.h index b4e3fb22..b8eff89a 100644 --- a/veejay-current/veejay-server/veejay/veejay.h +++ b/veejay-current/veejay-server/veejay/veejay.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002 Niels Elburg < elburg@hio.hen.nl> + * Copyright(C)2002 Niels Elburg < nwelburg@gmail.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/veejay/vj-OSC.h b/veejay-current/veejay-server/veejay/vj-OSC.h index 54e2cf42..95415059 100644 --- a/veejay-current/veejay-server/veejay/vj-OSC.h +++ b/veejay-current/veejay-server/veejay/vj-OSC.h @@ -1,6 +1,6 @@ /* * veejay - Linux VeeJay - * (C) 2003 Niels Elburg + * (C) 2003 Niels Elburg * * * This program is free software; you can redistribute it and/or modify diff --git a/veejay-current/veejay-server/veejay/vj-event.c b/veejay-current/veejay-server/veejay/vj-event.c index df4718bd..19d7defb 100644 --- a/veejay-current/veejay-server/veejay/vj-event.c +++ b/veejay-current/veejay-server/veejay/vj-event.c @@ -3027,11 +3027,11 @@ void vj_event_send_bundles(void *ptr, const char format[], va_list ap) if(tree->arg_len) veejay_strncat( buf, tree->args, tree->arg_len ); - void *ptr = tree; + void *tree_ptr = tree; tree = tree->next; - free(ptr); + free(tree_ptr); } #endif if(name) @@ -3789,8 +3789,8 @@ void vj_event_dec_frame(void *ptr, const char format[], va_list ap) { veejay_t *v = (veejay_t *) ptr; int args[1]; - char *s = NULL; - P_A( args,s,format, ap ); + char *str = NULL; + P_A( args,str,format, ap ); if(!STREAM_PLAYING(v)) { video_playback_setup *s = v->settings; @@ -3807,8 +3807,8 @@ void vj_event_prev_second(void *ptr, const char format[], va_list ap) { veejay_t *v = (veejay_t *)ptr; int args[1]; - char *s = NULL; - P_A( args,s,format, ap ); + char *str = NULL; + P_A( args,str,format, ap ); if(!STREAM_PLAYING(v)) { video_playback_setup *s = v->settings; @@ -7444,7 +7444,7 @@ void vj_event_toggle_osd_extra( void *ptr, const char format[], va_list ap ) } static struct { - char *name; + const char *name; int id; } recorder_formats[] = { { "mlzo", ENCODER_LZO }, @@ -7709,7 +7709,7 @@ void vj_event_tag_rec_offline_start(void *ptr, const char format[], va_list ap) { char tmp[255]; - int format = _recorder_format; + int rec_format = _recorder_format; char prefix[40]; sprintf(prefix, "stream-%02d", args[0]); @@ -7719,13 +7719,13 @@ void vj_event_tag_rec_offline_start(void *ptr, const char format[], va_list ap) return; } - if(format==-1) + if(rec_format==-1) { veejay_msg(VEEJAY_MSG_ERROR, "Set a destination format first"); return; } - if( vj_tag_init_encoder( args[0], tmp, format, + if( vj_tag_init_encoder( args[0], tmp, rec_format, args[1]) ) { video_playback_setup *s = v->settings; @@ -7798,8 +7798,8 @@ void vj_event_output_y4m_stop(void *ptr, const char format[], va_list ap) void vj_event_enable_audio(void *ptr, const char format[], va_list ap) { - veejay_t *v = (veejay_t*)ptr; #ifdef HAVE_JACK + veejay_t *v = (veejay_t*)ptr; if (!v->audio_running ) { veejay_msg(0,"Veejay was started without audio."); @@ -8055,8 +8055,8 @@ void vj_event_print_tag_info(veejay_t *v, int id) if (vj_effect_get_extra_frame(y) == 1) { - int source = vj_tag_get_chain_source(id, i); - veejay_msg(VEEJAY_MSG_INFO, "Mixing with %s %d",(source == VJ_TAG_TYPE_NONE ? "Sample" : "Stream"),vj_tag_get_chain_channel(id,i)); + int source_type = vj_tag_get_chain_source(id, i); + veejay_msg(VEEJAY_MSG_INFO, "Mixing with %s %d",(source_type == VJ_TAG_TYPE_NONE ? "Sample" : "Stream"),vj_tag_get_chain_channel(id,i)); } } } @@ -8853,17 +8853,17 @@ void vj_event_send_stream_args ( void *ptr, const char format[], va_list ap ) veejay_memset( tagargs, 0, sizeof(tagargs)); vj_tag_generator_get_args( args[0], tagargs, &n_args, &id ); - char *ptr = &line[0]; + char *line_ptr = &line[0]; - ptr = vj_sprintf( ptr, id ); *ptr ++ = ' '; + line_ptr = vj_sprintf( line_ptr, id ); *line_ptr ++ = ' '; int n = n_args; int i; for( i = 0; i < n; i ++ ) { - ptr = vj_sprintf( ptr, tagargs[i] ); *ptr ++ = ' '; + line_ptr = vj_sprintf( line_ptr, tagargs[i] ); *line_ptr ++ = ' '; } - ptr = vj_sprintf( ptr, tagargs[n] ); + line_ptr = vj_sprintf( line_ptr, tagargs[n] ); FORMAT_MSG(fline,line); SEND_MSG(v, fline); diff --git a/veejay-current/veejay-server/veejay/vj-lib.h b/veejay-current/veejay-server/veejay/vj-lib.h index 3552720a..f14add89 100644 --- a/veejay-current/veejay-server/veejay/vj-lib.h +++ b/veejay-current/veejay-server/veejay/vj-lib.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 Niels Elburg + * Copyright (C) 2002 Niels Elburg * * This program is free software you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/veejay/vj-misc.h b/veejay-current/veejay-server/veejay/vj-misc.h index 9a2883f4..9d51d930 100644 --- a/veejay-current/veejay-server/veejay/vj-misc.h +++ b/veejay-current/veejay-server/veejay/vj-misc.h @@ -39,7 +39,7 @@ filelist_t *find_media_files( veejay_t *info ); #endif int available_diskspace(void); int vj_perform_screenshot2(veejay_t * info, uint8_t ** src); - +int sufficient_space(int max_size, int nframes); #ifdef ARCH_X86 int veejay_sprintf( char *s, size_t size, const char *format, ... ); #define veejay_snprintf veejay_sprintf diff --git a/veejay-current/veejay-server/veejay/vj-pjack.c b/veejay-current/veejay-server/veejay/vj-pjack.c index 6d23960b..2895c839 100644 --- a/veejay-current/veejay-server/veejay/vj-pjack.c +++ b/veejay-current/veejay-server/veejay/vj-pjack.c @@ -1,5 +1,5 @@ /* veejay - Linux VeeJay - * (C) 2002-2004 Niels Elburg + * (C) 2002-2004 Niels Elburg * * * This program is free software; you can redistribute it and/or modify diff --git a/veejay-current/veejay-server/veejay/vj-shm.c b/veejay-current/veejay-server/veejay/vj-shm.c index 1e7e77a3..5fb3432e 100644 --- a/veejay-current/veejay-server/veejay/vj-shm.c +++ b/veejay-current/veejay-server/veejay/vj-shm.c @@ -40,6 +40,7 @@ #include #include #include +#include #define HEADER_LENGTH 4096 #ifndef PATH_MAX #define PATH_MAX 1024 @@ -363,8 +364,9 @@ void *vj_shm_new_master( const char *homedir, VJFrame *frame) pthread_rwlockattr_t rw_lock_attr; veejay_memset( v->sms, 0, size ); - - uint8_t *Y = v->sms + HEADER_LENGTH; + uint8_t *sms_addr = (const uint8_t*) v->sms; + + uint8_t *Y = sms_addr + HEADER_LENGTH; uint8_t *U = Y + frame->len; uint8_t *V = U + frame->uv_len; @@ -421,7 +423,7 @@ void *vj_shm_new_master( const char *homedir, VJFrame *frame) veejay_msg( VEEJAY_MSG_DEBUG, "Shared Memory ID = %d", v->shm_id ); veejay_msg( VEEJAY_MSG_INFO, "(SHM) Shared Memory consumer key is %d", v->key ); veejay_msg( VEEJAY_MSG_DEBUG, "Starting Address: %p, Frame starts at: %p, Lock at %p", - v->sms, v->sms + HEADER_LENGTH, &(data->rwlock)); + v->sms, sms_addr + HEADER_LENGTH, &(data->rwlock)); simply_my_shmid = v->key; diff --git a/veejay-current/veejay-server/veejay/vj-task.c b/veejay-current/veejay-server/veejay/vj-task.c index 5655f7bb..cc556b3f 100644 --- a/veejay-current/veejay-server/veejay/vj-task.c +++ b/veejay-current/veejay-server/veejay/vj-task.c @@ -169,7 +169,7 @@ static void task_add(uint8_t task_no, performer_job_routine fp , void *data) total_tasks ++; } -struct task *task_get() +static struct task *task_get() { struct task *t = NULL; if( total_tasks > 0 ) { @@ -185,7 +185,7 @@ struct task *task_get() return t; } -void task_run( struct task *task, void *data, uint8_t id) +static void task_run( struct task *task, void *data, uint8_t id) { (*task->handler)(data); @@ -197,7 +197,7 @@ void task_run( struct task *task, void *data, uint8_t id) __unlock(); } -void *task_thread(void *data) +static void *task_thread(void *data) { for( ;; ) { diff --git a/veejay-current/veejay-server/veejay/vj-task.h b/veejay-current/veejay-server/veejay/vj-task.h index e5646c47..0e30388b 100644 --- a/veejay-current/veejay-server/veejay/vj-task.h +++ b/veejay-current/veejay-server/veejay/vj-task.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002-2012 Niels Elburg + * Copyright(C)2002-2012 Niels Elburg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/veejay/vj-viewport.c b/veejay-current/veejay-server/veejay/vj-viewport.c index 68c685c9..4cd24215 100644 --- a/veejay-current/veejay-server/veejay/vj-viewport.c +++ b/veejay-current/veejay-server/veejay/vj-viewport.c @@ -891,9 +891,9 @@ static int viewport_configure( } else { - matrix_t *tmp = viewport_matrix(); - matrix_t *im = viewport_invert_matrix( m, tmp ); - free(tmp); + matrix_t *mtmp = viewport_matrix(); + matrix_t *im = viewport_invert_matrix( m, mtmp ); + free(mtmp); if(!im) { free(m); @@ -1583,10 +1583,6 @@ void viewport_set_initial_active( void *vv, int status ) v->initial_active = status; } -void empireoftheclouds() -{ -} - void *viewport_get_configuration(void *vv, char *filename ) { viewport_config_t *vc = viewport_load_settings( filename ); diff --git a/veejay-current/veejay-server/veejay/vj-viewport.h b/veejay-current/veejay-server/veejay/vj-viewport.h index e821822d..82ec6187 100644 --- a/veejay-current/veejay-server/veejay/vj-viewport.h +++ b/veejay-current/veejay-server/veejay/vj-viewport.h @@ -22,25 +22,25 @@ /* Viewport component for FX */ #define VP_QUADZOOM 1 -void viewport_process_dynamic_alpha( void *data, uint8_t *in[4], uint8_t *out[4] ); -void viewport_process_dynamic( void *data, uint8_t *in[3], uint8_t *out[3] ); -void viewport_process_dynamic_map( void *data, uint8_t *in[3], uint8_t *out[3], uint32_t *map, int feather ); -void *viewport_fx_init_map( int wid, int hei, int x1, int y1, int x2, int y2, int x3, int y3, int x4, int y4, int reverse); -void *viewport_fx_zoom_init(int type, int wid, int hei, int x, int y, int zoom, int dir); +void viewport_process_dynamic_alpha( void *data, uint8_t *in[4], uint8_t *out[4] ); +void viewport_process_dynamic( void *data, uint8_t *in[3], uint8_t *out[3] ); +void viewport_process_dynamic_map( void *data, uint8_t *in[3], uint8_t *out[3], uint32_t *map, int feather ); +void *viewport_fx_init_map( int wid, int hei, int x1, int y1, int x2, int y2, int x3, int y3, int x4, int y4, int reverse); +void *viewport_fx_zoom_init(int type, int wid, int hei, int x, int y, int zoom, int dir); void viewport_update_from(void *vv, void *bb); -void *viewport_clone(void *iv, int new_w, int new_h ); +void *viewport_clone(void *iv, int new_w, int new_h ); void viewport_set_ui(void *vv, int value ); /* The viewport */ -int viewport_active( void *data ); +int viewport_active( void *data ); int viewport_render_ssm(void *vdata ); void viewport_render( void *data, uint8_t *in[3], uint8_t *out[3], int width, int height,int uv_len ); int viewport_external_mouse( void *data, uint8_t *in[3],int sx, int sy, int button, int frontback, int w, int h, char *homedir, int mode, int id ); char *viewport_get_help(void *data); -char *viewport_get_my_status(void *v); +char *viewport_get_my_status(void *v); void viewport_clone_parameters( void *src , void *dst ); void *viewport_init(int x0, int y0, int w0, int h0, int w, int h,int iw, int ih, char *dir, int *enable, int *frontback, int mode); int viewport_active( void *data ); -void viewport_destroy( void *data ); +void viewport_destroy( void *data ); void vewport_draw_interface_color( void *vdata, uint8_t *img[3] ); void viewport_produce_bw_img( void *vdata, uint8_t *img[3], uint8_t *out_img[3], int Yonly); void viewport_produce_full_img_yuyv( void *vdata, uint8_t *img[3], uint8_t *out_img ); @@ -51,7 +51,7 @@ void viewport_transform_coords( void *data, void *coords, int n, int blob_id, in void viewport_dummy_send( void *data ); int *viewport_event_get_projection(void *data, int scale); int viewport_event_set_projection(void *data, float x, float y, int num, int fb); -void viewport_push_frame(void *data, int w, int h, uint8_t *Y, uint8_t *U, uint8_t *V ); +void viewport_push_frame(void *data, int w, int h, uint8_t *Y, uint8_t *U, uint8_t *V ); void viewport_reconfigure(void *vv); int viewport_get_mode(void *vv); int viewport_reconfigure_from_config(void *vv, void *vc, char *filename); @@ -66,5 +66,8 @@ char *viewport_get_my_help(void *vv); int viewport_finetune_coord(void *data, int screen_width, int screen_height,int inc_x, int inc_y); void viewport_save_settings( void *v, int frontback, char *path ); void viewport_produce_full_img( void *vdata, uint8_t *img[3], uint8_t *out_img[3] ); +void viewport_render_dynamic( void *vdata, uint8_t *in[3], uint8_t *out[3],int width, int height ); +void viewport_produce_full_img_packed( void *vdata, uint8_t *img[3], uint8_t *out_img ); + #endif diff --git a/veejay-current/veejay-server/veejay/vjkf.c b/veejay-current/veejay-server/veejay/vjkf.c index f15e5b80..133a76ae 100644 --- a/veejay-current/veejay-server/veejay/vjkf.c +++ b/veejay-current/veejay-server/veejay/vjkf.c @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002-2008 Niels Elburg < elburg@hio.hen.nl> + * Copyright(C)2002-2008 Niels Elburg < nwelburg@gmail.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/veejay-current/veejay-server/veejay/vjkf.h b/veejay-current/veejay-server/veejay/vjkf.h index f2a23c5f..17115b14 100644 --- a/veejay-current/veejay-server/veejay/vjkf.h +++ b/veejay-current/veejay-server/veejay/vjkf.h @@ -1,7 +1,7 @@ /* * Linux VeeJay * - * Copyright(C)2002-2008 Niels Elburg < elburg@hio.hen.nl> + * Copyright(C)2002-2008 Niels Elburg < nwelburg@gmail.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License