don't mix tabs and spaces

[platform/upstream/gstreamer.git] / gst / elements / gstbufferstore.c

diff --git a/gst/elements/gstbufferstore.c b/gst/elements/gstbufferstore.c
index 7a31f64..dcb00da 100644 (file)
--- a/gst/elements/gstbufferstore.c
+++ b/gst/elements/gstbufferstore.c
@@ -29,44 +29,53 @@
 GST_DEBUG_CATEGORY_STATIC (gst_buffer_store_debug);
 #define GST_CAT_DEFAULT gst_buffer_store_debug
 
 GST_DEBUG_CATEGORY_STATIC (gst_buffer_store_debug);
 #define GST_CAT_DEFAULT gst_buffer_store_debug
 

-enum {
+enum
+{

   CLEARED,
   BUFFER_ADDED,
   LAST_SIGNAL
 };
   CLEARED,
   BUFFER_ADDED,
   LAST_SIGNAL
 };

-enum {
+enum
+{

   ARG_0
 };
 
 
   ARG_0
 };
 
 

-static void    gst_buffer_store_dispose        (GObject *              object);
+static void gst_buffer_store_dispose (GObject * object);
+
+static gboolean gst_buffer_store_add_buffer_func (GstBufferStore * store,
+    GstBuffer * buffer);
+static void gst_buffer_store_cleared_func (GstBufferStore * store);

 
 

-static gboolean        gst_buffer_store_add_buffer_func (GstBufferStore *      store, 
-                                                GstBuffer *            buffer);
-static void    gst_buffer_store_cleared_func   (GstBufferStore *       store);
-  

 static guint gst_buffer_store_signals[LAST_SIGNAL] = { 0 };
 
 static guint gst_buffer_store_signals[LAST_SIGNAL] = { 0 };
 

-GST_BOILERPLATE (GstBufferStore, gst_buffer_store, GObject, G_TYPE_OBJECT);
+#define _do_init(bla) \
+    GST_DEBUG_CATEGORY_INIT (gst_buffer_store_debug, "GstBufferStore", 0, "buffer store helper");
+
+GST_BOILERPLATE_FULL (GstBufferStore, gst_buffer_store, GObject, G_TYPE_OBJECT,
+    _do_init);

 
 
 G_GNUC_UNUSED static void
 
 
 G_GNUC_UNUSED static void

-debug_buffers (GstBufferStore *store)
+debug_buffers (GstBufferStore * store)

 {
   GList *walk = store->buffers;
 {
   GList *walk = store->buffers;

-  
+

   g_printerr ("BUFFERS in store:\n");
   while (walk) {
   g_printerr ("BUFFERS in store:\n");
   while (walk) {

-    g_print ("%15"G_GUINT64_FORMAT" - %7u\n", GST_BUFFER_OFFSET (walk->data), GST_BUFFER_SIZE (walk->data));
+    g_print ("%15" G_GUINT64_FORMAT " - %7u\n", GST_BUFFER_OFFSET (walk->data),
+        GST_BUFFER_SIZE (walk->data));

     walk = g_list_next (walk);
   }
   g_printerr ("\n");
 }
     walk = g_list_next (walk);
   }
   g_printerr ("\n");
 }

+

 static gboolean
 static gboolean

