From 879e00b969a486f55175e695789b9fb1142488a7 Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Tue, 15 Sep 2009 20:49:39 +0200
Subject: [PATCH] mpegtspacketizer: Spread branch prediction macros

---
 gst/mpegdemux/mpegtspacketizer.c |  2 +-
 gst/mpegdemux/mpegtsparse.c      | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gst/mpegdemux/mpegtspacketizer.c b/gst/mpegdemux/mpegtspacketizer.c
index 7a3fd3f358..647cdd6eda 100644
--- a/gst/mpegdemux/mpegtspacketizer.c
+++ b/gst/mpegdemux/mpegtspacketizer.c
@@ -1981,7 +1981,7 @@ mpegts_packetizer_next_packet (MpegTSPacketizer * packetizer,
   packet->buffer = NULL;
   while (gst_adapter_available (packetizer->adapter) >= 188) {
     sync_byte = *gst_adapter_peek (packetizer->adapter, 1);
-    if (sync_byte != 0x47) {
+    if (G_UNLIKELY (sync_byte != 0x47)) {
       GST_DEBUG ("lost sync %02x", sync_byte);
       gst_adapter_flush (packetizer->adapter, 1);
       continue;
diff --git a/gst/mpegdemux/mpegtsparse.c b/gst/mpegdemux/mpegtsparse.c
index 8761a55d3f..ee4cbe94c7 100644
--- a/gst/mpegdemux/mpegtsparse.c
+++ b/gst/mpegdemux/mpegtsparse.c
@@ -1093,8 +1093,8 @@ mpegts_parse_handle_psi (MpegTSParse * parse, MpegTSPacketizerSection * section)
   gboolean res = TRUE;
   GstStructure *structure = NULL;
 
-  if (mpegts_parse_calc_crc32 (GST_BUFFER_DATA (section->buffer),
-          GST_BUFFER_SIZE (section->buffer)) != 0) {
+  if (G_UNLIKELY (mpegts_parse_calc_crc32 (GST_BUFFER_DATA (section->buffer),
+              GST_BUFFER_SIZE (section->buffer)) != 0)) {
     GST_WARNING_OBJECT (parse, "bad crc in psi pid 0x%x", section->pid);
     return FALSE;
   }
@@ -1103,7 +1103,7 @@ mpegts_parse_handle_psi (MpegTSParse * parse, MpegTSPacketizerSection * section)
     case 0x00:
       /* PAT */
       structure = mpegts_packetizer_parse_pat (parse->packetizer, section);
-      if (structure)
+      if (G_LIKELY (structure))
         mpegts_parse_apply_pat (parse, structure);
       else
         res = FALSE;
@@ -1111,7 +1111,7 @@ mpegts_parse_handle_psi (MpegTSParse * parse, MpegTSPacketizerSection * section)
       break;
     case 0x02:
       structure = mpegts_packetizer_parse_pmt (parse->packetizer, section);
-      if (structure)
+      if (G_LIKELY (structure))
         mpegts_parse_apply_pmt (parse, section->pid, structure);
       else
         res = FALSE;
@@ -1122,7 +1122,7 @@ mpegts_parse_handle_psi (MpegTSParse * parse, MpegTSPacketizerSection * section)
     case 0x41:
       /* NIT, other network */
       structure = mpegts_packetizer_parse_nit (parse->packetizer, section);
-      if (structure)
+      if (G_LIKELY (structure))
         mpegts_parse_apply_nit (parse, section->pid, structure);
       else
         res = FALSE;
@@ -1131,7 +1131,7 @@ mpegts_parse_handle_psi (MpegTSParse * parse, MpegTSPacketizerSection * section)
     case 0x42:
     case 0x46:
       structure = mpegts_packetizer_parse_sdt (parse->packetizer, section);
-      if (structure)
+      if (G_LIKELY (structure))
         mpegts_parse_apply_sdt (parse, section->pid, structure);
       else
         res = FALSE;
@@ -1173,7 +1173,7 @@ mpegts_parse_handle_psi (MpegTSParse * parse, MpegTSPacketizerSection * section)
     case 0x6F:
       /* EIT, schedule */
       structure = mpegts_packetizer_parse_eit (parse->packetizer, section);
-      if (structure)
+      if (G_LIKELY (structure))
         mpegts_parse_apply_eit (parse, section->pid, structure);
       else
         res = FALSE;
@@ -1225,7 +1225,7 @@ mpegts_parse_chain (GstPad * pad, GstBuffer * buf)
       !GST_FLOW_IS_FATAL (res)) {
     /* get the next packet */
     parsed = mpegts_packetizer_next_packet (packetizer, &packet);
-    if (!parsed)
+    if (G_UNLIKELY (!parsed))
       /* bad header, skip the packet */
       goto next;
 
@@ -1234,16 +1234,16 @@ mpegts_parse_chain (GstPad * pad, GstBuffer * buf)
       MpegTSPacketizerSection section;
 
       parsed = mpegts_packetizer_push_section (packetizer, &packet, &section);
-      if (!parsed)
+      if (G_UNLIKELY (!parsed))
         /* bad section data */
         goto next;
 
-      if (section.complete) {
+      if (G_LIKELY (section.complete)) {
         /* section complete */
         parsed = mpegts_parse_handle_psi (parse, &section);
         gst_buffer_unref (section.buffer);
 
-        if (!parsed)
+        if (G_UNLIKELY (!parsed))
           /* bad PSI table */
           goto next;
       }