mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-16 13:00:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs/gst/control/: Add support for double dparams.

Browse source 
Original commit message from CVS:
* libs/gst/control/dparam.c: (gst_dparam_class_init),
(gst_dparam_get_property), (gst_dparam_set_property),
(gst_dparam_do_update_default):
* libs/gst/control/dparam.h:
* libs/gst/control/dparam_smooth.c: (gst_dpsmooth_class_init),
(gst_dpsmooth_new), (gst_dpsmooth_set_property),
(gst_dpsmooth_get_property), (gst_dpsmooth_value_changed_double),
(gst_dpsmooth_do_update_double):
* libs/gst/control/dparam_smooth.h:
* libs/gst/control/dparammanager.c:
(gst_dpman_inline_direct_update):
Add support for double dparams.
This commit is contained in:
David Schleef 2004-02-14 00:01:33 +00:00
parent 5e7335abe3
commit cd8208e769
6 changed files with 178 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2004-02-13 David Schleef <ds@schleef.org>
* libs/gst/control/dparam.c: (gst_dparam_class_init),
(gst_dparam_get_property), (gst_dparam_set_property),
(gst_dparam_do_update_default):
* libs/gst/control/dparam.h:
* libs/gst/control/dparam_smooth.c: (gst_dpsmooth_class_init),
(gst_dpsmooth_new), (gst_dpsmooth_set_property),
(gst_dpsmooth_get_property), (gst_dpsmooth_value_changed_double),
(gst_dpsmooth_do_update_double):
* libs/gst/control/dparam_smooth.h:
* libs/gst/control/dparammanager.c:
(gst_dpman_inline_direct_update):
Add support for double dparams.
2004-02-13 David Schleef <ds@schleef.org>
* gst/elements/gstfdsrc.c: (gst_fdsrc_get): Use GST_TIME_TO_TIMEVAL()

24
libs/gst/control/dparam.c
View file

