mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-10 16:45:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/x264/gstx264enc.c: Try harder not to crash when we get an EOS event but haven't set up the encoder yet (as may ha...

Browse source 
Original commit message from CVS:
* ext/x264/gstx264enc.c: (gst_x264_enc_header_buf),
(gst_x264_enc_sink_event), (gst_x264_enc_chain),
(gst_x264_enc_encode_frame):
Try harder not to crash when we get an EOS event but haven't set
up the encoder yet (as may happen when upstream errors out with
not-negotiated, for example). Also, always push the EOS event
downstream.
This commit is contained in:
Tim-Philipp Müller 2008-06-04 11:33:21 +00:00
parent 165253fdef
commit 7567247554
2 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2008-06-04 Tim-Philipp Müller <tim.muller at collabora co uk>
* ext/x264/gstx264enc.c: (gst_x264_enc_header_buf),
(gst_x264_enc_sink_event), (gst_x264_enc_chain),
(gst_x264_enc_encode_frame):
Try harder not to crash when we get an EOS event but haven't set
up the encoder yet (as may happen when upstream errors out with
not-negotiated, for example). Also, always push the EOS event
downstream.
2008-06-04 Sebastian Dröge <slomo@circular-chaos.org>
* gst/interleave/interleave.c: (gst_interleave_pad_get_type),

29
ext/x264/gstx264enc.c
View file

@ -220,6 +220,9 @@ gst_x264_enc_header_buf (GstX264Enc * encoder)
guint8 *buffer, *sps;
gulong buffer_size;
if (G_UNLIKELY (encoder->x264enc == NULL))
return NULL;
/* Create avcC header. */
header_return = x264_encoder_headers (encoder->x264enc, &nal, &i_nal);
@ -681,25 +684,23 @@ gst_x264_enc_sink_event (GstPad * pad, GstEvent * event)
{
gboolean ret;
GstX264Enc *encoder;
GstFlowReturn flow_ret;
int i_nal;
encoder = GST_X264_ENC (gst_pad_get_parent (pad));
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_EOS:
/* send the rest NAL units */
case GST_EVENT_EOS:{
GstFlowReturn flow_ret;
int i_nal;
/* first send the rest NAL units */
do {
flow_ret = gst_x264_enc_encode_frame (encoder, NULL, &i_nal);
} while (flow_ret == GST_FLOW_OK && i_nal > 0);
/* send EOS */
if (flow_ret == GST_FLOW_OK) {
ret = gst_pad_push_event (encoder->srcpad, event);
} else {
ret = FALSE;
}
/* then push the EOS downstream */
ret = gst_pad_push_event (encoder->srcpad, event);
break;
}
default:
ret = gst_pad_push_event (encoder->srcpad, event);
break;
@ -779,10 +780,9 @@ gst_x264_enc_chain (GstPad * pad, GstBuffer * buf)
/* ERRORS */
not_inited:
{
GST_ELEMENT_ERROR (encoder, CORE, NEGOTIATION, (NULL),
("Got buffer before pads were fully negotiated"));
GST_WARNING_OBJECT (encoder, "Got buffer before set_caps was called");
gst_buffer_unref (buf);
return GST_FLOW_ERROR;
return GST_FLOW_NOT_NEGOTIATED;
}
wrong_buffer_size:
{
@ -810,6 +810,9 @@ gst_x264_enc_encode_frame (GstX264Enc * encoder, x264_picture_t * pic_in,
GstClockTime timestamp;
GstClockTime duration;
if (G_UNLIKELY (encoder->x264enc == NULL))
return GST_FLOW_NOT_NEGOTIATED;
encoder_return = x264_encoder_encode (encoder->x264enc,
&nal, i_nal, pic_in, &pic_out);