mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 20:51:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

gdppay: fixup for changed caps

Browse source 
Try to send the streamheader after the first buffer.
This commit is contained in:
Wim Taymans 2012-02-03 11:38:15 +01:00
parent 1dfb84e3c5
commit 3a11210bc2
1 changed files with 4 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gst/gdp/gstgdppay.c
View file

@ -546,6 +546,8 @@ gst_gdp_queue_buffer (GstGDPPay * this, GstBuffer * buffer)
"queued buffer %p, now %d buffers queued", "queued buffer %p, now %d buffers queued",
buffer, g_list_length (this->queue)); buffer, g_list_length (this->queue));
gst_gdp_pay_reset_streamheader (this);
return GST_FLOW_OK; return GST_FLOW_OK;
} }
@ -587,34 +589,10 @@ gst_gdp_pay_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
this->new_segment_buf = outbuffer; this->new_segment_buf = outbuffer;
} }
} }
#if 0
/* make sure we've received caps before */ /* make sure we've received caps before */
caps = gst_buffer_get_caps (buffer); if (!this->caps)
if (!this->caps && !caps)
goto no_caps; goto no_caps;
/* if the caps have changed, process caps first */
if (caps && !gst_caps_is_equal (this->caps, caps)) {
GST_LOG_OBJECT (this, "caps changed to %p, %" GST_PTR_FORMAT, caps, caps);
gst_caps_replace (&(this->caps), caps);
outbuffer = gst_gdp_buffer_from_caps (this, caps);
if (!outbuffer)
goto no_caps_buffer;
GST_BUFFER_TIMESTAMP (outbuffer) = GST_BUFFER_TIMESTAMP (buffer);
GST_BUFFER_DURATION (outbuffer) = 0;
GST_BUFFER_FLAG_SET (outbuffer, GST_BUFFER_FLAG_HEADER);
if (this->caps_buf)
gst_buffer_unref (this->caps_buf);
this->caps_buf = outbuffer;
gst_gdp_pay_reset_streamheader (this);
}
if (caps)
gst_caps_unref (caps);
#endif
/* create a GDP header packet, /* create a GDP header packet,
* then create a GST buffer of the header packet and the buffer contents */ * then create a GST buffer of the header packet and the buffer contents */
outbuffer = gst_gdp_pay_buffer_from_buffer (this, buffer); outbuffer = gst_gdp_pay_buffer_from_buffer (this, buffer);
@ -642,18 +620,16 @@ done:
return ret; return ret;
/* ERRORS */ /* ERRORS */
#if 0
no_caps: no_caps:
{ {
/* when returning a fatal error as a GstFlowReturn we must post an error /* when returning a fatal error as a GstFlowReturn we must post an error
* message */ * message */
GST_ELEMENT_ERROR (this, STREAM, FORMAT, (NULL), GST_ELEMENT_ERROR (this, STREAM, FORMAT, (NULL),
("first received buffer does not have caps set")); ("first received buffer does not have caps set"));
if (caps)
gst_caps_unref (caps);
ret = GST_FLOW_NOT_NEGOTIATED; ret = GST_FLOW_NOT_NEGOTIATED;
goto done; goto done;
} }
#if 0
no_caps_buffer: no_caps_buffer:
{ {
GST_ELEMENT_ERROR (this, STREAM, ENCODE, (NULL), GST_ELEMENT_ERROR (this, STREAM, ENCODE, (NULL),