-continue_accu (GSignalInvocationHint *ihint, GValue *return_accu, 
-              const GValue *handler_return, gpointer data)
+continue_accu (GSignalInvocationHint * ihint, GValue * return_accu,
+    const GValue * handler_return, gpointer data)

 {
   gboolean do_continue = g_value_get_boolean (handler_return);
 {
   gboolean do_continue = g_value_get_boolean (handler_return);

+

   g_value_set_boolean (return_accu, do_continue);
 
   return do_continue;
   g_value_set_boolean (return_accu, do_continue);
 
   return do_continue;


@@ -76,31 +85,31 @@ gst_buffer_store_base_init (gpointer g_class)
 {
 }
 static void
 {
 }
 static void

-gst_buffer_store_class_init (GstBufferStoreClass *store_class)
+gst_buffer_store_class_init (GstBufferStoreClass * store_class)

 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (store_class);
 
   gobject_class->dispose = gst_buffer_store_dispose;
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (store_class);
 
   gobject_class->dispose = gst_buffer_store_dispose;

-  
-  gst_buffer_store_signals[CLEARED] = g_signal_new ("cleared", 
-         G_TYPE_FROM_CLASS (store_class), G_SIGNAL_RUN_LAST,
-          G_STRUCT_OFFSET (GstBufferStoreClass, cleared), NULL, NULL,
-          gst_marshal_VOID__VOID, G_TYPE_NONE, 0);
-  gst_buffer_store_signals[BUFFER_ADDED] = g_signal_new ("buffer-added", 
-         G_TYPE_FROM_CLASS (store_class), G_SIGNAL_RUN_LAST,
-          G_STRUCT_OFFSET (GstBufferStoreClass, buffer_added), continue_accu, NULL,
-          gst_marshal_BOOLEAN__POINTER, G_TYPE_BOOLEAN, 1, GST_TYPE_BUFFER);
+
+  gst_buffer_store_signals[CLEARED] = g_signal_new ("cleared",
+      G_TYPE_FROM_CLASS (store_class), G_SIGNAL_RUN_LAST,
+      G_STRUCT_OFFSET (GstBufferStoreClass, cleared), NULL, NULL,
+      gst_marshal_VOID__VOID, G_TYPE_NONE, 0);
+  gst_buffer_store_signals[BUFFER_ADDED] = g_signal_new ("buffer-added",
+      G_TYPE_FROM_CLASS (store_class), G_SIGNAL_RUN_LAST,
+      G_STRUCT_OFFSET (GstBufferStoreClass, buffer_added), continue_accu, NULL,
+      gst_marshal_BOOLEAN__POINTER, G_TYPE_BOOLEAN, 1, GST_TYPE_BUFFER);

 
   store_class->cleared = gst_buffer_store_cleared_func;
   store_class->buffer_added = gst_buffer_store_add_buffer_func;
 }
 static void
 
   store_class->cleared = gst_buffer_store_cleared_func;
   store_class->buffer_added = gst_buffer_store_add_buffer_func;
 }
 static void

-gst_buffer_store_init (GstBufferStore *store)
+gst_buffer_store_init (GstBufferStore * store)

 {
   store->buffers = NULL;
 }
 static void
 {
   store->buffers = NULL;
 }
 static void

-gst_buffer_store_dispose (GObject *object)
+gst_buffer_store_dispose (GObject * object)

 {
   GstBufferStore *store = GST_BUFFER_STORE (object);
 
 {
   GstBufferStore *store = GST_BUFFER_STORE (object);
 


@@ -108,22 +117,24 @@ gst_buffer_store_dispose (GObject *object)
 
   parent_class->dispose (object);
 }
 
   parent_class->dispose (object);
 }

+

 static gboolean
 static gboolean

