Merge branch 'master' of https://github.com/tvdzwan/hyperion.git

Author: tvdzwan

CMakeLists.txt

@@ -13,6 +13,9 @@ option (ENABLE_SPIDEV   "Enable the SPIDEV device" ON)
 message(STATUS "ENABLE_DISPMANX = " ${ENABLE_DISPMANX})
 message(STATUS "ENABLE_SPIDEV   = " ${ENABLE_SPIDEV})
 
+option (ENABLE_V4L2 "Enable the V4L2 grabber" ON)
+message(STATUS "ENABLE_V4L2 = " ${ENABLE_V4L2})
+
 # Createt the configuration file
 # configure a header file to pass some of the CMake settings
 # to the source code

HyperionConfig.h.in

@@ -3,5 +3,8 @@
 // Define to enable the dispmanx grabber
 #cmakedefine ENABLE_DISPMANX
 
+// Define to enable the v4l2 grabber
+#cmakedefine ENABLE_V4L2
+
 // Define to enable the spi-device
 #cmakedefine ENABLE_SPIDEV

bin/copy_binaries_to_deploy.sh

@@ -22,6 +22,7 @@ tar --create --verbose --gzip --absolute-names --show-transformed-names \
 	--transform "s://:/:g" \
 	"$builddir/bin/hyperiond" \
 	"$builddir/bin/hyperion-remote" \
+	"$builddir/bin/hyperion-v4l2" \
 	"$builddir/bin/gpio2spi" \
 	"$builddir/bin/dispmanx2png" \
 	"$repodir/effects/"* \

bin/install_hyperion.sh

@@ -36,7 +36,7 @@ if [ $IS_OPENELEC -eq 1 ]; then
 	# OpenELEC has a readonly file system. Use alternative location
 	curl --get https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.tar.gz | tar -C /storage -xz
 	curl --get https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.deps.openelec-rpi.tar.gz | tar -C /storage/hyperion/bin -xz
-	
+
 	# modify the default config to have a correct effect path
 	sed -i 's:/opt:/storage:g' /storage/hyperion/config/hyperion.config.json
 else
@@ -47,6 +47,7 @@ fi
 if [ $IS_OPENELEC -ne 1 ]; then
 	ln -fs /opt/hyperion/bin/hyperiond /usr/bin/hyperiond
 	ln -fs /opt/hyperion/bin/hyperion-remote /usr/bin/hyperion-remote
+	ln -fs /opt/hyperion/bin/hyperion-v4l2 /usr/bin/hyperion-v4l2
 fi
 
 # create link to the gpio changer (gpio->spi)
@@ -62,7 +63,6 @@ if [ $IS_OPENELEC -eq 1 ]; then
 else
 	ln -s /opt/hyperion/config/hyperion.config.json /etc/hyperion.config.json
 fi
-	
 
 # Copy the service control configuration to /etc/int
 if [ $USE_INITCTL -eq 1 ]; then

config/hyperion.config.json

@@ -56,21 +56,21 @@
 				"red" :
 				{
 					"threshold"  : 0.0000,
-					"gamma"      : 2.0000,
+					"gamma"      : 1.0000,
 					"blacklevel" : 0.0000,
 					"whitelevel" : 1.0000
 				},
 				"green" :
 				{
 					"threshold"  : 0.0000,
-					"gamma"      : 2.0000,
+					"gamma"      : 1.0000,
 					"blacklevel" : 0.0000,
 					"whitelevel" : 1.0000
 				},
 				"blue" :
 				{
 					"threshold"  : 0.0000,
-					"gamma"      : 2.0000,
+					"gamma"      : 1.0000,
 					"blacklevel" : 0.0000,
 					"whitelevel" : 1.0000
 				}
@@ -348,10 +348,12 @@
 	],
 
 	/// The black border configuration, contains the following items: 
-	///  * enable : true if the detector should be activated
+	///  * enable    : true if the detector should be activated
+	///  * threshold : Value below which a pixel is regarded as black (value between 0.0 and 1.0)
 	"blackborderdetector" : 
 	{
-		"enable" : true
+		"enable" : true,
+		"threshold" : 0.01
 	},
 
 	/// The configuration of the effect engine, contains the following items: 

