commit 5e6a7a8db745270e82dc0ff48dce2549a6d6088c
author Jonas Larsson <ljonas@google.com> Tue Oct 08 22:43:41 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 08 22:43:41 2019 +0000
tree 1f12af9544e6a16bc7c9f5f5cdf6f6e537771f95
parent b8e20b4fc1b142de76038041e78385e510524adb
parent ee8fe33b336de2b81928bb8e69e869d21e7822b6

Merge "Fix compatibility with glfilterbin, glvideoflip"

edgetpuvision/pipelines.py

diff --git a/edgetpuvision/pipelines.py b/edgetpuvision/pipelines.py
index 421db0c..95eaa50 100644
--- a/edgetpuvision/pipelines.py
+++ b/edgetpuvision/pipelines.py
@@ -36,9 +36,7 @@
 def inference_pipeline(layout, stillimage=False):
     size = max_inner_size(layout.render_size, layout.inference_size)
     return [
-        Filter('glupload'),
-        Filter('glbox'),
-        Filter('gldownload'),
+        Filter('glfilterbin', filter='glbox'),
         Caps('video/x-raw', format='RGB', width=layout.inference_size.width, height=layout.inference_size.height),
         Sink('app', name='appsink', emit_signals=True, max_buffers=1, drop=True, sync=False),
     ]

plugins/glbox.py

diff --git a/plugins/glbox.py b/plugins/glbox.py
index 4ecb0d3..1f44039 100644
--- a/plugins/glbox.py
+++ b/plugins/glbox.py
@@ -37,8 +37,7 @@
 SINK_CAPS = 'video/x-raw(memory:GLMemory),format=RGBA,width=[1,{max_int}],height=[1,{max_int}],texture-target=2D'
 SINK_CAPS = Gst.Caps.from_string(SINK_CAPS.format(max_int=GLib.MAXINT))
 
-SRC_CAPS = 'video/x-raw(memory:GLMemory),format=RGB,width=[1,{max_int}],height=[1,{max_int}],texture-target=2D'
-SRC_CAPS += '; video/x-raw(memory:GLMemory),format=RGBA,width=[1,{max_int}],height=[1,{max_int}],texture-target=2D'
+SRC_CAPS = 'video/x-raw(memory:GLMemory),format=RGBA,width=[1,{max_int}],height=[1,{max_int}],texture-target=2D'
 SRC_CAPS = Gst.Caps.from_string(SRC_CAPS.format(max_int=GLib.MAXINT))
 
 VERTEX_SHADER = '''