mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 09:10:36 +00:00
+ changes for new float caps without slope/intercept + some category changes for plugins
Original commit message from CVS: + changes for new float caps without slope/intercept + some category changes for plugins
This commit is contained in:
parent
d5c716edbd
commit
f6830d4ad1
9 changed files with 39 additions and 48 deletions
|
@ -30,7 +30,7 @@
|
|||
|
||||
static GstElementDetails colorspace_details = {
|
||||
"Colorspace converter",
|
||||
"Filter/Video",
|
||||
"Filter/Convert",
|
||||
"LGPL",
|
||||
"Converts video from one colorspace to another using libhermes",
|
||||
VERSION,
|
||||
|
|
|
@ -171,7 +171,7 @@ gst_jack_src_request_pad_factory(void)
|
|||
GstCaps *caps;
|
||||
caps = gst_caps_new("src",
|
||||
"audio/x-raw-float",
|
||||
GST_AUDIO_FLOAT_MONO_PAD_TEMPLATE_PROPS);
|
||||
GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS);
|
||||
template = gst_pad_template_new("%s", GST_PAD_SRC,
|
||||
GST_PAD_REQUEST, caps, NULL);
|
||||
}
|
||||
|
@ -188,7 +188,7 @@ gst_jack_sink_request_pad_factory(void)
|
|||
GstCaps *caps;
|
||||
caps = gst_caps_new ("sink",
|
||||
"audio/x-raw-float",
|
||||
GST_AUDIO_FLOAT_MONO_PAD_TEMPLATE_PROPS);
|
||||
GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS);
|
||||
template = gst_pad_template_new("%s", GST_PAD_SINK,
|
||||
GST_PAD_REQUEST, caps, NULL);
|
||||
}
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include <string.h>
|
||||
#include <math.h>
|
||||
#include <gst/control/control.h>
|
||||
#include <gst/audio/audio.h>
|
||||
|
||||
#include "gstladspa.h"
|
||||
#include <ladspa.h> /* main ladspa sdk include file */
|
||||
|
@ -35,14 +36,10 @@ ladspa_sink_factory (gchar *name)
|
|||
name,
|
||||
GST_PAD_SINK,
|
||||
GST_PAD_ALWAYS,
|
||||
GST_CAPS_NEW (
|
||||
gst_caps_new (
|
||||
"ladspa_sink",
|
||||
"audio/x-raw-float",
|
||||
"width", GST_PROPS_INT (32),
|
||||
"endianness", GST_PROPS_INT (G_BYTE_ORDER),
|
||||
"rate", GST_PROPS_INT_RANGE (4000, 96000),
|
||||
"buffer-frames", GST_PROPS_INT_RANGE (1, G_MAXINT),
|
||||
"channels", GST_PROPS_INT (1)
|
||||
GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS
|
||||
)
|
||||
);
|
||||
}
|
||||
|
@ -55,14 +52,10 @@ ladspa_src_factory (gchar *name)
|
|||
name,
|
||||
GST_PAD_SRC,
|
||||
GST_PAD_ALWAYS,
|
||||
GST_CAPS_NEW (
|
||||
gst_caps_new (
|
||||
"ladspa_src",
|
||||
"audio/x-raw-float",
|
||||
"width", GST_PROPS_INT (32),
|
||||
"endianness", GST_PROPS_INT (G_BYTE_ORDER),
|
||||
"rate", GST_PROPS_INT_RANGE (4000, 96000),
|
||||
"buffer-frames", GST_PROPS_INT_RANGE (1, G_MAXINT),
|
||||
"channels", GST_PROPS_INT (1)
|
||||
GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS
|
||||
)
|
||||
);
|
||||
}
|
||||
|
@ -91,6 +84,13 @@ static GstElementClass *parent_class = NULL;
|
|||
static GstPlugin *ladspa_plugin;
|
||||
static GHashTable *ladspa_descriptors;
|
||||
|
||||
enum {
|
||||
ARG_0,
|
||||
ARG_SAMPLERATE,
|
||||
ARG_BUFFERSIZE,
|
||||
ARG_LAST,
|
||||
};
|
||||
|
||||
GST_DEBUG_CATEGORY_STATIC (ladspa_debug);
|
||||
#define DEBUG(...) \
|
||||
GST_CAT_LEVEL_LOG (ladspa_debug, GST_LEVEL_DEBUG, NULL, __VA_ARGS__)
|
||||
|
@ -477,25 +477,24 @@ gst_ladspa_force_src_caps(GstLADSPA *ladspa, GstPad *pad)
|
|||
if (!ladspa->buffer_frames) {
|
||||
ladspa->buffer_frames = 256; /* 5 ms at 44100 kHz (just a default...) */
|
||||
g_return_if_fail (ladspa->bufpool == NULL);
|
||||
ladspa->bufpool = gst_buffer_pool_get_default (ladspa->buffer_frames * sizeof(gfloat),
|
||||
3);
|
||||
ladspa->bufpool =
|
||||
gst_buffer_pool_get_default (ladspa->buffer_frames * sizeof(gfloat), 3);
|
||||
}
|
||||
|
||||
DEBUG_OBJ (ladspa, "forcing caps with rate=%d, buffer-frames=%d",
|
||||
ladspa->samplerate, ladspa->buffer_frames);
|
||||
|
||||
gst_pad_try_set_caps (pad, gst_caps_new (
|
||||
gst_pad_try_set_caps (pad,
|
||||
gst_caps_new (
|
||||
"ladspa_src_caps",
|
||||
"audio/x-raw-float",
|
||||
gst_props_new (
|
||||
"width", GST_PROPS_INT (32),
|
||||
"endianness", GST_PROPS_INT (G_BYTE_ORDER),
|
||||
"buffer-frames", GST_PROPS_INT (ladspa->buffer_frames),
|
||||
"rate", GST_PROPS_INT (ladspa->samplerate),
|
||||
"buffer-frames", GST_PROPS_INT (ladspa->buffer_frames),
|
||||
"channels", GST_PROPS_INT (1),
|
||||
NULL
|
||||
)
|
||||
));
|
||||
NULL)));
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
/* elementfactory information */
|
||||
static GstElementDetails icecastsend_details = {
|
||||
"An Icecast plugin",
|
||||
"Sink/Network/Icecast",
|
||||
"Sink/Network",
|
||||
"GPL",
|
||||
"Sends data to an icecast server using libshout",
|
||||
VERSION,
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
static GstElementDetails gst_smoothwave_details = {
|
||||
"Smooth waveform",
|
||||
"Sink/Visualization",
|
||||
"Visualization",
|
||||
"LGPL",
|
||||
"Fading grayscale waveform display",
|
||||
VERSION,
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
/* elementfactory information */
|
||||
static GstElementDetails snapshot_details = {
|
||||
"snapshot",
|
||||
"Filter/Effect",
|
||||
"Filter/Video",
|
||||
"LGPL",
|
||||
"Dump a frame to a png file",
|
||||
VERSION,
|
||||
|
|
|
@ -60,14 +60,10 @@ GST_PAD_TEMPLATE_FACTORY (sf_src_factory,
|
|||
"src%d",
|
||||
GST_PAD_SRC,
|
||||
GST_PAD_REQUEST,
|
||||
GST_CAPS_NEW (
|
||||
gst_caps_new (
|
||||
"sf_src",
|
||||
"audio/x-raw-float",
|
||||
"rate", GST_PROPS_INT_RANGE (1, G_MAXINT),
|
||||
"width", GST_PROPS_INT (32),
|
||||
"endianness", GST_PROPS_INT (G_BYTE_ORDER),
|
||||
"buffer-frames", GST_PROPS_INT_RANGE (1, G_MAXINT),
|
||||
"channels", GST_PROPS_INT (1)
|
||||
GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS
|
||||
)
|
||||
);
|
||||
|
||||
|
@ -75,14 +71,10 @@ GST_PAD_TEMPLATE_FACTORY (sf_sink_factory,
|
|||
"sink%d",
|
||||
GST_PAD_SINK,
|
||||
GST_PAD_REQUEST,
|
||||
GST_CAPS_NEW (
|
||||
gst_caps_new (
|
||||
"sf_sink",
|
||||
"audio/x-raw-float",
|
||||
"rate", GST_PROPS_INT_RANGE (1, G_MAXINT),
|
||||
"width", GST_PROPS_INT (32),
|
||||
"endianness", GST_PROPS_INT (G_BYTE_ORDER),
|
||||
"buffer-frames", GST_PROPS_INT_RANGE (1, G_MAXINT),
|
||||
"channels", GST_PROPS_INT (1)
|
||||
GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS
|
||||
)
|
||||
);
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
static GstElementDetails gst_smoothwave_details = {
|
||||
"Smooth waveform",
|
||||
"Sink/Visualization",
|
||||
"Visualization",
|
||||
"LGPL",
|
||||
"Fading grayscale waveform display",
|
||||
VERSION,
|
||||
|
|
Loading…
Reference in a new issue