@ -42,6 +42,7 @@ static void gst_dparam_set_property (GObject *object, guint prop_id, const GValu
enum {
ARG_0,
ARG_VALUE_FLOAT,
ARG_VALUE_DOUBLE,
ARG_VALUE_INT,
ARG_VALUE_INT64,
};
@ -92,6 +93,10 @@ gst_dparam_class_init (GstDParamClass *klass)
g_param_spec_float("value_float","Float Value",
"The value that should be changed if gfloat is the type",
-G_MAXFLOAT, G_MAXFLOAT, 0.0F, G_PARAM_READWRITE));
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_VALUE_DOUBLE,
g_param_spec_float("value_double","Double Value",
"The value that should be changed if gdouble is the type",
-G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_READWRITE));
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_VALUE_INT,
g_param_spec_int("value_int","Integer Value",
"The value that should be changed if gint is the type",
@ -154,6 +159,10 @@ gst_dparam_get_property (GObject *object, guint prop_id, GValue *value, GParamSp
g_value_set_float (value, dparam->value_float);
break;
case ARG_VALUE_DOUBLE:
g_value_set_double (value, dparam->value_double);
break;
case ARG_VALUE_INT:
g_value_set_int (value, dparam->value_int);
break;
@ -177,12 +186,21 @@ gst_dparam_set_property (GObject *object, guint prop_id, const GValue *value, GP
switch (prop_id) {
case ARG_VALUE_FLOAT:
GST_DEBUG ("setting value from %f to %f", dparam->value_float, g_value_get_float (value));
GST_DEBUG ("setting value from %g to %g", dparam->value_float, g_value_get_float (value));
dparam->value_float = g_value_get_float (value);
GST_DPARAM_NEXT_UPDATE_TIMESTAMP(dparam) = GST_DPARAM_LAST_UPDATE_TIMESTAMP(dparam);
GST_DPARAM_READY_FOR_UPDATE(dparam) = TRUE;
break;
case ARG_VALUE_DOUBLE:
GST_DEBUG ("setting value from %g to %g",
dparam->value_double, g_value_get_double (value));
dparam->value_double = g_value_get_double (value);
GST_DPARAM_NEXT_UPDATE_TIMESTAMP(dparam) =
GST_DPARAM_LAST_UPDATE_TIMESTAMP(dparam);
GST_DPARAM_READY_FOR_UPDATE(dparam) = TRUE;
break;
case ARG_VALUE_INT:
GST_DEBUG ("setting value from %d to %d", dparam->value_int, g_value_get_int (value));
dparam->value_int = g_value_get_int (value);
@ -222,6 +240,10 @@ gst_dparam_do_update_default (GstDParam *dparam, gint64 timestamp, GValue *value
g_value_set_float(value, dparam->value_float);
break;
case G_TYPE_DOUBLE:
g_value_set_double(value, dparam->value_double);
break;
case G_TYPE_INT:
g_value_set_int(value, dparam->value_int);
break;

5
libs/gst/control/dparam.h
View file

@ -71,6 +71,7 @@ struct _GstDParam {
GMutex *lock;
gfloat value_float;
gdouble value_double;
gint value_int;
gint64 value_int64;
@ -83,6 +84,8 @@ struct _GstDParam {
gint64 last_update_timestamp;
gchar *unit_name;
gboolean is_log;
gpointer _gst_reserved[GST_PADDING];
};
struct _GstDParamClass {
@ -90,6 +93,8 @@ struct _GstDParamClass {
/* signal callbacks */
void (*value_changed) (GstDParam *dparam);
gpointer _gst_reserved[GST_PADDING];
};

125
libs/gst/control/dparam_smooth.c
View file

@ -38,12 +38,15 @@ static void gst_dpsmooth_set_property (GObject *object, guint prop_id, const GVa
static void gst_dpsmooth_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
static void gst_dpsmooth_do_update_float (GstDParam *dparam, gint64 timestamp, GValue *value, GstDParamUpdateInfo update_info);
static void gst_dpsmooth_value_changed_float (GstDParam *dparam);
static void gst_dpsmooth_do_update_double (GstDParam *dparam, gint64 timestamp, GValue *value, GstDParamUpdateInfo update_info);
static void gst_dpsmooth_value_changed_double (GstDParam *dparam);
enum {
ARG_0,
ARG_UPDATE_PERIOD,
ARG_SLOPE_TIME,
ARG_SLOPE_DELTA_FLOAT,
ARG_SLOPE_DELTA_DOUBLE,
ARG_SLOPE_DELTA_INT,
ARG_SLOPE_DELTA_INT64,
};
@ -101,6 +104,12 @@ gst_dpsmooth_class_init (GstDParamSmoothClass *klass)
"The amount a float value can change for a given slope_time",
0.0F, G_MAXFLOAT, 0.2F, G_PARAM_READWRITE));
g_object_class_install_property(G_OBJECT_CLASS(klass),
ARG_SLOPE_DELTA_FLOAT,
g_param_spec_float("slope_delta_double", "Slope Delta double",
"The amount a double value can change for a given slope_time",
0.0, G_MAXDOUBLE, 0.2, G_PARAM_READWRITE));
/*gstobject_class->save_thyself = gst_dparam_save_thyself; */
}
@ -134,6 +143,12 @@ gst_dpsmooth_new (GType type)
g_signal_connect (G_OBJECT (dpsmooth), "value_changed", G_CALLBACK (gst_dpsmooth_value_changed_float), NULL);
break;
}
case G_TYPE_DOUBLE: {
dparam->do_update_func = gst_dpsmooth_do_update_double;
g_signal_connect (G_OBJECT (dpsmooth), "value_changed",
G_CALLBACK (gst_dpsmooth_value_changed_double), NULL);
break;
}
default:
/* we don't support this type here */
dparam->do_update_func = gst_dparam_do_update_default;
@ -174,6 +189,11 @@ gst_dpsmooth_set_property (GObject *object, guint prop_id, const GValue *value,
GST_DPARAM_READY_FOR_UPDATE(dparam) = TRUE;
break;
case ARG_SLOPE_DELTA_DOUBLE:
dpsmooth->slope_delta_double = g_value_get_double (value);
GST_DPARAM_READY_FOR_UPDATE(dparam) = TRUE;
break;
default:
break;
}
@ -201,6 +221,9 @@ gst_dpsmooth_get_property (GObject *object, guint prop_id, GValue *value, GParam
case ARG_SLOPE_DELTA_FLOAT:
g_value_set_float (value, dpsmooth->slope_delta_float);
break;
case ARG_SLOPE_DELTA_DOUBLE:
g_value_set_double (value, dpsmooth->slope_delta_double);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@ -308,3 +331,105 @@ gst_dpsmooth_do_update_float (GstDParam *dparam, gint64 timestamp, GValue *value
GST_DPARAM_UNLOCK(dparam);
}
static void
gst_dpsmooth_value_changed_double (GstDParam *dparam)
{
GstDParamSmooth *dpsmooth;
gdouble time_ratio;
g_return_if_fail(GST_IS_DPSMOOTH(dparam));
dpsmooth = GST_DPSMOOTH(dparam);
if (GST_DPARAM_IS_LOG(dparam)){
dparam->value_double = log(dparam->value_double);
}
dpsmooth->start_double = dpsmooth->current_double;
dpsmooth->diff_double = dparam->value_double - dpsmooth->start_double;
time_ratio = ABS(dpsmooth->diff_double) / dpsmooth->slope_delta_double;
dpsmooth->duration_interp = (gint64)(time_ratio * (gdouble)dpsmooth->slope_time);
dpsmooth->need_interp_times = TRUE;
GST_DEBUG ("%f to %f ratio:%f duration:%"
G_GINT64_FORMAT "\n",
dpsmooth->start_double, dparam->value_double, time_ratio, dpsmooth->duration_interp);
}
static void
gst_dpsmooth_do_update_double (GstDParam *dparam, gint64 timestamp, GValue *value, GstDParamUpdateInfo update_info)
{
gdouble time_ratio;
GstDParamSmooth *dpsmooth = GST_DPSMOOTH(dparam);
GST_DPARAM_LOCK(dparam);
if (dpsmooth->need_interp_times){
dpsmooth->start_interp = timestamp;
dpsmooth->end_interp = timestamp + dpsmooth->duration_interp;
dpsmooth->need_interp_times = FALSE;
}
if ((update_info == GST_DPARAM_UPDATE_FIRST) || (timestamp >= dpsmooth->end_interp)){
if (GST_DPARAM_IS_LOG(dparam)){
g_value_set_double(value, exp(dparam->value_double));
}
else {
g_value_set_double(value, dparam->value_double);
}
dpsmooth->current_double = dparam->value_double;
GST_DEBUG ("interp finished at %"
G_GINT64_FORMAT, timestamp);
GST_DPARAM_LAST_UPDATE_TIMESTAMP(dparam) = timestamp;
GST_DPARAM_NEXT_UPDATE_TIMESTAMP(dparam) = timestamp;
GST_DPARAM_READY_FOR_UPDATE(dparam) = FALSE;
GST_DPARAM_UNLOCK(dparam);
return;
}
if (timestamp <= dpsmooth->start_interp){
if (GST_DPARAM_IS_LOG(dparam)){
g_value_set_double(value, exp(dpsmooth->start_double));
}
else {
g_value_set_double(value, dpsmooth->start_double);
}
GST_DPARAM_LAST_UPDATE_TIMESTAMP(dparam) = timestamp;
GST_DPARAM_NEXT_UPDATE_TIMESTAMP(dparam) = dpsmooth->start_interp + dpsmooth->update_period;
GST_DEBUG ("interp started at %" G_GINT64_FORMAT, timestamp);
GST_DPARAM_UNLOCK(dparam);
return;
}
time_ratio = (gdouble)(timestamp - dpsmooth->start_interp) / (gdouble)dpsmooth->duration_interp;
GST_DEBUG ("start:%" G_GINT64_FORMAT " current:%" G_GINT64_FORMAT " end:%" G_GINT64_FORMAT " ratio%f", dpsmooth->start_interp, timestamp, dpsmooth->end_interp, time_ratio);
GST_DEBUG ("pre start:%f current:%f target:%f", dpsmooth->start_double, dpsmooth->current_double, dparam->value_double);
dpsmooth->current_double = dpsmooth->start_double + (dpsmooth->diff_double * time_ratio);
GST_DPARAM_NEXT_UPDATE_TIMESTAMP(dparam) = timestamp + dpsmooth->update_period;
if (GST_DPARAM_NEXT_UPDATE_TIMESTAMP(dparam) > dpsmooth->end_interp){
GST_DPARAM_NEXT_UPDATE_TIMESTAMP(dparam) = dpsmooth->end_interp;
}
GST_DPARAM_LAST_UPDATE_TIMESTAMP(dparam) = timestamp;
if (GST_DPARAM_IS_LOG(dparam)){
g_value_set_double(value, exp(dpsmooth->current_double));
}
else {
g_value_set_double(value, dpsmooth->current_double);
}
GST_DEBUG ("post start:%f current:%f target:%f", dpsmooth->start_double, dpsmooth->current_double, dparam->value_double);
GST_DPARAM_UNLOCK(dparam);
}

7
libs/gst/control/dparam_smooth.h
View file

@ -45,18 +45,25 @@ struct _GstDParamSmooth {
gfloat start_float;
gfloat diff_float;
gfloat current_float;
gdouble start_double;
gdouble diff_double;
gdouble current_double;
gint64 update_period;
gint64 slope_time;
gfloat slope_delta_float;
gdouble slope_delta_double;
gboolean need_interp_times;
gpointer _gst_reserved[GST_PADDING];
};
struct _GstDParamSmoothClass {
GstDParamClass parent_class;
/* signal callbacks */
gpointer _gst_reserved[GST_PADDING];
};
GType gst_dpsmooth_get_type (void);

3
libs/gst/control/dparammanager.c
View file

@ -659,6 +659,9 @@ gst_dpman_inline_direct_update(GValue *value, gpointer data){
case G_TYPE_FLOAT:
*(gfloat*)data = g_value_get_float(value);
break;
case G_TYPE_DOUBLE:
*(double*)data = g_value_get_double(value);
break;
default:
break;
}