summaryrefslogtreecommitdiff
path: root/sys/dev/usb/uvideo.c
diff options
context:
space:
mode:
authorJacob Meuser <jakemsr@cvs.openbsd.org>2010-10-18 23:25:32 +0000
committerJacob Meuser <jakemsr@cvs.openbsd.org>2010-10-18 23:25:32 +0000
commita129dfe93666afc1a35b53d313e4d9cd7c8d3a31 (patch)
tree0d3556c9d4352d103c01c63285a307b22e846da8 /sys/dev/usb/uvideo.c
parent2fef109ae4249521c99a7416d9585451e6f9bea2 (diff)
bFrameIntervalType affects frame rates, not frame sizes
Diffstat (limited to 'sys/dev/usb/uvideo.c')
-rw-r--r--sys/dev/usb/uvideo.c21
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);
}