From: mglocker Date: Fri, 18 Jul 2008 18:49:11 +0000 (+0000) Subject: Implement VIDIOC_S_FMT and VIDIOC_TRY_FMT. Now V4L2 applications can X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=94047bb7339f70ee0b2349097cbc920f66feeaaa;p=openbsd Implement VIDIOC_S_FMT and VIDIOC_TRY_FMT. Now V4L2 applications can set their desired image size, and therefore users can manipulate the image size, too via the application. Also tested by brad@ --- diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c index 8179b921607..85a253c209c 100644 --- a/sys/dev/usb/uvideo.c +++ b/sys/dev/usb/uvideo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvideo.c,v 1.53 2008/07/14 19:57:36 mglocker Exp $ */ +/* $OpenBSD: uvideo.c,v 1.54 2008/07/18 18:49:11 mglocker Exp $ */ /* * Copyright (c) 2008 Robert Nagy @@ -99,6 +99,7 @@ usbd_status uvideo_vs_alloc(struct uvideo_softc *); void uvideo_vs_free(struct uvideo_softc *); usbd_status uvideo_vs_open(struct uvideo_softc *); void uvideo_vs_close(struct uvideo_softc *); +usbd_status uvideo_vs_init(struct uvideo_softc *); void uvideo_vs_start(struct uvideo_softc *); void uvideo_vs_cb(usbd_xfer_handle, usbd_private_handle, usbd_status); @@ -245,7 +246,6 @@ uvideo_open(void *addr, int flags, int *size, uint8_t *buffer, void (*intr)(void *), void *arg) { struct uvideo_softc *sc = addr; - usbd_status error; DPRINTF(1, "%s: uvideo_open: sc=%p\n", DEVNAME(sc), sc); @@ -258,26 +258,8 @@ uvideo_open(void *addr, int flags, int *size, uint8_t *buffer, sc->sc_uplayer_fbuffer = buffer; sc->sc_uplayer_intr = intr; - /* open video stream pipe */ - error = uvideo_vs_open(sc); - if (error != USBD_NORMAL_COMPLETION) - return (EIO); - - /* allocate video stream xfer buffer */ - error = uvideo_vs_alloc(sc); - if (error != USBD_NORMAL_COMPLETION) - return (EIO); - - /* allocate video stream sample buffer */ - error = uvideo_vs_alloc_sample(sc); - if (error != USBD_NORMAL_COMPLETION) - return (EIO); -#ifdef UVIDEO_DUMP - if (uvideo_debug_file_open(sc) != 0) - return(EIO); - usb_init_task(&sc->sc_task_write, uvideo_debug_file_write_sample, sc); -#endif sc->sc_mmap_flag = 0; + sc->sc_negotiated_flag = 0; return (0); } @@ -639,10 +621,14 @@ uvideo_vs_parse_desc_format_mjpeg(struct uvideo_softc *sc, sc->sc_fmtgrp[d->bFormatIndex].format_dfidx = sc->sc_fmtgrp[d->bFormatIndex].format->u.mjpeg.bDefaultFrameIndex; + sc->sc_fmtgrp[d->bFormatIndex].pixelformat = V4L2_PIX_FMT_MJPEG; + if (sc->sc_fmtgrp_cur == NULL) /* set MJPEG format */ sc->sc_fmtgrp_cur = &sc->sc_fmtgrp[d->bFormatIndex]; + sc->sc_fmtgrp_num++; + return (0); } @@ -651,6 +637,7 @@ uvideo_vs_parse_desc_format_uncompressed(struct uvideo_softc *sc, const usb_descriptor_t *desc) { struct usb_video_format_uncompressed_desc *d; + int i; d = (struct usb_video_format_uncompressed_desc *)(uint8_t *)desc; @@ -669,10 +656,21 @@ uvideo_vs_parse_desc_format_uncompressed(struct uvideo_softc *sc, sc->sc_fmtgrp[d->bFormatIndex].format_dfidx = sc->sc_fmtgrp[d->bFormatIndex].format->u.uc.bDefaultFrameIndex; + i = d->bFormatIndex; + if (!strcmp(sc->sc_fmtgrp[i].format->u.uc.guidFormat, "YUY2")) { + sc->sc_fmtgrp[i].pixelformat = V4L2_PIX_FMT_YUYV; + } else if (!strcmp(sc->sc_fmtgrp[i].format->u.uc.guidFormat, "NV12")) { + sc->sc_fmtgrp[i].pixelformat = V4L2_PIX_FMT_NV12; + } else { + sc->sc_fmtgrp[i].pixelformat = 0; + } + if (sc->sc_fmtgrp_cur == NULL) /* set UNCOMPRESSED format */ sc->sc_fmtgrp_cur = &sc->sc_fmtgrp[d->bFormatIndex]; + sc->sc_fmtgrp_num++; + return (0); } @@ -746,6 +744,8 @@ uvideo_vs_parse_desc_frame_mjpeg(struct uvideo_softc *sc, sc->sc_fmtgrp[*fmtidx].frame[d->bFrameIndex]; } + sc->sc_fmtgrp[*fmtidx].frame_num++; + return (0); } @@ -782,6 +782,8 @@ uvideo_vs_parse_desc_frame_uncompressed(struct uvideo_softc *sc, sc->sc_fmtgrp[*fmtidx].frame[d->bFrameIndex]; } + sc->sc_fmtgrp[*fmtidx].frame_num++; + return (0); } @@ -1186,10 +1188,12 @@ uvideo_vs_open(struct uvideo_softc *sc) DPRINTF(1, "%s: %s\n", DEVNAME(sc), __func__); - /* do device negotation with commit */ - error = uvideo_vs_negotation(sc, 1); - if (error != USBD_NORMAL_COMPLETION) - return (error); + if (sc->sc_negotiated_flag == 0) { + /* do device negotation with commit */ + error = uvideo_vs_negotation(sc, 1); + if (error != USBD_NORMAL_COMPLETION) + return (error); + } error = uvideo_vs_set_alt(sc, sc->sc_vs_curr->ifaceh, UGETDW(sc->sc_desc_probe.dwMaxPayloadTransferSize)); @@ -1252,6 +1256,33 @@ uvideo_vs_close(struct uvideo_softc *sc) (void)usbd_set_interface(sc->sc_vs_curr->ifaceh, 0); } +usbd_status +uvideo_vs_init(struct uvideo_softc *sc) +{ + usbd_status error; + + /* open video stream pipe */ + error = uvideo_vs_open(sc); + if (error != USBD_NORMAL_COMPLETION) + return (EIO); + + /* allocate video stream xfer buffer */ + error = uvideo_vs_alloc(sc); + if (error != USBD_NORMAL_COMPLETION) + return (EIO); + + /* allocate video stream sample buffer */ + error = uvideo_vs_alloc_sample(sc); + if (error != USBD_NORMAL_COMPLETION) + return (EIO); +#ifdef UVIDEO_DUMP + if (uvideo_debug_file_open(sc) != 0) + return(EIO); + usb_init_task(&sc->sc_task_write, uvideo_debug_file_write_sample, sc); +#endif + return (USBD_NORMAL_COMPLETION); +} + void uvideo_vs_start(struct uvideo_softc *sc) { @@ -2044,10 +2075,74 @@ int uvideo_s_fmt(void *v, struct v4l2_format *fmt) { struct uvideo_softc *sc = v; + struct uvideo_format_group *fmtgrp_save; + struct usb_video_frame_mjpeg_desc *frame_save; + int found, i, j, width, height; + usbd_status error; if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) return (EINVAL); + DPRINTF(1, "%s: %s: requested width=%d, height=%d\n", + DEVNAME(sc), __func__, fmt->fmt.pix.width, fmt->fmt.pix.height); + + /* search requested pixel format */ + for (found = 0, i = 1; i <= sc->sc_fmtgrp_num; i++) { + if (fmt->fmt.pix.pixelformat == sc->sc_fmtgrp[i].pixelformat) { + found = 1; + break; + } + } + if (found == 0) + return (EINVAL); + + /* search requested frame resolution */ + for (found = 0, j = 1; j <= sc->sc_fmtgrp[i].frame_num; j++) { + width = UGETW(sc->sc_fmtgrp[i].frame[j]->wWidth); + height = UGETW(sc->sc_fmtgrp[i].frame[j]->wHeight); + DPRINTF(1, "%s: %s: frame index %d: width=%d, height=%d\n", + DEVNAME(sc), __func__, j, width, height); + if (fmt->fmt.pix.width == width && + fmt->fmt.pix.height == height) { + found = 1; + break; + } + } + /* + * TODO + * If we don't have exactly the requested resolution we should + * search for the closest matching resolution which we can offer. + */ + if (found == 0) + return (EINVAL); + + /* + * Do negotation. + */ + /* save a copy of current fromat group in case of negotation fails */ + fmtgrp_save = sc->sc_fmtgrp_cur; + frame_save = sc->sc_fmtgrp_cur->frame_cur; + /* set new format group */ + sc->sc_fmtgrp_cur = &sc->sc_fmtgrp[i]; + sc->sc_fmtgrp[i].frame_cur = sc->sc_fmtgrp[i].frame[j]; + sc->sc_fmtgrp[i].format_dfidx = j; + /* do device negotation with commit */ + error = uvideo_vs_negotation(sc, 1); + if (error != USBD_NORMAL_COMPLETION) { + sc->sc_fmtgrp_cur = fmtgrp_save; + sc->sc_fmtgrp_cur->frame_cur = frame_save; + return (EINVAL); + } + sc->sc_negotiated_flag = 1; + + /* offer closest resolution which we have found */ + fmt->fmt.pix.width = width; + fmt->fmt.pix.height = height; + + DPRINTF(1, "%s: %s: offered width=%d, height=%d\n", + DEVNAME(sc), __func__, width, height); + + /* tell our sample buffer size */ fmt->fmt.pix.sizeimage = sc->sc_sample_buffer.buf_size; return (0); @@ -2207,6 +2302,7 @@ uvideo_streamon(void *v, int type) { struct uvideo_softc *sc = v; + uvideo_vs_init(sc); uvideo_vs_start(sc); return (0); @@ -2225,9 +2321,55 @@ uvideo_streamoff(void *v, int type) int uvideo_try_fmt(void *v, struct v4l2_format *fmt) { + struct uvideo_softc *sc = v; + int found, i, j, width, height; + if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) return (EINVAL); + DPRINTF(1, "%s: %s: requested width=%d, height=%d\n", + DEVNAME(sc), __func__, fmt->fmt.pix.width, fmt->fmt.pix.height); + + /* search requested pixel format */ + for (found = 0, i = 1; i <= sc->sc_fmtgrp_num; i++) { + if (fmt->fmt.pix.pixelformat == sc->sc_fmtgrp[i].pixelformat) { + found = 1; + break; + } + } + if (found == 0) + return (EINVAL); + + /* search requested frame resolution */ + for (found = 0, j = 1; j <= sc->sc_fmtgrp[i].frame_num; j++) { + width = UGETW(sc->sc_fmtgrp[i].frame[j]->wWidth); + height = UGETW(sc->sc_fmtgrp[i].frame[j]->wHeight); + DPRINTF(1, "%s: %s: frame index %d: width=%d, height=%d\n", + DEVNAME(sc), __func__, j, width, height); + if (fmt->fmt.pix.width == width && + fmt->fmt.pix.height == height) { + found = 1; + break; + } + } + /* + * TODO + * If we don't have exactly the requested resolution we should + * search for the closest matching resolution which we can offer. + */ + if (found == 0) + return (EINVAL); + + /* offer closest resolution which we have found */ + fmt->fmt.pix.width = width; + fmt->fmt.pix.height = height; + + DPRINTF(1, "%s: %s: offered width=%d, height=%d\n", + DEVNAME(sc), __func__, width, height); + + /* tell our sample buffer size */ + fmt->fmt.pix.sizeimage = sc->sc_sample_buffer.buf_size; + return (0); } @@ -2261,5 +2403,6 @@ uvideo_start_read(void *v) if (sc->sc_mmap_flag) sc->sc_mmap_flag = 0; + uvideo_vs_init(sc); uvideo_vs_start(sc); } diff --git a/sys/dev/usb/uvideo.h b/sys/dev/usb/uvideo.h index 0bbcb4584d5..0f5eebccec2 100644 --- a/sys/dev/usb/uvideo.h +++ b/sys/dev/usb/uvideo.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uvideo.h,v 1.21 2008/07/14 04:45:50 mglocker Exp $ */ +/* $OpenBSD: uvideo.h,v 1.22 2008/07/18 18:49:11 mglocker Exp $ */ /* * Copyright (c) 2007 Robert Nagy @@ -437,10 +437,12 @@ struct uvideo_format_desc { } __packed; struct uvideo_format_group { + uint32_t pixelformat; struct uvideo_format_desc *format; uint8_t format_dfidx; /* frame descriptors for mjpeg and uncompressed are identical */ #define UVIDEO_MAX_FRAME 16 + int frame_num; struct usb_video_frame_mjpeg_desc *frame_cur; struct usb_video_frame_mjpeg_desc *frame[UVIDEO_MAX_FRAME]; } __packed; @@ -469,6 +471,7 @@ struct uvideo_softc { int sc_dying; int sc_mode; int sc_video_buf_size; + int sc_negotiated_flag; u_int16_t uvc_version; u_int32_t clock_frequency; @@ -492,6 +495,7 @@ struct uvideo_softc { struct usb_video_input_header_desc_all sc_desc_vs_input_header; #define UVIDEO_MAX_FORMAT 8 + int sc_fmtgrp_num; struct uvideo_format_group *sc_fmtgrp_cur; struct uvideo_format_group sc_fmtgrp[UVIDEO_MAX_FORMAT];