| From 12103842d5f347cf245e71071d0c44297bcdb1f9 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?= <eocanha@igalia.com> |
| Date: Fri, 4 Dec 2015 18:39:59 +0100 |
| Subject: [PATCH] Don't abort gst_omx_video_dec_set_format() if there's a |
| timeout releasing the buffers taken by the egl_render out port |
| |
| --- |
| omx/gstomxvideodec.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c |
| index 2368f34..da35e0d 100644 |
| --- a/omx/gstomxvideodec.c |
| +++ b/omx/gstomxvideodec.c |
| @@ -1905,8 +1905,11 @@ gst_omx_video_dec_set_format (GstVideoDecoder * decoder, |
| 5 * GST_SECOND) != OMX_ErrorNone) |
| return FALSE; |
| if (gst_omx_port_wait_buffers_released (out_port, |
| - 1 * GST_SECOND) != OMX_ErrorNone) |
| + 1 * GST_SECOND) != OMX_ErrorNone) { |
| +#if !(defined (USE_OMX_TARGET_RPI) && defined (HAVE_GST_GL)) |
| return FALSE; |
| +#endif |
| + } |
| if (gst_omx_port_deallocate_buffers (self->dec_in_port) != OMX_ErrorNone) |
| return FALSE; |
| if (gst_omx_video_dec_deallocate_output_buffers (self) != OMX_ErrorNone) |
| -- |
| 2.1.4 |
| |