Updated passthrough to work with new caps nego stuff.
Original commit message from CVS: Updated passthrough to work with new caps nego stuff.
This commit is contained in:
parent
77c65b62bf
commit
1924c5ce0c
@ -23,7 +23,8 @@
|
|||||||
#include <gst/audio/audio.h>
|
#include <gst/audio/audio.h>
|
||||||
#include "gstpassthrough.h"
|
#include "gstpassthrough.h"
|
||||||
|
|
||||||
|
#define PASSTHRU_BUF_SIZE 4096
|
||||||
|
#define PASSTHRU_NUM_BUFS 4
|
||||||
|
|
||||||
static GstElementDetails passthrough_details = {
|
static GstElementDetails passthrough_details = {
|
||||||
"Passthrough",
|
"Passthrough",
|
||||||
@ -35,13 +36,13 @@ static GstElementDetails passthrough_details = {
|
|||||||
"(C) 2001",
|
"(C) 2001",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/* Filter signals and args */
|
|
||||||
enum {
|
enum {
|
||||||
/* FILL ME */
|
/* FILL ME */
|
||||||
LAST_SIGNAL
|
LAST_SIGNAL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* static guint gst_filter_signals[LAST_SIGNAL] = { 0 }; */
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
ARG_0,
|
ARG_0,
|
||||||
ARG_SILENT
|
ARG_SILENT
|
||||||
@ -87,7 +88,7 @@ static void passthrough_init (GstPassthrough *filter);
|
|||||||
static void passthrough_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
|
static void passthrough_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
|
||||||
static void passthrough_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
|
static void passthrough_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
|
||||||
|
|
||||||
static gint passthrough_parse_caps (GstPassthrough *filter, GstCaps *caps);
|
static GstPadConnectReturn passthrough_connect_sink (GstPad *pad, GstCaps *caps);
|
||||||
|
|
||||||
static void passthrough_chain (GstPad *pad, GstBuffer *buf);
|
static void passthrough_chain (GstPad *pad, GstBuffer *buf);
|
||||||
static void inline passthrough_fast_float_chain (gfloat* data, guint numsamples);
|
static void inline passthrough_fast_float_chain (gfloat* data, guint numsamples);
|
||||||
@ -95,7 +96,6 @@ static void inline passthrough_fast_16bit_chain (gint16* data, guint numsample
|
|||||||
static void inline passthrough_fast_8bit_chain (gint8* data, guint numsamples);
|
static void inline passthrough_fast_8bit_chain (gint8* data, guint numsamples);
|
||||||
|
|
||||||
static GstElementClass *parent_class = NULL;
|
static GstElementClass *parent_class = NULL;
|
||||||
//static guint gst_filter_signals[LAST_SIGNAL] = { 0 };
|
|
||||||
|
|
||||||
static GstBufferPool*
|
static GstBufferPool*
|
||||||
passthrough_get_bufferpool (GstPad *pad)
|
passthrough_get_bufferpool (GstPad *pad)
|
||||||
@ -107,43 +107,18 @@ passthrough_get_bufferpool (GstPad *pad)
|
|||||||
return gst_pad_get_bufferpool (filter->srcpad);
|
return gst_pad_get_bufferpool (filter->srcpad);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
static GstPadConnectReturn
|
||||||
static GstPadNegotiateReturn
|
passthrough_connect_sink (GstPad *pad, GstCaps *caps)
|
||||||
passthrough_negotiate_src (GstPad *pad, GstCaps **caps, gpointer *data)
|
|
||||||
{
|
|
||||||
GstPassthrough* filter = GST_PASSTHROUGH (gst_pad_get_parent (pad));
|
|
||||||
|
|
||||||
if (*caps==NULL)
|
|
||||||
return GST_PAD_NEGOTIATE_FAIL;
|
|
||||||
|
|
||||||
if (passthrough_parse_caps(filter, *caps))
|
|
||||||
return GST_PAD_NEGOTIATE_FAIL;
|
|
||||||
|
|
||||||
return gst_pad_negotiate_proxy(pad,filter->sinkpad,caps);
|
|
||||||
}
|
|
||||||
|
|
||||||
static GstPadNegotiateReturn
|
|
||||||
passthrough_negotiate_sink (GstPad *pad, GstCaps **caps, gpointer *data)
|
|
||||||
{
|
|
||||||
GstPassthrough* filter = GST_PASSTHROUGH (gst_pad_get_parent (pad));
|
|
||||||
|
|
||||||
if (*caps==NULL)
|
|
||||||
return GST_PAD_NEGOTIATE_FAIL;
|
|
||||||
|
|
||||||
if (passthrough_parse_caps(filter, *caps))
|
|
||||||
return GST_PAD_NEGOTIATE_FAIL;
|
|
||||||
|
|
||||||
return gst_pad_negotiate_proxy(pad,filter->srcpad,caps);
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
static gint
|
|
||||||
passthrough_parse_caps (GstPassthrough *filter, GstCaps *caps)
|
|
||||||
{
|
{
|
||||||
const gchar *format;
|
const gchar *format;
|
||||||
|
GstPassthrough *filter;
|
||||||
|
|
||||||
g_return_val_if_fail(filter!=NULL,-1);
|
g_return_val_if_fail (pad != NULL, GST_PAD_CONNECT_DELAYED);
|
||||||
g_return_val_if_fail(caps!=NULL,-1);
|
g_return_val_if_fail (caps != NULL, GST_PAD_CONNECT_DELAYED);
|
||||||
|
|
||||||
|
filter = GST_PASSTHROUGH (gst_pad_get_parent (pad));
|
||||||
|
g_return_if_fail (filter != NULL);
|
||||||
|
g_return_if_fail (GST_IS_PASSTHROUGH (filter));
|
||||||
|
|
||||||
format = gst_caps_get_string(caps, "format");
|
format = gst_caps_get_string(caps, "format");
|
||||||
|
|
||||||
@ -174,15 +149,17 @@ passthrough_parse_caps (GstPassthrough *filter, GstCaps *caps)
|
|||||||
g_print ("Passthrough : format float, layout %s, intercept %f, slope %f\n",
|
g_print ("Passthrough : format float, layout %s, intercept %f, slope %f\n",
|
||||||
filter->layout, filter->intercept, filter->slope);
|
filter->layout, filter->intercept, filter->slope);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (GST_CAPS_IS_FIXED (caps) && ! gst_pad_try_set_caps (filter->srcpad, caps))
|
||||||
|
return GST_PAD_CONNECT_REFUSED;
|
||||||
|
|
||||||
|
return GST_PAD_CONNECT_DELAYED;
|
||||||
|
}
|
||||||
|
|
||||||
GType
|
GType
|
||||||
gst_passthrough_get_type(void) {
|
gst_passthrough_get_type (void)
|
||||||
|
{
|
||||||
static GType passthrough_type = 0;
|
static GType passthrough_type = 0;
|
||||||
|
|
||||||
if (!passthrough_type) {
|
if (!passthrough_type) {
|
||||||
@ -214,7 +191,7 @@ passthrough_class_init (GstPassthroughClass *klass)
|
|||||||
|
|
||||||
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_SILENT,
|
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_SILENT,
|
||||||
g_param_spec_boolean("silent","silent","silent",
|
g_param_spec_boolean("silent","silent","silent",
|
||||||
TRUE,G_PARAM_READWRITE)); // CHECKME
|
TRUE, G_PARAM_READWRITE)); /* CHECKME */
|
||||||
|
|
||||||
gobject_class->set_property = passthrough_set_property;
|
gobject_class->set_property = passthrough_set_property;
|
||||||
gobject_class->get_property = passthrough_get_property;
|
gobject_class->get_property = passthrough_get_property;
|
||||||
@ -223,15 +200,15 @@ passthrough_class_init (GstPassthroughClass *klass)
|
|||||||
static void
|
static void
|
||||||
passthrough_init (GstPassthrough *filter)
|
passthrough_init (GstPassthrough *filter)
|
||||||
{
|
{
|
||||||
filter->sinkpad = gst_pad_new_from_template(passthrough_sink_factory (),"sink");
|
|
||||||
//gst_pad_set_negotiate_function(filter->sinkpad,passthrough_negotiate_sink);
|
|
||||||
gst_pad_set_bufferpool_function(filter->sinkpad,passthrough_get_bufferpool);
|
|
||||||
filter->srcpad = gst_pad_new_from_template (passthrough_src_factory (),"src");
|
filter->srcpad = gst_pad_new_from_template (passthrough_src_factory (),"src");
|
||||||
//gst_pad_set_negotiate_function(filter->srcpad,passthrough_negotiate_src);
|
|
||||||
|
|
||||||
gst_element_add_pad(GST_ELEMENT(filter),filter->sinkpad);
|
|
||||||
gst_element_add_pad (GST_ELEMENT (filter), filter->srcpad);
|
gst_element_add_pad (GST_ELEMENT (filter), filter->srcpad);
|
||||||
|
filter->sinkpad = gst_pad_new_from_template (passthrough_sink_factory (),"sink");
|
||||||
|
gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
|
||||||
|
|
||||||
|
gst_pad_set_connect_function (filter->sinkpad, passthrough_connect_sink);
|
||||||
|
gst_pad_set_bufferpool_function (filter->sinkpad, passthrough_get_bufferpool);
|
||||||
gst_pad_set_chain_function (filter->sinkpad, passthrough_chain);
|
gst_pad_set_chain_function (filter->sinkpad, passthrough_chain);
|
||||||
|
|
||||||
filter->silent = FALSE;
|
filter->silent = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -246,10 +223,15 @@ passthrough_chain (GstPad *pad, GstBuffer *buf)
|
|||||||
g_return_if_fail (GST_IS_PAD (pad));
|
g_return_if_fail (GST_IS_PAD (pad));
|
||||||
g_return_if_fail (buf != NULL);
|
g_return_if_fail (buf != NULL);
|
||||||
|
|
||||||
filter = GST_PASSTHROUGH(GST_OBJECT_PARENT (pad));
|
filter = GST_PASSTHROUGH (gst_pad_get_parent (pad));
|
||||||
g_return_if_fail (filter != NULL);
|
g_return_if_fail (filter != NULL);
|
||||||
g_return_if_fail (GST_IS_PASSTHROUGH (filter));
|
g_return_if_fail (GST_IS_PASSTHROUGH (filter));
|
||||||
|
|
||||||
|
filter->bufpool = gst_pad_get_bufferpool (filter->srcpad);
|
||||||
|
if (filter->bufpool == NULL) {
|
||||||
|
filter->bufpool = gst_buffer_pool_get_default (PASSTHRU_BUF_SIZE, PASSTHRU_NUM_BUFS);
|
||||||
|
}
|
||||||
|
|
||||||
switch (filter->format) {
|
switch (filter->format) {
|
||||||
case GST_PASSTHROUGH_FORMAT_INT:
|
case GST_PASSTHROUGH_FORMAT_INT:
|
||||||
int_data = (gint16 *) GST_BUFFER_DATA (buf);
|
int_data = (gint16 *) GST_BUFFER_DATA (buf);
|
||||||
@ -267,7 +249,7 @@ passthrough_chain (GstPad *pad, GstBuffer *buf)
|
|||||||
case GST_PASSTHROUGH_FORMAT_FLOAT:
|
case GST_PASSTHROUGH_FORMAT_FLOAT:
|
||||||
float_data = (gfloat *) GST_BUFFER_DATA (buf);
|
float_data = (gfloat *) GST_BUFFER_DATA (buf);
|
||||||
|
|
||||||
passthrough_fast_float_chain(float_data,GST_BUFFER_SIZE(buf)/sizeof(float));
|
passthrough_fast_float_chain (float_data, GST_BUFFER_SIZE (buf) / sizeof (gfloat));
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -276,18 +258,15 @@ passthrough_chain (GstPad *pad, GstBuffer *buf)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void inline
|
static void inline
|
||||||
passthrough_fast_float_chain(gfloat* data,
|
passthrough_fast_float_chain(gfloat* data, guint num_samples)
|
||||||
guint num_samples)
|
|
||||||
#include "filter.func"
|
#include "filter.func"
|
||||||
|
|
||||||
static void inline
|
static void inline
|
||||||
passthrough_fast_16bit_chain(gint16* data,
|
passthrough_fast_16bit_chain(gint16* data, guint num_samples)
|
||||||
guint num_samples)
|
|
||||||
#include "filter.func"
|
#include "filter.func"
|
||||||
|
|
||||||
static void inline
|
static void inline
|
||||||
passthrough_fast_8bit_chain(gint8* data,
|
passthrough_fast_8bit_chain(gint8* data, guint num_samples)
|
||||||
guint num_samples)
|
|
||||||
#include "filter.func"
|
#include "filter.func"
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -295,7 +274,6 @@ passthrough_set_property (GObject *object, guint prop_id, const GValue *value, G
|
|||||||
{
|
{
|
||||||
GstPassthrough *filter;
|
GstPassthrough *filter;
|
||||||
|
|
||||||
/* it's not null if we got it, but it might not be ours */
|
|
||||||
g_return_if_fail (GST_IS_PASSTHROUGH (object));
|
g_return_if_fail (GST_IS_PASSTHROUGH (object));
|
||||||
filter = GST_PASSTHROUGH (object);
|
filter = GST_PASSTHROUGH (object);
|
||||||
|
|
||||||
@ -314,7 +292,6 @@ passthrough_get_property (GObject *object, guint prop_id, GValue *value, GParamS
|
|||||||
{
|
{
|
||||||
GstPassthrough *filter;
|
GstPassthrough *filter;
|
||||||
|
|
||||||
/* it's not null if we got it, but it might not be ours */
|
|
||||||
g_return_if_fail (GST_IS_PASSTHROUGH (object));
|
g_return_if_fail (GST_IS_PASSTHROUGH (object));
|
||||||
filter = GST_PASSTHROUGH (object);
|
filter = GST_PASSTHROUGH (object);
|
||||||
|
|
||||||
@ -333,8 +310,7 @@ plugin_init (GModule *module, GstPlugin *plugin)
|
|||||||
{
|
{
|
||||||
GstElementFactory *factory;
|
GstElementFactory *factory;
|
||||||
|
|
||||||
factory = gst_elementfactory_new("passthrough",GST_TYPE_PASSTHROUGH,
|
factory = gst_elementfactory_new ("passthrough", GST_TYPE_PASSTHROUGH, &passthrough_details);
|
||||||
&passthrough_details);
|
|
||||||
g_return_val_if_fail (factory != NULL, FALSE);
|
g_return_val_if_fail (factory != NULL, FALSE);
|
||||||
|
|
||||||
gst_elementfactory_add_padtemplate (factory, passthrough_src_factory ());
|
gst_elementfactory_add_padtemplate (factory, passthrough_src_factory ());
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
// #include <gst/meta/audioraw.h>
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
@ -57,35 +56,28 @@ struct _GstPassthrough {
|
|||||||
GstElement element;
|
GstElement element;
|
||||||
|
|
||||||
GstPad *sinkpad, *srcpad;
|
GstPad *sinkpad, *srcpad;
|
||||||
|
GstBufferPool *bufpool;
|
||||||
|
|
||||||
gboolean silent;
|
gboolean silent;
|
||||||
|
|
||||||
/* the next three are valid for both int and float */
|
/* the next three are valid for both int and float */
|
||||||
|
|
||||||
GstPassthroughFormat format;
|
GstPassthroughFormat format;
|
||||||
|
|
||||||
guint rate;
|
guint rate;
|
||||||
|
|
||||||
guint channels;
|
guint channels;
|
||||||
|
|
||||||
/* the next five are valid only for format==GST_PASSTHROUGH_FORMAT_INT */
|
/* the next five are valid only for format==GST_PASSTHROUGH_FORMAT_INT */
|
||||||
|
|
||||||
guint width;
|
guint width;
|
||||||
|
|
||||||
guint depth;
|
guint depth;
|
||||||
|
|
||||||
guint endianness;
|
guint endianness;
|
||||||
|
|
||||||
guint law;
|
guint law;
|
||||||
|
|
||||||
gboolean is_signed;
|
gboolean is_signed;
|
||||||
|
|
||||||
/* the next three are valid only for format==GST_PASSTHROUGH_FORMAT_FLOAT */
|
/* the next three are valid only for format==GST_PASSTHROUGH_FORMAT_FLOAT */
|
||||||
|
|
||||||
const gchar *layout;
|
const gchar *layout;
|
||||||
|
|
||||||
gfloat slope;
|
gfloat slope;
|
||||||
|
|
||||||
gfloat intercept;
|
gfloat intercept;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user