-gst_buffer_store_add_buffer_func (GstBufferStore *store, GstBuffer *buffer)
+gst_buffer_store_add_buffer_func (GstBufferStore * store, GstBuffer * buffer)

 {
   g_assert (buffer != NULL);
 {
   g_assert (buffer != NULL);

-  
+

   if (!GST_BUFFER_OFFSET_IS_VALID (buffer) &&
   if (!GST_BUFFER_OFFSET_IS_VALID (buffer) &&

-      store->buffers &&
-      GST_BUFFER_OFFSET_IS_VALID (store->buffers->data)) {
+      store->buffers && GST_BUFFER_OFFSET_IS_VALID (store->buffers->data)) {

     /* we assumed valid offsets, but suddenly they are not anymore */
     /* we assumed valid offsets, but suddenly they are not anymore */

-    GST_DEBUG_OBJECT (store, "attempting to add buffer %p with invalid offset to store with valid offset, abort",
-           buffer);
+    GST_DEBUG_OBJECT (store,
+        "attempting to add buffer %p with invalid offset to store with valid offset, abort",
+        buffer);

     return FALSE;
     return FALSE;

-  } else if (!store->buffers || !GST_BUFFER_OFFSET_IS_VALID (store->buffers->data)) {
+  } else if (!store->buffers
+      || !GST_BUFFER_OFFSET_IS_VALID (store->buffers->data)) {

     /* the starting buffer had an invalid offset, in that case we assume continuous buffers */
     GST_LOG_OBJECT (store, "adding buffer %p with invalid offset and size %u",
     /* the starting buffer had an invalid offset, in that case we assume continuous buffers */
     GST_LOG_OBJECT (store, "adding buffer %p with invalid offset and size %u",

-           buffer, GST_BUFFER_SIZE (buffer));
+        buffer, GST_BUFFER_SIZE (buffer));

     gst_data_ref (GST_DATA (buffer));
     store->buffers = g_list_append (store->buffers, buffer);
     return TRUE;
     gst_data_ref (GST_DATA (buffer));
     store->buffers = g_list_append (store->buffers, buffer);
     return TRUE;


@@ -131,10 +142,12 @@ gst_buffer_store_add_buffer_func (GstBufferStore *store, GstBuffer *buffer)
     /* both list and buffer have valid offsets, we can really go wild */
     GList *walk, *current_list = NULL;
     GstBuffer *current;
     /* both list and buffer have valid offsets, we can really go wild */
     GList *walk, *current_list = NULL;
     GstBuffer *current;

-    
+

     g_assert (GST_BUFFER_OFFSET_IS_VALID (buffer));
     g_assert (GST_BUFFER_OFFSET_IS_VALID (buffer));

-    GST_LOG_OBJECT (store, "attempting to add buffer %p with offset %"G_GUINT64_FORMAT" and size %u",
-           buffer, GST_BUFFER_OFFSET (buffer), GST_BUFFER_SIZE (buffer));
+    GST_LOG_OBJECT (store,
+        "attempting to add buffer %p with offset %" G_GUINT64_FORMAT
+        " and size %u", buffer, GST_BUFFER_OFFSET (buffer),
+        GST_BUFFER_SIZE (buffer));

     /* we keep a sorted list of non-overlapping buffers */
     walk = store->buffers;
     while (walk) {
     /* we keep a sorted list of non-overlapping buffers */
     walk = store->buffers;
     while (walk) {


@@ -142,89 +155,101 @@ gst_buffer_store_add_buffer_func (GstBufferStore *store, GstBuffer *buffer)
       current_list = walk;
       walk = g_list_next (walk);
       if (GST_BUFFER_OFFSET (current) < GST_BUFFER_OFFSET (buffer)) {
       current_list = walk;
       walk = g_list_next (walk);
       if (GST_BUFFER_OFFSET (current) < GST_BUFFER_OFFSET (buffer)) {

-       continue;
+        continue;

       } else if (GST_BUFFER_OFFSET (current) == GST_BUFFER_OFFSET (buffer)) {
       } else if (GST_BUFFER_OFFSET (current) == GST_BUFFER_OFFSET (buffer)) {

-       guint needed_size;
-       if (walk) {
-         needed_size = MIN (GST_BUFFER_SIZE (buffer), 
-                 GST_BUFFER_OFFSET (walk->data) - GST_BUFFER_OFFSET (current));
-       } else {
-         needed_size = GST_BUFFER_SIZE (buffer);
-       }
-       if (needed_size <= GST_BUFFER_SIZE (current)) {
-         buffer = NULL;
-         break;
-       } else {
-         if (needed_size < GST_BUFFER_SIZE (buffer)) {
-           /* need to create subbuffer to not have overlapping data */
-           GstBuffer *sub = gst_buffer_create_sub (buffer, 0, needed_size);
-           g_assert (sub);
-           buffer = sub;
-         } else {
-           gst_data_ref (GST_DATA (buffer));
-         }
-         /* replace current buffer with new one */
-         GST_INFO_OBJECT (store, "replacing buffer %p with buffer %p with offset %"G_GINT64_FORMAT" and size %u", 
-                          current_list->data, buffer, GST_BUFFER_OFFSET (buffer), GST_BUFFER_SIZE (buffer));
-         gst_data_unref (GST_DATA (current_list->data));
-         current_list->data = buffer;
-         buffer = NULL;
-         break;
-       }
+        guint needed_size;
+
+        if (walk) {
+          needed_size = MIN (GST_BUFFER_SIZE (buffer),
+              GST_BUFFER_OFFSET (walk->data) - GST_BUFFER_OFFSET (current));
+        } else {
+          needed_size = GST_BUFFER_SIZE (buffer);
+        }
+        if (needed_size <= GST_BUFFER_SIZE (current)) {
+          buffer = NULL;
+          break;
+        } else {
+          if (needed_size < GST_BUFFER_SIZE (buffer)) {
+            /* need to create subbuffer to not have overlapping data */
+            GstBuffer *sub = gst_buffer_create_sub (buffer, 0, needed_size);
+
+            g_assert (sub);
+            buffer = sub;
+          } else {
+            gst_data_ref (GST_DATA (buffer));
+          }
+          /* replace current buffer with new one */
+          GST_INFO_OBJECT (store,
+              "replacing buffer %p with buffer %p with offset %" G_GINT64_FORMAT
+              " and size %u", current_list->data, buffer,
+              GST_BUFFER_OFFSET (buffer), GST_BUFFER_SIZE (buffer));
+          gst_data_unref (GST_DATA (current_list->data));
+          current_list->data = buffer;
+          buffer = NULL;
+          break;
+        }

       } else if (GST_BUFFER_OFFSET (current) > GST_BUFFER_OFFSET (buffer)) {
       } else if (GST_BUFFER_OFFSET (current) > GST_BUFFER_OFFSET (buffer)) {

-       GList *previous = g_list_previous (current_list);
-       guint64 start_offset = previous ? 
-               GST_BUFFER_OFFSET (previous->data) + GST_BUFFER_SIZE (previous->data) : 0;
-
-       if (start_offset == GST_BUFFER_OFFSET (current)) {
-         buffer = NULL;
-         break;
-       } else {
-         /* we have data to insert */
-         if (start_offset > GST_BUFFER_OFFSET (buffer) ||
-             GST_BUFFER_OFFSET (buffer) + GST_BUFFER_SIZE (buffer) > GST_BUFFER_OFFSET (current)) {
-           GstBuffer *sub;
-
-           /* need a subbuffer */
-           start_offset = GST_BUFFER_OFFSET (buffer) > start_offset ? 0 : 
-                          start_offset - GST_BUFFER_OFFSET (buffer);
-           sub = gst_buffer_create_sub (buffer, start_offset,
-                   MIN (GST_BUFFER_SIZE (buffer), GST_BUFFER_OFFSET (current) - start_offset - GST_BUFFER_OFFSET (buffer)));
-           g_assert (sub);
-           GST_BUFFER_OFFSET (sub) = start_offset + GST_BUFFER_OFFSET (buffer);
-           buffer = sub;
-         } else {
-           gst_data_ref (GST_DATA (buffer));
-         }
-         GST_INFO_OBJECT (store, "adding buffer %p with offset %"G_GINT64_FORMAT" and size %u", 
-                          buffer, GST_BUFFER_OFFSET (buffer), GST_BUFFER_SIZE (buffer));
-         store->buffers = g_list_insert_before (store->buffers, current_list, buffer);
-         buffer = NULL;
-         break;
-       }
+        GList *previous = g_list_previous (current_list);
+        guint64 start_offset = previous ?
+            GST_BUFFER_OFFSET (previous->data) +
+            GST_BUFFER_SIZE (previous->data) : 0;
+
+        if (start_offset == GST_BUFFER_OFFSET (current)) {
+          buffer = NULL;
+          break;
+        } else {
+          /* we have data to insert */
+          if (start_offset > GST_BUFFER_OFFSET (buffer) ||
+              GST_BUFFER_OFFSET (buffer) + GST_BUFFER_SIZE (buffer) >
+              GST_BUFFER_OFFSET (current)) {
+            GstBuffer *sub;
+
+            /* need a subbuffer */
+            start_offset = GST_BUFFER_OFFSET (buffer) > start_offset ? 0 :
+                start_offset - GST_BUFFER_OFFSET (buffer);
+            sub = gst_buffer_create_sub (buffer, start_offset,
+                MIN (GST_BUFFER_SIZE (buffer),
+                    GST_BUFFER_OFFSET (current) - start_offset -
+                    GST_BUFFER_OFFSET (buffer)));
+            g_assert (sub);
+            GST_BUFFER_OFFSET (sub) = start_offset + GST_BUFFER_OFFSET (buffer);
+            buffer = sub;
+          } else {
+            gst_data_ref (GST_DATA (buffer));
+          }
+          GST_INFO_OBJECT (store,
+              "adding buffer %p with offset %" G_GINT64_FORMAT " and size %u",
+              buffer, GST_BUFFER_OFFSET (buffer), GST_BUFFER_SIZE (buffer));
+          store->buffers =
+              g_list_insert_before (store->buffers, current_list, buffer);
+          buffer = NULL;
+          break;
+        }

       }
     }
     if (buffer) {
       gst_data_ref (GST_DATA (buffer));
       }
     }
     if (buffer) {
       gst_data_ref (GST_DATA (buffer));

-      GST_INFO_OBJECT (store, "adding buffer %p with offset %"G_GINT64_FORMAT" and size %u", 
-                      buffer, GST_BUFFER_OFFSET (buffer), GST_BUFFER_SIZE (buffer));
+      GST_INFO_OBJECT (store,
+          "adding buffer %p with offset %" G_GINT64_FORMAT " and size %u",
+          buffer, GST_BUFFER_OFFSET (buffer), GST_BUFFER_SIZE (buffer));

       if (current_list) {
       if (current_list) {

-       g_list_append (current_list, buffer);
+        g_list_append (current_list, buffer);

       } else {
       } else {

-       g_assert (store->buffers == NULL);
-       store->buffers = g_list_prepend (NULL, buffer);
+        g_assert (store->buffers == NULL);
+        store->buffers = g_list_prepend (NULL, buffer);

       }
     }
     return TRUE;
   }
 }
 static void
       }
     }
     return TRUE;
   }
 }
 static void

