mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

fix a segfault, and support ladspa 1.1 (default parameter values)

Browse source 
Original commit message from CVS:
fix a segfault, and support ladspa 1.1 (default parameter values)
This commit is contained in:
Andy Wingo 2002-07-24 18:32:00 +00:00
parent 2168884c17
commit e92ac611e6
2 changed files with 46 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
ext/ladspa/gstladspa.c
View file

@ -242,6 +242,47 @@ gst_ladspa_class_init (GstLADSPAClass *klass)
if (argtype==G_TYPE_FLOAT) klass->control_info[i].upperbound = G_MAXFLOAT; if (argtype==G_TYPE_FLOAT) klass->control_info[i].upperbound = G_MAXFLOAT;
} }
klass->control_info[i].def = klass->control_info[i].lowerbound;
#ifdef LADSPA_IS_HINT_HAS_DEFAULT
/* figure out the defaults */
if (LADSPA_IS_HINT_HAS_DEFAULT (hintdesc)) {
if (LADSPA_IS_HINT_DEFAULT_MINIMUM (hintdesc))
klass->control_info[i].def = klass->control_info[i].lowerbound;
else if (LADSPA_IS_HINT_DEFAULT_LOW (hintdesc))
if (LADSPA_IS_HINT_LOGARITHMIC (hintdesc))
klass->control_info[i].def = exp (0.75*log(klass->control_info[i].lowerbound) +
0.25*log(klass->control_info[i].upperbound));
else
klass->control_info[i].def = (0.75*klass->control_info[i].lowerbound +
0.25*klass->control_info[i].upperbound);
else if (LADSPA_IS_HINT_DEFAULT_MIDDLE (hintdesc))
if (LADSPA_IS_HINT_LOGARITHMIC (hintdesc))
klass->control_info[i].def = exp (0.5*log(klass->control_info[i].lowerbound) +
0.5*log(klass->control_info[i].upperbound));
else
klass->control_info[i].def = (0.5*klass->control_info[i].lowerbound +
0.5*klass->control_info[i].upperbound);
else if (LADSPA_IS_HINT_DEFAULT_HIGH (hintdesc))
if (LADSPA_IS_HINT_LOGARITHMIC (hintdesc))
klass->control_info[i].def = exp (0.25*log(klass->control_info[i].lowerbound) +
0.75*log(klass->control_info[i].upperbound));
else
klass->control_info[i].def = (0.25*klass->control_info[i].lowerbound +
0.75*klass->control_info[i].upperbound);
else if (LADSPA_IS_HINT_DEFAULT_MAXIMUM (hintdesc))
klass->control_info[i].def = klass->control_info[i].upperbound;
else if (LADSPA_IS_HINT_DEFAULT_0 (hintdesc))
klass->control_info[i].def = 0.0;
else if (LADSPA_IS_HINT_DEFAULT_1 (hintdesc))
klass->control_info[i].def = 1.0;
else if (LADSPA_IS_HINT_DEFAULT_100 (hintdesc))
klass->control_info[i].def = 100.0;
else if (LADSPA_IS_HINT_DEFAULT_440 (hintdesc))
klass->control_info[i].def = 440.0;
}
#endif /* LADSPA_IS_HINT_HAS_DEFAULT */
if (LADSPA_IS_PORT_INPUT(desc->PortDescriptors[current_portnum])) { if (LADSPA_IS_PORT_INPUT(desc->PortDescriptors[current_portnum])) {
argperms = G_PARAM_READWRITE; argperms = G_PARAM_READWRITE;
klass->control_info[i].writable = TRUE; klass->control_info[i].writable = TRUE;
@ -288,7 +329,7 @@ gst_ladspa_class_init (GstLADSPAClass *klass)
paramspec = g_param_spec_int(argname,argname,argname, paramspec = g_param_spec_int(argname,argname,argname,
(gint)klass->control_info[i].lowerbound, (gint)klass->control_info[i].lowerbound,
(gint)klass->control_info[i].upperbound, (gint)klass->control_info[i].upperbound,
(gint)klass->control_info[i].lowerbound, argperms); (gint)klass->control_info[i].def, argperms);
} else if (klass->control_info[i].samplerate){ } else if (klass->control_info[i].samplerate){
paramspec = g_param_spec_float(argname,argname,argname, paramspec = g_param_spec_float(argname,argname,argname,
0.0, G_MAXFLOAT, 0.0, G_MAXFLOAT,
@ -296,7 +337,7 @@ gst_ladspa_class_init (GstLADSPAClass *klass)
} else { } else {
paramspec = g_param_spec_float(argname,argname,argname, paramspec = g_param_spec_float(argname,argname,argname,
klass->control_info[i].lowerbound, klass->control_info[i].upperbound, klass->control_info[i].lowerbound, klass->control_info[i].upperbound,
klass->control_info[i].lowerbound, argperms); klass->control_info[i].def, argperms);
} }
g_object_class_install_property(G_OBJECT_CLASS(klass), i+ARG_LAST, paramspec); g_object_class_install_property(G_OBJECT_CLASS(klass), i+ARG_LAST, paramspec);
@ -345,11 +386,7 @@ gst_ladspa_init (GstLADSPA *ladspa)
LADSPA_IS_PORT_INPUT(desc->PortDescriptors[i])) { LADSPA_IS_PORT_INPUT(desc->PortDescriptors[i])) {
cinfo = oclass->control_info[controlcount]; cinfo = oclass->control_info[controlcount];
/* use the lowerbound as the default value if it exists */ /* use the lowerbound as the default value if it exists */
if (cinfo.lower){ ladspa->controls[controlcount]=cinfo.def;
ladspa->controls[controlcount]=cinfo.lowerbound;
} else {
ladspa->controls[controlcount] = 0.0;
}
/* set up dparams for this instance */ /* set up dparams for this instance */
if (cinfo.toggled){ if (cinfo.toggled){
@ -925,8 +962,7 @@ gst_ladspa_chain (GstPad *pad, GstBuffer *buf)
} }
if (num_created_buffers > 0){ if (num_created_buffers > 0){
GstBufferPool *bufpool; ladspa->bufpool = gst_buffer_pool_get_default (sizeof (LADSPA_Data) * GST_BUFFER_SIZE(buf), ladspa->numbuffers);
bufpool = gst_buffer_pool_get_default (sizeof (LADSPA_Data) * GST_BUFFER_SIZE(buf), ladspa->numbuffers);
for (i = numsrcpads - num_created_buffers ; i<numsrcpads ; i++){ for (i = numsrcpads - num_created_buffers ; i<numsrcpads ; i++){
buffers_out[i] = gst_buffer_new_from_pool (ladspa->bufpool, 0, 0); buffers_out[i] = gst_buffer_new_from_pool (ladspa->bufpool, 0, 0);

1
ext/ladspa/gstladspa.h
View file

@ -39,6 +39,7 @@ typedef struct _ladspa_control_info {
gchar *name; gchar *name;
gchar *param_name; gchar *param_name;
gfloat lowerbound, upperbound; gfloat lowerbound, upperbound;
gfloat def;
gboolean lower,upper,samplerate; gboolean lower,upper,samplerate;
gboolean toggled, logarithmic, integer, writable; gboolean toggled, logarithmic, integer, writable;
} ladspa_control_info; } ladspa_control_info;