From: <tho...@fr...> - 2005-08-14 16:11:09
|
CVS Root: /cvs/gstreamer Module: gst-plugins Changes by: thomasvs Date: Sun Aug 14 2005 09:11:08 PDT Log message: licensing, name and description changes Modified files: . : ChangeLog ext/aalib : gstaasink.c ext/arts : gst_arts.c ext/audiofile : gstaf.c ext/gconf : gstgconfelements.c ext/musicbrainz : gsttrm.c ext/raw1394 : gst1394.c ext/sndfile : gstsf.c gst/equalizer : gstiirequalizer.c gst/fdsrc : gstfdsrc.c gst/multifilesink: gstmultifilesink.c gst/virtualdub : gstvirtualdub.c sys/dxr3 : dxr3init.c Removed files: gst/qtdemux : README Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.1778&r2=1.1779 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/aalib/gstaasink.c.diff?r1=1.43&r2=1.44 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/arts/gst_arts.c.diff?r1=1.20&r2=1.21 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/audiofile/gstaf.c.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/gconf/gstgconfelements.c.diff?r1=1.2&r2=1.3 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/musicbrainz/gsttrm.c.diff?r1=1.9&r2=1.10 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/raw1394/gst1394.c.diff?r1=1.11&r2=1.12 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/sndfile/gstsf.c.diff?r1=1.25&r2=1.26 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/equalizer/gstiirequalizer.c.diff?r1=1.1&r2=1.2 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/fdsrc/gstfdsrc.c.diff?r1=1.2&r2=1.3 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/multifilesink/gstmultifilesink.c.diff?r1=1.3&r2=1.4 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/qtdemux/README http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/virtualdub/gstvirtualdub.c.diff?r1=1.6&r2=1.7 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/sys/dxr3/dxr3init.c.diff?r1=1.9&r2=1.10 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins/ChangeLog,v retrieving revision 1.1778 retrieving revision 1.1779 diff -u -d -r1.1778 -r1.1779 --- ChangeLog 13 Aug 2005 11:58:02 -0000 1.1778 +++ ChangeLog 14 Aug 2005 16:10:53 -0000 1.1779 @@ -1,3 +1,27 @@ +2005-08-14 Thomas Vander Stichele <thomas at apestaart dot org> + + * ext/aalib/gstaasink.c: + aalib is LGPL, so this plugin can be LGPL + * ext/arts/gst_arts.c: (plugin_init): + rename, we don't like underscores + * ext/audiofile/gstaf.c: + * ext/sndfile/gstsf.c: + rename, we like a descriptive plugin name + * ext/gconf/gstgconfelements.c: + change description a little + * ext/musicbrainz/gsttrm.c: + musicbrainz is LGPL, so plugin can be LGPL + * ext/raw1394/gst1394.c: + rename, we like all-digit names + * gst/equalizer/gstiirequalizer.c: + * gst/fdsrc/gstfdsrc.c: + * gst/multifilesink/gstmultifilesink.c: + rename + * gst/virtualdub/gstvirtualdub.c: + use GST_PLUGIN_DEFINE + * sys/dxr3/dxr3init.c: + only uses system headers, and code is LGPL, so plugin is LGPL 2005-08-13 Tim-Philipp Müller <tim at centricular dot net> * ext/mad/Makefile.am: Index: gstaf.c RCS file: /cvs/gstreamer/gst-plugins/ext/audiofile/gstaf.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- gstaf.c 14 Mar 2004 22:33:53 -0000 1.8 +++ gstaf.c 14 Aug 2005 16:10:54 -0000 1.9 @@ -42,5 +42,5 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "gstaf", + "audiofile", "Audiofile plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN) Index: gstaasink.c RCS file: /cvs/gstreamer/gst-plugins/ext/aalib/gstaasink.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- gstaasink.c 10 Jul 2005 12:52:19 -0000 1.43 +++ gstaasink.c 14 Aug 2005 16:10:53 -0000 1.44 @@ -548,4 +548,4 @@ "aasink", "ASCII Art video sink", - plugin_init, VERSION, "GPL", GST_PACKAGE, GST_ORIGIN) + plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN) Index: gst_arts.c RCS file: /cvs/gstreamer/gst-plugins/ext/arts/gst_arts.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- gst_arts.c 9 Nov 2004 06:08:22 -0000 1.20 +++ gst_arts.c 14 Aug 2005 16:10:54 -0000 1.21 @@ -170,7 +170,8 @@ static gboolean plugin_init (GstPlugin * plugin) { - if (!gst_element_register (plugin, "gstarts", GST_RANK_NONE, GST_TYPE_ARTS)) + if (!gst_element_register (plugin, "artsfilter", GST_RANK_NONE, + GST_TYPE_ARTS)) return FALSE; return TRUE; @@ -178,6 +179,6 @@ - "gst_arts", + "arts", "arTs filter wrapper", plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN) Index: gstgconfelements.c RCS file: /cvs/gstreamer/gst-plugins/ext/gconf/gstgconfelements.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gstgconfelements.c 20 Jul 2005 09:55:36 -0000 1.2 +++ gstgconfelements.c 14 Aug 2005 16:10:54 -0000 1.3 @@ -45,5 +45,5 @@ "gconfelements", - "Plugin contains plugins wrapping the GStreamer/GConf audio/video output settings", + "elements wrapping the GStreamer/GConf audio/video output settings", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN) Index: gsttrm.c RCS file: /cvs/gstreamer/gst-plugins/ext/musicbrainz/gsttrm.c,v retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- gsttrm.c 5 Jul 2005 10:51:31 -0000 1.9 +++ gsttrm.c 14 Aug 2005 16:10:54 -0000 1.10 @@ -404,4 +404,4 @@ "trm", "A trm signature producer", + plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN) Index: gst1394.c RCS file: /cvs/gstreamer/gst-plugins/ext/raw1394/gst1394.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- gst1394.c 15 Mar 2004 19:31:55 -0000 1.11 +++ gst1394.c 14 Aug 2005 16:10:54 -0000 1.12 @@ -38,6 +38,6 @@ - "gst1394", + "1394", "Source for DV data via IEEE1394 interface", plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN); Index: gstsf.c RCS file: /cvs/gstreamer/gst-plugins/ext/sndfile/gstsf.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- gstsf.c 1 Nov 2004 14:43:36 -0000 1.25 +++ gstsf.c 14 Aug 2005 16:10:54 -0000 1.26 @@ -874,6 +874,6 @@ - "gstsf", - "Sndfile plugin library", + "sndfile", + "use libsndfile to read and write audio from and to files", Index: gstiirequalizer.c RCS file: /cvs/gstreamer/gst-plugins/gst/equalizer/gstiirequalizer.c,v retrieving revision 1.1 diff -u -d -r1.1 -r1.2 --- gstiirequalizer.c 28 Oct 2004 02:33:48 -0000 1.1 +++ gstiirequalizer.c 14 Aug 2005 16:10:54 -0000 1.2 @@ -219,8 +219,7 @@ setup_filter (GstIirEqualizer * equ, SecondOrderFilter * filter, gdouble gain, gdouble frequency) - gdouble q = - pow (HIGHEST_FREQ / LOWEST_FREQ, + gdouble q = pow (HIGHEST_FREQ / LOWEST_FREQ, 1.0 / (equ->freq_count - 1)) * equ->bandwidth; gdouble theta = frequency * 2 * M_PI; @@ -341,64 +340,64 @@ /* start of code that is type specific */ -#define CREATE_OPTIMIZED_FUNCTIONS(TYPE,BIG_TYPE,MIN_VAL,MAX_VAL) \ -typedef struct { \ - TYPE x1, x2; /* history of input values for a filter */ \ - TYPE y1, y2; /* history of output values for a filter */ \ -} SecondOrderHistory ## TYPE; \ - \ -static inline TYPE \ -one_step_ ## TYPE (SecondOrderFilter *filter, \ - SecondOrderHistory ## TYPE *history, TYPE input) \ -{ \ - /* calculate output */ \ - TYPE output = filter->alpha * (input - history->x2) + \ - filter->gamma * history->y1 - filter->beta * history->y2; \ - /* update history */ \ - history->y2 = history->y1; \ - history->y1 = output; \ - history->x2 = history->x1; \ - history->x1 = input; \ - return output; \ -} \ -static const guint history_size_ ## TYPE = sizeof (SecondOrderHistory ## TYPE); \ -static void \ -gst_iir_equ_process_ ## TYPE (GstIirEqualizer *equ, guint8 *data, guint size, \ - guint channels) \ - guint frames = size / channels / sizeof (TYPE); \ - guint i, c, f; \ - BIG_TYPE cur; \ - TYPE val; \ - for (i = 0; i < frames; i++) { \ - for (c = 0; c < channels; c++) { \ - SecondOrderHistory ## TYPE *history = equ->history; \ - val = *((TYPE *) data); \ - cur = 0; \ - for (f = 0; f < equ->freq_count; f++) { \ - SecondOrderFilter *filter = &equ->filter[f]; \ - cur += one_step_ ## TYPE (filter, history, val); \ - history++; \ - } \ - cur += val * 0.25; \ - cur = CLAMP (cur, MIN_VAL, MAX_VAL); \ - *((TYPE *) data) = (TYPE) cur; \ - data += sizeof (TYPE); \ - } \ - } \ +#define CREATE_OPTIMIZED_FUNCTIONS(TYPE,BIG_TYPE,MIN_VAL,MAX_VAL) \ +typedef struct { \ + TYPE x1, x2; /* history of input values for a filter */ \ + TYPE y1, y2; /* history of output values for a filter */ \ +} SecondOrderHistory ## TYPE; \ + \ +static inline TYPE \ +one_step_ ## TYPE (SecondOrderFilter *filter, \ + SecondOrderHistory ## TYPE *history, TYPE input) \ +{ \ + /* calculate output */ \ + TYPE output = filter->alpha * (input - history->x2) + \ + filter->gamma * history->y1 - filter->beta * history->y2; \ + /* update history */ \ + history->y2 = history->y1; \ + history->y1 = output; \ + history->x2 = history->x1; \ + history->x1 = input; \ + return output; \ +} \ +static const guint \ +history_size_ ## TYPE = sizeof (SecondOrderHistory ## TYPE); \ +static void \ +gst_iir_equ_process_ ## TYPE (GstIirEqualizer *equ, guint8 *data, \ +guint size, guint channels) \ + guint frames = size / channels / sizeof (TYPE); \ + guint i, c, f; \ + BIG_TYPE cur; \ + TYPE val; \ + for (i = 0; i < frames; i++) { \ + for (c = 0; c < channels; c++) { \ + SecondOrderHistory ## TYPE *history = equ->history; \ + val = *((TYPE *) data); \ + cur = 0; \ + for (f = 0; f < equ->freq_count; f++) { \ + SecondOrderFilter *filter = &equ->filter[f]; \ + cur += one_step_ ## TYPE (filter, history, val); \ + history++; \ + } \ + cur += val * 0.25; \ + cur = CLAMP (cur, MIN_VAL, MAX_VAL); \ + *((TYPE *) data) = (TYPE) cur; \ + data += sizeof (TYPE); \ + } \ + } \ } -CREATE_OPTIMIZED_FUNCTIONS (gint16, gint, -32768, 32767) - CREATE_OPTIMIZED_FUNCTIONS (gfloat, gfloat, -1.0, 1.0) +CREATE_OPTIMIZED_FUNCTIONS (gint16, gint, -32768, 32767); +CREATE_OPTIMIZED_FUNCTIONS (gfloat, gfloat, -1.0, 1.0); - static void - gst_iir_equalizer_filter_inplace (GstAudiofilter * filter, - GstBuffer * buf) +static void +gst_iir_equalizer_filter_inplace (GstAudiofilter * filter, GstBuffer * buf) GstIirEqualizer *equ = GST_IIR_EQUALIZER (filter); @@ -435,6 +434,6 @@ - "gstequalizer", + "equalizer", "GStreamer equalizers", Index: gstfdsrc.c RCS file: /cvs/gstreamer/gst-plugins/gst/fdsrc/gstfdsrc.c,v --- gstfdsrc.c 18 Jul 2005 09:59:38 -0000 1.2 +++ gstfdsrc.c 14 Aug 2005 16:10:55 -0000 1.3 @@ -295,6 +295,6 @@ - "gstfdsrc", - "A source for fd (file descriptors)", + "fdsrc", + "A source that reads from a file descriptor", Index: gstmultifilesink.c RCS file: /cvs/gstreamer/gst-plugins/gst/multifilesink/gstmultifilesink.c,v retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gstmultifilesink.c 5 Jul 2005 10:51:41 -0000 1.3 +++ gstmultifilesink.c 14 Aug 2005 16:10:55 -0000 1.4 @@ -673,6 +673,6 @@ - "gstmultifilesink", + "multifilesink", "multiple file sink (sequentially) after new media events", --- README DELETED --- Index: gstvirtualdub.c RCS file: /cvs/gstreamer/gst-plugins/gst/virtualdub/gstvirtualdub.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- gstvirtualdub.c 15 Mar 2004 19:32:17 -0000 1.6 +++ gstvirtualdub.c 14 Aug 2005 16:10:55 -0000 1.7 @@ -120,9 +120,7 @@ -GstPluginDesc plugin_desc = { - GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "virtualdub", - plugin_init -}; +GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, + GST_VERSION_MINOR, + "virtualdub", + "VirtualDub", plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN); Index: dxr3init.c RCS file: /cvs/gstreamer/gst-plugins/sys/dxr3/dxr3init.c,v --- dxr3init.c 15 Mar 2004 19:32:26 -0000 1.9 +++ dxr3init.c 14 Aug 2005 16:10:55 -0000 1.10 @@ -53,4 +53,4 @@ "dxr3", "dxr3 mpeg video board elements", |