mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapiencode: fix error handling while allocating output buffers.

Browse source 
Fix default GstVideoEncoder::allocate_buffer() implementation to properly
unmap the coded buffer prior to returning an error.
This commit is contained in:
Gwenole Beauchesne 2013-11-26 17:26:44 +01:00
parent a6b8f94470
commit 207264abc4
1 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
gst/vaapi/gstvaapiencode.c
View file

@ -129,6 +129,7 @@ static GstFlowReturn
gst_vaapiencode_default_allocate_buffer (GstVaapiEncode * encode,
GstVaapiCodedBuffer * coded_buf, GstBuffer ** outbuf_ptr)
{
GstVideoEncoder *const venc = GST_VIDEO_ENCODER_CAST (encode);
GstBuffer *buf;
gint32 buf_size;
@ -139,27 +140,39 @@ gst_vaapiencode_default_allocate_buffer (GstVaapiEncode * encode,
return GST_VAAPI_ENCODE_FLOW_MEM_ERROR;
buf_size = gst_vaapi_coded_buffer_get_size (coded_buf);
if (buf_size <= 0) {
GST_ERROR ("get GstVaapiCodedBuf buffer size:%d", buf_size);
return GST_VAAPI_ENCODE_FLOW_MEM_ERROR;
}
if (buf_size <= 0)
goto error_invalid_buffer;
buf =
gst_video_encoder_allocate_output_buffer (GST_VIDEO_ENCODER_CAST (encode),
buf_size);
if (!buf) {
GST_ERROR ("failed to allocate output buffer of size %d", buf_size);
return GST_VAAPI_ENCODE_FLOW_MEM_ERROR;
}
buf = gst_video_encoder_allocate_output_buffer (venc, buf_size);
if (!buf)
goto error_create_buffer;
if (!gst_vaapi_coded_buffer_get_buffer (coded_buf, buf))
goto error_copy_buffer;
if (!gst_vaapi_coded_buffer_get_buffer (coded_buf, buf)) {
GST_ERROR ("failed to get encoded buffer");
gst_buffer_replace (&buf, NULL);
return GST_VAAPI_ENCODE_FLOW_MEM_ERROR;
}
gst_vaapi_coded_buffer_unmap (coded_buf);
*outbuf_ptr = buf;
return GST_FLOW_OK;
/* ERRORS */
error_invalid_buffer:
{
GST_ERROR ("invalid GstVaapiCodedBuffer size (%d)", buf_size);
gst_vaapi_coded_buffer_unmap (coded_buf);
return GST_VAAPI_ENCODE_FLOW_MEM_ERROR;
}
error_create_buffer:
{
GST_ERROR ("failed to create output buffer of size %d", buf_size);
gst_vaapi_coded_buffer_unmap (coded_buf);
return GST_VAAPI_ENCODE_FLOW_MEM_ERROR;
}
error_copy_buffer:
{
GST_ERROR ("failed to copy GstVaapiCodedBuffer data");
gst_buffer_unref (buf);
gst_vaapi_coded_buffer_unmap (coded_buf);
return GST_VAAPI_ENCODE_FLOW_MEM_ERROR;
}
}
static GstFlowReturn