Revert "Create a netbuffer directly instead of using gst_pad_buffer_alloc"

This reverts commit c8cd93a9a92d579f2a7090acea65e72180b358a4.

2 files changed, 11 insertions, 13 deletions

diff --git a/gst/gstnicesrc.c b/gst/gstnicesrc.c
index 895c8bd..e83eade 100644
--- a/gst/gstnicesrc.c
+++ b/gst/gstnicesrc.c
@@ -195,18 +195,15 @@ gst_nice_src_read_callback (NiceAgent *agent,
 {
   GstBaseSrc *basesrc = GST_BASE_SRC (data);
   GstNiceSrc *nicesrc = GST_NICE_SRC (basesrc);
-  GstNetBuffer *mybuf;
 
   GST_LOG_OBJECT (agent, "Got buffer, getting out of the main loop");
 
-  mybuf = gst_netbuffer_new ();
-  GST_BUFFER_MALLOCDATA (mybuf) = g_memdup (buf, len);
-  GST_BUFFER_SIZE (mybuf) = len;
-  GST_BUFFER_DATA (mybuf) = GST_BUFFER_MALLOCDATA (mybuf);
-  if (GST_PAD_CAPS (basesrc->srcpad))
-    GST_BUFFER_CAPS (mybuf) = gst_caps_ref (GST_PAD_CAPS (basesrc->srcpad));
-
-  nicesrc->outbuf = GST_BUFFER_CAST (mybuf);
+  nicesrc->flow_ret = gst_pad_alloc_buffer (basesrc->srcpad, nicesrc->offset,
+      len, GST_PAD_CAPS (basesrc->srcpad), &nicesrc->outbuf);
+  if (nicesrc->flow_ret == GST_FLOW_OK) {
+    memcpy (nicesrc->outbuf->data, buf, len);
+    nicesrc->outbuf->size = len;
+  }
 
   g_main_loop_quit (nicesrc->mainloop);
 }
@@ -270,6 +267,7 @@ gst_nice_src_create (
   GST_LOG_OBJECT (nicesrc, "create called");
 
   nicesrc->outbuf = NULL;
+  nicesrc->offset = offset;
 
   GST_OBJECT_LOCK (basesrc);
   if (nicesrc->unlocked) {
@@ -284,13 +282,12 @@ gst_nice_src_create (
     GST_LOG_OBJECT (nicesrc, "Got buffer, pushing");
 
     *buffer = nicesrc->outbuf;
-    GST_BUFFER_OFFSET (*buffer) = offset;
-
-    return GST_FLOW_OK;
+    return nicesrc->flow_ret;
   } else {
     GST_LOG_OBJECT (nicesrc, "Got interrupting, returning wrong-state");
     return GST_FLOW_WRONG_STATE;
   }
+
 }
 
 static void
diff --git a/gst/gstnicesrc.h b/gst/gstnicesrc.h
index bac19a2..96e8f2a 100644
--- a/gst/gstnicesrc.h
+++ b/gst/gstnicesrc.h
@@ -40,7 +40,6 @@
 
 #include <gst/gst.h>
 #include <gst/base/gstbasesrc.h>
-#include <gst/netbuffer/gstnetbuffer.h>
 
 #include <nice/nice.h>
 
@@ -67,6 +66,8 @@ struct _GstNiceSrc
   guint stream_id;
   guint component_id;
   GMainLoop *mainloop;
+  guint64 offset;
+  GstFlowReturn flow_ret;
   GstBuffer *outbuf;
   gboolean unlocked;
   GSource *idle_source;