-gst_buffer_store_cleared_func (GstBufferStore *store)
+gst_buffer_store_cleared_func (GstBufferStore * store)

 {
   g_list_foreach (store->buffers, (GFunc) gst_data_unref, NULL);
   g_list_free (store->buffers);
   store->buffers = NULL;
 }
 {
   g_list_foreach (store->buffers, (GFunc) gst_data_unref, NULL);
   g_list_free (store->buffers);
   store->buffers = NULL;
 }

+

 /**
  * gst_buffer_store_new:
  *
 /**
  * gst_buffer_store_new:
  *


@@ -237,6 +262,7 @@ gst_buffer_store_new (void)
 {
   return GST_BUFFER_STORE (g_object_new (GST_TYPE_BUFFER_STORE, NULL));
 }
 {
   return GST_BUFFER_STORE (g_object_new (GST_TYPE_BUFFER_STORE, NULL));
 }

+

 /**
  * gst_buffer_store_clear:
  * @store: a bufferstore
 /**
  * gst_buffer_store_clear:
  * @store: a bufferstore


@@ -246,12 +272,13 @@ gst_buffer_store_new (void)
  */
 /* FIXME: call this function _reset ? */
 void
  */
 /* FIXME: call this function _reset ? */
 void

-gst_buffer_store_clear (GstBufferStore *store)
+gst_buffer_store_clear (GstBufferStore * store)

 {
   g_return_if_fail (GST_IS_BUFFER_STORE (store));
 {
   g_return_if_fail (GST_IS_BUFFER_STORE (store));

-  
-  g_signal_emit (store, gst_buffer_store_signals [CLEARED], 0, NULL);
+
+  g_signal_emit (store, gst_buffer_store_signals[CLEARED], 0, NULL);

 }
 }

