summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2019-03-26 16:12:36 -0400
committerScott Murray <scott.murray@konsulko.com>2019-03-26 16:16:02 -0400
commitefc9161e0887f1ce8d2fa3d59b62087a8552b638 (patch)
treeb3a00edf61a2f0fc440389f5307b370134792b44
parent37ca895c177f2c33207ae580dda3ad7d87ca609b (diff)
Add waylandsink fallback
Add a check for vaapisink availability, and fall back to using waylandsink if it is unavailable. This should allow using a non-Intel board for the cluster demo, though there are potentially issues around having a H.264 decoder plugin available that may need to be addressed in the target platform BSP (e.g. Raspberry Pi). Change-Id: Ie351fe0cd6e36e3db6707b9202b3b1fd7c66d3ce Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-rw-r--r--app/main.cpp23
1 files changed, 22 insertions, 1 deletions
diff --git a/app/main.cpp b/app/main.cpp
index 400a066..967f5e4 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -20,6 +20,8 @@
#include <gst/gst.h>
#include "surface.hpp"
+#undef DEBUG
+
int main(int argc, char *argv[])
{
int port = 0;
@@ -49,11 +51,30 @@ int main(int argc, char *argv[])
//
// videotestsrc pattern=smpte ! video/x-raw,format=BGRx,width=384,height=368 ! waylandsink
//
+
std::string pipeline_str = \
- "udpsrc port=5005 ! application/x-rtp,media=video,encoding-name=H264 ! queue ! rtph264depay ! h264parse config-interval=1 disable-passthrough=true ! decodebin ! vaapisink";
+ "udpsrc port=5005 ! application/x-rtp,media=video,encoding-name=H264 ! queue ! rtph264depay ! h264parse config-interval=1 disable-passthrough=true ! decodebin ! ";
+ GstPlugin *plugin = gst_registry_find_plugin(gst_registry_get (), "vaapisink");
+ if(plugin) {
+ pipeline_str += "vaapisink";
+ gst_object_unref(plugin);
+ } else {
+ pipeline_str += "videoconvert ! video/x-raw,format=BGRx,width=384,height=368 ! waylandsink";
+ }
+#ifdef DEBUG
+ std::cout << "Using pipeline: " << pipeline_str << std::endl;
+#endif
// Initialize GStreamer
+#ifdef DEBUG
+ int gargc = 2;
+ char **gargv = (char**) malloc(2 * sizeof(char*));
+ gargv[0] = strdup(argv[0]);
+ gargv[1] = strdup("--gst-debug-level=2");
+ gst_init(&gargc, &gargv);
+#else
gst_init(NULL, NULL);
+#endif
// Create our IVI surface handler
SurfaceHandler handler(port, token, role);