mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-10 01:54:11 +00:00
Code Issues1 Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-base

Browse source
This commit is contained in:
Wim Taymans 2009-01-22 13:12:02 +01:00 committed by Wim Taymans
commit 509f561ef3
7 changed files with 42 additions and 14 deletions

8
autogen.sh
View file

@ -22,6 +22,14 @@ then
fi
. common/gst-autogen.sh
# install pre-commit hook for doing clean commits
if test ! -x .git/hooks/pre-commit;
then
cp common/hooks/pre-commit.hook .git/hooks/pre-commit
chmod +x .git/hooks/pre-commit
fi
CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-gtk-doc --enable-plugin-docs'
autogen_options $@

2
common

@ -1 +1 @@
Subproject commit 5dc8ae302733ce1aae5b1aaa613ce77a8ae4b3d9
Subproject commit 137543b7e782c811bc88bf9210323e7e75835d18

2
configure.ac
View file

@ -5,7 +5,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file
dnl initialize autoconf
dnl releases only do -Wall, cvs and prerelease does -Werror too
dnl use a three digit version number for releases, and four for cvs/prerelease
AC_INIT(GStreamer Base Plug-ins, 0.10.22,
AC_INIT(GStreamer Base Plug-ins, 0.10.22.1,
http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
gst-plugins-base)

11
gst-libs/gst/fft/gstfftf32.c
View file

@ -20,6 +20,7 @@
#include <glib.h>
#include <math.h>
#include "_kiss_fft_guts_f32.h"
#include "kiss_fftr_f32.h"
#include "gstfft.h"
#include "gstfftf32.h"
@ -74,13 +75,18 @@ GstFFTF32 *
gst_fft_f32_new (gint len, gboolean inverse)
{
GstFFTF32 *self;
gsize subsize = 0, memneeded;
g_return_val_if_fail (len > 0, NULL);
g_return_val_if_fail (len % 2 == 0, NULL);
self = g_new (GstFFTF32, 1);
kiss_fftr_f32_alloc (len, (inverse) ? 1 : 0, NULL, &subsize);
memneeded = ALIGN_STRUCT (sizeof (GstFFTF32)) + subsize;
self->cfg = kiss_fftr_f32_alloc (len, (inverse) ? 1 : 0, NULL, NULL);
self = (GstFFTF32 *) g_malloc0 (memneeded);
self->cfg = (((guint8 *) self) + ALIGN_STRUCT (sizeof (GstFFTF32)));
self->cfg = kiss_fftr_f32_alloc (len, (inverse) ? 1 : 0, self->cfg, &subsize);
g_assert (self->cfg);
self->inverse = inverse;
@ -152,7 +158,6 @@ gst_fft_f32_inverse_fft (GstFFTF32 * self, const GstFFTF32Complex * freqdata,
void
gst_fft_f32_free (GstFFTF32 * self)
{
kiss_fftr_f32_free (self->cfg);
g_free (self);
}

11
gst-libs/gst/fft/gstfftf64.c
View file

@ -20,6 +20,7 @@
#include <glib.h>
#include <math.h>
#include "_kiss_fft_guts_f64.h"
#include "kiss_fftr_f64.h"
#include "gstfft.h"
#include "gstfftf64.h"
@ -74,13 +75,18 @@ GstFFTF64 *
gst_fft_f64_new (gint len, gboolean inverse)
{
GstFFTF64 *self;
gsize subsize = 0, memneeded;
g_return_val_if_fail (len > 0, NULL);
g_return_val_if_fail (len % 2 == 0, NULL);
self = g_new (GstFFTF64, 1);
kiss_fftr_f64_alloc (len, (inverse) ? 1 : 0, NULL, &subsize);
memneeded = ALIGN_STRUCT (sizeof (GstFFTF64)) + subsize;
self->cfg = kiss_fftr_f64_alloc (len, (inverse) ? 1 : 0, NULL, NULL);
self = (GstFFTF64 *) g_malloc0 (memneeded);
self->cfg = (((guint8 *) self) + ALIGN_STRUCT (sizeof (GstFFTF64)));
self->cfg = kiss_fftr_f64_alloc (len, (inverse) ? 1 : 0, self->cfg, &subsize);
g_assert (self->cfg);
self->inverse = inverse;
@ -152,7 +158,6 @@ gst_fft_f64_inverse_fft (GstFFTF64 * self, const GstFFTF64Complex * freqdata,
void
gst_fft_f64_free (GstFFTF64 * self)
{
kiss_fftr_f64_free (self->cfg);
g_free (self);
}

11
gst-libs/gst/fft/gstffts16.c
View file

@ -20,6 +20,7 @@
#include <glib.h>
#include <math.h>
#include "_kiss_fft_guts_s16.h"
#include "kiss_fftr_s16.h"
#include "gstfft.h"
#include "gstffts16.h"
@ -74,13 +75,18 @@ GstFFTS16 *
gst_fft_s16_new (gint len, gboolean inverse)
{
GstFFTS16 *self;
gsize subsize = 0, memneeded;
g_return_val_if_fail (len > 0, NULL);
g_return_val_if_fail (len % 2 == 0, NULL);
self = g_new (GstFFTS16, 1);
kiss_fftr_s16_alloc (len, (inverse) ? 1 : 0, NULL, &subsize);
memneeded = ALIGN_STRUCT (sizeof (GstFFTS16)) + subsize;
self->cfg = kiss_fftr_s16_alloc (len, (inverse) ? 1 : 0, NULL, NULL);
self = (GstFFTS16 *) g_malloc0 (memneeded);
self->cfg = (((guint8 *) self) + ALIGN_STRUCT (sizeof (GstFFTS16)));
self->cfg = kiss_fftr_s16_alloc (len, (inverse) ? 1 : 0, self->cfg, &subsize);
g_assert (self->cfg);
self->inverse = inverse;
@ -152,7 +158,6 @@ gst_fft_s16_inverse_fft (GstFFTS16 * self, const GstFFTS16Complex * freqdata,
void
gst_fft_s16_free (GstFFTS16 * self)
{
kiss_fftr_s16_free (self->cfg);
g_free (self);
}

11
gst-libs/gst/fft/gstffts32.c
View file

@ -20,6 +20,7 @@
#include <glib.h>
#include <math.h>
#include "_kiss_fft_guts_s32.h"
#include "kiss_fftr_s32.h"
#include "gstfft.h"
#include "gstffts32.h"
@ -73,13 +74,18 @@ GstFFTS32 *
gst_fft_s32_new (gint len, gboolean inverse)
{
GstFFTS32 *self;
gsize subsize = 0, memneeded;
g_return_val_if_fail (len > 0, NULL);
g_return_val_if_fail (len % 2 == 0, NULL);
self = g_new (GstFFTS32, 1);
kiss_fftr_s32_alloc (len, (inverse) ? 1 : 0, NULL, &subsize);
memneeded = ALIGN_STRUCT (sizeof (GstFFTS32)) + subsize;
self->cfg = kiss_fftr_s32_alloc (len, (inverse) ? 1 : 0, NULL, NULL);
self = (GstFFTS32 *) g_malloc0 (memneeded);
self->cfg = (((guint8 *) self) + ALIGN_STRUCT (sizeof (GstFFTS32)));
self->cfg = kiss_fftr_s32_alloc (len, (inverse) ? 1 : 0, self->cfg, &subsize);
g_assert (self->cfg);
self->inverse = inverse;
@ -151,7 +157,6 @@ gst_fft_s32_inverse_fft (GstFFTS32 * self, const GstFFTS32Complex * freqdata,
void
gst_fft_s32_free (GstFFTS32 * self)
{
kiss_fftr_s32_free (self->cfg);
g_free (self);
}