From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Sat, 14 Apr 2007 12:34:55 +0000 (+0000)
Subject: gst/gdp/gstgdppay.c (gst_gdp_pay_chain): tests/check/pipelines/streamheader.c (tag_ev... 
X-Git-Tag: 1.19.3~511^2~11204
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=66a6f3413c417792f62c6afb1a7d35d1cc606a3b;p=platform%2Fupstream%2Fgstreamer.git

gst/gdp/gstgdppay.c (gst_gdp_pay_chain): tests/check/pipelines/streamheader.c (tag_event_probe_cb,

Original commit message from CVS:
* gst/gdp/gstgdppay.c (gst_gdp_pay_chain):
* tests/check/pipelines/streamheader.c (tag_event_probe_cb,
GST_START_TEST, buffer_probe_cb, GST_START_TEST):
Fix a bug where serialized IN_CAPS buffers needed to be set IN_CAPS.
---

diff --git a/ChangeLog b/ChangeLog
index 057e0ed921..0e2349372e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-14  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/gdp/gstgdppay.c (gst_gdp_pay_chain):
+	* tests/check/pipelines/streamheader.c (tag_event_probe_cb,
+	  GST_START_TEST, buffer_probe_cb, GST_START_TEST):
+	  Fix a bug where serialized IN_CAPS buffers needed to be set IN_CAPS.
+
 2007-04-13  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* tests/check/pipelines/streamheader.c (tag_event_probe_cb,
diff --git a/gst/gdp/gstgdppay.c b/gst/gdp/gstgdppay.c
index 9f3e0d6313..554950d0ea 100644
--- a/gst/gdp/gstgdppay.c
+++ b/gst/gdp/gstgdppay.c
@@ -599,6 +599,15 @@ gst_gdp_pay_chain (GstPad * pad, GstBuffer * buffer)
   if (!outbuffer)
     goto no_buffer;
 
+  /* If the incoming buffer is IN_CAPS, that means we have it on the caps
+   * as streamheader, and we have serialized a GDP version of it and put it
+   * on our caps */
+  if (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_IN_CAPS)) {
+    GST_DEBUG_OBJECT (this, "Setting IN_CAPS flag on outgoing buffer %p",
+        outbuffer);
+    GST_BUFFER_FLAG_SET (outbuffer, GST_BUFFER_FLAG_IN_CAPS);
+  }
+
   gst_gdp_stamp_buffer (this, outbuffer);
   GST_BUFFER_TIMESTAMP (outbuffer) = GST_BUFFER_TIMESTAMP (buffer);
   GST_BUFFER_DURATION (outbuffer) = GST_BUFFER_DURATION (buffer);
diff --git a/tests/check/pipelines/streamheader.c b/tests/check/pipelines/streamheader.c
index c38ea585c5..ea9d9ee7ee 100644
--- a/tests/check/pipelines/streamheader.c
+++ b/tests/check/pipelines/streamheader.c
@@ -195,8 +195,7 @@ GST_START_TEST (test_multifdsink_gdp_vorbisenc)
 
   g_main_loop_run (loop);
 
-  //FIXME: here's the bug
-  //assert_equals_int (n_in_caps, 3);
+  assert_equals_int (n_in_caps, 3);
 }
 
 GST_END_TEST;