summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2018-03-08 13:53:52 +0200
committerAndrei Gherzan <andrei@gherzan.com>2018-03-08 21:57:25 +0000
commit79ea44b997a6eb6e2f0d36b1d583c85fa9e37f36 (patch)
tree09b0b8257dbb8c3378d36db604ef614aaac5aaf0 /recipes-multimedia
parentabd453d7da0c5e1ff3262a6e3d528e44cb2f4792 (diff)
downloadmeta-raspberrypi-79ea44b997a6eb6e2f0d36b1d583c85fa9e37f36.tar.gz
gstreamer1.0-omx: remove unused patches
Remove the following unused patches: 1. 0002-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch 2. 0003-fix-decoder-flushing.patch Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat (limited to 'recipes-multimedia')
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-omx/0002-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch47
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-omx/0003-fix-decoder-flushing.patch15
2 files changed, 0 insertions, 62 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx/0002-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch b/recipes-multimedia/gstreamer/gstreamer1.0-omx/0002-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch
deleted file mode 100644
index aef21a5..0000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-omx/0002-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 2e111e52f96f0b942abda120c30a876629bd73fc Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?= <eocanha@igalia.com>
3Date: Mon, 25 May 2015 14:53:35 +0200
4Subject: [PATCH] Don't try to acquire buffer when src pad isn't active
5
6This solves a race condition when setting the pipeline from PAUSE to
7NULL while the decoder loop is still running. Without this patch, the
8thread which interacts with the decode sink pad gets blocked here:
9
10 gst_element_change_state()
11 gst_element_change_state_func()
12 gst_element_pads_activate() --> Deactivating pads
13 activate_pads()
14 gst_pad_set_active()
15 gst_pad_activate_mode()
16 post_activate()
17 GST_PAD_STREAM_LOCK()
18
19while gst_omx_port_acquire_buffer() gets stalled forever in
20gst_omx_component_wait_message() waiting for a message that will never
21arrive:
22
23 gst_omx_video_dec_loop()
24 gst_omx_port_acquire_buffer()
25 gst_omx_component_wait_message()
26---
27 omx/gstomxvideodec.c | 5 +++++
28 1 file changed, 5 insertions(+)
29
30diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
31index cd24944..57a61dd 100644
32--- a/omx/gstomxvideodec.c
33+++ b/omx/gstomxvideodec.c
34@@ -1247,6 +1247,11 @@ gst_omx_video_dec_loop (GstOMXVideoDec * self)
35 GstClockTimeDiff deadline;
36 OMX_ERRORTYPE err;
37
38+ if (!gst_pad_is_active(GST_VIDEO_DECODER_SRC_PAD (self))) {
39+ GST_DEBUG_OBJECT (self, "Src pad not active, not acquiring buffer and flushing instead");
40+ goto flushing;
41+ }
42+
43 #if defined (USE_OMX_TARGET_RPI) && defined (HAVE_GST_GL)
44 port = self->eglimage ? self->egl_out_port : self->dec_out_port;
45 #else
46--
471.8.3.2
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx/0003-fix-decoder-flushing.patch b/recipes-multimedia/gstreamer/gstreamer1.0-omx/0003-fix-decoder-flushing.patch
deleted file mode 100644
index a244b09..0000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-omx/0003-fix-decoder-flushing.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1diff --git a/omx/gstomx.c b/omx/gstomx.c
2index 69696c4..c382019 100644
3--- a/omx/gstomx.c
4+++ b/omx/gstomx.c
5@@ -1508,8 +1508,8 @@ gst_omx_port_set_flushing (GstOMXPort * port, GstClockTime timeout,
6 last_error = OMX_ErrorNone;
7 gst_omx_component_handle_messages (comp);
8 while (signalled && last_error == OMX_ErrorNone && !port->flushed
9- && port->buffers
10- && port->buffers->len > g_queue_get_length (&port->pending_buffers)) {
11+ /* && port->buffers
12+ && port->buffers->len > g_queue_get_length (&port->pending_buffers) */) {
13 signalled = gst_omx_component_wait_message (comp, timeout);
14 if (signalled)
15 gst_omx_component_handle_messages (comp);