Added support for high-res 1280x1024 IR and Image (at ~10 FPS)

avin2 · avin2 · commit cc3dd7c3e0bd · 2010-12-12T03:03:14.000+02:00
diff --git a/Bin/SensorKinect-Win32-5.0.0.exe b/Bin/SensorKinect-Win32-5.0.0.exe
diff --git a/OpenNI/Data/SamplesConfig.xml b/OpenNI/Data/SamplesConfig.xml
@@ -0,0 +1,66 @@
+<OpenNI>
+	<Licenses>
+		<!-- Add licenses here 
+		<License vendor="vendor" key="key"/>
+		-->
+	</Licenses>
+	<Log writeToConsole="true" writeToFile="false">
+		<!-- 0 - Verbose, 1 - Info, 2 - Warning, 3 - Error (default) -->
+		<LogLevel value="3"/>
+		<Masks>
+			<Mask name="ALL" on="false"/>
+		</Masks>
+		<Dumps>
+		</Dumps>
+	</Log>
+	<ProductionNodes>	
+		<!-- Normal Image -->
+		<Node type="Image" name="Image1">
+			<Configuration>
+				<MapOutputMode xRes="640" yRes="480" FPS="30"/>
+				<Mirror on="true"/>
+			</Configuration>
+		</Node>	
+	
+		<!-- HighRes Image -->
+		<!--
+		<Node type="Image" name="Image1">
+			<Configuration>
+				<MapOutputMode xRes="1280" yRes="1024" FPS="15"/>
+				<Mirror on="true"/>
+			</Configuration>
+		</Node>
+		-->
+		
+		<!-- Normal IR -->
+		<!--
+		<Node type="IR" name="IR1">
+			<Configuration>
+				<MapOutputMode xRes="640" yRes="480" FPS="30"/>
+				<Mirror on="true"/>
+			</Configuration>
+		</Node>
+		-->
+		
+		<!-- HighRes IR -->
+		<!--
+		<Node type="IR" name="IR1">
+			<Configuration>
+				<MapOutputMode xRes="1280" yRes="1024" FPS="15"/>
+				<Mirror on="true"/>
+			</Configuration>
+		</Node>		
+		-->
+		
+		<Node type="Depth" name="Depth1">
+			<Configuration>
+				<MapOutputMode xRes="640" yRes="480" FPS="30"/>
+				<Mirror on="true"/>
+			</Configuration>
+		</Node>
+		<!--
+		<Node type="Audio" name="Audio1">
+		</Node>
+		-->
+	</ProductionNodes>
+</OpenNI>
diff --git a/README b/README
@@ -5,6 +5,11 @@ Kinect Mod:
 -----------
 
 Changes:
+v0.3:
+	1) Added support for high-res 1280x1024 IR and Image (at ~10 FPS)
+	   Checkout the file OPENNI\Data\SamplesConfig.xml for usage example.
+	   (Copy it to your OpenNI\Data dir and use NiViewer to test the different resolutions)
+
 v0.2:
 	1) VS2010 redist will now be installed automatically.
 	2) The driver will now also be installed automatically on both x86 and x64 machines.
diff --git a/Source/XnDeviceSensorV2/XnDeviceSensorIO.cpp b/Source/XnDeviceSensorV2/XnDeviceSensorIO.cpp
@@ -34,10 +34,12 @@
 //---------------------------------------------------------------------------
 // Defines
 //---------------------------------------------------------------------------
-#define XN_SENSOR_VENDOR_ID			0x045E
+#define XN_SENSOR_VENDOR_ID			0x1D27
+#define XN_SENSOR_VENDOR_ID_KINECT	0x045E
 #define XN_SENSOR_2_0_PRODUCT_ID	0x0200
 #define XN_SENSOR_5_0_PRODUCT_ID	0x0500
-#define XN_SENSOR_6_0_PRODUCT_ID	0x02AE
+#define XN_SENSOR_6_0_PRODUCT_ID	0x0600
+#define XN_SENSOR_KINECT_PRODUCT_ID	0x02AE
 
 #if XN_PLATFORM == XN_PLATFORM_WIN32
 	#include <initguid.h>
@@ -102,7 +104,13 @@ XnStatus XnSensorIO::OpenDevice(const XnChar* strPath)
 		xnLogVerbose(XN_MASK_DEVICE_IO, "Can't find 5.0. Trying to open an older sensor...");
 		nRetVal = xnUSBOpenDevice(XN_SENSOR_VENDOR_ID, XN_SENSOR_2_0_PRODUCT_ID, USB_DEVICE_EXTRA_PARAM, (void*)strPath, &m_pSensorHandle->USBDevice);
 	}