+

 /**
  * gst_buffer_store_add_buffer:
  * @store: a bufferstore
 /**
  * gst_buffer_store_add_buffer:
  * @store: a bufferstore


@@ -262,10 +289,10 @@ gst_buffer_store_clear (GstBufferStore *store)
  * Returns: TRUE, if the buffer was added, FALSE if an error occured.
  */
 gboolean
  * Returns: TRUE, if the buffer was added, FALSE if an error occured.
  */
 gboolean

-gst_buffer_store_add_buffer (GstBufferStore *store, GstBuffer *buffer)
+gst_buffer_store_add_buffer (GstBufferStore * store, GstBuffer * buffer)

 {
   gboolean ret;
 {
   gboolean ret;

-  
+

   g_return_val_if_fail (GST_IS_BUFFER_STORE (store), FALSE);
   g_return_val_if_fail (GST_IS_BUFFER (buffer), FALSE);
 
   g_return_val_if_fail (GST_IS_BUFFER_STORE (store), FALSE);
   g_return_val_if_fail (GST_IS_BUFFER (buffer), FALSE);
 


@@ -273,11 +300,13 @@ gst_buffer_store_add_buffer (GstBufferStore *store, GstBuffer *buffer)
       GST_BUFFER_OFFSET_IS_VALID (store->buffers->data) &&
       !GST_BUFFER_OFFSET_IS_VALID (buffer))
     return FALSE;
       GST_BUFFER_OFFSET_IS_VALID (store->buffers->data) &&
       !GST_BUFFER_OFFSET_IS_VALID (buffer))
     return FALSE;

