gst/matroska/: Reverse the level list as we usually are only interested in the first element or want to add a new fir...

Original commit message from CVS:
* gst/matroska/ebml-read.c: (gst_ebml_level_free),
(gst_ebml_finalize), (gst_ebml_read_change_state),
(gst_ebml_read_element_level_up), (gst_ebml_read_master):
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_parse_contents_seekentry):
Reverse the level list as we usually are only interested in the
first element or want to add a new first element. Having the
first element stored at the end and calling g_list_last() and
g_list_append() is more expensive.
Also use GSlice for allocating the GstEbmlLevel structs.

3 files changed, 71 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index f5b4acf9..512b4c6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-06-14  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* gst/matroska/ebml-read.c: (gst_ebml_level_free),
+	(gst_ebml_finalize), (gst_ebml_read_change_state),
+	(gst_ebml_read_element_level_up), (gst_ebml_read_master):
+	* gst/matroska/matroska-demux.c:
+	(gst_matroska_demux_parse_contents_seekentry):
+	Reverse the level list as we usually are only interested in the
+	first element or want to add a new first element. Having the
+	first element stored at the end and calling g_list_last() and
+	g_list_append() is more expensive.
+
+	Also use GSlice for allocating the GstEbmlLevel structs.
+
 2008-06-13  Tim-Philipp Müller  <tim.muller at collabora co uk>
 
 	* gst/debug/gsttaginject.c: (gst_tag_inject_finalize),
diff --git a/gst/matroska/ebml-read.c b/gst/matroska/ebml-read.c
index 85f0e50d..45dd3b3f 100644
--- a/gst/matroska/ebml-read.c
+++ b/gst/matroska/ebml-read.c
@@ -34,7 +34,9 @@ GST_DEBUG_CATEGORY_STATIC (ebmlread_debug);
 #define GST_CAT_DEFAULT ebmlread_debug
 
 static void gst_ebml_read_class_init (GstEbmlReadClass * klass);
+
 static void gst_ebml_read_init (GstEbmlRead * ebml);
+
 static GstStateChangeReturn gst_ebml_read_change_state (GstElement * element,
     GstStateChange transition);
 
@@ -74,11 +76,17 @@ gst_ebml_read_get_type (void)
 }
 
 static void
