mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-13 19:05:37 +00:00
ext/xine/xineinput.c: call parent dispose.
Original commit message from CVS: 2004-02-23 Benjamin Otte <otte@gnome.org> * ext/xine/xineinput.c: (gst_xine_input_dispose): (gst_xine_input_subclass_init): call parent dispose. change pad template for CD reader correctly * ext/xine/Makefile.am: * ext/xine/gstxine.h: * ext/xine/xine.c: (plugin_init): * ext/xine/xineaudiosink.c: wrap audio sinks, too * gst-libs/gst/resample/private.h: * gst-libs/gst/resample/resample.c: (gst_resample_init), (gst_resample_reinit), (gst_resample_scale), (gst_resample_nearest_s16), (gst_resample_bilinear_s16), (gst_resample_sinc_slow_s16), (gst_resample_sinc_s16), (gst_resample_sinc_ft_s16), (gst_resample_nearest_float), (gst_resample_bilinear_float), (gst_resample_sinc_slow_float), (gst_resample_sinc_float), (gst_resample_sinc_ft_float): * gst-libs/gst/resample/resample.h: * gst/audioscale/gstaudioscale.c: (gst_audioscale_method_get_type), (gst_audioscale_class_init), (gst_audioscale_link), (gst_audioscale_get_buffer), (gst_audioscale_init), (gst_audioscale_chain), (gst_audioscale_set_property), (gst_audioscale_get_property): * gst/audioscale/gstaudioscale.h: s/resample_*/gst_resample_*/i to not clobber namespaces
This commit is contained in:
parent
4f97d9f1d0
commit
47c01dd098
9 changed files with 440 additions and 73 deletions
28
ChangeLog
28
ChangeLog
|
@ -1,3 +1,31 @@
|
|||
2004-02-23 Benjamin Otte <otte@gnome.org>
|
||||
|
||||
* ext/xine/xineinput.c: (gst_xine_input_dispose):
|
||||
(gst_xine_input_subclass_init):
|
||||
call parent dispose.
|
||||
change pad template for CD reader correctly
|
||||
* ext/xine/Makefile.am:
|
||||
* ext/xine/gstxine.h:
|
||||
* ext/xine/xine.c: (plugin_init):
|
||||
* ext/xine/xineaudiosink.c:
|
||||
wrap audio sinks, too
|
||||
* gst-libs/gst/resample/private.h:
|
||||
* gst-libs/gst/resample/resample.c: (gst_resample_init),
|
||||
(gst_resample_reinit), (gst_resample_scale),
|
||||
(gst_resample_nearest_s16), (gst_resample_bilinear_s16),
|
||||
(gst_resample_sinc_slow_s16), (gst_resample_sinc_s16),
|
||||
(gst_resample_sinc_ft_s16), (gst_resample_nearest_float),
|
||||
(gst_resample_bilinear_float), (gst_resample_sinc_slow_float),
|
||||
(gst_resample_sinc_float), (gst_resample_sinc_ft_float):
|
||||
* gst-libs/gst/resample/resample.h:
|
||||
* gst/audioscale/gstaudioscale.c: (gst_audioscale_method_get_type),
|
||||
(gst_audioscale_class_init), (gst_audioscale_link),
|
||||
(gst_audioscale_get_buffer), (gst_audioscale_init),
|
||||
(gst_audioscale_chain), (gst_audioscale_set_property),
|
||||
(gst_audioscale_get_property):
|
||||
* gst/audioscale/gstaudioscale.h:
|
||||
s/resample_*/gst_resample_*/i to not clobber namespaces
|
||||
|
||||
2004-02-23 Julien MOUTTE <julien@moutte.net>
|
||||
|
||||
* gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps),
|
||||
|
|
|
@ -2,7 +2,12 @@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
|
|||
|
||||
plugin_LTLIBRARIES = libgstxine.la
|
||||
|
||||
libgstxine_la_SOURCES = xine.c xinecaps.c xineaudiodec.c xineinput.c
|
||||
libgstxine_la_SOURCES = \
|
||||
xine.c \
|
||||
xineaudiodec.c \
|
||||
xineaudiosink.c \
|
||||
xinecaps.c \
|
||||
xineinput.c
|
||||
libgstxine_la_CFLAGS = $(GST_CFLAGS) $(XINE_CFLAGS)
|
||||
libgstxine_la_LIBADD = $(XINE_LIBS)
|
||||
libgstxine_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||
|
|
|
@ -75,6 +75,7 @@ guint32 gst_xine_get_format_for_caps (const GstCaps *caps);
|
|||
|
||||
/* init functions for the plugins */
|
||||
|
||||
gboolean gst_xine_audio_sink_init_plugin (GstPlugin *plugin);
|
||||
gboolean gst_xine_audio_dec_init_plugin (GstPlugin *plugin);
|
||||
gboolean gst_xine_input_init_plugin (GstPlugin *plugin);
|
||||
|
||||
|
|
|
@ -154,7 +154,8 @@ static gboolean
|
|||
plugin_init (GstPlugin *plugin)
|
||||
{
|
||||
if (!gst_xine_input_init_plugin (plugin) ||
|
||||
!gst_xine_audio_dec_init_plugin (plugin))
|
||||
!gst_xine_audio_dec_init_plugin (plugin) ||
|
||||
!gst_xine_audio_sink_init_plugin (plugin))
|
||||
return FALSE;
|
||||
|
||||
return TRUE;
|
||||
|
|
330
ext/xine/xineaudiosink.c
Normal file
330
ext/xine/xineaudiosink.c
Normal file
|
@ -0,0 +1,330 @@
|
|||
/* GStreamer
|
||||
* Copyright (C) 2004 Benjamin Otte <in7y118@public.uni-hamburg.de>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library 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 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
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library 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 <gst/gst.h>
|
||||
#include "gstxine.h"
|
||||
#include <xine/audio_out.h>
|
||||
#include <xine/xine_internal.h>
|
||||
#include <xine/plugin_catalog.h>
|
||||
|
||||
#define GST_TYPE_XINE_AUDIO_SINK \
|
||||
(gst_xine_audio_sink_get_type())
|
||||
#define GST_XINE_AUDIO_SINK(obj) \
|
||||
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_XINE_AUDIO_SINK,GstXineAudioSink))
|
||||
#define GST_XINE_AUDIO_SINK_GET_CLASS(obj) \
|
||||
(G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_XINE_AUDIO_SINK, GstXineAudioSinkClass))
|
||||
#define GST_XINE_AUDIO_SINK_CLASS(klass) \
|
||||
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_XINE_AUDIO_SINK,GstXineAudioSinkClass))
|
||||
#define GST_IS_XINE_AUDIO_SINK(obj) \
|
||||
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_XINE_AUDIO_SINK))
|
||||
#define GST_IS_XINE_AUDIO_SINK_CLASS(obj) \
|
||||
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_XINE_AUDIO_SINK))
|
||||
|
||||
GType gst_xine_audio_sink_get_type (void);
|
||||
|
||||
typedef struct _GstXineAudioSink GstXineAudioSink;
|
||||
typedef struct _GstXineAudioSinkClass GstXineAudioSinkClass;
|
||||
|
||||
struct _GstXineAudioSink
|
||||
{
|
||||
GstXine parent;
|
||||
|
||||
GstPad * sinkpad;
|
||||
|
||||
ao_driver_t * driver;
|
||||
guint open; /* number of bytes per sample or 0 if driver not open */
|
||||
};
|
||||
|
||||
struct _GstXineAudioSinkClass
|
||||
{
|
||||
GstXineClass parent_class;
|
||||
|
||||
plugin_node_t * plugin_node;
|
||||
};
|
||||
|
||||
/** GstXineAudioSink ***********************************************************/
|
||||
|
||||
GST_BOILERPLATE (GstXineAudioSink, gst_xine_audio_sink, GstXine, GST_TYPE_XINE)
|
||||
|
||||
static GstElementStateReturn
|
||||
gst_xine_audio_sink_change_state (GstElement *element);
|
||||
|
||||
static void
|
||||
gst_xine_audio_sink_base_init (gpointer g_class)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
gst_xine_audio_sink_class_init (GstXineAudioSinkClass *klass)
|
||||
{
|
||||
GstElementClass *element = GST_ELEMENT_CLASS (klass);
|
||||
|
||||
element->change_state = gst_xine_audio_sink_change_state;
|
||||
}
|
||||
|
||||
static void
|
||||
gst_xine_audio_sink_init (GstXineAudioSink *xine)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
gst_xine_audio_sink_chain (GstPad *pad, GstData *data)
|
||||
{
|
||||
GstXineAudioSink *xine = GST_XINE_AUDIO_SINK (gst_object_get_parent (GST_OBJECT (pad)));
|
||||
|
||||
while (xine->driver->write (xine->driver, (guint16 *) GST_BUFFER_DATA (data), GST_BUFFER_SIZE (data) / xine->open) == 0);
|
||||
gst_data_unref (GST_DATA (data));
|
||||
}
|
||||
|
||||
static GstElementStateReturn
|
||||
gst_xine_audio_sink_change_state (GstElement *element)
|
||||
{
|
||||
GstXineAudioSink *xine = GST_XINE_AUDIO_SINK (element);
|
||||
audio_driver_class_t *driver = (audio_driver_class_t *) GST_XINE_AUDIO_SINK_GET_CLASS (xine)->plugin_node->plugin_class;
|
||||
|
||||
switch (GST_STATE_TRANSITION (element)) {
|
||||
case GST_STATE_NULL_TO_READY:
|
||||
if (driver == NULL) {
|
||||
xine_audio_port_t *port = xine_open_audio_driver (GST_XINE_GET_CLASS (xine)->xine,
|
||||
GST_XINE_AUDIO_SINK_GET_CLASS (xine)->plugin_node->info->id, NULL);
|
||||
if (!port)
|
||||
return GST_STATE_FAILURE;
|
||||
port->exit (port);
|
||||
driver = (audio_driver_class_t *) GST_XINE_AUDIO_SINK_GET_CLASS (xine)->plugin_node->plugin_class;
|
||||
if (driver == NULL)
|
||||
return GST_STATE_FAILURE;
|
||||
}
|
||||
xine->driver = driver->open_plugin (driver, NULL);
|
||||
if (!xine->driver)
|
||||
return GST_STATE_FAILURE;
|
||||
break;
|
||||
case GST_STATE_READY_TO_PAUSED:
|
||||
break;
|
||||
case GST_STATE_PAUSED_TO_PLAYING:
|
||||
break;
|
||||
case GST_STATE_PLAYING_TO_PAUSED:
|
||||
break;
|
||||
case GST_STATE_PAUSED_TO_READY:
|
||||
if (xine->open != 0)
|
||||
xine->driver->close (xine->driver);
|
||||
xine->open = 0;
|
||||
break;
|
||||
case GST_STATE_READY_TO_NULL:
|
||||
xine->driver->exit (xine->driver);
|
||||
xine->driver = NULL;
|
||||
break;
|
||||
default:
|
||||
GST_ERROR_OBJECT (element, "invalid state change");
|
||||
break;
|
||||
}
|
||||
|
||||
return GST_CALL_PARENT_WITH_DEFAULT (GST_ELEMENT_CLASS, change_state, (element), GST_STATE_SUCCESS);
|
||||
}
|
||||
|
||||
static GstCaps *
|
||||
_xine_audio_sink_get_caps (GstPad *pad)
|
||||
{
|
||||
GstXineAudioSink *xine = GST_XINE_AUDIO_SINK (gst_object_get_parent (GST_OBJECT (pad)));
|
||||
GstCaps *caps, *ret = gst_caps_new_empty ();
|
||||
guint32 capa, channels;
|
||||
|
||||
if (!xine->driver)
|
||||
return gst_caps_copy (gst_pad_get_pad_template_caps (pad));
|
||||
|
||||
capa = xine->driver->get_capabilities (xine->driver);
|
||||
channels = capa & (AO_CAP_MODE_MONO | AO_CAP_MODE_STEREO);
|
||||
|
||||
if (channels == 0) {
|
||||
/* neither mono nor stereo supported, die */
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* this loop is messy */
|
||||
capa &= AO_CAP_8BITS;
|
||||
do {
|
||||
if (capa & AO_CAP_8BITS) {
|
||||
caps = gst_caps_from_string ("audio/x-raw-int, "
|
||||
"signed = (boolean) FALSE, "
|
||||
"width = (int) 8, "
|
||||
"depth = (int) 8, "
|
||||
"rate = (int) [ 8000, 192000 ]");
|
||||
capa &= ~AO_CAP_8BITS;
|
||||
} else {
|
||||
caps = gst_caps_from_string ("audio/x-raw-int, "
|
||||
"endianness = (int) BYTE_ORDER, "
|
||||
"signed = (boolean) TRUE, "
|
||||
"width = (int) 16, "
|
||||
"depth = (int) 16, "
|
||||
"rate = (int) [ 8000, 192000 ]");
|
||||
capa = -1;
|
||||
}
|
||||
switch (channels) {
|
||||
case AO_CAP_MODE_MONO | AO_CAP_MODE_STEREO:
|
||||
gst_caps_set_simple (caps, "channels", GST_TYPE_INT_RANGE, 1, 2, NULL);
|
||||
break;
|
||||
case AO_CAP_MODE_MONO:
|
||||
gst_caps_set_simple (caps, "channels", G_TYPE_INT, 1, NULL);
|
||||
break;
|
||||
case AO_CAP_MODE_STEREO:
|
||||
gst_caps_set_simple (caps, "channels", G_TYPE_INT, 2, NULL);
|
||||
break;
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
break;
|
||||
}
|
||||
gst_caps_append (ret, caps);
|
||||
} while (capa != -1);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static GstPadLinkReturn
|
||||
_xine_audio_sink_link (GstPad *pad, const GstCaps *caps)
|
||||
{
|
||||
GstStructure *structure = gst_caps_get_structure (caps, 0);
|
||||
GstXineAudioSink *xine = GST_XINE_AUDIO_SINK (gst_object_get_parent (GST_OBJECT (pad)));
|
||||
guint channels, temp, rate, width;
|
||||
int mode;
|
||||
|
||||
if (!gst_structure_get_int (structure, "channels", &channels))
|
||||
return GST_PAD_LINK_REFUSED;
|
||||
mode = (channels == 1) ? AO_CAP_MODE_MONO : AO_CAP_MODE_STEREO;
|
||||
if (!gst_structure_get_int (structure, "rate", &rate))
|
||||
return GST_PAD_LINK_REFUSED;
|
||||
if (!gst_structure_get_int (structure, "width", &width))
|
||||
return GST_PAD_LINK_REFUSED;
|
||||
|
||||
if (xine->open != 0)
|
||||
xine->driver->close (xine->driver);
|
||||
xine->open = 0;
|
||||
temp = xine->driver->open (xine->driver, width, rate, mode);
|
||||
if (temp == 0)
|
||||
return GST_PAD_LINK_REFUSED;
|
||||
|
||||
xine->open = channels * width / 8;
|
||||
if (temp != rate) {
|
||||
/* FIXME? */
|
||||
GST_WARNING_OBJECT (xine, "rates don't match (requested: %u, got %u)", rate, temp);
|
||||
}
|
||||
|
||||
return GST_PAD_LINK_OK;
|
||||
}
|
||||
|
||||
/** GstXineAudioSink subclasses ************************************************/
|
||||
|
||||
static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE (
|
||||
"sink",
|
||||
GST_PAD_SINK,
|
||||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS (
|
||||
"audio/x-raw-int, "
|
||||
"signed = (boolean) FALSE, "
|
||||
"width = (int) 8, "
|
||||
"depth = (int) 8, "
|
||||
"rate = (int) [ 8000, 192000 ], "
|
||||
"channels = (int) [1, 2]; "
|
||||
"audio/x-raw-int, "
|
||||
"endianness = (int) BYTE_ORDER, "
|
||||
"signed = (boolean) TRUE, "
|
||||
"width = (int) 16, "
|
||||
"depth = (int) 16, "
|
||||
"rate = (int) [ 8000, 192000 ], "
|
||||
"channels = (int) [1, 2]"
|
||||
)
|
||||
);
|
||||
|
||||
static void
|
||||
gst_xine_audio_sink_subclass_init (gpointer g_class, gpointer class_data)
|
||||
{
|
||||
GstXineAudioSinkClass *xine_class = GST_XINE_AUDIO_SINK_CLASS (g_class);
|
||||
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
|
||||
GstElementDetails details = GST_ELEMENT_DETAILS (
|
||||
NULL,
|
||||
"Source",
|
||||
NULL,
|
||||
"Benjamin Otte <otte@gnome.org>"
|
||||
);
|
||||
|
||||
xine_class->plugin_node = class_data;
|
||||
details.longname = g_strdup_printf ("%s xine audio sink", xine_class->plugin_node->info->id);
|
||||
details.description = g_strdup_printf ("%s audio output using Xine", xine_class->plugin_node->info->id);
|
||||
gst_element_class_set_details (element_class, &details);
|
||||
g_free (details.longname);
|
||||
g_free (details.description);
|
||||
|
||||
gst_element_class_add_pad_template (element_class,
|
||||
gst_static_pad_template_get (&sink_template));
|
||||
}
|
||||
|
||||
static void
|
||||
gst_xine_audio_sink_sub_init (GTypeInstance *instance, gpointer g_class)
|
||||
{
|
||||
GstElementClass *klass = GST_ELEMENT_GET_CLASS (instance);
|
||||
GstXineAudioSink *xine = GST_XINE_AUDIO_SINK (instance);
|
||||
|
||||
xine->sinkpad = gst_pad_new_from_template (
|
||||
gst_element_class_get_pad_template (klass, "sink"), "sink");
|
||||
gst_pad_set_chain_function (xine->sinkpad, gst_xine_audio_sink_chain);
|
||||
gst_pad_set_getcaps_function (xine->sinkpad, _xine_audio_sink_get_caps);
|
||||
gst_pad_set_link_function (xine->sinkpad, _xine_audio_sink_link);
|
||||
gst_element_add_pad (GST_ELEMENT (xine), xine->sinkpad);
|
||||
}
|
||||
|
||||
gboolean
|
||||
gst_xine_audio_sink_init_plugin (GstPlugin *plugin)
|
||||
{
|
||||
GTypeInfo plugin_info =
|
||||
{
|
||||
sizeof (GstXineAudioSinkClass),
|
||||
NULL,
|
||||
NULL,
|
||||
gst_xine_audio_sink_subclass_init,
|
||||
NULL,
|
||||
NULL,
|
||||
sizeof (GstXineAudioSink),
|
||||
0,
|
||||
gst_xine_audio_sink_sub_init,
|
||||
};
|
||||
plugin_node_t *node;
|
||||
GstXineClass *klass;
|
||||
|
||||
klass = g_type_class_ref (GST_TYPE_XINE);
|
||||
|
||||
node = xine_list_first_content (klass->xine->plugin_catalog->aout);
|
||||
while (node) {
|
||||
gchar *plugin_name = g_strdup_printf ("xineaudiosink_%s", node->info->id);
|
||||
gchar *type_name = g_strdup_printf ("GstXineAudioSink%s", node->info->id);
|
||||
GType type;
|
||||
plugin_info.class_data = node;
|
||||
type = g_type_register_static (GST_TYPE_XINE_AUDIO_SINK, type_name, &plugin_info, 0);
|
||||
g_free (type_name);
|
||||
if (!gst_element_register (plugin, plugin_name,
|
||||
GST_RANK_MARGINAL, type)) {
|
||||
g_free (plugin_name);
|
||||
return FALSE;
|
||||
}
|
||||
g_free (plugin_name);
|
||||
|
||||
node = xine_list_next_content (klass->xine->plugin_catalog->aout);
|
||||
}
|
||||
|
||||
g_type_class_unref (klass);
|
||||
return TRUE;
|
||||
}
|
||||
|
|
@ -110,6 +110,8 @@ gst_xine_input_dispose (GObject *object)
|
|||
|
||||
g_free (xine->location);
|
||||
xine->location = NULL;
|
||||
|
||||
GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -273,7 +275,7 @@ gst_xine_input_subclass_init (gpointer g_class, gpointer class_data)
|
|||
g_free (details.description);
|
||||
|
||||
/* FIXME: this is pretty hackish, anyone knows a better idea (xine doesn't) */
|
||||
if (strcmp (input->get_description (input), "CD") == 0) {
|
||||
if (strcmp (input->get_identifier (input), "cdda") == 0) {
|
||||
gst_element_class_add_pad_template (element_class,
|
||||
gst_static_pad_template_get (&cdda_template));
|
||||
} else {
|
||||
|
|
|
@ -23,17 +23,17 @@
|
|||
|
||||
#include "resample.h"
|
||||
|
||||
void resample_nearest_s16(resample_t *r);
|
||||
void resample_bilinear_s16(resample_t *r);
|
||||
void resample_sinc_s16(resample_t *r);
|
||||
void resample_sinc_slow_s16(resample_t *r);
|
||||
void resample_sinc_ft_s16(resample_t * r);
|
||||
void gst_resample_nearest_s16(gst_resample_t *r);
|
||||
void gst_resample_bilinear_s16(gst_resample_t *r);
|
||||
void gst_resample_sinc_s16(gst_resample_t *r);
|
||||
void gst_resample_sinc_slow_s16(gst_resample_t *r);
|
||||
void gst_resample_sinc_ft_s16(gst_resample_t * r);
|
||||
|
||||
void resample_nearest_float(resample_t *r);
|
||||
void resample_bilinear_float(resample_t *r);
|
||||
void resample_sinc_float(resample_t *r);
|
||||
void resample_sinc_slow_float(resample_t *r);
|
||||
void resample_sinc_ft_float(resample_t * r);
|
||||
void gst_resample_nearest_float(gst_resample_t *r);
|
||||
void gst_resample_bilinear_float(gst_resample_t *r);
|
||||
void gst_resample_sinc_float(gst_resample_t *r);
|
||||
void gst_resample_sinc_slow_float(gst_resample_t *r);
|
||||
void gst_resample_sinc_ft_float(gst_resample_t * r);
|
||||
|
||||
|
||||
typedef struct functable_s functable_t;
|
||||
|
|
|
@ -66,7 +66,7 @@ signed short double_to_s16_ppcasm(double x)
|
|||
return rint(x);
|
||||
}
|
||||
|
||||
void resample_init(resample_t * r)
|
||||
void gst_resample_init(gst_resample_t * r)
|
||||
{
|
||||
r->i_start = 0;
|
||||
if(r->filter_length&1){
|
||||
|
@ -77,10 +77,10 @@ void resample_init(resample_t * r)
|
|||
|
||||
memset(r->acc, 0, sizeof(r->acc));
|
||||
|
||||
resample_reinit(r);
|
||||
gst_resample_reinit(r);
|
||||
}
|
||||
|
||||
void resample_reinit(resample_t * r)
|
||||
void gst_resample_reinit(gst_resample_t * r)
|
||||
{
|
||||
/* i_inc is the number of samples that the output increments for
|
||||
* each input sample. o_inc is the opposite. */
|
||||
|
@ -89,40 +89,40 @@ void resample_reinit(resample_t * r)
|
|||
|
||||
r->halftaps = (r->filter_length - 1.0) * 0.5;
|
||||
|
||||
if (r->format == RESAMPLE_S16) {
|
||||
if (r->format == GST_RESAMPLE_S16) {
|
||||
switch (r->method) {
|
||||
default:
|
||||
case RESAMPLE_NEAREST:
|
||||
r->scale = resample_nearest_s16;
|
||||
case GST_RESAMPLE_NEAREST:
|
||||
r->scale = gst_resample_nearest_s16;
|
||||
break;
|
||||
case RESAMPLE_BILINEAR:
|
||||
r->scale = resample_bilinear_s16;
|
||||
case GST_RESAMPLE_BILINEAR:
|
||||
r->scale = gst_resample_bilinear_s16;
|
||||
break;
|
||||
case RESAMPLE_SINC_SLOW:
|
||||
r->scale = resample_sinc_s16;
|
||||
case GST_RESAMPLE_SINC_SLOW:
|
||||
r->scale = gst_resample_sinc_s16;
|
||||
break;
|
||||
case RESAMPLE_SINC:
|
||||
r->scale = resample_sinc_ft_s16;
|
||||
case GST_RESAMPLE_SINC:
|
||||
r->scale = gst_resample_sinc_ft_s16;
|
||||
break;
|
||||
}
|
||||
} else if (r->format == RESAMPLE_FLOAT) {
|
||||
} else if (r->format == GST_RESAMPLE_FLOAT) {
|
||||
switch (r->method) {
|
||||
default:
|
||||
case RESAMPLE_NEAREST:
|
||||
r->scale = resample_nearest_float;
|
||||
case GST_RESAMPLE_NEAREST:
|
||||
r->scale = gst_resample_nearest_float;
|
||||
break;
|
||||
case RESAMPLE_BILINEAR:
|
||||
r->scale = resample_bilinear_float;
|
||||
case GST_RESAMPLE_BILINEAR:
|
||||
r->scale = gst_resample_bilinear_float;
|
||||
break;
|
||||
case RESAMPLE_SINC_SLOW:
|
||||
r->scale = resample_sinc_float;
|
||||
case GST_RESAMPLE_SINC_SLOW:
|
||||
r->scale = gst_resample_sinc_float;
|
||||
break;
|
||||
case RESAMPLE_SINC:
|
||||
r->scale = resample_sinc_ft_float;
|
||||
case GST_RESAMPLE_SINC:
|
||||
r->scale = gst_resample_sinc_ft_float;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
fprintf (stderr, "resample: Unexpected format \"%d\"\n", r->format);
|
||||
fprintf (stderr, "gst_resample: Unexpected format \"%d\"\n", r->format);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -140,7 +140,7 @@ void resample_reinit(resample_t * r)
|
|||
* i_start_buf is the time of the first sample in the temporary
|
||||
* buffer.
|
||||
*/
|
||||
void resample_scale(resample_t * r, void *i_buf, unsigned int i_size)
|
||||
void gst_resample_scale(gst_resample_t * r, void *i_buf, unsigned int i_size)
|
||||
{
|
||||
int o_size;
|
||||
|
||||
|
@ -160,11 +160,11 @@ void resample_scale(resample_t * r, void *i_buf, unsigned int i_size)
|
|||
r->o_buf = r->get_buffer(r->priv, o_size);
|
||||
|
||||
if(r->verbose){
|
||||
printf("resample_scale: i_buf=%p i_size=%d\n",
|
||||
printf("gst_resample_scale: i_buf=%p i_size=%d\n",
|
||||
i_buf,i_size);
|
||||
printf("resample_scale: i_samples=%d o_samples=%d i_inc=%g o_buf=%p\n",
|
||||
printf("gst_resample_scale: i_samples=%d o_samples=%d i_inc=%g o_buf=%p\n",
|
||||
r->i_samples, r->o_samples, r->i_inc, r->o_buf);
|
||||
printf("resample_scale: i_start=%g i_end=%g o_start=%g\n",
|
||||
printf("gst_resample_scale: i_start=%g i_end=%g o_start=%g\n",
|
||||
r->i_start, r->i_end, r->o_start);
|
||||
}
|
||||
|
||||
|
@ -172,7 +172,7 @@ void resample_scale(resample_t * r, void *i_buf, unsigned int i_size)
|
|||
int size = (r->filter_length + r->i_samples) * sizeof(double) * 2;
|
||||
|
||||
if(r->verbose){
|
||||
printf("resample temp buffer size=%d\n",size);
|
||||
printf("gst_resample temp buffer size=%d\n",size);
|
||||
}
|
||||
if(r->buffer)free(r->buffer);
|
||||
r->buffer_len = size;
|
||||
|
@ -180,7 +180,7 @@ void resample_scale(resample_t * r, void *i_buf, unsigned int i_size)
|
|||
memset(r->buffer, 0, size);
|
||||
}
|
||||
|
||||
if (r->format==RESAMPLE_S16) {
|
||||
if (r->format==GST_RESAMPLE_S16) {
|
||||
if(r->channels==2){
|
||||
conv_double_short(
|
||||
r->buffer + r->filter_length * sizeof(double) * 2,
|
||||
|
@ -190,7 +190,7 @@ void resample_scale(resample_t * r, void *i_buf, unsigned int i_size)
|
|||
r->buffer + r->filter_length * sizeof(double) * 2,
|
||||
r->i_buf, r->i_samples, sizeof(double) * 2);
|
||||
}
|
||||
} else if (r->format==RESAMPLE_FLOAT) {
|
||||
} else if (r->format==GST_RESAMPLE_FLOAT) {
|
||||
if(r->channels==2){
|
||||
conv_double_float(
|
||||
r->buffer + r->filter_length * sizeof(double) * 2,
|
||||
|
@ -216,7 +216,7 @@ void resample_scale(resample_t * r, void *i_buf, unsigned int i_size)
|
|||
r->i_start -= r->o_samples;
|
||||
}
|
||||
|
||||
void resample_nearest_s16(resample_t * r)
|
||||
void gst_resample_nearest_s16(gst_resample_t * r)
|
||||
{
|
||||
signed short *i_ptr, *o_ptr;
|
||||
int i_count = 0;
|
||||
|
@ -262,7 +262,7 @@ void resample_nearest_s16(resample_t * r)
|
|||
}
|
||||
}
|
||||
|
||||
void resample_bilinear_s16(resample_t * r)
|
||||
void gst_resample_bilinear_s16(gst_resample_t * r)
|
||||
{
|
||||
signed short *i_ptr, *o_ptr;
|
||||
int o_count = 0;
|
||||
|
@ -311,7 +311,7 @@ void resample_bilinear_s16(resample_t * r)
|
|||
}
|
||||
}
|
||||
|
||||
void resample_sinc_slow_s16(resample_t * r)
|
||||
void gst_resample_sinc_slow_s16(gst_resample_t * r)
|
||||
{
|
||||
signed short *i_ptr, *o_ptr;
|
||||
int i, j;
|
||||
|
@ -324,7 +324,7 @@ void resample_sinc_slow_s16(resample_t * r)
|
|||
if (!r->buffer) {
|
||||
int size = r->filter_length * 2 * r->channels;
|
||||
|
||||
printf("resample temp buffer\n");
|
||||
printf("gst_resample temp buffer\n");
|
||||
r->buffer = malloc(size);
|
||||
memset(r->buffer, 0, size);
|
||||
}
|
||||
|
@ -377,7 +377,7 @@ void resample_sinc_slow_s16(resample_t * r)
|
|||
}
|
||||
|
||||
/* only works for channels == 2 ???? */
|
||||
void resample_sinc_s16(resample_t * r)
|
||||
void gst_resample_sinc_s16(gst_resample_t * r)
|
||||
{
|
||||
double *ptr;
|
||||
signed short *o_ptr;
|
||||
|
@ -468,7 +468,7 @@ static functable_t *ft;
|
|||
|
||||
double out_tmp[10000];
|
||||
|
||||
void resample_sinc_ft_s16(resample_t * r)
|
||||
void gst_resample_sinc_ft_s16(gst_resample_t * r)
|
||||
{
|
||||
double *ptr;
|
||||
signed short *o_ptr;
|
||||
|
@ -567,7 +567,7 @@ void resample_sinc_ft_s16(resample_t * r)
|
|||
********/
|
||||
|
||||
|
||||
void resample_nearest_float(resample_t * r)
|
||||
void gst_resample_nearest_float(gst_resample_t * r)
|
||||
{
|
||||
float *i_ptr, *o_ptr;
|
||||
int i_count = 0;
|
||||
|
@ -613,7 +613,7 @@ void resample_nearest_float(resample_t * r)
|
|||
}
|
||||
}
|
||||
|
||||
void resample_bilinear_float(resample_t * r)
|
||||
void gst_resample_bilinear_float(gst_resample_t * r)
|
||||
{
|
||||
float *i_ptr, *o_ptr;
|
||||
int o_count = 0;
|
||||
|
@ -662,7 +662,7 @@ void resample_bilinear_float(resample_t * r)
|
|||
}
|
||||
}
|
||||
|
||||
void resample_sinc_slow_float(resample_t * r)
|
||||
void gst_resample_sinc_slow_float(gst_resample_t * r)
|
||||
{
|
||||
float *i_ptr, *o_ptr;
|
||||
int i, j;
|
||||
|
@ -675,7 +675,7 @@ void resample_sinc_slow_float(resample_t * r)
|
|||
if (!r->buffer) {
|
||||
int size = r->filter_length * sizeof(float) * r->channels;
|
||||
|
||||
printf("resample temp buffer\n");
|
||||
printf("gst_resample temp buffer\n");
|
||||
r->buffer = malloc(size);
|
||||
memset(r->buffer, 0, size);
|
||||
}
|
||||
|
@ -728,7 +728,7 @@ void resample_sinc_slow_float(resample_t * r)
|
|||
}
|
||||
|
||||
/* only works for channels == 2 ???? */
|
||||
void resample_sinc_float(resample_t * r)
|
||||
void gst_resample_sinc_float(gst_resample_t * r)
|
||||
{
|
||||
double *ptr;
|
||||
float *o_ptr;
|
||||
|
@ -778,7 +778,7 @@ void resample_sinc_float(resample_t * r)
|
|||
}
|
||||
}
|
||||
|
||||
void resample_sinc_ft_float(resample_t * r)
|
||||
void gst_resample_sinc_ft_float(gst_resample_t * r)
|
||||
{
|
||||
double *ptr;
|
||||
float *o_ptr;
|
||||
|
|
|
@ -18,30 +18,30 @@
|
|||
*/
|
||||
|
||||
|
||||
#ifndef __RESAMPLE_H__
|
||||
#define __RESAMPLE_H__
|
||||
#ifndef __GST_RESAMPLE_H__
|
||||
#define __GST_RESAMPLE_H__
|
||||
|
||||
typedef enum {
|
||||
RESAMPLE_NEAREST = 0,
|
||||
RESAMPLE_BILINEAR,
|
||||
RESAMPLE_SINC_SLOW,
|
||||
RESAMPLE_SINC,
|
||||
} resample_method;
|
||||
GST_RESAMPLE_NEAREST = 0,
|
||||
GST_RESAMPLE_BILINEAR,
|
||||
GST_RESAMPLE_SINC_SLOW,
|
||||
GST_RESAMPLE_SINC,
|
||||
} gst_resample_method;
|
||||
|
||||
typedef enum {
|
||||
RESAMPLE_S16 = 0,
|
||||
RESAMPLE_FLOAT
|
||||
} resample_format;
|
||||
GST_RESAMPLE_S16 = 0,
|
||||
GST_RESAMPLE_FLOAT
|
||||
} gst_resample_format;
|
||||
|
||||
typedef struct resample_s resample_t;
|
||||
typedef struct gst_resample_s gst_resample_t;
|
||||
|
||||
struct resample_s {
|
||||
struct gst_resample_s {
|
||||
/* parameters */
|
||||
|
||||
resample_method method;
|
||||
gst_resample_method method;
|
||||
int channels;
|
||||
int verbose;
|
||||
resample_format format;
|
||||
gst_resample_format format;
|
||||
|
||||
int filter_length;
|
||||
|
||||
|
@ -81,16 +81,16 @@ struct resample_s {
|
|||
double acc[10];
|
||||
|
||||
/* methods */
|
||||
void (*scale)(resample_t *r);
|
||||
void (*scale)(gst_resample_t *r);
|
||||
|
||||
double ack;
|
||||
};
|
||||
|
||||
void resample_init(resample_t *r);
|
||||
void gst_resample_init(gst_resample_t *r);
|
||||
|
||||
void resample_reinit(resample_t *r);
|
||||
void gst_resample_reinit(gst_resample_t *r);
|
||||
|
||||
void resample_scale(resample_t *r, void *i_buf, unsigned int size);
|
||||
void gst_resample_scale(gst_resample_t *r, void *i_buf, unsigned int size);
|
||||
|
||||
#endif /* __RESAMPLE_H__ */
|
||||
#endif /* __GST_RESAMPLE_H__ */
|
||||
|
||||
|
|
Loading…
Reference in a new issue