-  
-  g_signal_emit (store, gst_buffer_store_signals [BUFFER_ADDED], 0, buffer, &ret);
-  
+
+  g_signal_emit (store, gst_buffer_store_signals[BUFFER_ADDED], 0, buffer,
+      &ret);
+

   return ret;
 }
   return ret;
 }

+

 /**
  * gst_buffer_store_get_buffer:
  * @store: a bufferstore
 /**
  * gst_buffer_store_get_buffer:
  * @store: a bufferstore


@@ -292,7 +321,7 @@ gst_buffer_store_add_buffer (GstBufferStore *store, GstBuffer *buffer)
  *          available.
  */
 GstBuffer *
  *          available.
  */
 GstBuffer *

-gst_buffer_store_get_buffer (GstBufferStore *store, guint64 offset, guint size)
+gst_buffer_store_get_buffer (GstBufferStore * store, guint64 offset, guint size)

 {
   GstBuffer *current;
   GList *walk;
 {
   GstBuffer *current;
   GList *walk;


@@ -321,47 +350,49 @@ gst_buffer_store_get_buffer (GstBufferStore *store, guint64 offset, guint size)
     if (cur_offset > offset) {
       /* #include <windows.h>
          do_nothing_loop (); */
     if (cur_offset > offset) {
       /* #include <windows.h>
          do_nothing_loop (); */

-    } else if (cur_offset == offset &&
-       GST_BUFFER_SIZE (current) == size) {
-      GST_LOG_OBJECT (store, "found matching buffer %p for offset %"G_GUINT64_FORMAT" and size %u",
-                     current, offset, size);
+    } else if (cur_offset == offset && GST_BUFFER_SIZE (current) == size) {
+      GST_LOG_OBJECT (store,
+          "found matching buffer %p for offset %" G_GUINT64_FORMAT
+          " and size %u", current, offset, size);

       ret = current;
       gst_data_ref (GST_DATA (ret));
       ret = current;
       gst_data_ref (GST_DATA (ret));

-      GST_LOG_OBJECT (store, "refcount %d",
-                     GST_DATA_REFCOUNT_VALUE(ret));
+      GST_LOG_OBJECT (store, "refcount %d", GST_DATA_REFCOUNT_VALUE (ret));

       break;
     } else if (cur_offset + GST_BUFFER_SIZE (current) > offset) {
       if (cur_offset + GST_BUFFER_SIZE (current) >= offset + size) {
       break;
     } else if (cur_offset + GST_BUFFER_SIZE (current) > offset) {
       if (cur_offset + GST_BUFFER_SIZE (current) >= offset + size) {

-       ret = gst_buffer_create_sub (current, offset - cur_offset, size);
-       GST_LOG_OBJECT (store, "created subbuffer %p from buffer %p for offset %llu and size %u",
-                       ret, current,  offset, size);
-       break;
+        ret = gst_buffer_create_sub (current, offset - cur_offset, size);
+        GST_LOG_OBJECT (store,
+            "created subbuffer %p from buffer %p for offset %llu and size %u",
+            ret, current, offset, size);
+        break;

       }
       /* uh, the requested data spans some buffers */
       ret = gst_buffer_new_and_alloc (size);
       }
       /* uh, the requested data spans some buffers */
       ret = gst_buffer_new_and_alloc (size);

-      GST_LOG_OBJECT (store, "created buffer %p for offset %"G_GUINT64_FORMAT
-                     " and size %u, will fill with data now",
-                     ret, offset, size);
+      GST_LOG_OBJECT (store, "created buffer %p for offset %" G_GUINT64_FORMAT
+          " and size %u, will fill with data now", ret, offset, size);

       data = GST_BUFFER_DATA (ret);
       tmp = GST_BUFFER_SIZE (current) - offset + cur_offset;
       memcpy (data, GST_BUFFER_DATA (current) + offset - cur_offset, tmp);
       data += tmp;
       size -= tmp;
       while (size) {
       data = GST_BUFFER_DATA (ret);
       tmp = GST_BUFFER_SIZE (current) - offset + cur_offset;
       memcpy (data, GST_BUFFER_DATA (current) + offset - cur_offset, tmp);
       data += tmp;
       size -= tmp;
       while (size) {

-       if (walk == NULL || 
-           (have_offset && 
-            GST_BUFFER_OFFSET (current) + GST_BUFFER_SIZE (current) != GST_BUFFER_OFFSET (walk->data))) {
-         GST_DEBUG_OBJECT (store, "not all data for offset %"G_GUINT64_FORMAT" and remaining size %u available, aborting",
-                           offset, size);
-         gst_data_unref (GST_DATA (ret));
-         ret = NULL;
-         goto out;
-       }
-       current = GST_BUFFER (walk->data);
-       walk = g_list_next (walk);
-       tmp = MIN (GST_BUFFER_SIZE (current), size);
-       memcpy (data, GST_BUFFER_DATA (current), tmp);
-       size -= tmp;
+        if (walk == NULL ||
+            (have_offset &&
+                GST_BUFFER_OFFSET (current) + GST_BUFFER_SIZE (current) !=
+                GST_BUFFER_OFFSET (walk->data))) {
+          GST_DEBUG_OBJECT (store,
+              "not all data for offset %" G_GUINT64_FORMAT
+              " and remaining size %u available, aborting", offset, size);
+          gst_data_unref (GST_DATA (ret));
+          ret = NULL;
+          goto out;
+        }
+        current = GST_BUFFER (walk->data);
+        walk = g_list_next (walk);
+        tmp = MIN (GST_BUFFER_SIZE (current), size);
+        memcpy (data, GST_BUFFER_DATA (current), tmp);
+        data += tmp;
+        size -= tmp;

       }
     }
     if (!have_offset) {
       }
     }
     if (!have_offset) {


@@ -369,9 +400,10 @@ gst_buffer_store_get_buffer (GstBufferStore *store, guint64 offset, guint size)
     }
   }
 out:
     }
   }
 out:

