Merge pull request #30 from christiankerl/fix_max_iso_packet_size

reimplement custom version of libusb_get_max_iso_packet_size

Author: floe

depends/install_deps.sh

@@ -3,17 +3,18 @@ cd `dirname $0`
 DEPENDS_DIR=`pwd`
 
 # libusbx with superspeed patch
-LIBUSBX_SOURCE_DIR=$DEPENDS_DIR/libusbx_src
-LIBUSBX_INSTALL_DIR=$DEPENDS_DIR/libusbx
+LIBUSB_SOURCE_DIR=$DEPENDS_DIR/libusb_src
+LIBUSB_INSTALL_DIR=$DEPENDS_DIR/libusb
 
-rm -rf $LIBUSBX_SOURCE_DIR $LIBUSBX_INSTALL_DIR
+rm -rf $LIBUSB_SOURCE_DIR $LIBUSB_INSTALL_DIR
 
-git clone -b superspeed https://github.com/JoshBlake/libusbx.git $LIBUSBX_SOURCE_DIR
+git clone https://github.com/libusb/libusb.git $LIBUSB_SOURCE_DIR
 
-cd $LIBUSBX_SOURCE_DIR
+cd $LIBUSB_SOURCE_DIR
+git checkout v1.0.19
 git apply $DEPENDS_DIR/linux_usbfs_increase_max_iso_buffer_length.patch
 ./bootstrap.sh
-./configure --prefix=$LIBUSBX_INSTALL_DIR
+./configure --prefix=$LIBUSB_INSTALL_DIR
 make && make install
 
 cd $DEPENDS_DIR

examples/protonect/CMakeLists.txt

@@ -27,8 +27,8 @@ FIND_PACKAGE(OpenCV REQUIRED)
 INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIR})
 
 # LibUSB
-INCLUDE_DIRECTORIES("${MY_DIR}/../../depends/libusbx/include/libusb-1.0/")
-LINK_DIRECTORIES("${MY_DIR}/../../depends/libusbx/lib/")
+INCLUDE_DIRECTORIES("${MY_DIR}/../../depends/libusb/include/libusb-1.0/")
+LINK_DIRECTORIES("${MY_DIR}/../../depends/libusb/lib/")
 
 # GLEW
 INCLUDE_DIRECTORIES("${MY_DIR}/../../depends/glew/include/")

examples/protonect/include/libfreenect2/protocol/usb_control.h

@@ -79,6 +79,8 @@ class UsbControl
     Error
   };
 
+  ResultCode getIrMaxIsoPacketSize(int &size);
+
   ResultCode setConfiguration();
   ResultCode claimInterfaces();
   ResultCode releaseInterfaces();

examples/protonect/src/libfreenect2.cpp

@@ -422,7 +422,8 @@ bool Freenect2DeviceImpl::open()
   if(usb_control_.enablePowerStates() != UsbControl::Success) return false;
   if(usb_control_.setVideoTransferFunctionState(UsbControl::Disabled) != UsbControl::Success) return false;
 
-  size_t max_iso_packet_size = libusb_get_max_iso_packet_size(usb_device_, 0x84);
+  int max_iso_packet_size;
+  if(usb_control_.getIrMaxIsoPacketSize(max_iso_packet_size) != UsbControl::Success) return false;
 
   if(max_iso_packet_size < 0x8400)
   {

examples/protonect/src/usb_control.cpp

@@ -127,6 +127,54 @@ namespace libusb_ext
 
     return libusb_control_transfer(handle, bmRequestType, bRequest, wValue, wIndex, data, wLength, timeout);
   }
+
+  int get_max_iso_packet_size(libusb_device *device, int configuration, int alternate_setting, int endpoint)
+  {
+    libusb_config_descriptor *config_desc;
+    int r = LIBUSB_ERROR_NOT_FOUND;
+
+    r = libusb_get_config_descriptor_by_value(device, configuration, &config_desc);
+
+    if(r == LIBUSB_SUCCESS)
+    {
+      for(int interface_idx = 0; interface_idx < config_desc->bNumInterfaces; ++interface_idx)
+      {
+        const libusb_interface &interface = config_desc->interface[interface_idx];
+
+        if(interface.num_altsetting > alternate_setting)
+        {
+          const libusb_interface_descriptor &interface_desc = interface.altsetting[alternate_setting];
+          const libusb_endpoint_descriptor *endpoint_desc = 0;
+
+          for(int endpoint_idx = 0; endpoint_idx < interface_desc.bNumEndpoints; ++endpoint_idx)
+          {
+            if(interface_desc.endpoint[endpoint_idx].bEndpointAddress == endpoint && (interface_desc.endpoint[endpoint_idx].bmAttributes & 0x3) == LIBUSB_TRANSFER_TYPE_ISOCHRONOUS)
+            {
+              endpoint_desc = interface_desc.endpoint + endpoint_idx;
+              break;
+            }
+          }
+
+          if(endpoint_desc != 0)
+          {
+            libusb_ss_endpoint_companion_descriptor *companion_desc;
+            // ctx is only used for error reporting, libusb should better ask for a libusb_device anyway...
+            r = libusb_get_ss_endpoint_companion_descriptor(NULL /* ctx */, endpoint_desc, &companion_desc);
+
+            if(r != LIBUSB_SUCCESS) continue;
+
+            r = companion_desc->wBytesPerInterval;
+
+            libusb_free_ss_endpoint_companion_descriptor(companion_desc);
+            break;
+          }
+        }
+      }
+    }
+    libusb_free_config_descriptor(config_desc);
+
+    return r;
+  }
 }
 
 UsbControl::UsbControl(libusb_device_handle *handle) :
@@ -255,5 +303,21 @@ UsbControl::ResultCode UsbControl::setIrInterfaceState(UsbControl::State state)
   return checkLibusbResult("setIrInterfaceState", r);
 }
 
+
+UsbControl::ResultCode UsbControl::getIrMaxIsoPacketSize(int &size)
+{
+  size = 0;
+  libusb_device *dev = libusb_get_device(handle_);
+  int r = libusb_ext::get_max_iso_packet_size(dev, 1, 1, 0x84);
+
+  if(r > LIBUSB_SUCCESS)
+  {
+    size = r;
+    r = LIBUSB_SUCCESS;
+  }
+
+  return checkLibusbResult("getIrMaxIsoPacketSize", r);
+}
+
 } /* namespace protocol */
 } /* namespace libfreenect2 */