+gst_ebml_level_free (GstEbmlLevel * level)
+{
+  g_slice_free (GstEbmlLevel, level);
+}
+
+static void
 gst_ebml_finalize (GObject * obj)
 {
   GstEbmlRead *ebml = GST_EBML_READ (obj);
 
-  g_list_foreach (ebml->level, (GFunc) g_free, NULL);
+  g_list_foreach (ebml->level, (GFunc) gst_ebml_level_free, NULL);
   g_list_free (ebml->level);
   ebml->level = NULL;
   if (ebml->cached_buffer) {
@@ -93,6 +101,7 @@ static void
 gst_ebml_read_class_init (GstEbmlReadClass * klass)
 {
   GstElementClass *gstelement_class = (GstElementClass *) klass;
+
   GObjectClass *gobject_class = (GObjectClass *) klass;
 
   parent_class = g_type_class_peek_parent (klass);
@@ -117,6 +126,7 @@ static GstStateChangeReturn
 gst_ebml_read_change_state (GstElement * element, GstStateChange transition)
 {
   GstStateChangeReturn ret;
+
   GstEbmlRead *ebml = GST_EBML_READ (element);
 
   switch (transition) {
@@ -134,7 +144,7 @@ gst_ebml_read_change_state (GstElement * element, GstStateChange transition)
   switch (transition) {
     case GST_STATE_CHANGE_PAUSED_TO_READY:
     {
-      g_list_foreach (ebml->level, (GFunc) g_free, NULL);
+      g_list_foreach (ebml->level, (GFunc) gst_ebml_level_free, NULL);
       g_list_free (ebml->level);
       ebml->level = NULL;
       if (ebml->cached_buffer) {
@@ -162,15 +172,15 @@ static guint
 gst_ebml_read_element_level_up (GstEbmlRead * ebml)
 {
   guint num = 0;
+
   guint64 pos = ebml->offset;
 
   while (ebml->level != NULL) {
-    GList *last = g_list_last (ebml->level);
-    GstEbmlLevel *level = last->data;
+    GstEbmlLevel *level = ebml->level->data;
 
     if (pos >= level->start + level->length) {
-      ebml->level = g_list_remove (ebml->level, level);
-      g_free (level);
+      ebml->level = g_list_delete_link (ebml->level, ebml->level);
+      gst_ebml_level_free (level);
       num++;
     } else {
       break;
@@ -193,6 +203,7 @@ gst_ebml_read_peek_bytes (GstEbmlRead * ebml, guint size, GstBuffer ** p_buf,
    * We do it mainly to avoid pulling buffers of 1 byte all the time */
   if (ebml->cached_buffer) {
     guint64 cache_offset = GST_BUFFER_OFFSET (ebml->cached_buffer);
+
     guint cache_size = GST_BUFFER_SIZE (ebml->cached_buffer);
 
     if (cache_offset <= ebml->offset &&
@@ -291,9 +302,13 @@ static GstFlowReturn
 gst_ebml_read_element_id (GstEbmlRead * ebml, guint32 * id, guint * level_up)
 {
   guint8 *buf;
+
   gint len_mask = 0x80, read = 1, n = 1;
+
   guint32 total;
+
   guint8 b;
+
   GstFlowReturn ret;
 
   ret = gst_ebml_read_peek_bytes (ebml, 1, NULL, &buf);
@@ -347,9 +362,13 @@ gst_ebml_read_element_length (GstEbmlRead * ebml, guint64 * length,
     gint * rread)
 {
   GstFlowReturn ret;
+
   guint8 *buf;
+
   gint len_mask = 0x80, read = 1, n = 1, num_ffs = 0;
+
   guint64 total;
+
   guint8 b;
 
   ret = gst_ebml_read_peek_bytes (ebml, 1, NULL, &buf);
@@ -412,6 +431,7 @@ GstFlowReturn
 gst_ebml_peek_id (GstEbmlRead * ebml, guint * level_up, guint32 * id)
 {
   guint64 off;
+
   GstFlowReturn ret;
 
   g_assert (level_up);
@@ -433,6 +453,7 @@ gint64
 gst_ebml_read_get_length (GstEbmlRead * ebml)
 {
   GstFormat fmt = GST_FORMAT_BYTES;
+
   gint64 end;
 
   /* FIXME: what to do if we don't get the upstream length */
@@ -466,7 +487,9 @@ GstFlowReturn
 gst_ebml_read_skip (GstEbmlRead * ebml)
 {
   guint64 length;
+
   guint32 id;
+
   GstFlowReturn ret;
 
   ret = gst_ebml_read_element_id (ebml, &id, NULL);
@@ -489,6 +512,7 @@ GstFlowReturn
 gst_ebml_read_buffer (GstEbmlRead * ebml, guint32 * id, GstBuffer ** buf)
 {
   guint64 length;
+
   GstFlowReturn ret;
 
   ret = gst_ebml_read_element_id (ebml, id, NULL);
@@ -519,6 +543,7 @@ gst_ebml_read_bytes (GstEbmlRead * ebml, guint32 * id, guint8 ** data,
     guint * size)
 {
   guint64 length;
+
   GstFlowReturn ret;
 
   *size = 0;
@@ -554,7 +579,9 @@ GstFlowReturn
 gst_ebml_read_uint (GstEbmlRead * ebml, guint32 * id, guint64 * num)
 {
   guint8 *data;
+
   guint size;
+
   GstFlowReturn ret;
 
   ret = gst_ebml_read_bytes (ebml, id, &data, &size);
@@ -586,8 +613,11 @@ GstFlowReturn
 gst_ebml_read_sint (GstEbmlRead * ebml, guint32 * id, gint64 * num)
 {
   guint8 *data;
+
   guint size;
+
   gboolean negative = 0;
+
   GstFlowReturn ret;
 
   ret = gst_ebml_read_bytes (ebml, id, &data, &size);
@@ -638,7 +668,9 @@ static gdouble
 _ext2dbl (guint8 * data)
 {
   struct _ext_float *ext = (struct _ext_float *) data;
+
   guint64 m = 0;
+
   gint e, i;
 
   for (i = 0; i < 8; i++)
@@ -662,7 +694,9 @@ GstFlowReturn
 gst_ebml_read_float (GstEbmlRead * ebml, guint32 * id, gdouble * num)
 {
   guint8 *data;
+
   guint size;
+
   GstFlowReturn ret;
 
   ret = gst_ebml_read_bytes (ebml, id, &data, &size);
@@ -718,7 +752,9 @@ GstFlowReturn
 gst_ebml_read_ascii (GstEbmlRead * ebml, guint32 * id, gchar ** str)
 {
   guint8 *data;
+
   guint size;
+
   GstFlowReturn ret;
 
   ret = gst_ebml_read_bytes (ebml, id, &data, &size);
@@ -766,6 +802,7 @@ GstFlowReturn
 gst_ebml_read_date (GstEbmlRead * ebml, guint32 * id, gint64 * date)
 {
   gint64 ebml_date;
+
   GstFlowReturn ret;
 
   ret = gst_ebml_read_sint (ebml, id, &ebml_date);
@@ -786,7 +823,9 @@ GstFlowReturn
 gst_ebml_read_master (GstEbmlRead * ebml, guint32 * id)
 {
   GstEbmlLevel *level;
+
   guint64 length;
+
   GstFlowReturn ret;
 
   ret = gst_ebml_read_element_id (ebml, id, NULL);
@@ -798,10 +837,10 @@ gst_ebml_read_master (GstEbmlRead * ebml, guint32 * id)
     return ret;
 
   /* remember level */
-  level = g_new (GstEbmlLevel, 1);
+  level = g_slice_new (GstEbmlLevel);
   level->start = ebml->offset;
   level->length = length;
-  ebml->level = g_list_append (ebml->level, level);
+  ebml->level = g_list_prepend (ebml->level, level);
 
   return GST_FLOW_OK;
 }
@@ -815,7 +854,9 @@ gst_ebml_read_binary (GstEbmlRead * ebml,
     guint32 * id, guint8 ** binary, guint64 * length)
 {
   guint8 *data;
+
   guint size;
+
   GstFlowReturn ret;
 
   ret = gst_ebml_read_bytes (ebml, id, &data, &size);
@@ -837,7 +878,9 @@ gst_ebml_read_header (GstEbmlRead * ebml, gchar ** doctype, guint * version)
 {
   /* this function is the first to be called */
   guint32 id;
+
   guint level_up;
+
   GstFlowReturn ret;
 
   /* default init */
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index d8765ad3..7789de36 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -3577,10 +3577,10 @@ gst_matroska_demux_parse_contents_seekentry (GstMatroskaDemux * demux,
 
       /* we don't want to lose our seekhead level, so we add
        * a dummy. This is a crude hack. */
-      level = g_new (GstEbmlLevel, 1);
+      level = g_slice_new (GstEbmlLevel);
       level->start = 0;
       level->length = G_MAXUINT64;
-      ebml->level = g_list_append (ebml->level, level);
+      ebml->level = g_list_prepend (ebml->level, level);
 
       /* check ID */
       if ((ret = gst_ebml_peek_id (ebml, &demux->level_up, &id)) != GST_FLOW_OK)
@@ -3652,7 +3652,7 @@ gst_matroska_demux_parse_contents_seekentry (GstMatroskaDemux * demux,
           for (l = ebml->level; l; l = l->next) {
             GstEbmlLevel *level = (GstEbmlLevel *) l->data;
 
-            if (level->start == ebml->offset && l->next)
+            if (level->start == ebml->offset && l->prev)
               goto finish;
           }
 
@@ -3695,10 +3695,10 @@ gst_matroska_demux_parse_contents_seekentry (GstMatroskaDemux * demux,
       while (ebml->level) {
         guint64 length;
 
-        level = g_list_last (ebml->level)->data;
-        ebml->level = g_list_remove (ebml->level, level);
+        level = ebml->level->data;
+        ebml->level = g_list_delete_link (ebml->level, ebml->level);
         length = level->length;
-        g_free (level);
+        g_slice_free (GstEbmlLevel, level);
         if (length == G_MAXUINT64)
           break;
       }