| Patrick Williams | 8b8bc41 | 2016-08-17 15:02:23 -0500 | [diff] [blame] | 1 | From 12103842d5f347cf245e71071d0c44297bcdb1f9 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?= <eocanha@igalia.com> |
| 3 | Date: Fri, 4 Dec 2015 18:39:59 +0100 |
| 4 | Subject: [PATCH] Don't abort gst_omx_video_dec_set_format() if there's a |
| 5 | timeout releasing the buffers taken by the egl_render out port |
| 6 | |
| 7 | --- |
| 8 | omx/gstomxvideodec.c | 5 ++++- |
| 9 | 1 file changed, 4 insertions(+), 1 deletion(-) |
| 10 | |
| 11 | diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c |
| 12 | index 2368f34..da35e0d 100644 |
| 13 | --- a/omx/gstomxvideodec.c |
| 14 | +++ b/omx/gstomxvideodec.c |
| 15 | @@ -1905,8 +1905,11 @@ gst_omx_video_dec_set_format (GstVideoDecoder * decoder, |
| 16 | 5 * GST_SECOND) != OMX_ErrorNone) |
| 17 | return FALSE; |
| 18 | if (gst_omx_port_wait_buffers_released (out_port, |
| 19 | - 1 * GST_SECOND) != OMX_ErrorNone) |
| 20 | + 1 * GST_SECOND) != OMX_ErrorNone) { |
| 21 | +#if !(defined (USE_OMX_TARGET_RPI) && defined (HAVE_GST_GL)) |
| 22 | return FALSE; |
| 23 | +#endif |
| 24 | + } |
| 25 | if (gst_omx_port_deallocate_buffers (self->dec_in_port) != OMX_ErrorNone) |
| 26 | return FALSE; |
| 27 | if (gst_omx_video_dec_deallocate_output_buffers (self) != OMX_ErrorNone) |
| 28 | -- |
| 29 | 2.1.4 |
| 30 | |