mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 14:56:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

controller: rename new cubic interpolation mode

Browse source 
Don't abbreviate to 'mono' and use 'monotonic' instead.
This commit is contained in:
Stefan Sauer 2016-01-05 13:57:12 +01:00
parent 2f776d679f
commit ab17881cf0
3 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
libs/gst/controller/gstinterpolationcontrolsource.c
View file

@ -437,7 +437,7 @@ interpolate_cubic_get_value_array (GstTimedValueControlSource * self,
*/ */
static void static void
_interpolate_cubic_mono_update_cache (GstTimedValueControlSource * self) _interpolate_cubic_monotonic_update_cache (GstTimedValueControlSource * self)
{ {
gint i, n = self->nvalues; gint i, n = self->nvalues;
gdouble *dxs = g_new0 (gdouble, n); gdouble *dxs = g_new0 (gdouble, n);
@ -498,9 +498,9 @@ _interpolate_cubic_mono_update_cache (GstTimedValueControlSource * self)
inv_dx = 1.0 / dxs[i]; inv_dx = 1.0 / dxs[i];
common = c1 + c1s[i + 1] - m - m; common = c1 + c1s[i + 1] - m - m;
cp->cache.cubic_mono.c1s = c1; cp->cache.cubic_monotonic.c1s = c1;
cp->cache.cubic_mono.c2s = (m - c1 - common) * inv_dx; cp->cache.cubic_monotonic.c2s = (m - c1 - common) * inv_dx;
cp->cache.cubic_mono.c3s = common * inv_dx * inv_dx; cp->cache.cubic_monotonic.c3s = common * inv_dx * inv_dx;
iter = g_sequence_iter_next (iter); iter = g_sequence_iter_next (iter);
} }
@ -513,12 +513,12 @@ _interpolate_cubic_mono_update_cache (GstTimedValueControlSource * self)
} }
static inline gdouble static inline gdouble
_interpolate_cubic_mono (GstTimedValueControlSource * self, _interpolate_cubic_monotonic (GstTimedValueControlSource * self,
GstControlPoint * cp1, gdouble value1, GstControlPoint * cp2, GstControlPoint * cp1, gdouble value1, GstControlPoint * cp2,
gdouble value2, GstClockTime timestamp) gdouble value2, GstClockTime timestamp)
{ {
if (!self->valid_cache) { if (!self->valid_cache) {
_interpolate_cubic_mono_update_cache (self); _interpolate_cubic_monotonic_update_cache (self);
self->valid_cache = TRUE; self->valid_cache = TRUE;
} }
@ -527,9 +527,9 @@ _interpolate_cubic_mono (GstTimedValueControlSource * self,
gdouble diff2 = diff * diff; gdouble diff2 = diff * diff;
gdouble out; gdouble out;
out = value1 + cp1->cache.cubic_mono.c1s * diff; out = value1 + cp1->cache.cubic_monotonic.c1s * diff;
out += cp1->cache.cubic_mono.c2s * diff2; out += cp1->cache.cubic_monotonic.c2s * diff2;
out += cp1->cache.cubic_mono.c3s * diff * diff2; out += cp1->cache.cubic_monotonic.c3s * diff * diff2;
return out; return out;
} else { } else {
return value1; return value1;
@ -537,7 +537,7 @@ _interpolate_cubic_mono (GstTimedValueControlSource * self,
} }
static gboolean static gboolean
interpolate_cubic_mono_get (GstTimedValueControlSource * self, interpolate_cubic_monotonic_get (GstTimedValueControlSource * self,
GstClockTime timestamp, gdouble * value) GstClockTime timestamp, gdouble * value)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
@ -549,7 +549,7 @@ interpolate_cubic_mono_get (GstTimedValueControlSource * self,
g_mutex_lock (&self->lock); g_mutex_lock (&self->lock);
if (_get_nearest_control_points (self, timestamp, &cp1, &cp2)) { if (_get_nearest_control_points (self, timestamp, &cp1, &cp2)) {
*value = _interpolate_cubic_mono (self, cp1, cp1->value, cp2, *value = _interpolate_cubic_monotonic (self, cp1, cp1->value, cp2,
(cp2 ? cp2->value : 0.0), timestamp); (cp2 ? cp2->value : 0.0), timestamp);
ret = TRUE; ret = TRUE;
} }
@ -558,7 +558,7 @@ interpolate_cubic_mono_get (GstTimedValueControlSource * self,
} }
static gboolean static gboolean
interpolate_cubic_mono_get_value_array (GstTimedValueControlSource * self, interpolate_cubic_monotonic_get_value_array (GstTimedValueControlSource * self,
GstClockTime timestamp, GstClockTime interval, guint n_values, GstClockTime timestamp, GstClockTime interval, guint n_values,
gdouble * values) gdouble * values)
{ {
@ -581,7 +581,7 @@ interpolate_cubic_mono_get_value_array (GstTimedValueControlSource * self,
_get_nearest_control_points2 (self, ts, &cp1, &cp2, &next_ts); _get_nearest_control_points2 (self, ts, &cp1, &cp2, &next_ts);
} }
if (cp1) { if (cp1) {
*values = _interpolate_cubic_mono (self, cp1, cp1->value, cp2, *values = _interpolate_cubic_monotonic (self, cp1, cp1->value, cp2,
(cp2 ? cp2->value : 0.0), ts); (cp2 ? cp2->value : 0.0), ts);
ret = TRUE; ret = TRUE;
GST_LOG ("values[%3d]=%lf", i, *values); GST_LOG ("values[%3d]=%lf", i, *values);
@ -609,9 +609,9 @@ static struct
(GstControlSourceGetValueArray) interpolate_linear_get_value_array}, { (GstControlSourceGetValueArray) interpolate_linear_get_value_array}, {
(GstControlSourceGetValue) interpolate_cubic_get, (GstControlSourceGetValue) interpolate_cubic_get,
(GstControlSourceGetValueArray) interpolate_cubic_get_value_array}, { (GstControlSourceGetValueArray) interpolate_cubic_get_value_array}, {
(GstControlSourceGetValue) interpolate_cubic_mono_get, (GstControlSourceGetValue) interpolate_cubic_monotonic_get,
(GstControlSourceGetValueArray) (GstControlSourceGetValueArray)
interpolate_cubic_mono_get_value_array}}; interpolate_cubic_monotonic_get_value_array}};
static const guint num_interpolation_modes = G_N_ELEMENTS (interpolation_modes); static const guint num_interpolation_modes = G_N_ELEMENTS (interpolation_modes);
@ -628,8 +628,8 @@ gst_interpolation_mode_get_type (void)
{GST_INTERPOLATION_MODE_NONE, "GST_INTERPOLATION_MODE_NONE", "none"}, {GST_INTERPOLATION_MODE_NONE, "GST_INTERPOLATION_MODE_NONE", "none"},
{GST_INTERPOLATION_MODE_LINEAR, "GST_INTERPOLATION_MODE_LINEAR", "linear"}, {GST_INTERPOLATION_MODE_LINEAR, "GST_INTERPOLATION_MODE_LINEAR", "linear"},
{GST_INTERPOLATION_MODE_CUBIC, "GST_INTERPOLATION_MODE_CUBIC", "cubic"}, {GST_INTERPOLATION_MODE_CUBIC, "GST_INTERPOLATION_MODE_CUBIC", "cubic"},
{GST_INTERPOLATION_MODE_CUBIC_MONO, "GST_INTERPOLATION_MODE_CUBIC_MONO", {GST_INTERPOLATION_MODE_CUBIC_MONOTONIC,
"cubic-mono"}, "GST_INTERPOLATION_MODE_CUBIC_MONOTONIC", "cubic-monotonic"},
{0, NULL, NULL} {0, NULL, NULL}
}; };

