mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-20 08:41:07 +00:00
goom/goom2k1: remove obsolete left over files
They now use the new GstAudioVisualizer base class from gst-plugins-base/gst-libs/gst/pbutils Also fixed undefined reference to gst_audio_visualizer_get_type Added GST_PLUGINS_BASE_LIBS to Makefile.am and re-order LIBADD. https://bugzilla.gnome.org/show_bug.cgi?id=742875
This commit is contained in:
Julien Isorce
parent
fb7783f8b0
commit
c9df481e27
8 changed files with 8 additions and 3128 deletions
|
|
@ -35,11 +35,10 @@ libgstgoom_la_SOURCES = \
|
||||||
goom.h goom_typedefs.h goom_graphic.h \
|
goom.h goom_typedefs.h goom_graphic.h \
|
||||||
goom_config_param.h goom_visual_fx.h goom_filters.h \
|
goom_config_param.h goom_visual_fx.h goom_filters.h \
|
||||||
goom_tools.h goom_tools.h goom_config.h \
|
goom_tools.h goom_tools.h goom_config.h \
|
||||||
gstaudiovisualizer.c gstaudiovisualizer.h \
|
|
||||||
$(ARCH_FILES)
|
$(ARCH_FILES)
|
||||||
|
|
||||||
libgstgoom_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS) $(ARCH_CFLAGS) $(ORC_CFLAGS)
|
libgstgoom_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS) $(ARCH_CFLAGS) $(ORC_CFLAGS)
|
||||||
libgstgoom_la_LIBADD = $(GST_BASE_LIBS) -lgstpbutils-$(GST_API_VERSION) $(GST_LIBS) $(LIBM) $(ORC_LIBS)
|
libgstgoom_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_API_VERSION) $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) $(ORC_LIBS)
|
||||||
libgstgoom_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
libgstgoom_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
libgstgoom_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
|
libgstgoom_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,105 +0,0 @@
|
||||||
/* GStreamer
|
|
||||||
* Copyright (C) <2011> Stefan Kost <ensonic@users.sf.net>
|
|
||||||
* Copyright (C) <2015> Luis de Bethencourt <luis@debethencourt.com>
|
|
||||||
*
|
|
||||||
* gstaudiovisualizer.c: base class for audio visualisation elements
|
|
||||||
*
|
|
||||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __GST_AUDIO_VISUALIZER_H__
|
|
||||||
#define __GST_AUDIO_VISUALIZER_H__
|
|
||||||
|
|
||||||
#include <gst/gst.h>
|
|
||||||
#include <gst/base/gstbasetransform.h>
|
|
||||||
|
|
||||||
#include <gst/video/video.h>
|
|
||||||
#include <gst/audio/audio.h>
|
|
||||||
#include <gst/base/gstadapter.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
|
||||||
#define GST_TYPE_AUDIO_VISUALIZER (goom_gst_audio_visualizer_get_type())
|
|
||||||
#define GST_AUDIO_VISUALIZER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_VISUALIZER,GstAudioVisualizer))
|
|
||||||
#define GST_AUDIO_VISUALIZER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_VISUALIZER,GstAudioVisualizerClass))
|
|
||||||
#define GST_AUDIO_VISUALIZER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_AUDIO_VISUALIZER,GstAudioVisualizerClass))
|
|
||||||
#define GST_IS_SYNAESTHESIA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_VISUALIZER))
|
|
||||||
#define GST_IS_SYNAESTHESIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_VISUALIZER))
|
|
||||||
typedef struct _GstAudioVisualizer GstAudioVisualizer;
|
|
||||||
typedef struct _GstAudioVisualizerClass GstAudioVisualizerClass;
|
|
||||||
typedef struct _GstAudioVisualizerPrivate GstAudioVisualizerPrivate;
|
|
||||||
|
|
||||||
typedef void (*GstAudioVisualizerShaderFunc)(GstAudioVisualizer *scope, const GstVideoFrame *s, GstVideoFrame *d);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* GstAudioVisualizerShader:
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_NONE: no shading
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_FADE: plain fading
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_UP: fade and move up
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_DOWN: fade and move down
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_LEFT: fade and move left
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_RIGHT: fade and move right
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_HORIZ_OUT: fade and move horizontally out
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_HORIZ_IN: fade and move horizontally in
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_VERT_OUT: fade and move vertically out
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_VERT_IN: fade and move vertically in
|
|
||||||
*
|
|
||||||
* Different types of supported background shading functions.
|
|
||||||
*/
|
|
||||||
typedef enum {
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_NONE,
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_FADE,
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_UP,
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_DOWN,
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_LEFT,
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_RIGHT,
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_HORIZ_OUT,
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_HORIZ_IN,
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_VERT_OUT,
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_VERT_IN
|
|
||||||
} GstAudioVisualizerShader;
|
|
||||||
|
|
||||||
struct _GstAudioVisualizer
|
|
||||||
{
|
|
||||||
GstElement parent;
|
|
||||||
|
|
||||||
guint req_spf; /* min samples per frame wanted by the subclass */
|
|
||||||
|
|
||||||
/* video state */
|
|
||||||
GstVideoInfo vinfo;
|
|
||||||
|
|
||||||
/* audio state */
|
|
||||||
GstAudioInfo ainfo;
|
|
||||||
|
|
||||||
/* <private> */
|
|
||||||
GstAudioVisualizerPrivate *priv;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct _GstAudioVisualizerClass
|
|
||||||
{
|
|
||||||
GstElementClass parent_class;
|
|
||||||
|
|
||||||
/* virtual function, called whenever the format changes */
|
|
||||||
gboolean (*setup) (GstAudioVisualizer * scope);
|
|
||||||
|
|
||||||
/* virtual function for rendering a frame */
|
|
||||||
gboolean (*render) (GstAudioVisualizer * scope, GstBuffer * audio, GstVideoFrame * video);
|
|
||||||
|
|
||||||
gboolean (*decide_allocation) (GstAudioVisualizer * scope, GstQuery *query);
|
|
||||||
};
|
|
||||||
|
|
||||||
GType goom_gst_audio_visualizer_get_type (void);
|
|
||||||
|
|
||||||
G_END_DECLS
|
|
||||||
#endif /* __GST_AUDIO_VISUALIZER_H__ */
|
|
||||||
|
|
@ -21,7 +21,8 @@
|
||||||
#ifndef __GST_GOOM_H__
|
#ifndef __GST_GOOM_H__
|
||||||
#define __GST_GOOM_H__
|
#define __GST_GOOM_H__
|
||||||
|
|
||||||
#include "gst/pbutils/gstaudiovisualizer.h"
|
#include <gst/pbutils/gstaudiovisualizer.h>
|
||||||
|
|
||||||
#include "goom.h"
|
#include "goom.h"
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
|
||||||
|
|
@ -3,11 +3,10 @@ plugin_LTLIBRARIES = libgstgoom2k1.la
|
||||||
GOOM_FILTER_FILES = filters.c
|
GOOM_FILTER_FILES = filters.c
|
||||||
GOOM_FILTER_CFLAGS = -UMMX -UUSE_ASM
|
GOOM_FILTER_CFLAGS = -UMMX -UUSE_ASM
|
||||||
|
|
||||||
noinst_HEADERS = gstgoom.h filters.h goom_core.h goom_tools.h graphic.h lines.h \
|
noinst_HEADERS = gstgoom.h filters.h goom_core.h goom_tools.h graphic.h lines.h
|
||||||
gstaudiovisualizer.h
|
|
||||||
|
|
||||||
libgstgoom2k1_la_SOURCES = gstgoom.c goom_core.c $(GOOM_FILTER_FILES) graphic.c \
|
libgstgoom2k1_la_SOURCES = gstgoom.c goom_core.c $(GOOM_FILTER_FILES) graphic.c \
|
||||||
lines.c gstaudiovisualizer.c
|
lines.c
|
||||||
|
|
||||||
libgstgoom2k1_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS) \
|
libgstgoom2k1_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS) \
|
||||||
-Dgst_goom_get_type=gst_goom2k1_get_type \
|
-Dgst_goom_get_type=gst_goom2k1_get_type \
|
||||||
|
|
@ -24,7 +23,7 @@ libgstgoom2k1_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CF
|
||||||
-DzoomFilterDestroy=zoomFilterDestroy2k1 \
|
-DzoomFilterDestroy=zoomFilterDestroy2k1 \
|
||||||
-DzoomFilterNew=zoomFilterNew2k1
|
-DzoomFilterNew=zoomFilterNew2k1
|
||||||
|
|
||||||
libgstgoom2k1_la_LIBADD = $(GST_BASE_LIBS) -lgstpbutils-$(GST_API_VERSION) $(GST_LIBS) $(LIBM)
|
libgstgoom2k1_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_API_VERSION) $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
|
||||||
libgstgoom2k1_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
libgstgoom2k1_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
libgstgoom2k1_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
|
libgstgoom2k1_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,105 +0,0 @@
|
||||||
/* GStreamer
|
|
||||||
* Copyright (C) <2011> Stefan Kost <ensonic@users.sf.net>
|
|
||||||
* Copyright (C) <2015> Luis de Bethencourt <luis@debethencourt.com>
|
|
||||||
*
|
|
||||||
* gstaudiovisualizer.c: base class for audio visualisation elements
|
|
||||||
*
|
|
||||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __GST_AUDIO_VISUALIZER_H__
|
|
||||||
#define __GST_AUDIO_VISUALIZER_H__
|
|
||||||
|
|
||||||
#include <gst/gst.h>
|
|
||||||
#include <gst/base/gstbasetransform.h>
|
|
||||||
|
|
||||||
#include <gst/video/video.h>
|
|
||||||
#include <gst/audio/audio.h>
|
|
||||||
#include <gst/base/gstadapter.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
|
||||||
#define GST_TYPE_AUDIO_VISUALIZER (goom2k1_gst_audio_visualizer_get_type())
|
|
||||||
#define GST_AUDIO_VISUALIZER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_VISUALIZER,GstAudioVisualizer))
|
|
||||||
#define GST_AUDIO_VISUALIZER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_VISUALIZER,GstAudioVisualizerClass))
|
|
||||||
#define GST_AUDIO_VISUALIZER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_AUDIO_VISUALIZER,GstAudioVisualizerClass))
|
|
||||||
#define GST_IS_SYNAESTHESIA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_VISUALIZER))
|
|
||||||
#define GST_IS_SYNAESTHESIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_VISUALIZER))
|
|
||||||
typedef struct _GstAudioVisualizer GstAudioVisualizer;
|
|
||||||
typedef struct _GstAudioVisualizerClass GstAudioVisualizerClass;
|
|
||||||
typedef struct _GstAudioVisualizerPrivate GstAudioVisualizerPrivate;
|
|
||||||
|
|
||||||
typedef void (*GstAudioVisualizerShaderFunc)(GstAudioVisualizer *scope, const GstVideoFrame *s, GstVideoFrame *d);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* GstAudioVisualizerShader:
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_NONE: no shading
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_FADE: plain fading
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_UP: fade and move up
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_DOWN: fade and move down
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_LEFT: fade and move left
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_RIGHT: fade and move right
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_HORIZ_OUT: fade and move horizontally out
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_HORIZ_IN: fade and move horizontally in
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_VERT_OUT: fade and move vertically out
|
|
||||||
* @GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_VERT_IN: fade and move vertically in
|
|
||||||
*
|
|
||||||
* Different types of supported background shading functions.
|
|
||||||
*/
|
|
||||||
typedef enum {
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_NONE,
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_FADE,
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_UP,
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_DOWN,
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_LEFT,
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_RIGHT,
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_HORIZ_OUT,
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_HORIZ_IN,
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_VERT_OUT,
|
|
||||||
GST_AUDIO_VISUALIZER_SHADER_FADE_AND_MOVE_VERT_IN
|
|
||||||
} GstAudioVisualizerShader;
|
|
||||||
|
|
||||||
struct _GstAudioVisualizer
|
|
||||||
{
|
|
||||||
GstElement parent;
|
|
||||||
|
|
||||||
guint req_spf; /* min samples per frame wanted by the subclass */
|
|
||||||
|
|
||||||
/* video state */
|
|
||||||
GstVideoInfo vinfo;
|
|
||||||
|
|
||||||
/* audio state */
|
|
||||||
GstAudioInfo ainfo;
|
|
||||||
|
|
||||||
/* <private> */
|
|
||||||
GstAudioVisualizerPrivate *priv;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct _GstAudioVisualizerClass
|
|
||||||
{
|
|
||||||
GstElementClass parent_class;
|
|
||||||
|
|
||||||
/* virtual function, called whenever the format changes */
|
|
||||||
gboolean (*setup) (GstAudioVisualizer * scope);
|
|
||||||
|
|
||||||
/* virtual function for rendering a frame */
|
|
||||||
gboolean (*render) (GstAudioVisualizer * scope, GstBuffer * audio, GstVideoFrame * video);
|
|
||||||
|
|
||||||
gboolean (*decide_allocation) (GstAudioVisualizer * scope, GstQuery *query);
|
|
||||||
};
|
|
||||||
|
|
||||||
GType goom2k1_gst_audio_visualizer_get_type (void);
|
|
||||||
|
|
||||||
G_END_DECLS
|
|
||||||
#endif /* __GST_AUDIO_VISUALIZER_H__ */
|
|
||||||
|
|
@ -22,7 +22,8 @@
|
||||||
#ifndef __GST_GOOM_H__
|
#ifndef __GST_GOOM_H__
|
||||||
#define __GST_GOOM_H__
|
#define __GST_GOOM_H__
|
||||||
|
|
||||||
#include "gst/pbutils/gstaudiovisualizer.h"
|
#include <gst/pbutils/gstaudiovisualizer.h>
|
||||||
|
|
||||||
#include "goom_core.h"
|
#include "goom_core.h"
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue