From 58e4556c7bc5e8c5689c25ecbd218fadafd6c22c Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sun, 14 Aug 2005 16:10:55 +0000 Subject: [PATCH] licensing, name and description changes Original commit message from CVS: licensing, name and description changes --- ChangeLog | 24 ++++++ ext/arts/gst_arts.c | 5 +- ext/audiofile/gstaf.c | 2 +- ext/musicbrainz/gsttrm.c | 2 +- ext/sndfile/gstsf.c | 4 +- gst/equalizer/gstiirequalizer.c | 115 +++++++++++++-------------- gst/multifilesink/gstmultifilesink.c | 2 +- gst/qtdemux/README | 0 gst/virtualdub/gstvirtualdub.c | 10 +-- sys/dxr3/dxr3init.c | 2 +- 10 files changed, 94 insertions(+), 72 deletions(-) delete mode 100644 gst/qtdemux/README diff --git a/ChangeLog b/ChangeLog index 92e3166512..08090354d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +2005-08-14 Thomas Vander Stichele + + * 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 * ext/mad/Makefile.am: diff --git a/ext/arts/gst_arts.c b/ext/arts/gst_arts.c index a6c9621d8c..2b71f7d99a 100644 --- a/ext/arts/gst_arts.c +++ b/ext/arts/gst_arts.c @@ -170,7 +170,8 @@ gst_arts_loop (GstElement * element) 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 @@ plugin_init (GstPlugin * plugin) GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "gst_arts", + "arts", "arTs filter wrapper", plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN) diff --git a/ext/audiofile/gstaf.c b/ext/audiofile/gstaf.c index 79979a222b..288565cd6b 100644 --- a/ext/audiofile/gstaf.c +++ b/ext/audiofile/gstaf.c @@ -42,5 +42,5 @@ plugin_init (GstPlugin * plugin) GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "gstaf", + "audiofile", "Audiofile plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN) diff --git a/ext/musicbrainz/gsttrm.c b/ext/musicbrainz/gsttrm.c index c363b09bea..4afbf5f1d2 100644 --- a/ext/musicbrainz/gsttrm.c +++ b/ext/musicbrainz/gsttrm.c @@ -404,4 +404,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, "trm", "A trm signature producer", - plugin_init, VERSION, "GPL", GST_PACKAGE, GST_ORIGIN) + plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN) diff --git a/ext/sndfile/gstsf.c b/ext/sndfile/gstsf.c index 7a83e06767..fa75adb895 100644 --- a/ext/sndfile/gstsf.c +++ b/ext/sndfile/gstsf.c @@ -874,6 +874,6 @@ plugin_init (GstPlugin * plugin) GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "gstsf", - "Sndfile plugin library", + "sndfile", + "use libsndfile to read and write audio from and to files", plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN) diff --git a/gst/equalizer/gstiirequalizer.c b/gst/equalizer/gstiirequalizer.c index c7819792fb..0a4a24dcae 100644 --- a/gst/equalizer/gstiirequalizer.c +++ b/gst/equalizer/gstiirequalizer.c @@ -219,8 +219,7 @@ static void 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 @@ gst_iir_equalizer_get_property (GObject * object, guint prop_id, /* 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 @@ plugin_init (GstPlugin * plugin) GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "gstequalizer", + "equalizer", "GStreamer equalizers", plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN) diff --git a/gst/multifilesink/gstmultifilesink.c b/gst/multifilesink/gstmultifilesink.c index 01948713b1..5802532281 100644 --- a/gst/multifilesink/gstmultifilesink.c +++ b/gst/multifilesink/gstmultifilesink.c @@ -673,6 +673,6 @@ plugin_init (GstPlugin * plugin) GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "gstmultifilesink", + "multifilesink", "multiple file sink (sequentially) after new media events", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN) diff --git a/gst/qtdemux/README b/gst/qtdemux/README deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/gst/virtualdub/gstvirtualdub.c b/gst/virtualdub/gstvirtualdub.c index cdaccf9fbe..0fc2197eaa 100644 --- a/gst/virtualdub/gstvirtualdub.c +++ b/gst/virtualdub/gstvirtualdub.c @@ -120,9 +120,7 @@ plugin_init (GModule * module, GstPlugin * plugin) return TRUE; } -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); diff --git a/sys/dxr3/dxr3init.c b/sys/dxr3/dxr3init.c index 921d4f89d6..7c4f3e8b99 100644 --- a/sys/dxr3/dxr3init.c +++ b/sys/dxr3/dxr3init.c @@ -53,4 +53,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, "dxr3", "dxr3 mpeg video board elements", - plugin_init, VERSION, "GPL", GST_PACKAGE, GST_ORIGIN) + plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)