controller: add G_LIKELY and join two if for same condition

A G_LIKELY for the sequence!=NULL checks. Join two ifs to an if-else. Add
indent guides to keep indent form breaking the function declaration

diff --git a/libs/gst/controller/gstinterpolation.c b/libs/gst/controller/gstinterpolation.c
index fdf7b6b..4abb36e 100644 (file)
--- a/libs/gst/controller/gstinterpolation.c
+++ b/libs/gst/controller/gstinterpolation.c
@@ -535,7 +535,7 @@ _interpolate_linear_get_##vtype (GstInterpolationControlSource *self, GstClockTi
     g_value_init (&cp.value, self->priv->type); \
     g_value_copy (&self->priv->default_value, &cp.value); \
     cp1 = &cp; \
-    if (self->priv->values) \
+    if (G_LIKELY (self->priv->values)) \
       iter = g_sequence_get_begin_iter (self->priv->values); \
   } \
   if (iter) { \

diff --git a/libs/gst/controller/gstinterpolationcontrolsource.c b/libs/gst/controller/gstinterpolationcontrolsource.c
index e3983b0..fcc8675 100644 (file)
--- a/libs/gst/controller/gstinterpolationcontrolsource.c
+++ b/libs/gst/controller/gstinterpolationcontrolsource.c
@@ -122,9 +122,12 @@ gst_interpolation_control_source_new (void)
  *
  * Returns: %TRUE if the interpolation mode could be set, %FALSE otherwise
  */
+/* *INDENT-OFF* */
 gboolean
-    gst_interpolation_control_source_set_interpolation_mode
-    (GstInterpolationControlSource * self, GstInterpolateMode mode) {
+gst_interpolation_control_source_set_interpolation_mode (
+    GstInterpolationControlSource * self, GstInterpolateMode mode)
+/* *INDENT-ON* */
+{
   gboolean ret = TRUE;
   GstControlSource *csource = GST_CONTROL_SOURCE (self);
 
@@ -437,7 +440,7 @@ gst_interpolation_control_source_set_internal (GstInterpolationControlSource *
   /* check if a control point for the timestamp already exists */
 
   /* iter contains the iter right *after* timestamp */
-  if (self->priv->values) {
+  if (G_LIKELY (self->priv->values)) {
     iter =
         g_sequence_search (self->priv->values, &timestamp,
         (GCompareDataFunc) gst_control_point_find, NULL);
@@ -453,13 +456,12 @@ gst_interpolation_control_source_set_internal (GstInterpolationControlSource *
         goto done;
       }
     }
-  }
-
-  /* sort new cp into the prop->values list */
-  if (!self->priv->values)
+  } else {
     self->priv->values =
         g_sequence_new ((GDestroyNotify) gst_control_point_free);
+  }
 
+  /* sort new cp into the prop->values list */
   g_sequence_insert_sorted (self->priv->values, _make_new_cp (self, timestamp,
           value), (GCompareDataFunc) gst_control_point_compare, NULL);
   self->priv->nvalues++;
@@ -627,7 +629,7 @@ gst_interpolation_control_source_get_all (GstInterpolationControlSource * self)
   g_return_val_if_fail (GST_IS_INTERPOLATION_CONTROL_SOURCE (self), NULL);
 
   g_mutex_lock (self->lock);
-  if (self->priv->values)
+  if (G_LIKELY (self->priv->values))
     g_sequence_foreach (self->priv->values, (GFunc) _append_control_point,
         &res);
   g_mutex_unlock (self->lock);