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

gst/gstsegment.c: Use G_UNLIKELY to help the compiler a bit.

Browse source 
Original commit message from CVS:
* gst/gstsegment.c: (gst_segment_set_duration),
(gst_segment_set_last_stop), (gst_segment_set_seek),
(gst_segment_set_newsegment_full), (gst_segment_to_stream_time),
(gst_segment_to_running_time), (gst_segment_clip):
Use G_UNLIKELY to help the compiler a bit.
This commit is contained in:
Wim Taymans 2006-06-12 09:29:49 +00:00
parent eb006ba645
commit 237c3cd57a
2 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2006-06-12 Wim Taymans <wim@fluendo.com>
* gst/gstsegment.c: (gst_segment_set_duration),
(gst_segment_set_last_stop), (gst_segment_set_seek),
(gst_segment_set_newsegment_full), (gst_segment_to_stream_time),
(gst_segment_to_running_time), (gst_segment_clip):
Use G_UNLIKELY to help the compiler a bit.
2006-06-12 Wim Taymans <wim@fluendo.com> 2006-06-12 Wim Taymans <wim@fluendo.com>
Patch by: Stefan Kost <ensonic at sonicpulse dot de> Patch by: Stefan Kost <ensonic at sonicpulse dot de>

34
gst/gstsegment.c
View file

@ -187,7 +187,7 @@ gst_segment_set_duration (GstSegment * segment, GstFormat format,
{ {
g_return_if_fail (segment != NULL); g_return_if_fail (segment != NULL);
if (segment->format == GST_FORMAT_UNDEFINED) if (G_UNLIKELY (segment->format == GST_FORMAT_UNDEFINED))
segment->format = format; segment->format = format;
else else
g_return_if_fail (segment->format == format); g_return_if_fail (segment->format == format);
@ -212,7 +212,7 @@ gst_segment_set_last_stop (GstSegment * segment, GstFormat format,
{ {
g_return_if_fail (segment != NULL); g_return_if_fail (segment != NULL);
if (segment->format == GST_FORMAT_UNDEFINED) if (G_UNLIKELY (segment->format == GST_FORMAT_UNDEFINED))
segment->format = format; segment->format = format;
else else
g_return_if_fail (segment->format == format); g_return_if_fail (segment->format == format);
@ -255,7 +255,7 @@ gst_segment_set_seek (GstSegment * segment, gdouble rate,
g_return_if_fail (rate != 0.0); g_return_if_fail (rate != 0.0);
g_return_if_fail (segment != NULL); g_return_if_fail (segment != NULL);
if (segment->format == GST_FORMAT_UNDEFINED) if (G_UNLIKELY (segment->format == GST_FORMAT_UNDEFINED))
segment->format = format; segment->format = format;
else else
g_return_if_fail (segment->format == format); g_return_if_fail (segment->format == format);
@ -392,7 +392,7 @@ gst_segment_set_newsegment_full (GstSegment * segment, gboolean update,
g_return_if_fail (applied_rate != 0.0); g_return_if_fail (applied_rate != 0.0);
g_return_if_fail (segment != NULL); g_return_if_fail (segment != NULL);
if (segment->format == GST_FORMAT_UNDEFINED) if (G_UNLIKELY (segment->format == GST_FORMAT_UNDEFINED))
segment->format = format; segment->format = format;
/* any other format with 0 also gives time 0, the other values are /* any other format with 0 also gives time 0, the other values are
@ -476,24 +476,24 @@ gst_segment_to_stream_time (GstSegment * segment, GstFormat format,
g_return_val_if_fail (segment != NULL, -1); g_return_val_if_fail (segment != NULL, -1);
/* format does not matter for -1 */ /* format does not matter for -1 */
if (position == -1) if (G_UNLIKELY (position == -1))
return -1; return -1;
if (segment->format == GST_FORMAT_UNDEFINED) if (G_UNLIKELY (segment->format == GST_FORMAT_UNDEFINED))
segment->format = format; segment->format = format;
else else
g_return_val_if_fail (segment->format == format, -1); g_return_val_if_fail (segment->format == format, -1);
/* outside of the segment boundary stop */ /* outside of the segment boundary stop */
if (segment->stop != -1 && position >= segment->stop) if (G_UNLIKELY (segment->stop != -1 && position >= segment->stop))
return -1; return -1;
/* before the segment boundary */ /* before the segment boundary */
if (position < segment->start) if (G_UNLIKELY (position < segment->start))
return -1; return -1;
/* time must be known */ /* time must be known */
if (segment->time == -1) if (G_UNLIKELY (segment->time == -1))
return -1; return -1;
/* bring to uncorrected position in segment */ /* bring to uncorrected position in segment */
@ -548,21 +548,21 @@ gst_segment_to_running_time (GstSegment * segment, GstFormat format,
g_return_val_if_fail (segment != NULL, -1); g_return_val_if_fail (segment != NULL, -1);
if (position == -1) if (G_UNLIKELY (position == -1))
return -1; return -1;
if (segment->format == GST_FORMAT_UNDEFINED) if (G_UNLIKELY (segment->format == GST_FORMAT_UNDEFINED))
segment->format = format; segment->format = format;
else if (segment->accum) else if (segment->accum)
g_return_val_if_fail (segment->format == format, -1); g_return_val_if_fail (segment->format == format, -1);
/* before the segment boundary */ /* before the segment boundary */
if (position < segment->start) if (G_UNLIKELY (position < segment->start))
return -1; return -1;
if (segment->rate > 0.0) { if (segment->rate > 0.0) {
/* outside of the segment boundary stop */ /* outside of the segment boundary stop */
if (segment->stop != -1 && position >= segment->stop) if (G_UNLIKELY (segment->stop != -1 && position >= segment->stop))
return -1; return -1;
/* bring to uncorrected position in segment */ /* bring to uncorrected position in segment */
@ -570,7 +570,7 @@ gst_segment_to_running_time (GstSegment * segment, GstFormat format,
} else { } else {
/* cannot continue if no stop position set or outside of /* cannot continue if no stop position set or outside of
* the segment. */ * the segment. */
if (segment->stop == -1 || position >= segment->stop) if (G_UNLIKELY (segment->stop == -1 || position >= segment->stop))
return -1; return -1;
/* bring to uncorrected position in segment */ /* bring to uncorrected position in segment */
@ -618,19 +618,19 @@ gst_segment_clip (GstSegment * segment, GstFormat format, gint64 start,
{ {
g_return_val_if_fail (segment != NULL, FALSE); g_return_val_if_fail (segment != NULL, FALSE);
if (segment->format == GST_FORMAT_UNDEFINED) if (G_UNLIKELY (segment->format == GST_FORMAT_UNDEFINED))
segment->format = format; segment->format = format;
else else
g_return_val_if_fail (segment->format == format, FALSE); g_return_val_if_fail (segment->format == format, FALSE);
/* if we have a stop position and a valid start and start is bigger, /* if we have a stop position and a valid start and start is bigger,
* we're outside of the segment */ * we're outside of the segment */
if (segment->stop != -1 && start != -1 && start >= segment->stop) if (G_UNLIKELY (segment->stop != -1 && start != -1 && start >= segment->stop))
return FALSE; return FALSE;
/* if a stop position is given and is before the segment start, /* if a stop position is given and is before the segment start,
* we're outside of the segment */ * we're outside of the segment */
if (stop != -1 && stop <= segment->start) if (G_UNLIKELY (stop != -1 && stop <= segment->start))
return FALSE; return FALSE;
if (clip_start) { if (clip_start) {