mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-02 16:52:42 +00:00
uvch264: Make gudev/libusb a hard dependency and remove XU_FIND_UNIT ioctl support
Conflicts: sys/uvch264/gstuvch264_src.c
This commit is contained in:
parent
b807753453
commit
7a7267b402
3 changed files with 80 additions and 113 deletions
|
@ -694,7 +694,7 @@ AG_GST_CHECK_FEATURE(VCD, [Video CD], vcdsrc, [
|
||||||
dnl *** UVC H264 ***
|
dnl *** UVC H264 ***
|
||||||
translit(dnm, m, l) AM_CONDITIONAL(USE_UVCH264, true)
|
translit(dnm, m, l) AM_CONDITIONAL(USE_UVCH264, true)
|
||||||
AG_GST_CHECK_FEATURE(UVCH264, [UVC H264], uvch264, [
|
AG_GST_CHECK_FEATURE(UVCH264, [UVC H264], uvch264, [
|
||||||
AC_CHECK_HEADER(linux/uvcvideo.h, HAVE_UVCH264=yes, HAVE_UVCH264=no)
|
AC_CHECK_HEADER(linux/uvcvideo.h, HAVE_UVCVIDEO_H=yes, HAVE_UVCVIDEO_H=no)
|
||||||
AG_GST_PKG_CHECK_MODULES(GST_VIDEO, gstreamer-video-0.10 >= 0.10.36)
|
AG_GST_PKG_CHECK_MODULES(GST_VIDEO, gstreamer-video-0.10 >= 0.10.36)
|
||||||
PKG_CHECK_MODULES(G_UDEV, gudev-1.0 , [
|
PKG_CHECK_MODULES(G_UDEV, gudev-1.0 , [
|
||||||
AC_DEFINE([HAVE_GUDEV], 1, [Define if gudev is installed])
|
AC_DEFINE([HAVE_GUDEV], 1, [Define if gudev is installed])
|
||||||
|
@ -704,6 +704,13 @@ AG_GST_CHECK_FEATURE(UVCH264, [UVC H264], uvch264, [
|
||||||
AC_DEFINE([HAVE_LIBUSB], 1, [Define if libusb 1.x is installed])
|
AC_DEFINE([HAVE_LIBUSB], 1, [Define if libusb 1.x is installed])
|
||||||
HAVE_LIBUSB="yes" ],
|
HAVE_LIBUSB="yes" ],
|
||||||
[HAVE_LIBUSB="no"])
|
[HAVE_LIBUSB="no"])
|
||||||
|
if test "x$HAVE_UVCVIDEO_H" == "xyes" && \
|
||||||
|
test "x$HAVE_GUDEV" == "xyes" && \
|
||||||
|
test "x$HAVE_LIBUSB" == "xyes"; then
|
||||||
|
HAVE_UVCH264=yes
|
||||||
|
else
|
||||||
|
HAVE_UVCH264=no
|
||||||
|
fi
|
||||||
])
|
])
|
||||||
AC_SUBST(LIBUDEV_CFLAGS)
|
AC_SUBST(LIBUDEV_CFLAGS)
|
||||||
AC_SUBST(LIBUDEV_LIBS)
|
AC_SUBST(LIBUDEV_LIBS)
|
||||||
|
|
|
@ -32,13 +32,16 @@
|
||||||
# include <config.h>
|
# include <config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "gstuvch264_src.h"
|
||||||
|
|
||||||
#include <gst/video/video.h>
|
#include <gst/video/video.h>
|
||||||
#include <linux/uvcvideo.h>
|
#include <linux/uvcvideo.h>
|
||||||
#include <linux/usb/video.h>
|
#include <linux/usb/video.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#if defined (HAVE_GUDEV) && defined (HAVE_LIBUSB)
|
#include "gstuvch264_src.h"
|
||||||
|
#include "gstuvch264-marshal.h"
|
||||||
#include <gudev/gudev.h>
|
#include <gudev/gudev.h>
|
||||||
#include <libusb.h>
|
#include <libusb.h>
|
||||||
|
|
||||||
|
@ -61,22 +64,6 @@ typedef struct
|
||||||
#define USB_VIDEO_CONTROL 1
|
#define USB_VIDEO_CONTROL 1
|
||||||
#define USB_VIDEO_CONTROL_INTERFACE 0x24
|
#define USB_VIDEO_CONTROL_INTERFACE 0x24
|
||||||
#define USB_VIDEO_CONTROL_XU_TYPE 0x06
|
#define USB_VIDEO_CONTROL_XU_TYPE 0x06
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "gstuvch264_src.h"
|
|
||||||
|
|
||||||
#ifndef UVCIOC_XU_FIND_UNIT
|
|
||||||
/* Define the needed structure if <linux/uvcvideo.h> is too old.
|
|
||||||
* This might fail though if the kernel itself does not support it.
|
|
||||||
*/
|
|
||||||
struct uvc_xu_find_unit
|
|
||||||
{
|
|
||||||
__u8 guid[16];
|
|
||||||
__u8 unit;
|
|
||||||
};
|
|
||||||
#define UVCIOC_XU_FIND_UNIT _IOWR('u', 0x22, struct uvc_xu_find_unit)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
|
@ -628,13 +615,9 @@ gst_uvc_h264_src_dispose (GObject * object)
|
||||||
{
|
{
|
||||||
GstUvcH264Src *self = GST_UVC_H264_SRC (object);
|
GstUvcH264Src *self = GST_UVC_H264_SRC (object);
|
||||||
|
|
||||||
#if defined (HAVE_GUDEV) && defined (HAVE_LIBUSB)
|
|
||||||
if (self->usb_ctx)
|
if (self->usb_ctx)
|
||||||
libusb_exit (self->usb_ctx);
|
libusb_exit (self->usb_ctx);
|
||||||
self->usb_ctx = NULL;
|
self->usb_ctx = NULL;
|
||||||
#else
|
|
||||||
(void) self;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
G_OBJECT_CLASS (parent_class)->dispose (object);
|
G_OBJECT_CLASS (parent_class)->dispose (object);
|
||||||
}
|
}
|
||||||
|
@ -1811,112 +1794,93 @@ gst_uvc_h264_src_event (GstPad * pad, GstEvent * event)
|
||||||
static guint8
|
static guint8
|
||||||
xu_get_id (GstUvcH264Src * self)
|
xu_get_id (GstUvcH264Src * self)
|
||||||
{
|
{
|
||||||
struct uvc_xu_find_unit xu;
|
|
||||||
static const __u8 guid[16] = GUID_UVCX_H264_XU;
|
static const __u8 guid[16] = GUID_UVCX_H264_XU;
|
||||||
|
GUdevClient *client;
|
||||||
|
GUdevDevice *udevice;
|
||||||
|
GUdevDevice *parent;
|
||||||
|
guint64 busnum;
|
||||||
|
guint64 devnum;
|
||||||
|
libusb_device **device_list = NULL;
|
||||||
|
libusb_device *device = NULL;
|
||||||
|
ssize_t cnt;
|
||||||
|
int i, j, k;
|
||||||
|
|
||||||
if (self->v4l2_fd == -1) {
|
|
||||||
GST_WARNING_OBJECT (self, "Can't query XU with fd = -1");
|
if (self->usb_ctx == NULL)
|
||||||
return 0;
|
libusb_init (&self->usb_ctx);
|
||||||
|
|
||||||
|
client = g_udev_client_new (NULL);
|
||||||
|
if (client) {
|
||||||
|
udevice = g_udev_client_query_by_device_file (client, self->device);
|
||||||
|
if (udevice) {
|
||||||
|
parent = g_udev_device_get_parent_with_subsystem (udevice, "usb",
|
||||||
|
"usb_device");
|
||||||
|
if (parent) {
|
||||||
|
busnum = g_udev_device_get_sysfs_attr_as_uint64 (parent, "busnum");
|
||||||
|
devnum = g_udev_device_get_sysfs_attr_as_uint64 (parent, "devnum");
|
||||||
|
|
||||||
|
cnt = libusb_get_device_list (self->usb_ctx, &device_list);
|
||||||
|
for (i = 0; i < cnt; i++) {
|
||||||
|
if (busnum == libusb_get_bus_number (device_list[i]) &&
|
||||||
|
devnum == libusb_get_device_address (device_list[i])) {
|
||||||
|
device = libusb_ref_device (device_list[i]);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
libusb_free_device_list (device_list, 1);
|
||||||
|
g_object_unref (parent);
|
||||||
|
}
|
||||||
|
g_object_unref (udevice);
|
||||||
|
}
|
||||||
|
g_object_unref (client);
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy (xu.guid, guid, 16);
|
if (device) {
|
||||||
xu.unit = 0;
|
struct libusb_device_descriptor desc;
|
||||||
|
|
||||||
if (-1 == ioctl (self->v4l2_fd, UVCIOC_XU_FIND_UNIT, &xu)) {
|
if (libusb_get_device_descriptor (device, &desc) == 0) {
|
||||||
#if defined (HAVE_GUDEV) && defined (HAVE_LIBUSB)
|
for (i = 0; i < desc.bNumConfigurations; ++i) {
|
||||||
/* Fallback on libusb */
|
struct libusb_config_descriptor *config = NULL;
|
||||||
GUdevClient *client;
|
|
||||||
GUdevDevice *udevice;
|
|
||||||
GUdevDevice *parent;
|
|
||||||
guint64 busnum;
|
|
||||||
guint64 devnum;
|
|
||||||
libusb_device **device_list = NULL;
|
|
||||||
libusb_device *device = NULL;
|
|
||||||
ssize_t cnt;
|
|
||||||
int i, j, k;
|
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (self, "XU_FIND_UNIT ioctl failed. Fallback on libusb");
|
if (libusb_get_config_descriptor (device, i, &config) == 0) {
|
||||||
|
for (j = 0; j < config->bNumInterfaces; j++) {
|
||||||
|
for (k = 0; k < config->interface[j].num_altsetting; k++) {
|
||||||
|
const struct libusb_interface_descriptor *interface;
|
||||||
|
const guint8 *ptr = NULL;
|
||||||
|
|
||||||
if (self->usb_ctx == NULL)
|
interface = &config->interface[j].altsetting[k];
|
||||||
libusb_init (&self->usb_ctx);
|
if (interface->bInterfaceClass != LIBUSB_CLASS_VIDEO ||
|
||||||
|
interface->bInterfaceSubClass != USB_VIDEO_CONTROL)
|
||||||
|
continue;
|
||||||
|
ptr = interface->extra;
|
||||||
|
while (ptr - interface->extra +
|
||||||
|
sizeof (xu_descriptor) < interface->extra_length) {
|
||||||
|
xu_descriptor *desc = (xu_descriptor *) ptr;
|
||||||
|
|
||||||
client = g_udev_client_new (NULL);
|
GST_DEBUG_OBJECT (self, "Found VideoControl interface with "
|
||||||
if (client) {
|
"unit id %d : %" GUID_FORMAT, desc->bUnitID,
|
||||||
udevice = g_udev_client_query_by_device_file (client, self->device);
|
GUID_ARGS (desc->guidExtensionCode));
|
||||||
if (udevice) {
|
if (desc->bDescriptorType == USB_VIDEO_CONTROL_INTERFACE &&
|
||||||
parent = g_udev_device_get_parent_with_subsystem (udevice, "usb",
|
desc->bDescriptorSubType == USB_VIDEO_CONTROL_XU_TYPE &&
|
||||||
"usb_device");
|
memcmp (desc->guidExtensionCode, guid, 16) == 0) {
|
||||||
if (parent) {
|
guint8 unit_id = desc->bUnitID;
|
||||||
busnum = g_udev_device_get_sysfs_attr_as_uint64 (parent, "busnum");
|
|
||||||
devnum = g_udev_device_get_sysfs_attr_as_uint64 (parent, "devnum");
|
|
||||||
|
|
||||||
cnt = libusb_get_device_list (self->usb_ctx, &device_list);
|
GST_DEBUG_OBJECT (self, "Found H264 XU unit : %d", unit_id);
|
||||||
for (i = 0; i < cnt; i++) {
|
|
||||||
if (busnum == libusb_get_bus_number (device_list[i]) &&
|
|
||||||
devnum == libusb_get_device_address (device_list[i])) {
|
|
||||||
device = libusb_ref_device (device_list[i]);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
libusb_free_device_list (device_list, 1);
|
|
||||||
g_object_unref (parent);
|
|
||||||
}
|
|
||||||
g_object_unref (udevice);
|
|
||||||
}
|
|
||||||
g_object_unref (client);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (device) {
|
libusb_unref_device (device);
|
||||||
struct libusb_device_descriptor desc;
|
return unit_id;
|
||||||
|
|
||||||
if (libusb_get_device_descriptor (device, &desc) == 0) {
|
|
||||||
for (i = 0; i < desc.bNumConfigurations; ++i) {
|
|
||||||
struct libusb_config_descriptor *config = NULL;
|
|
||||||
|
|
||||||
if (libusb_get_config_descriptor (device, i, &config) == 0) {
|
|
||||||
for (j = 0; j < config->bNumInterfaces; j++) {
|
|
||||||
for (k = 0; k < config->interface[j].num_altsetting; k++) {
|
|
||||||
const struct libusb_interface_descriptor *interface;
|
|
||||||
const guint8 *ptr = NULL;
|
|
||||||
|
|
||||||
interface = &config->interface[j].altsetting[k];
|
|
||||||
if (interface->bInterfaceClass != LIBUSB_CLASS_VIDEO ||
|
|
||||||
interface->bInterfaceSubClass != USB_VIDEO_CONTROL)
|
|
||||||
continue;
|
|
||||||
ptr = interface->extra;
|
|
||||||
while (ptr - interface->extra +
|
|
||||||
sizeof (xu_descriptor) < interface->extra_length) {
|
|
||||||
xu_descriptor *desc = (xu_descriptor *) ptr;
|
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (self, "Found VideoControl interface with "
|
|
||||||
"unit id %d : %" GUID_FORMAT, desc->bUnitID,
|
|
||||||
GUID_ARGS (desc->guidExtensionCode));
|
|
||||||
if (desc->bDescriptorType == USB_VIDEO_CONTROL_INTERFACE &&
|
|
||||||
desc->bDescriptorSubType == USB_VIDEO_CONTROL_XU_TYPE &&
|
|
||||||
memcmp (desc->guidExtensionCode, guid, 16) == 0) {
|
|
||||||
guint8 unit_id = desc->bUnitID;
|
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (self, "Found H264 XU unit : %d", unit_id);
|
|
||||||
|
|
||||||
libusb_unref_device (device);
|
|
||||||
return unit_id;
|
|
||||||
}
|
|
||||||
ptr += desc->bLength;
|
|
||||||
}
|
}
|
||||||
|
ptr += desc->bLength;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
libusb_unref_device (device);
|
|
||||||
}
|
}
|
||||||
#else
|
libusb_unref_device (device);
|
||||||
GST_WARNING_OBJECT (self, "XU_FIND_UNIT ioctl failed");
|
|
||||||
#endif
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return xu.unit;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
|
|
|
@ -30,9 +30,7 @@
|
||||||
|
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
#include <gst/basecamerabinsrc/gstbasecamerasrc.h>
|
#include <gst/basecamerabinsrc/gstbasecamerasrc.h>
|
||||||
#if defined (HAVE_GUDEV) && defined (HAVE_LIBUSB)
|
|
||||||
#include <libusb.h>
|
#include <libusb.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "uvc_h264.h"
|
#include "uvc_h264.h"
|
||||||
|
|
||||||
|
@ -105,9 +103,7 @@ struct _GstUvcH264Src
|
||||||
|
|
||||||
int v4l2_fd;
|
int v4l2_fd;
|
||||||
guint8 h264_unit_id;
|
guint8 h264_unit_id;
|
||||||
#if defined (HAVE_GUDEV) && defined (HAVE_LIBUSB)
|
|
||||||
libusb_context *usb_ctx;
|
libusb_context *usb_ctx;
|
||||||
#endif
|
|
||||||
|
|
||||||
GstPadEventFunction srcpad_event_func;
|
GstPadEventFunction srcpad_event_func;
|
||||||
GstEvent *key_unit_event;
|
GstEvent *key_unit_event;
|
||||||
|
|
Loading…
Reference in a new issue