summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 58e5d5e)
raw | patch | inline | side by side (parent: 58e5d5e)
author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | |
Wed, 15 Sep 2010 23:37:59 +0000 (00:37 +0100) | ||
committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | |
Thu, 16 Sep 2010 18:40:15 +0000 (19:40 +0100) |
Sprinkle some G_UNLIKELY(), return TRUE/FALSE constants, avoid an
unnecessary g_value_unset(), move g_value_init()+set_int64_range()
closer to where they're needed.
unnecessary g_value_unset(), move g_value_init()+set_int64_range()
closer to where they're needed.
gst/gstquery.c | patch | blob | history |
diff --git a/gst/gstquery.c b/gst/gstquery.c
index 411b2a169045af33d4fb58797bc55253cf67cc3a..44ffa59da0afcfdd3120ade10257895ddcf23a01 100644 (file)
--- a/gst/gstquery.c
+++ b/gst/gstquery.c
GValue *last_array_value;
const GValue *value;
GValue range_value = { 0 };
- gboolean ret = FALSE;
-
- g_return_val_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_BUFFERING, ret);
- if (start >= stop)
- return ret;
+ g_return_val_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_BUFFERING, FALSE);
- g_value_init (&range_value, GST_TYPE_INT64_RANGE);
- gst_value_set_int64_range (&range_value, start, stop);
+ if (G_UNLIKELY (start >= stop))
+ return FALSE;
structure = gst_query_get_structure (query);
value = gst_structure_id_get_value (structure, GST_QUARK (BUFFERING_RANGES));
if (value) {
array = (GValueArray *) g_value_get_boxed (value);
last_array_value = g_value_array_get_nth (array, array->n_values - 1);
- if (start > gst_value_get_int64_range_min (last_array_value))
- ret = TRUE;
+ if (G_UNLIKELY (start <= gst_value_get_int64_range_min (last_array_value)))
+ return FALSE;
} else {
GValue new_array_val = { 0, };
* existing value array owned by the GstStructure / the field's GValue */
gst_structure_id_take_value (structure, GST_QUARK (BUFFERING_RANGES),
&new_array_val);
-
- ret = TRUE;
- }
-
- if (ret) {
- g_value_array_append (array, &range_value);
}
- g_value_unset (&range_value);
+ g_value_init (&range_value, GST_TYPE_INT64_RANGE);
+ gst_value_set_int64_range (&range_value, start, stop);
+ g_value_array_append (array, &range_value);
+ /* skip the g_value_unset(&range_value) here, we know it's not needed */
- return ret;
+ return TRUE;
}
/**