d692522577
This patch reworks the videobuffer management logic present in the UVC webcam gadget and ports it to use the "more apt" videobuf2 framework for video buffer management. To support routing video data captured from a real V4L2 video capture device with a "zero copy" operation on videobuffers (as they pass from the V4L2 domain to UVC domain via a user-space application), we need to support USER_PTR IO method at the UVC gadget side. So the V4L2 capture device driver can still continue to use MMAP IO method and now the user-space application can just pass a pointer to the video buffers being dequeued from the V4L2 device side while queueing them at the UVC gadget end. This ensures that we have a "zero-copy" design as the videobuffers pass from the V4L2 capture device to the UVC gadget. Note that there will still be a need to apply UVC specific payload headers on top of each UVC payload data, which will still require a copy operation to be performed in the 'encode' routines of the UVC gadget. This patch also addresses one issue found out while porting the UVC gadget to videobuf2 framework: - In case the usb requests queued by the gadget get completed with a status of -ESHUTDOWN (disconnected from host), the queue of videobuf2 should be cancelled to ensure that the application space daemon is not left in a state waiting for a vb2 to be successfully absorbed at the USB side. Signed-off-by: Bhupesh Sharma <bhupesh.sharma@st.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
64 lines
1.3 KiB
C
64 lines
1.3 KiB
C
#ifndef _UVC_QUEUE_H_
|
|
#define _UVC_QUEUE_H_
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/poll.h>
|
|
#include <linux/videodev2.h>
|
|
#include <media/videobuf2-core.h>
|
|
|
|
/* Maximum frame size in bytes, for sanity checking. */
|
|
#define UVC_MAX_FRAME_SIZE (16*1024*1024)
|
|
/* Maximum number of video buffers. */
|
|
#define UVC_MAX_VIDEO_BUFFERS 32
|
|
|
|
/* ------------------------------------------------------------------------
|
|
* Structures.
|
|
*/
|
|
|
|
enum uvc_buffer_state {
|
|
UVC_BUF_STATE_IDLE = 0,
|
|
UVC_BUF_STATE_QUEUED = 1,
|
|
UVC_BUF_STATE_ACTIVE = 2,
|
|
UVC_BUF_STATE_DONE = 3,
|
|
UVC_BUF_STATE_ERROR = 4,
|
|
};
|
|
|
|
struct uvc_buffer {
|
|
struct vb2_buffer buf;
|
|
struct list_head queue;
|
|
|
|
enum uvc_buffer_state state;
|
|
void *mem;
|
|
unsigned int length;
|
|
unsigned int bytesused;
|
|
};
|
|
|
|
#define UVC_QUEUE_DISCONNECTED (1 << 0)
|
|
#define UVC_QUEUE_DROP_INCOMPLETE (1 << 1)
|
|
#define UVC_QUEUE_PAUSED (1 << 2)
|
|
|
|
struct uvc_video_queue {
|
|
struct vb2_queue queue;
|
|
struct mutex mutex; /* Protects queue */
|
|
|
|
unsigned int flags;
|
|
__u32 sequence;
|
|
|
|
unsigned int buf_used;
|
|
|
|
spinlock_t irqlock; /* Protects flags and irqqueue */
|
|
struct list_head irqqueue;
|
|
};
|
|
|
|
static inline int uvc_queue_streaming(struct uvc_video_queue *queue)
|
|
{
|
|
return vb2_is_streaming(&queue->queue);
|
|
}
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* _UVC_QUEUE_H_ */
|
|
|