mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 16:21:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

omxvideodec: Error out if the GStreamer allocated buffer is smaller than the OpenMAX output buffer

Browse source 
Usually this must never happen but currently it happens during reconfigurations
because of a race condition. Still it's better than crashing.
This commit is contained in:
Sebastian Dröge 2011-07-06 13:19:15 +02:00
parent 5d4f7890c2
commit 9a3753bd61
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
omx/gstomxvideodec.c
View file

@ -354,9 +354,23 @@ gst_omx_video_dec_loop (GstOMXVideoDec * self)
} else if (buf->omx_buf->nFilledLen > 0) { } else if (buf->omx_buf->nFilledLen > 0) {
if (gst_base_video_decoder_alloc_src_frame (GST_BASE_VIDEO_DECODER (self), if (gst_base_video_decoder_alloc_src_frame (GST_BASE_VIDEO_DECODER (self),
frame) == GST_FLOW_OK) { frame) == GST_FLOW_OK) {
memcpy (GST_BUFFER_DATA (frame->src_buffer), /* FIXME: This currently happens because of a race condition too.
buf->omx_buf->pBuffer + buf->omx_buf->nOffset, * We first need to reconfigure the output port and then the input
buf->omx_buf->nFilledLen); * port if both need reconfiguration.
*/
if (GST_BUFFER_SIZE (frame->src_buffer) >= buf->omx_buf->nFilledLen) {
memcpy (GST_BUFFER_DATA (frame->src_buffer),
buf->omx_buf->pBuffer + buf->omx_buf->nOffset,
buf->omx_buf->nFilledLen);
} else {
GST_ERROR_OBJECT (self, "Invalid frame size (%u < %u)",
GST_BUFFER_SIZE (frame->src_buffer), buf->omx_buf->nFilledLen);
gst_buffer_replace (&frame->src_buffer, NULL);
g_slice_free (BufferIdentification, frame->coder_hook);
gst_base_video_decoder_finish_frame (GST_BASE_VIDEO_DECODER (self),
frame);
goto invalid_frame_size;
}
} }
g_slice_free (BufferIdentification, frame->coder_hook); g_slice_free (BufferIdentification, frame->coder_hook);
flow_ret = flow_ret =
@ -423,6 +437,14 @@ reconfigure_error:
gst_pad_pause_task (GST_BASE_VIDEO_CODEC_SRC_PAD (self)); gst_pad_pause_task (GST_BASE_VIDEO_CODEC_SRC_PAD (self));
return; return;
} }
invalid_frame_size:
{
GST_ELEMENT_ERROR (self, LIBRARY, SETTINGS, (NULL), ("Invalid frame size"));
gst_pad_push_event (GST_BASE_VIDEO_CODEC_SRC_PAD (self),
gst_event_new_eos ());
gst_pad_pause_task (GST_BASE_VIDEO_CODEC_SRC_PAD (self));
return;
}
} }
static gboolean static gboolean