4
libs/gst/controller/gstinterpolationcontrolsource.h
View file

@ -56,7 +56,7 @@ typedef struct _GstInterpolationControlSourcePrivate GstInterpolationControlSour
* @GST_INTERPOLATION_MODE_LINEAR: linear interpolation * @GST_INTERPOLATION_MODE_LINEAR: linear interpolation
* @GST_INTERPOLATION_MODE_CUBIC: cubic interpolation (natural), may overshoot * @GST_INTERPOLATION_MODE_CUBIC: cubic interpolation (natural), may overshoot
* the min or max values set by the control point, but is more 'curvy' * the min or max values set by the control point, but is more 'curvy'
* @GST_INTERPOLATION_MODE_CUBIC_MONO: monotonic cubic interpolation, will not * @GST_INTERPOLATION_MODE_CUBIC_MONOTONIC: monotonic cubic interpolation, will not
* produce any values outside of the min-max range set by the control points * produce any values outside of the min-max range set by the control points
* (Since 1.8) * (Since 1.8)
* *
@ -67,7 +67,7 @@ typedef enum
GST_INTERPOLATION_MODE_NONE, GST_INTERPOLATION_MODE_NONE,
GST_INTERPOLATION_MODE_LINEAR, GST_INTERPOLATION_MODE_LINEAR,
GST_INTERPOLATION_MODE_CUBIC, GST_INTERPOLATION_MODE_CUBIC,
GST_INTERPOLATION_MODE_CUBIC_MONO, GST_INTERPOLATION_MODE_CUBIC_MONOTONIC,
} GstInterpolationMode; } GstInterpolationMode;
/** /**

4
libs/gst/controller/gsttimedvaluecontrolsource.h
View file

@ -76,7 +76,7 @@ struct _GstControlPoint
} cubic; } cubic;
struct { /* 24 bytes */ struct { /* 24 bytes */
gdouble c1s, c2s, c3s; gdouble c1s, c2s, c3s;
} cubic_mono; } cubic_monotonic;
guint8 _gst_reserved[64]; guint8 _gst_reserved[64];
} cache; } cache;
}; };
@ -120,7 +120,7 @@ GType gst_timed_value_control_source_get_type (void);
/* Functions */ /* Functions */
GSequenceIter * gst_timed_value_control_source_find_control_point_iter ( GSequenceIter * gst_timed_value_control_source_find_control_point_iter (
GstTimedValueControlSource * self, GstTimedValueControlSource * self,
GstClockTime timestamp); GstClockTime timestamp);
gboolean gst_timed_value_control_source_set (GstTimedValueControlSource * self, gboolean gst_timed_value_control_source_set (GstTimedValueControlSource * self,