From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Mon, 14 Jun 2010 12:48:02 +0000 (+0200)
Subject: mpegtsdemux: Don't use liboil functions
X-Git-Tag: 1.19.3~507^2~16874
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b1a12c3a2d5824235d9039257aa0997142c18fb9;p=platform%2Fupstream%2Fgstreamer.git

mpegtsdemux: Don't use liboil functions

glibc memcpy() will be faster than liboil's/orc's for now anyway
and we can use orc's later, after orc has support for loop unrolling.
---

diff --git a/gst/mpegdemux/Makefile.am b/gst/mpegdemux/Makefile.am
index a3e56fc..3737017 100644
--- a/gst/mpegdemux/Makefile.am
+++ b/gst/mpegdemux/Makefile.am
@@ -15,10 +15,10 @@ libgstmpegdemux_la_SOURCES = \
 
 libgstmpegdemux_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
-	$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS)
+	$(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstmpegdemux_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
-	$(GST_BASE_LIBS) $(GST_LIBS) $(LIBOIL_LIBS)
+	$(GST_BASE_LIBS) $(GST_LIBS)
 libgstmpegdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstmpegdemux_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/gst/mpegdemux/gstmpegtsdemux.c b/gst/mpegdemux/gstmpegtsdemux.c
index 058507b..507cfdd 100644
--- a/gst/mpegdemux/gstmpegtsdemux.c
+++ b/gst/mpegdemux/gstmpegtsdemux.c
@@ -48,8 +48,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <liboil/liboil.h>
-
 #include <gst/tag/tag.h>
 
 #include "gstmpegdefs.h"
@@ -329,7 +327,6 @@ gst_mpegts_demux_init (GstMpegTSDemux * demux)
   demux->pcr[1] = -1;
   demux->cache_duration = GST_CLOCK_TIME_NONE;
   demux->base_pts = GST_CLOCK_TIME_NONE;
-  oil_init ();
 }
 
 static void
@@ -1599,7 +1596,7 @@ gst_mpegts_stream_parse_private_section (GstMpegTSStream * stream,
   /* just dump this down the pad */
   if (gst_pad_alloc_buffer (stream->pad, 0, datalen, NULL, &buffer) ==
       GST_FLOW_OK) {
-    oil_memcpy (buffer->data, data, datalen);
+    memcpy (buffer->data, data, datalen);
     gst_pad_push (stream->pad, buffer);
   }
 
@@ -2163,7 +2160,7 @@ gst_mpegts_stream_pes_buffer_push (GstMpegTSStream * stream,
     stream->pes_buffer_used = 0;
   }
   out_data = GST_BUFFER_DATA (stream->pes_buffer) + stream->pes_buffer_used;
-  oil_memcpy (out_data, in_data, in_size);
+  memcpy (out_data, in_data, in_size);
   stream->pes_buffer_used += in_size;
 done:
   return ret;
@@ -2191,7 +2188,7 @@ gst_mpegts_demux_push_fragment (GstMpegTSStream * stream,
 {
   GstFlowReturn ret;
   GstBuffer *es_buf = gst_buffer_new_and_alloc (in_size);
-  oil_memcpy (GST_BUFFER_DATA (es_buf), in_data, in_size);
+  memcpy (GST_BUFFER_DATA (es_buf), in_data, in_size);
   ret = gst_pes_filter_push (&stream->filter, es_buf);
 
   /* If PES filter return ok then PES fragment buffering 
@@ -2331,7 +2328,7 @@ gst_mpegts_demux_parse_stream (GstMpegTSDemux * demux, GstMpegTSStream * stream,
         /* FIXME: try to use data directly instead of creating a buffer and
            pushing in into adapter at section filter */
         sec_buf = gst_buffer_new_and_alloc (datalen);
-        oil_memcpy (GST_BUFFER_DATA (sec_buf), data, datalen);
+        memcpy (GST_BUFFER_DATA (sec_buf), data, datalen);
         if (gst_section_filter_push (&stream->section_filter,
                 payload_unit_start_indicator, continuity_counter, sec_buf)) {
           GST_DEBUG_OBJECT (demux, "section finished");