-  
+

   return ret;
 }
   return ret;
 }

+

 /**
  * gst_buffer_store_get_size:
  * @store: a bufferstore
 /**
  * gst_buffer_store_get_size:
  * @store: a bufferstore


@@ -384,7 +416,7 @@ out:
  *          offset.
  */
 guint
  *          offset.
  */
 guint

-gst_buffer_store_get_size (GstBufferStore *store, guint64 offset)
+gst_buffer_store_get_size (GstBufferStore * store, guint64 offset)

 {
   GList *walk;
   gboolean have_offset;
 {
   GList *walk;
   gboolean have_offset;


@@ -404,8 +436,9 @@ gst_buffer_store_get_size (GstBufferStore *store, guint64 offset)
     have_offset = FALSE;
   }
   while (walk) {
     have_offset = FALSE;
   }
   while (walk) {

-    if (have_offset && counting && 
-       cur_offset + GST_BUFFER_SIZE (current) !=  GST_BUFFER_OFFSET (walk->data)) {
+    if (have_offset && counting &&
+        cur_offset + GST_BUFFER_SIZE (current) !=
+        GST_BUFFER_OFFSET (walk->data)) {

       break;
     }
     current = GST_BUFFER (walk->data);
       break;
     }
     current = GST_BUFFER (walk->data);


@@ -417,17 +450,17 @@ gst_buffer_store_get_size (GstBufferStore *store, guint64 offset)
       ret += GST_BUFFER_SIZE (current);
     } else {
       if (cur_offset > offset)
       ret += GST_BUFFER_SIZE (current);
     } else {
       if (cur_offset > offset)

-       return 0;
+        return 0;

       if (cur_offset + GST_BUFFER_SIZE (current) > offset) {
       if (cur_offset + GST_BUFFER_SIZE (current) > offset) {

-       /* we have at least some bytes */
-       ret = cur_offset + GST_BUFFER_SIZE (current) - offset;
-       counting = TRUE;
+        /* we have at least some bytes */
+        ret = cur_offset + GST_BUFFER_SIZE (current) - offset;
+        counting = TRUE;

       }
     }
     if (!have_offset) {
       cur_offset += GST_BUFFER_SIZE (current);
     }
   }
       }
     }
     if (!have_offset) {
       cur_offset += GST_BUFFER_SIZE (current);
     }
   }

-  
+

   return ret;
 }
   return ret;
 }