opencvlux config

diff --git a/examples/opencvluxconfig b/examples/opencvluxconfig
new file mode 100644 (file)
index 0000000..9ba13ad
--- /dev/null
+++ b/examples/opencvluxconfig
@@ -0,0 +1,25 @@
+{
+       "mainloop" : "/usr/lib/automotive-message-broker/qtmainloopplugin.so",
+       "sources" : [ 
+               {
+                       "name" : "OpenCV Lux plugin",
+                       "path" : "/usr/lib/automotive-message-broker/opencvluxplugin.so",
+                       "threaded" : "true",
+                       "kinect" : "false",
+                       "opencl" : "false",
+                       "pixelLowerBound" : "0",
+                       "pixelUpperBound" : "255",
+                       "fps" : "30",
+                       "device" : "0"
+               }
+       ],
+       "sinks": [
+               {
+                       "name" : "Example sink",
+                       "path" : "/usr/lib/automotive-message-broker/examplesinkplugin.so",
+                       "interface" : "lo",
+                       "port" : "23000"
+               } 
+       ]
+}
+

diff --git a/examples/websinkssl b/examples/websinkssl
new file mode 100644 (file)
index 0000000..f4eca85
--- /dev/null
+++ b/examples/websinkssl
@@ -0,0 +1,20 @@
+{
+       "sources" : [ 
+               {
+                       "name" : "example",
+                       "path" : "/usr/lib/automotive-message-broker/examplesourceplugin.so"
+               }
+       ],
+       "sinks": [
+               {
+                       "name" : "WebSocketSink",
+                       "path" : "/usr/lib/automotive-message-broker/websocketsinkplugin.so",
+                       "cert" : "libwebsockets-test-server.pem",
+                       "key" : "libwebsockets-test-server.key.pem",
+                       "interface" : "eth0",
+                       "port" : "23000",
+                       "ssl" : "true"
+               } 
+       ]
+}
+

diff --git a/plugins/opencvlux/opencvluxplugin.cpp b/plugins/opencvlux/opencvluxplugin.cpp
index 4cf47d1..449014a 100644 (file)
--- a/plugins/opencvlux/opencvluxplugin.cpp
+++ b/plugins/opencvlux/opencvluxplugin.cpp
@@ -216,14 +216,21 @@ void OpenCvLuxPlugin::grabImage()
 
 uint OpenCvLuxPlugin::evalImage(cv::Mat qImg)
 {
-#ifdef OPENCL
        cv::Scalar avgPixelIntensity;
-       cv::Scalar stdDev;
 
-       cv::ocl::meanStdDev(qImg, avgPixelIntensity, stdDev);
-#else
-       cv::Scalar avgPixelIntensity = cv::mean(qImg);
+
+       if(useOpenCl)
+       {
+#ifdef OPENCL
+               cv::Scalar stdDev;
+               cv::ocl::meanStdDev(qImg, avgPixelIntensity, stdDev);
 #endif
+       }
+       else
+       {
+               cv::Scalar avgPixelIntensity = cv::mean(qImg);
+       }
+
 
        double val = avgPixelIntensity.val[0];