From ef02d1da1dfeae0782b3993adf7a4fe1f2e9d99b Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Tue, 23 Jun 2009 16:54:32 +0200
Subject: raw1394: sprinkle branch likeliness macros accross the code.

---
 ext/raw1394/gstdv1394src.c  | 10 ++++++----
 ext/raw1394/gsthdv1394src.c |  7 ++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'ext/raw1394')

diff --git a/ext/raw1394/gstdv1394src.c b/ext/raw1394/gstdv1394src.c
index 2e525393..05f11788 100644
--- a/ext/raw1394/gstdv1394src.c
+++ b/ext/raw1394/gstdv1394src.c
@@ -392,7 +392,7 @@ gst_dv1394src_iec61883_receive (unsigned char *data, int len,
 {
   GstDV1394Src *dv1394src = GST_DV1394SRC (cbdata);
 
-  if (!GST_PAD_CAPS (GST_BASE_SRC_PAD (dv1394src))) {
+  if (G_UNLIKELY (!GST_PAD_CAPS (GST_BASE_SRC_PAD (dv1394src)))) {
     GstCaps *caps;
     unsigned char *p = data;
 
@@ -418,9 +418,10 @@ gst_dv1394src_iec61883_receive (unsigned char *data, int len,
     gst_pad_set_caps (GST_BASE_SRC_PAD (dv1394src), caps);
     gst_caps_unref (caps);
   }
+
   dv1394src->frame = NULL;
-  if ((dv1394src->frame_sequence + 1) % (dv1394src->skip +
-          dv1394src->consecutive) < dv1394src->consecutive) {
+  if (G_LIKELY ((dv1394src->frame_sequence + 1) % (dv1394src->skip +
+              dv1394src->consecutive) < dv1394src->consecutive)) {
     if (complete && len == dv1394src->frame_size) {
       gint64 i64;
       guint8 *bufdata;
@@ -651,12 +652,13 @@ gst_dv1394src_create (GstPushSrc * psrc, GstBuffer ** buf)
   while (TRUE) {
     int res = poll (pollfds, 2, -1);
 
-    if (res < 0) {
+    if (G_UNLIKELY (res < 0)) {
       if (errno == EAGAIN || errno == EINTR)
         continue;
       else
         goto error_while_polling;
     }
+
     if (G_UNLIKELY (pollfds[1].revents)) {
       char command;
 
diff --git a/ext/raw1394/gsthdv1394src.c b/ext/raw1394/gsthdv1394src.c
index 54900bf7..8fd10a6e 100644
--- a/ext/raw1394/gsthdv1394src.c
+++ b/ext/raw1394/gsthdv1394src.c
@@ -314,10 +314,10 @@ gst_hdv1394src_iec61883_receive (unsigned char *data, int len,
   GST_LOG ("data:%p, len:%d, dropped:%d", data, len, dropped);
 
   /* error out if we don't have enough room ! */
-  if (dv1394src->outoffset > (2048 * 188 - len))
+  if (G_UNLIKELY (dv1394src->outoffset > (2048 * 188 - len)))
     return -1;
 
-  if (len == IEC61883_MPEG2_TSP_SIZE) {
+  if (G_LIKELY (len == IEC61883_MPEG2_TSP_SIZE)) {
     memcpy ((guint8 *) dv1394src->outdata + dv1394src->outoffset, data, len);
     dv1394src->outoffset += len;
   }
@@ -408,12 +408,13 @@ gst_hdv1394src_create (GstPushSrc * psrc, GstBuffer ** buf)
 
     GST_LOG ("res:%d", res);
 
-    if (res < 0) {
+    if (G_UNLIKELY (res < 0)) {
       if (errno == EAGAIN || errno == EINTR)
         continue;
       else
         goto error_while_polling;
     }
+
     if (G_UNLIKELY (pollfds[1].revents)) {
       char command;
 
-- 
cgit