Skip to content

For Kinects with 0000000000000000 Serial No - use Audio Serial as a fallback -- implemented, fixes #360 #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
olzhas wants to merge 2 commits into from
Closed

For Kinects with 0000000000000000 Serial No - use Audio Serial as a fallback -- implemented, fixes #360 #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
541326f
For Kinects with 0000000000000000 Serial No - use Audio Serial as a
olzhas May 29, 2014
63c4ca1
Removed printf() and extra else condition
olzhas May 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions src/usb_libusb10.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,45 @@ FN_INTERNAL int fnusb_list_device_attributes(fnusb_ctx *ctx, struct freenect_dev
memset(new_dev_attrs, 0, sizeof(*new_dev_attrs));

*camera_prev_next = new_dev_attrs;

// Copy string with serial number

// Fallback for kinect 4 windows and 1473 to the audio serial
if (strncmp((const char*)string_desc, K4W_AND_1473_SERIAL_NO, 16) == 0) {
int j;
struct libusb_device_descriptor audio_desc;
for (j=0; j< count; j++) {
int result = libusb_get_device_descriptor (devs[j], &audio_desc);
if (result < 0)
continue;

if (audio_desc.idVendor == VID_MICROSOFT && audio_desc.idProduct == PID_K4W_AUDIO) {
// Verify that a serial number exists to query. If not, don't touch the device.
if (audio_desc.iSerialNumber == 0) {
continue;
}
int audio_bus_num = libusb_get_bus_number(libusb_get_parent(devs[j]));
int audio_port_num = libusb_get_port_number(libusb_get_parent(devs[j]));
if (libusb_get_bus_number(libusb_get_parent(devs[i])) == audio_bus_num &&
libusb_get_port_number(libusb_get_parent(devs[i])) == audio_port_num &&
audio_bus_num != 0 && audio_port_num != 0) {

int result_audio;
libusb_device_handle *this_audio_device;
result_audio = libusb_open(devs[j], &this_audio_device);
if (result_audio != 0) {
continue;
}
result_audio = libusb_get_string_descriptor_ascii(this_device, audio_desc.iSerialNumber, string_desc, 256);
if (result_audio < 0) {
continue;
}
libusb_close(this_audio_device);
}
}
}
}

new_dev_attrs->camera_serial = strdup((char*)string_desc);
camera_prev_next = &(new_dev_attrs->next);
// Increment number of cameras found
Expand Down
2 changes: 2 additions & 0 deletions src/usb_libusb10.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
#define VIDEO_PKTBUF 1920
#endif

#define K4W_AND_1473_SERIAL_NO "0000000000000000"

typedef struct {
libusb_context *ctx;
int should_free_ctx;
Expand Down