From a330012d6ac3533eac8cbd1ae08ab05802c85e8a Mon Sep 17 00:00:00 2001
From: Antonio Ospite <antonio.ospite@collabora.com>
Date: Mon, 11 Mar 2019 10:08:21 +0100
Subject: [PATCH] test: rtpbin_buffer_list: move buffer list creation next to
 its validation

The tests create a buffer list and then use the chain_list callback to
verify that the correct packets have been pushed.

Move the creation and validation code next to each other so that the
reader can more easily understand what is going on.

While at it add some comments to introduce the two related functions.
---
 tests/check/elements/rtpbin_buffer_list.c | 58 ++++++++++++-----------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/tests/check/elements/rtpbin_buffer_list.c b/tests/check/elements/rtpbin_buffer_list.c
index acdd8b66ea..0cb0c05f64 100644
--- a/tests/check/elements/rtpbin_buffer_list.c
+++ b/tests/check/elements/rtpbin_buffer_list.c
@@ -129,34 +129,6 @@ create_rtp_packet_buffer (gconstpointer header, gint header_size,
   return buffer;
 }
 
-static GstBufferList *
-create_buffer_list (void)
-{
-  GstBufferList *list;
-  GstBuffer *orig_buffer;
-  GstBuffer *buffer;
-
-  orig_buffer = create_original_buffer ();
-  fail_if (orig_buffer == NULL);
-
-  list = gst_buffer_list_new ();
-  fail_if (list == NULL);
-
-  /*** First packet. **/
-  buffer =
-      create_rtp_packet_buffer (&rtp_header[0], rtp_header_len[0], orig_buffer,
-      payload_offset[0], payload_len[0]);
-  gst_buffer_list_add (list, buffer);
-
-  /***  Second packet. ***/
-  buffer =
-      create_rtp_packet_buffer (&rtp_header[1], rtp_header_len[1], orig_buffer,
-      payload_offset[1], payload_len[1]);
-  gst_buffer_list_add (list, buffer);
-
-  return list;
-}
-
 static void
 check_header (GstBuffer * buffer, guint index)
 {
@@ -235,6 +207,36 @@ check_packet (GstBufferList * list, guint list_index, guint packet_index)
  */
 static gboolean chain_list_func_called;
 
+/* Create two packets with different payloads. */
+static GstBufferList *
+create_buffer_list (void)
+{
+  GstBufferList *list;
+  GstBuffer *orig_buffer;
+  GstBuffer *buffer;
+
+  orig_buffer = create_original_buffer ();
+  fail_if (orig_buffer == NULL);
+
+  list = gst_buffer_list_new ();
+  fail_if (list == NULL);
+
+  /*** First packet. **/
+  buffer =
+      create_rtp_packet_buffer (&rtp_header[0], rtp_header_len[0], orig_buffer,
+      payload_offset[0], payload_len[0]);
+  gst_buffer_list_add (list, buffer);
+
+  /***  Second packet. ***/
+  buffer =
+      create_rtp_packet_buffer (&rtp_header[1], rtp_header_len[1], orig_buffer,
+      payload_offset[1], payload_len[1]);
+  gst_buffer_list_add (list, buffer);
+
+  return list;
+}
+
+/* Check that the correct packets have been pushed out of the element. */
 static GstFlowReturn
 sink_chain_list (GstPad * pad, GstObject * parent, GstBufferList * list)
 {