-	
+	if (nRetVal == XN_STATUS_USB_DEVICE_NOT_FOUND)
+	{
+		// if not found, try the kinect
+		xnLogVerbose(XN_MASK_DEVICE_IO, "Can't find 2.0 - 4.0. Trying to open a kinect sensor...");
+		nRetVal = xnUSBOpenDevice(XN_SENSOR_VENDOR_ID_KINECT, XN_SENSOR_KINECT_PRODUCT_ID, USB_DEVICE_EXTRA_PARAM, (void*)strPath, &m_pSensorHandle->USBDevice);
+	}	
+
 	XN_IS_STATUS_OK(nRetVal);
 
 	nRetVal = xnUSBGetDeviceSpeed(m_pSensorHandle->USBDevice, &DevSpeed);
diff --git a/Source/XnDeviceSensorV2/XnFirmwareStreams.cpp b/Source/XnDeviceSensorV2/XnFirmwareStreams.cpp
@@ -117,11 +117,14 @@ XnStatus XnFirmwareStreams::CheckClaimStream(const XnChar* strType, XnResolution
 				XN_LOG_WARNING_RETURN(XN_STATUS_DEVICE_BAD_PARAM, XN_MASK_DEVICE_SENSOR, "Cannot set depth stream to resolution %d when IR is set to resolution %d!", nRes, pIRStreamData->nRes);
 			}
 
+			// Avin: Removed to enable 1280x1024 IR
+			/*
 			// check FPS
 			if (pIRStreamData->nFPS != nFPS)
 			{
 				XN_LOG_WARNING_RETURN(XN_STATUS_DEVICE_BAD_PARAM, XN_MASK_DEVICE_SENSOR, "Depth and IR streams must have the same FPS!");
 			}
+			*/
 		}
 	}
 	else if (strcmp(strType, XN_STREAM_TYPE_IR) == 0)
@@ -150,10 +153,14 @@ XnStatus XnFirmwareStreams::CheckClaimStream(const XnChar* strType, XnResolution
 			}
 
 			// check FPS
+			// Avin: Removed to enable 1280x1024 IR
+			/*
+			
 			if (pDepthStreamData->nFPS != nFPS)
 			{
 				XN_LOG_WARNING_RETURN(XN_STATUS_DEVICE_BAD_PARAM, XN_MASK_DEVICE_SENSOR, "Depth and IR streams must have the same FPS!");
 			}
+			*/
 		}
 	}
 	else if (strcmp(strType, XN_STREAM_TYPE_IMAGE) == 0)
diff --git a/Source/XnDeviceSensorV2/XnSensorFirmwareParams.cpp b/Source/XnDeviceSensorV2/XnSensorFirmwareParams.cpp
@@ -451,10 +451,13 @@ XnStatus XnSensorFirmwareParams::SetImageResolution(XnUInt64 nValue)
 	case XN_RESOLUTION_VGA:
 		break;
 	case XN_RESOLUTION_SXGA:
+		// Avin: Removed to enable 1280x1024 Image
+		/*	
 		if (m_pInfo->nFWVer < XN_SENSOR_FW_VER_5_3)
 		{
 			XN_LOG_WARNING_RETURN(XN_STATUS_IO_INVALID_STREAM_IMAGE_RESOLUTION, XN_MASK_DEVICE_SENSOR, "Image resolution is not supported by this firmware!");
 		}
+		*/		
 		break;
 	case XN_RESOLUTION_UXGA:
 		if (m_pInfo->nFWVer < XN_SENSOR_FW_VER_5_1)
diff --git a/Source/XnDeviceSensorV2/XnSensorImageStream.cpp b/Source/XnDeviceSensorV2/XnSensorImageStream.cpp
@@ -168,11 +168,14 @@ XnStatus XnSensorImageStream::ValidateMode()
 	XnOutputFormats nOutputFormat = GetOutputFormat();
 	XnResolutions nResolution = GetResolution();
 
+	// Avin: Removed to enable 1280x1024 Image
 	// check resolution
+	/*
 	if ((nResolution == XN_RESOLUTION_UXGA || nResolution == XN_RESOLUTION_SXGA) && nInputFormat != XN_IO_IMAGE_FORMAT_BAYER)
 	{
 		XN_LOG_WARNING_RETURN(XN_STATUS_DEVICE_BAD_PARAM, XN_MASK_DEVICE_SENSOR, "UXGA resolution is only supported with BAYER input!");
 	}
+	*/
 
 	// check output format
 	if (nOutputFormat == XN_OUTPUT_FORMAT_GRAYSCALE8 && nInputFormat != XN_IO_IMAGE_FORMAT_BAYER)

