diff options
| author |   jakemsr <jakemsr@openbsd.org> | 2010-10-18 23:25:31 +0000 |
|---|---|---|
| committer | jakemsr <jakemsr@openbsd.org> | 2010-10-18 23:25:31 +0000 |
| commit | 829d46fc259cf8ab2910812fa83a0c3eaec5af81 (patch) | |
| tree | 34666072353f314e8900f3e8b4ad8bf3df5dd057 | |
| parent | when configuring the streaming interface with the video probe and (diff) | |
| download | wireguard-openbsd-829d46fc259cf8ab2910812fa83a0c3eaec5af81.tar.xz wireguard-openbsd-829d46fc259cf8ab2910812fa83a0c3eaec5af81.zip | |
bFrameIntervalType affects frame rates, not frame sizes
| -rw-r--r-- | sys/dev/usb/uvideo.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c index 0fa41d4a502..770ee5f8510 100644 --- a/sys/dev/usb/uvideo.c +++ b/sys/dev/usb/uvideo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvideo.c,v 1.144 2010/10/18 23:20:15 jakemsr Exp $ */ +/* $OpenBSD: uvideo.c,v 1.145 2010/10/18 23:25:31 jakemsr Exp $ */ /* * Copyright (c) 2008 Robert Nagy <robert@openbsd.org> @@ -2776,20 +2776,11 @@ uvideo_enum_fsizes(void *v, struct v4l2_frmsizeenum *fsizes) /* no more frames left */ return (EINVAL); - if (sc->sc_fmtgrp[idx].frame[i]->bFrameIntervalType == 0) { - /* TODO */ - fsizes->type = V4L2_FRMSIZE_TYPE_CONTINUOUS; - fsizes->un.stepwise.min_width = 0; - fsizes->un.stepwise.min_height = 0; - fsizes->un.stepwise.max_width = 0; - fsizes->un.stepwise.max_height = 0; - } else { - fsizes->type = V4L2_FRMSIZE_TYPE_DISCRETE; - fsizes->un.discrete.width = - UGETW(sc->sc_fmtgrp[idx].frame[i]->wWidth); - fsizes->un.discrete.height = - UGETW(sc->sc_fmtgrp[idx].frame[i]->wHeight); - } + fsizes->type = V4L2_FRMSIZE_TYPE_DISCRETE; + fsizes->un.discrete.width = + UGETW(sc->sc_fmtgrp[idx].frame[i]->wWidth); + fsizes->un.discrete.height = + UGETW(sc->sc_fmtgrp[idx].frame[i]->wHeight); return (0); } |