From b5bf7e90101c8ff6efd2a1e993673e4f56735caf Mon Sep 17 00:00:00 2001 From: ddennedy Date: Tue, 10 Apr 2007 06:51:40 +0000 Subject: [PATCH] Cleanup copyrights and attributions, and move Jean-Baptiste's services to a new kdenlive module. git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@964 d19143bc-622f-0410-bfdd-b5b2a6649095 --- ChangeLog | 4 ++ docs/policies.txt | 19 +++++++ src/modules/core/Makefile | 3 -- src/modules/core/configure | 3 -- src/modules/core/factory.c | 9 ---- src/modules/core/filter_boxblur.h | 28 ----------- src/modules/core/filter_wave.h | 28 ----------- src/modules/core/producer_framebuffer.h | 27 ---------- src/modules/core/transition_luma.c | 3 ++ src/modules/gtk2/pixops.c | 9 ++-- src/modules/gtk2/pixops.h | 9 ++-- src/modules/jackrack/jack_rack.c | 35 +++++++------ src/modules/jackrack/jack_rack.h | 35 +++++++------ src/modules/jackrack/lock_free_fifo.c | 35 +++++++------ src/modules/jackrack/lock_free_fifo.h | 35 +++++++------ src/modules/jackrack/plugin.c | 35 +++++++------ src/modules/jackrack/plugin.h | 35 +++++++------ src/modules/jackrack/plugin_desc.c | 34 +++++++------ src/modules/jackrack/plugin_desc.h | 35 +++++++------ src/modules/jackrack/plugin_mgr.c | 35 +++++++------ src/modules/jackrack/plugin_mgr.h | 35 +++++++------ src/modules/jackrack/plugin_settings.c | 35 +++++++------ src/modules/jackrack/plugin_settings.h | 35 +++++++------ src/modules/jackrack/process.c | 35 +++++++------ src/modules/jackrack/process.h | 35 +++++++------ src/modules/kdenlive/Makefile | 37 ++++++++++++++ src/modules/kdenlive/configure | 8 +++ src/modules/kdenlive/factory.c | 50 +++++++++++++++++++ .../{core => kdenlive}/filter_boxblur.c | 21 ++++---- src/modules/kdenlive/filter_boxblur.h | 27 ++++++++++ src/modules/{core => kdenlive}/filter_wave.c | 21 ++++---- src/modules/kdenlive/filter_wave.h | 27 ++++++++++ .../{core => kdenlive}/producer_framebuffer.c | 33 ++++++------ src/modules/kdenlive/producer_framebuffer.h | 27 ++++++++++ src/modules/normalize/filter_volume.c | 2 +- src/modules/xine/filter_deinterlace.c | 47 ----------------- 36 files changed, 534 insertions(+), 397 deletions(-) delete mode 100644 src/modules/core/filter_boxblur.h delete mode 100644 src/modules/core/filter_wave.h delete mode 100644 src/modules/core/producer_framebuffer.h create mode 100644 src/modules/kdenlive/Makefile create mode 100755 src/modules/kdenlive/configure create mode 100644 src/modules/kdenlive/factory.c rename src/modules/{core => kdenlive}/filter_boxblur.c (92%) create mode 100644 src/modules/kdenlive/filter_boxblur.h rename src/modules/{core => kdenlive}/filter_wave.c (87%) create mode 100644 src/modules/kdenlive/filter_wave.h rename src/modules/{core => kdenlive}/producer_framebuffer.c (90%) create mode 100644 src/modules/kdenlive/producer_framebuffer.h diff --git a/ChangeLog b/ChangeLog index 56992655..9a74663a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ $Id$ +2007-04-09 Dan Dennedy + Cleanup copyrights and attributions, and move Jean-Baptiste's services + to a new kdenlive module. + 2007-03-30 Dan Dennedy Add support for sox 13.0.0. diff --git a/docs/policies.txt b/docs/policies.txt index d06b1d8e..f568582b 100644 --- a/docs/policies.txt +++ b/docs/policies.txt @@ -13,6 +13,11 @@ The framework and valerie client libraries are covered under LGPL. Miracle, inigo, albino, and humperdink applications are covered under GPL. Modules should strive to be LGPL to make them available through the framework as LGPL. +Coding Style: +There are not a lot of rules, but we prefer brackets on their own line, +indents using tabs, liberal usage of spaces in statements and expressions, and +no hard line length. The code in src/framework serves as a good example. + Procedures ---------- @@ -20,3 +25,17 @@ Update services.txt when you add or update a service. Until we convert to Subversion, which can provide a nice, comprehensive log please update ChangeLog with every commit. + +Setting Copyright on Appropriated Code: +You do not want to be accused of copying someone's code and changing copyright +or license without permission. The license is straightforward: you must retain +the original author's license unless you receive explicit permission. There are +a few ways to approach the copyright declaration depending upon the +intermingling and changes. If you heavily comingle original and new code or +lightly modifiy the original code, you can retain the original's copyright +including the years, and then add your copyright for the current year. If you +can separate the MLT integration from the core subroutines, then you can put +the core subroutines into a separate file with the original copyright and just +copyright the MLT integration code as your own. However, if you have heavily +modified the original code beyond nearly all recognition, you can copyright it +as your own and attribute the original author as inspiration. diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile index 30b92262..86d0b44a 100644 --- a/src/modules/core/Makefile +++ b/src/modules/core/Makefile @@ -4,10 +4,8 @@ TARGET = ../libmltcore$(LIBSUF) OBJS = factory.o \ producer_colour.o \ - producer_framebuffer.o \ producer_noise.o \ producer_ppm.o \ - filter_boxblur.o \ filter_brightness.o \ filter_channelcopy.o \ filter_data_feed.o \ @@ -23,7 +21,6 @@ OBJS = factory.o \ filter_resize.o \ filter_transition.o \ filter_watermark.o \ - filter_wave.o \ transition_composite.o \ transition_luma.o \ transition_mix.o \ diff --git a/src/modules/core/configure b/src/modules/core/configure index 65d9ab74..160844b9 100755 --- a/src/modules/core/configure +++ b/src/modules/core/configure @@ -6,13 +6,11 @@ then cat << EOF >> ../producers.dat color libmltcore$LIBSUF colour libmltcore$LIBSUF -framebuffer libmltcore$LIBSUF noise libmltcore$LIBSUF ppm libmltcore$LIBSUF EOF cat << EOF >> ../filters.dat -boxblur libmltcore$LIBSUF brightness libmltcore$LIBSUF channelcopy libmltcore$LIBSUF data_feed libmltcore$LIBSUF @@ -28,7 +26,6 @@ rescale libmltcore$LIBSUF resize libmltcore$LIBSUF transition libmltcore$LIBSUF watermark libmltcore$LIBSUF -wave libmltcore$LIBSUF EOF cat << EOF >> ../transitions.dat diff --git a/src/modules/core/factory.c b/src/modules/core/factory.c index 21f7bb05..c90a6654 100644 --- a/src/modules/core/factory.c +++ b/src/modules/core/factory.c @@ -21,10 +21,8 @@ #include #include "producer_colour.h" -#include "producer_framebuffer.h" #include "producer_noise.h" #include "producer_ppm.h" -#include "filter_boxblur.h" #include "filter_brightness.h" #include "filter_channelcopy.h" #include "filter_data.h" @@ -39,7 +37,6 @@ #include "filter_region.h" #include "filter_transition.h" #include "filter_watermark.h" -#include "filter_wave.h" #include "transition_composite.h" #include "transition_luma.h" #include "transition_mix.h" @@ -52,8 +49,6 @@ void *mlt_create_producer( char *id, void *arg ) return producer_colour_init( arg ); if ( !strcmp( id, "colour" ) ) return producer_colour_init( arg ); - if ( !strcmp( id, "framebuffer" ) ) - return producer_framebuffer_init( arg ); if ( !strcmp( id, "noise" ) ) return producer_noise_init( arg ); if ( !strcmp( id, "ppm" ) ) @@ -63,8 +58,6 @@ void *mlt_create_producer( char *id, void *arg ) void *mlt_create_filter( char *id, void *arg ) { - if ( !strcmp( id, "boxblur" ) ) - return filter_boxblur_init( arg ); if ( !strcmp( id, "brightness" ) ) return filter_brightness_init( arg ); if ( !strcmp( id, "channelcopy" ) ) @@ -95,8 +88,6 @@ void *mlt_create_filter( char *id, void *arg ) return filter_transition_init( arg ); if ( !strcmp( id, "watermark" ) ) return filter_watermark_init( arg ); - if ( !strcmp( id, "wave" ) ) - return filter_wave_init( arg ); return NULL; } diff --git a/src/modules/core/filter_boxblur.h b/src/modules/core/filter_boxblur.h deleted file mode 100644 index 9515b713..00000000 --- a/src/modules/core/filter_boxblur.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * filter_boxblur.h -- box blur filter - * Copyright (C) 2003-2004 Ushodaya Enterprises Limited - * Author: Leny Grisel - * - * 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 _FILTER_BOXBLUR_H_ -#define _FILTER_BOXBLUR_H_ - -#include - -extern mlt_filter filter_boxblur_init( char *arg ); - -#endif diff --git a/src/modules/core/filter_wave.h b/src/modules/core/filter_wave.h deleted file mode 100644 index ef3bc96b..00000000 --- a/src/modules/core/filter_wave.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * filter_wave.h -- wave filter - * Copyright (C) 2003-2004 Ushodaya Enterprises Limited - * Author: Leny Grisel - * - * 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 _FILTER_WAVE_H_ -#define _FILTER_WAVE_H_ - -#include - -extern mlt_filter filter_wave_init( char *arg ); - -#endif diff --git a/src/modules/core/producer_framebuffer.h b/src/modules/core/producer_framebuffer.h deleted file mode 100644 index d6e2ff00..00000000 --- a/src/modules/core/producer_framebuffer.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * producer_framebuffer.h -- slowmotion and reverse playing - * Copyright (C) 2006 Jean-Baptiste Mardelle - * - * 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 _PRODUCER_FRAMEBUFFER_H_ -#define _PRODUCER_FRAMEBUFFER_H_ - -#include - -extern mlt_producer producer_framebuffer_init( char *arg ); - -#endif diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c index f8ce18a7..4b87b2ae 100644 --- a/src/modules/core/transition_luma.c +++ b/src/modules/core/transition_luma.c @@ -3,6 +3,9 @@ * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Dan Dennedy * + * Adapted from Kino Plugin Timfx, which is + * Copyright (C) 2002 Timothy M. Shead + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either diff --git a/src/modules/gtk2/pixops.c b/src/modules/gtk2/pixops.c index a835f704..c25e56b3 100644 --- a/src/modules/gtk2/pixops.c +++ b/src/modules/gtk2/pixops.c @@ -1,9 +1,12 @@ /* GdkPixbuf library - Scaling and compositing functions * - * Copyright (C) 1999 The Free Software Foundation - * + * Original: + * Copyright (C) 2000 Red Hat, Inc * Author: Owen Taylor - * Modified for YUV422 by Dan Dennedy + * + * Modification for MLT: + * Copyright (C) 2003-2004 Ushodaya Enterprises Limited + * Author: Dan Dennedy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/modules/gtk2/pixops.h b/src/modules/gtk2/pixops.h index 623c7a2a..5b159fab 100644 --- a/src/modules/gtk2/pixops.h +++ b/src/modules/gtk2/pixops.h @@ -1,9 +1,12 @@ /* GdkPixbuf library - Scaling and compositing functions * - * Copyright (C) 1999 The Free Software Foundation - * + * Original: + * Copyright (C) 2000 Red Hat, Inc * Author: Owen Taylor - * Modified for YUV422 by: Dan Dennedy + * + * Modification for MLT: + * Copyright (C) 2003-2004 Ushodaya Enterprises Limited + * Author: Dan Dennedy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/modules/jackrack/jack_rack.c b/src/modules/jackrack/jack_rack.c index f7b8a858..96e7f9de 100644 --- a/src/modules/jackrack/jack_rack.c +++ b/src/modules/jackrack/jack_rack.c @@ -1,21 +1,26 @@ /* - * JACK Rack - * - * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) - * - * 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. + * JACK Rack * - * 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. + * Original: + * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Modification for MLT: + * Copyright (C) 2004 Ushodaya Enterprises Limited + * Author: Dan Dennedy + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include diff --git a/src/modules/jackrack/jack_rack.h b/src/modules/jackrack/jack_rack.h index 06c3439e..7936a8b2 100644 --- a/src/modules/jackrack/jack_rack.h +++ b/src/modules/jackrack/jack_rack.h @@ -1,21 +1,26 @@ /* - * JACK Rack - * - * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) - * - * 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. + * JACK Rack * - * 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. + * Original: + * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Modification for MLT: + * Copyright (C) 2004 Ushodaya Enterprises Limited + * Author: Dan Dennedy + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef __JR_JACK_RACK_H__ diff --git a/src/modules/jackrack/lock_free_fifo.c b/src/modules/jackrack/lock_free_fifo.c index 296d6b12..177f6b42 100644 --- a/src/modules/jackrack/lock_free_fifo.c +++ b/src/modules/jackrack/lock_free_fifo.c @@ -1,21 +1,26 @@ /* - * JACK Rack - * - * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) - * - * 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. + * JACK Rack * - * 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. + * Original: + * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Modification for MLT: + * Copyright (C) 2004 Ushodaya Enterprises Limited + * Author: Dan Dennedy + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include diff --git a/src/modules/jackrack/lock_free_fifo.h b/src/modules/jackrack/lock_free_fifo.h index af8c19d9..29abd3cf 100644 --- a/src/modules/jackrack/lock_free_fifo.h +++ b/src/modules/jackrack/lock_free_fifo.h @@ -1,21 +1,26 @@ /* - * JACK Rack - * - * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) - * - * 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. + * JACK Rack * - * 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. + * Original: + * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Modification for MLT: + * Copyright (C) 2004 Ushodaya Enterprises Limited + * Author: Dan Dennedy + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef __JLH_LOCK_FREE_FIFO_H__ diff --git a/src/modules/jackrack/plugin.c b/src/modules/jackrack/plugin.c index c5b80784..6a483a88 100644 --- a/src/modules/jackrack/plugin.c +++ b/src/modules/jackrack/plugin.c @@ -1,21 +1,26 @@ /* - * jack-ladspa-host - * - * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) - * - * 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. + * JACK Rack * - * 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. + * Original: + * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Modification for MLT: + * Copyright (C) 2004 Ushodaya Enterprises Limited + * Author: Dan Dennedy + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include diff --git a/src/modules/jackrack/plugin.h b/src/modules/jackrack/plugin.h index 4b37a709..576b803c 100644 --- a/src/modules/jackrack/plugin.h +++ b/src/modules/jackrack/plugin.h @@ -1,21 +1,26 @@ /* - * JACK Rack - * - * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) - * - * 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. + * JACK Rack * - * 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. + * Original: + * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Modification for MLT: + * Copyright (C) 2004 Ushodaya Enterprises Limited + * Author: Dan Dennedy + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef __JR_PLUGIN_H__ diff --git a/src/modules/jackrack/plugin_desc.c b/src/modules/jackrack/plugin_desc.c index d77f09fa..b3259895 100644 --- a/src/modules/jackrack/plugin_desc.c +++ b/src/modules/jackrack/plugin_desc.c @@ -1,20 +1,26 @@ /* - * JACK Rack - * - * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) - * - * 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. + * JACK Rack * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * GNU General Public License for more details. + * Original: + * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Modification for MLT: + * Copyright (C) 2004 Ushodaya Enterprises Limited + * Author: Dan Dennedy + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include diff --git a/src/modules/jackrack/plugin_desc.h b/src/modules/jackrack/plugin_desc.h index c9198d0c..d6b5ca32 100644 --- a/src/modules/jackrack/plugin_desc.h +++ b/src/modules/jackrack/plugin_desc.h @@ -1,21 +1,26 @@ /* - * JACK Rack - * - * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) - * - * 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. + * JACK Rack * - * 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. + * Original: + * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Modification for MLT: + * Copyright (C) 2004 Ushodaya Enterprises Limited + * Author: Dan Dennedy + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef __JR_PLUGIN_DESC_H__ diff --git a/src/modules/jackrack/plugin_mgr.c b/src/modules/jackrack/plugin_mgr.c index c2861cfd..7d2440f2 100644 --- a/src/modules/jackrack/plugin_mgr.c +++ b/src/modules/jackrack/plugin_mgr.c @@ -1,21 +1,26 @@ /* - * jack-ladspa-host - * - * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) - * - * 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. + * JACK Rack * - * 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. + * Original: + * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Modification for MLT: + * Copyright (C) 2004 Ushodaya Enterprises Limited + * Author: Dan Dennedy + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include diff --git a/src/modules/jackrack/plugin_mgr.h b/src/modules/jackrack/plugin_mgr.h index 9d196a74..bc70237e 100644 --- a/src/modules/jackrack/plugin_mgr.h +++ b/src/modules/jackrack/plugin_mgr.h @@ -1,21 +1,26 @@ /* - * JACK Rack - * - * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) - * - * 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. + * JACK Rack * - * 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. + * Original: + * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Modification for MLT: + * Copyright (C) 2004 Ushodaya Enterprises Limited + * Author: Dan Dennedy + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef __JR_PLUGIN_MANAGER_H__ diff --git a/src/modules/jackrack/plugin_settings.c b/src/modules/jackrack/plugin_settings.c index 68c277c3..01839bf9 100644 --- a/src/modules/jackrack/plugin_settings.c +++ b/src/modules/jackrack/plugin_settings.c @@ -1,21 +1,26 @@ /* - * JACK Rack - * - * Copyright (C) Robert Ham 2003 (node@users.sourceforge.net) - * - * 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. + * JACK Rack * - * 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. + * Original: + * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Modification for MLT: + * Copyright (C) 2004 Ushodaya Enterprises Limited + * Author: Dan Dennedy + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ #define _GNU_SOURCE diff --git a/src/modules/jackrack/plugin_settings.h b/src/modules/jackrack/plugin_settings.h index 49d69537..852333b4 100644 --- a/src/modules/jackrack/plugin_settings.h +++ b/src/modules/jackrack/plugin_settings.h @@ -1,21 +1,26 @@ /* - * JACK Rack - * - * Copyright (C) Robert Ham 2003 (node@users.sourceforge.net) - * - * 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. + * JACK Rack * - * 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. + * Original: + * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Modification for MLT: + * Copyright (C) 2004 Ushodaya Enterprises Limited + * Author: Dan Dennedy + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef __JR_PLUGIN_SETTINGS_H__ diff --git a/src/modules/jackrack/process.c b/src/modules/jackrack/process.c index 636bfd4c..efd497fd 100644 --- a/src/modules/jackrack/process.c +++ b/src/modules/jackrack/process.c @@ -1,21 +1,26 @@ /* - * jack-ladspa-host - * - * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) - * - * 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. + * JACK Rack * - * 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. + * Original: + * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Modification for MLT: + * Copyright (C) 2004 Ushodaya Enterprises Limited + * Author: Dan Dennedy + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include diff --git a/src/modules/jackrack/process.h b/src/modules/jackrack/process.h index 7fe29b81..8b0c3657 100644 --- a/src/modules/jackrack/process.h +++ b/src/modules/jackrack/process.h @@ -1,21 +1,26 @@ /* - * JACK Rack - * - * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) - * - * 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. + * JACK Rack * - * 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. + * Original: + * Copyright (C) Robert Ham 2002, 2003 (node@users.sourceforge.net) * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Modification for MLT: + * Copyright (C) 2004 Ushodaya Enterprises Limited + * Author: Dan Dennedy + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef __JLH_PROCESS_H__ diff --git a/src/modules/kdenlive/Makefile b/src/modules/kdenlive/Makefile new file mode 100644 index 00000000..91bdd33e --- /dev/null +++ b/src/modules/kdenlive/Makefile @@ -0,0 +1,37 @@ +include ../../../config.mak + +TARGET = ../libmltkdenlive$(LIBSUF) + +OBJS = factory.o \ + filter_boxblur.o \ + filter_wave.o \ + producer_framebuffer.o + +CFLAGS += -I../.. + +LDFLAGS += -lm + +LDFLAGS+=-L../../framework -lmlt + +SRCS := $(OBJS:.o=.c) + +all: $(TARGET) + +$(TARGET): $(OBJS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) + +depend: $(SRCS) + $(CC) -MM $(CFLAGS) $^ 1>.depend + +distclean: clean + rm -f .depend + +clean: + rm -f $(OBJS) $(TARGET) + +install: all + install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules" + +ifneq ($(wildcard .depend),) +include .depend +endif diff --git a/src/modules/kdenlive/configure b/src/modules/kdenlive/configure new file mode 100755 index 00000000..26d569d2 --- /dev/null +++ b/src/modules/kdenlive/configure @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ "$help" != "1" ] +then + echo "boxblur libmltkdenlive$LIBSUF" >> ../filters.dat + echo "wav libmltkdenlive$LIBSUF" >> ../filters.dat + echo "framebuffer libmltkdenlive$LIBSUF" >> ../producers.dat +fi diff --git a/src/modules/kdenlive/factory.c b/src/modules/kdenlive/factory.c new file mode 100644 index 00000000..1d83b20f --- /dev/null +++ b/src/modules/kdenlive/factory.c @@ -0,0 +1,50 @@ +/* + * factory.c -- the factory method interfaces + * Copyright (C) 2007 Jean-Baptiste Mardelle + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include + +#include "producer_framebuffer.h" +#include "filter_boxblur.h" +#include "filter_wave.h" + +void *mlt_create_producer( char *id, void *arg ) +{ + if ( !strcmp( id, "framebuffer" ) ) + return producer_framebuffer_init( arg ); + return NULL; +} + +void *mlt_create_filter( char *id, void *arg ) +{ + if ( !strcmp( id, "boxblur" ) ) + return filter_boxblur_init( arg ); + if ( !strcmp( id, "wave" ) ) + return filter_wave_init( arg ); + return NULL; +} + +void *mlt_create_transition( char *id, void *arg ) +{ + return NULL; +} + +void *mlt_create_consumer( char *id, void *arg ) +{ + return NULL; +} diff --git a/src/modules/core/filter_boxblur.c b/src/modules/kdenlive/filter_boxblur.c similarity index 92% rename from src/modules/core/filter_boxblur.c rename to src/modules/kdenlive/filter_boxblur.c index 23474268..30d9d58e 100644 --- a/src/modules/core/filter_boxblur.c +++ b/src/modules/kdenlive/filter_boxblur.c @@ -1,21 +1,20 @@ /* * filter_boxblur.c -- blur filter - * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Leny Grisel * - * 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 library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * aint32_t with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "filter_boxblur.h" diff --git a/src/modules/kdenlive/filter_boxblur.h b/src/modules/kdenlive/filter_boxblur.h new file mode 100644 index 00000000..f51f9535 --- /dev/null +++ b/src/modules/kdenlive/filter_boxblur.h @@ -0,0 +1,27 @@ +/* + * filter_boxblur.h -- box blur filter + * Author: Leny Grisel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _FILTER_BOXBLUR_H_ +#define _FILTER_BOXBLUR_H_ + +#include + +extern mlt_filter filter_boxblur_init( char *arg ); + +#endif diff --git a/src/modules/core/filter_wave.c b/src/modules/kdenlive/filter_wave.c similarity index 87% rename from src/modules/core/filter_wave.c rename to src/modules/kdenlive/filter_wave.c index 0cb86644..cae183e9 100644 --- a/src/modules/core/filter_wave.c +++ b/src/modules/kdenlive/filter_wave.c @@ -1,21 +1,20 @@ /* * wave.c -- wave filter - * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Leny Grisel * - * 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 library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * aint32_t with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "filter_wave.h" diff --git a/src/modules/kdenlive/filter_wave.h b/src/modules/kdenlive/filter_wave.h new file mode 100644 index 00000000..10fda124 --- /dev/null +++ b/src/modules/kdenlive/filter_wave.h @@ -0,0 +1,27 @@ +/* + * filter_wave.h -- wave filter + * Author: Leny Grisel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _FILTER_WAVE_H_ +#define _FILTER_WAVE_H_ + +#include + +extern mlt_filter filter_wave_init( char *arg ); + +#endif diff --git a/src/modules/core/producer_framebuffer.c b/src/modules/kdenlive/producer_framebuffer.c similarity index 90% rename from src/modules/core/producer_framebuffer.c rename to src/modules/kdenlive/producer_framebuffer.c index a017ead7..4a1393e9 100644 --- a/src/modules/core/producer_framebuffer.c +++ b/src/modules/kdenlive/producer_framebuffer.c @@ -1,20 +1,21 @@ /* * producer_framebuffer.c -- create subspeed frames + * Copyright (C) 2007 Jean-Baptiste Mardelle * Author: Jean-Baptiste Mardelle, based on the code of motion_est by Zachary Drew * - * 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 library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser 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. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "producer_framebuffer.h" @@ -45,19 +46,21 @@ static int framebuffer_get_image( mlt_frame this, uint8_t **image, mlt_image_for // Frame properties objects mlt_properties frame_properties = MLT_FRAME_PROPERTIES( this ); mlt_properties first_frame_properties = MLT_FRAME_PROPERTIES( first_frame ); - + // image stride - int size; + int size, xstride, ystride; switch( *format ){ case mlt_image_yuv422: size = *width * *height * 2; + xstride = 2; + ystride = 2 * *width; break; default: fprintf(stderr, "Unsupported image format\n"); return -1; } - uint8_t *output = mlt_properties_get_data( producer_properties, "output_buffer", NULL ); + uint8_t *output = mlt_properties_get_data( producer_properties, "output_buffer", 0 ); if( output == NULL ) { output = mlt_pool_alloc( size ); @@ -69,8 +72,8 @@ static int framebuffer_get_image( mlt_frame this, uint8_t **image, mlt_image_for uint8_t *first_image = mlt_properties_get_data( first_frame_properties, "image", NULL ); // which frames are buffered? + int error = 0; - mlt_properties_set_double( first_frame_properties, "consumer_aspect_ratio", mlt_properties_get_double(frame_properties, "consumer_aspect_ratio")); if( first_image == NULL ) { @@ -81,6 +84,7 @@ static int framebuffer_get_image( mlt_frame this, uint8_t **image, mlt_image_for return error; } } + // Start with a base image memcpy( output, first_image, size ); @@ -172,6 +176,7 @@ static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index // Give the returned frame temporal identity mlt_frame_set_position( *frame, mlt_producer_position( this ) ); + } return 0; diff --git a/src/modules/kdenlive/producer_framebuffer.h b/src/modules/kdenlive/producer_framebuffer.h new file mode 100644 index 00000000..6c91cd27 --- /dev/null +++ b/src/modules/kdenlive/producer_framebuffer.h @@ -0,0 +1,27 @@ +/* + * producer_framebuffer.h -- slowmotion and reverse playing + * Copyright (C) 2007 Jean-Baptiste Mardelle + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _PRODUCER_FRAMEBUFFER_H_ +#define _PRODUCER_FRAMEBUFFER_H_ + +#include + +extern mlt_producer producer_framebuffer_init( char *arg ); + +#endif diff --git a/src/modules/normalize/filter_volume.c b/src/modules/normalize/filter_volume.c index 2c129c6a..6fa708d2 100644 --- a/src/modules/normalize/filter_volume.c +++ b/src/modules/normalize/filter_volume.c @@ -31,7 +31,7 @@ #define MAX_CHANNELS 6 #define EPSILON 0.00001 -/* The normalise functions come from the normalize utility: +/* The following normalise functions come from the normalize utility: Copyright (C) 1999--2002 Chris Vaill */ #define samp_width 16 diff --git a/src/modules/xine/filter_deinterlace.c b/src/modules/xine/filter_deinterlace.c index c29e8881..ef69b8af 100644 --- a/src/modules/xine/filter_deinterlace.c +++ b/src/modules/xine/filter_deinterlace.c @@ -26,53 +26,6 @@ #include #include -/* Linear Blend filter - C version contributed by Rogerio Brito. - This algorithm has the same interface as the other functions. - - The destination "screen" (pdst) is constructed from the source - screen (psrc[0]) line by line. - - The i-th line of the destination screen is the average of 3 lines - from the source screen: the (i-1)-th, i-th and (i+1)-th lines, with - the i-th line having weight 2 in the computation. - - Remarks: - * each line on pdst doesn't depend on previous lines; - * due to the way the algorithm is defined, the first & last lines of the - screen aren't deinterlaced. - -*/ -#if 0 -static void deinterlace_yuv( uint8_t *pdst, uint8_t *psrc, int width, int height ) -{ - register int x, y; - register uint8_t *l0, *l1, *l2, *l3; - - l0 = pdst; // target line - l1 = psrc; // 1st source line - l2 = l1 + width; // 2nd source line = line that follows l1 - l3 = l2 + width; // 3rd source line = line that follows l2 - - // Copy the first line - memcpy(l0, l1, width); - l0 += width; - - for (y = 1; y < height-1; ++y) - { - // computes avg of: l1 + 2*l2 + l3 - for (x = 0; x < width; ++x) - l0[x] = (l1[x] + (l2[x]<<1) + l3[x]) >> 2; - - // updates the line pointers - l1 = l2; l2 = l3; l3 += width; - l0 += width; - } - - // Copy the last line - memcpy(l0, l1, width); -} -#endif - /** Do it :-). */ -- 2.39.2