Original file line number	Diff line number	Diff line change
`@@ -117,11 +117,14 @@ XnStatus XnFirmwareStreams::CheckClaimStream(const XnChar* strType, XnResolution`
`117`	`117`	`XN_LOG_WARNING_RETURN(XN_STATUS_DEVICE_BAD_PARAM, XN_MASK_DEVICE_SENSOR, "Cannot set depth stream to resolution %d when IR is set to resolution %d!", nRes, pIRStreamData->nRes);`
`118`	`118`	`}`
`119`	`119`
	`120`	`+ // Avin: Removed to enable 1280x1024 IR`
	`121`	`+ /*`
`120`	`122`	`// check FPS`
`121`	`123`	`if (pIRStreamData->nFPS != nFPS)`
`122`	`124`	`{`
`123`	`125`	`XN_LOG_WARNING_RETURN(XN_STATUS_DEVICE_BAD_PARAM, XN_MASK_DEVICE_SENSOR, "Depth and IR streams must have the same FPS!");`
`124`	`126`	`}`
	`127`	`+ */`
`125`	`128`	`}`
`126`	`129`	`}`
`127`	`130`	`else if (strcmp(strType, XN_STREAM_TYPE_IR) == 0)`
`@@ -150,10 +153,14 @@ XnStatus XnFirmwareStreams::CheckClaimStream(const XnChar* strType, XnResolution`
`150`	`153`	`}`
`151`	`154`
`152`	`155`	`// check FPS`
	`156`	`+ // Avin: Removed to enable 1280x1024 IR`
	`157`	`+ /*`
	`158`	`+`
`153`	`159`	`if (pDepthStreamData->nFPS != nFPS)`
`154`	`160`	`{`
`155`	`161`	`XN_LOG_WARNING_RETURN(XN_STATUS_DEVICE_BAD_PARAM, XN_MASK_DEVICE_SENSOR, "Depth and IR streams must have the same FPS!");`
`156`	`162`	`}`
	`163`	`+ */`
`157`	`164`	`}`
`158`	`165`	`}`
`159`	`166`	`else if (strcmp(strType, XN_STREAM_TYPE_IMAGE) == 0)`
Original file line number	Diff line number	Diff line change
`@@ -451,10 +451,13 @@ XnStatus XnSensorFirmwareParams::SetImageResolution(XnUInt64 nValue)`
`451`	`451`	`case XN_RESOLUTION_VGA:`
`452`	`452`	`break;`
`453`	`453`	`case XN_RESOLUTION_SXGA:`
	`454`	`+ // Avin: Removed to enable 1280x1024 Image`
	`455`	`+ /*`
`454`	`456`	`if (m_pInfo->nFWVer < XN_SENSOR_FW_VER_5_3)`
`455`	`457`	`{`
`456`	`458`	`XN_LOG_WARNING_RETURN(XN_STATUS_IO_INVALID_STREAM_IMAGE_RESOLUTION, XN_MASK_DEVICE_SENSOR, "Image resolution is not supported by this firmware!");`
`457`	`459`	`}`
	`460`	`+ */`
`458`	`461`	`break;`
`459`	`462`	`case XN_RESOLUTION_UXGA:`
`460`	`463`	`if (m_pInfo->nFWVer < XN_SENSOR_FW_VER_5_1)`
Original file line number	Diff line number	Diff line change
`@@ -168,11 +168,14 @@ XnStatus XnSensorImageStream::ValidateMode()`
`168`	`168`	`XnOutputFormats nOutputFormat = GetOutputFormat();`
`169`	`169`	`XnResolutions nResolution = GetResolution();`
`170`	`170`
	`171`	`+ // Avin: Removed to enable 1280x1024 Image`
`171`	`172`	`// check resolution`
	`173`	`+ /*`
`172`	`174`	`if ((nResolution == XN_RESOLUTION_UXGA \|\| nResolution == XN_RESOLUTION_SXGA) && nInputFormat != XN_IO_IMAGE_FORMAT_BAYER)`
`173`	`175`	`{`
`174`	`176`	`XN_LOG_WARNING_RETURN(XN_STATUS_DEVICE_BAD_PARAM, XN_MASK_DEVICE_SENSOR, "UXGA resolution is only supported with BAYER input!");`
`175`	`177`	`}`
	`178`	`+ */`
`176`	`179`
`177`	`180`	`// check output format`
`178`	`181`	`if (nOutputFormat == XN_OUTPUT_FORMAT_GRAYSCALE8 && nInputFormat != XN_IO_IMAGE_FORMAT_BAYER)`