From dd07a36962c78103f9d183b369b466efef30888a Mon Sep 17 00:00:00 2001 From: Harunobu Kurokawa Date: Mon, 10 Jun 2019 16:23:24 +0900 Subject: gst-record: switch to remote plugin from old style gst-record weston 6.0.0 has already merged remoting plugin feature. This commit enable to add remoting plugin library. To activate remoting output and transfer it, user should add "remote-output" configuration in weston.ini. Bug-AGL : SPEC-2420 Change-Id: Ieeb3760ece5c6a1d19f9a08ee7f0ed973cc433ec Signed-off-by: Harunobu Kurokawa --- .../0005-gst-record-Add-omx-pool-retries.patch | 51 ---------------------- 1 file changed, 51 deletions(-) delete mode 100644 meta-gstrecorder-rcar-gen3/recipes-graphics/wayland/weston/0005-gst-record-Add-omx-pool-retries.patch (limited to 'meta-gstrecorder-rcar-gen3/recipes-graphics/wayland/weston/0005-gst-record-Add-omx-pool-retries.patch') diff --git a/meta-gstrecorder-rcar-gen3/recipes-graphics/wayland/weston/0005-gst-record-Add-omx-pool-retries.patch b/meta-gstrecorder-rcar-gen3/recipes-graphics/wayland/weston/0005-gst-record-Add-omx-pool-retries.patch deleted file mode 100644 index d6a7a1b3..00000000 --- a/meta-gstrecorder-rcar-gen3/recipes-graphics/wayland/weston/0005-gst-record-Add-omx-pool-retries.patch +++ /dev/null @@ -1,51 +0,0 @@ -gst-record: Add retry on omx buffer pool query - -The omx encoder plugin seems to sometimes not be ready immediately to -answer the pad query to get the buffer pool, add a retry loop with a -slight delay between attempts to avoid failing. - -Upstream-Status: Inappropriate [bugfix] - -Signed-off-by: Scott Murray - -diff --git a/libweston/gst-recorder.c b/libweston/gst-recorder.c -index 7dafd956..9c29d04b 100644 ---- a/libweston/gst-recorder.c -+++ b/libweston/gst-recorder.c -@@ -833,6 +833,7 @@ static int - gst_recorder_find_omx_pool(struct gst_recorder *r) - { - int ret = 0; -+ int i; - GstCaps *caps; - GstQuery *query; - GstBufferPool *pool; -@@ -853,14 +854,24 @@ gst_recorder_find_omx_pool(struct gst_recorder *r) - /* find a pool for the negotiated caps now */ - query = gst_query_new_allocation (caps, TRUE); - -- if (!gst_pad_peer_query (r->appsrc_pad, query)) { -- /* query failed, not a problem, we use the query defaults */ -- weston_log("allocation query failed\n"); -+ /* -+ * The omx plugin seems to not always be ready to respond to queries -+ * immediately, try a few times with a delay to avoid failures. -+ */ -+ for (i = 0; i < 5; i++) { -+ usleep(100000); -+ if (gst_pad_peer_query (r->appsrc_pad, query)) { -+ break; -+ } else { -+ weston_log("allocation query attempt %d failed\n", i + 1); -+ } -+ } -+ if (i == 5) { - ret = -1; - goto err; - } - -- weston_log("goot %d pools\n", gst_query_get_n_allocation_pools (query)); -+ weston_log("got %d pools\n", gst_query_get_n_allocation_pools (query)); - if (gst_query_get_n_allocation_pools (query) > 0) { - /* we got configuration from our peer, parse them */ - gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max); -- cgit 1.2.3-korg