config/hyperion_x86.config.json

@@ -13,9 +13,9 @@
 	"device" :
 	{
 		"name"       : "MyPi",
-		"type"       : "test",
-		"output"     : "~/hyperion.test.out",
-		"rate"       : 250000,
+		"type"       : "adalight",
+		"output"     : "/dev/ttyUSB0",
+		"rate"       : 115200,
 		"colorOrder" : "rgb"
 	},
 
@@ -348,10 +348,12 @@
 	],
 
 	/// The black border configuration, contains the following items: 
-	///  * enable : true if the detector should be activated
+	///  * enable    : true if the detector should be activated
+	///  * threshold : Value below which a pixel is regarded as black (value between 0.0 and 1.0)
 	"blackborderdetector" : 
 	{
-		"enable" : true
+		"enable" : true,
+		"threshold" : 0.01
 	},
 
 	/// The configuration of the effect engine, contains the following items: 
@@ -371,6 +373,38 @@
 		"duration_ms" : 3000
 	},
 
+	///  The configuration for the frame-grabber, contains the following items: 
+	///   * width        : The width of the grabbed frames [pixels]
+	///   * height       : The height of the grabbed frames [pixels]
+	///   * frequency_Hz : The frequency of the frame grab [Hz]
+// 	"framegrabber" : 
+// 	{
+// 		"width" : 64,
+// 		"height" : 64,
+// 		"frequency_Hz" : 10.0
+// 	},
+
+	/// The configuration of the XBMC connection used to enable and disable the frame-grabber. Contains the following fields: 
+	///  * xbmcAddress       : The IP address of the XBMC-host
+	///  * xbmcTcpPort       : The TCP-port of the XBMC-server
+	///  * grabVideo         : Flag indicating that the frame-grabber is on(true) during video playback
+	///  * grabPictures      : Flag indicating that the frame-grabber is on(true) during picture show
+	///  * grabAudio         : Flag indicating that the frame-grabber is on(true) during audio playback
+	///  * grabMenu          : Flag indicating that the frame-grabber is on(true) in the XBMC menu
+	///  * grabScreensaver   : Flag indicating that the frame-grabber is on(true) when XBMC is on screensaver
+	///  * enable3DDetection : Flag indicating that the frame-grabber should switch to a 3D compatible modus if a 3D video is playing
+// 	"xbmcVideoChecker" : 
+// 	{
+// 		"xbmcAddress" : "127.0.0.1",
+// 		"xbmcTcpPort" : 9090,
+// 		"grabVideo" : true,
+// 		"grabPictures" : true,
+// 		"grabAudio" : true,
+// 		"grabMenu" : false,
+// 		"grabScreensaver" : true,
+// 		"enable3DDetection" : true
+// 	},
+
 	/// The configuration of the Json server which enables the json remote interface
 	///  * port : Port at which the json server is started
 	"jsonServer" : 

dependencies/build/getoptPlusPlus/getoptpp.cc

@@ -120,7 +120,7 @@ void OptionsParser::usage() const {
    for(i = parameters.parameters.begin();
 		   i != parameters.parameters.end(); i++)
    {
-	   cerr.width(30);
+	   cerr.width(33);
 	   cerr << std::left << "    " + (*i)->usageLine();
 
 	   cerr.width(40);

deploy/hyperion.deps.openelec-rpi.tar.gz

@@ -48,8 +48,9 @@ namespace hyperion
 	public:
 		///
 		/// Constructs a black-border detector
+		/// @param[in] blackborderThreshold The threshold which the blackborder detector should use
 		///
-		BlackBorderDetector();
+		BlackBorderDetector(uint8_t blackborderThreshold);
 
 		///
 		/// Performs the actual black-border detection on the given image
@@ -125,7 +126,11 @@ namespace hyperion
 		inline bool isBlack(const Pixel_T & color)
 		{
 			// Return the simple compare of the color against black
-			return color.red < 3 && color.green < 3 && color.green < 3;
+			return color.red < _blackborderThreshold && color.green < _blackborderThreshold && color.green < _blackborderThreshold;
 		}
+
+	private:
+		/// Threshold for the blackborder detector [0 .. 255]
+		const uint8_t _blackborderThreshold;
 	};
 } // end namespace hyperion