diff options
| author | Marcus Glocker <mglocker@cvs.openbsd.org> | 2008-04-10 09:22:16 +0000 |
|---|---|---|
| committer | Marcus Glocker <mglocker@cvs.openbsd.org> | 2008-04-10 09:22:16 +0000 |
| commit | f6f346c3084158cea6a14974fc27a60e0b2a1630 (patch) | |
| tree | ee47aa7f01f59777b2ae7249c434aec33977ec78 /sys | |
| parent | 7df2155c114e4ecc55c6a01714e31fbd15d88d1b (diff) | |
Fix MJPEG Video Frame Descriptor struct.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/uvideo.c | 13 | ||||
| -rw-r--r-- | sys/dev/usb/uvideo.h | 5 |
2 files changed, 10 insertions, 8 deletions
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c index 33a8abcaee5..cd66ba94bba 100644 --- a/sys/dev/usb/uvideo.c +++ b/sys/dev/usb/uvideo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvideo.c,v 1.2 2008/04/09 20:38:55 mglocker Exp $ */ +/* $OpenBSD: uvideo.c,v 1.3 2008/04/10 09:22:15 mglocker Exp $ */ /* * Copyright (c) 2008 Robert Nagy <robert@openbsd.org> @@ -1026,12 +1026,13 @@ uvideo_dump_desc_frame_mjpeg(struct uvideo_softc *sc, printf("bDescriptorSubtype=0x%02x\n", d->bDescriptorSubtype); printf("bFrameIndex=0x%02x\n", d->bFrameIndex); printf("bmCapabilities=0x%02x\n", d->bmCapabilities); - printf("wWidth=0x%d\n", UGETW(d->wWidth)); - printf("wHeight=0x%d\n", UGETW(d->wHeight)); - printf("dwMinBitRate=0x%08x\n", UGETDW(d->dwMaxBitRate)); - printf("dwMaxVideoFrameBufferSize=0x%08x\n", + printf("wWidth=%d\n", UGETW(d->wWidth)); + printf("wHeight=%d\n", UGETW(d->wHeight)); + printf("dwMinBitRate=%d\n", UGETDW(d->dwMinBitRate)); + printf("dwMaxBitRate=%d\n", UGETDW(d->dwMaxBitRate)); + printf("dwMaxVideoFrameBufferSize=%d\n", UGETDW(d->dwMaxVideoFrameBufferSize)); - printf("dwDefaultFrameInterval=0x%d\n", + printf("dwDefaultFrameInterval=%d\n", UGETDW(d->dwDefaultFrameInterval)); printf("bFrameIntervalType=0x%02x\n", d->bFrameIntervalType); } diff --git a/sys/dev/usb/uvideo.h b/sys/dev/usb/uvideo.h index 96fec6e08a8..6855fc7218a 100644 --- a/sys/dev/usb/uvideo.h +++ b/sys/dev/usb/uvideo.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uvideo.h,v 1.2 2008/04/09 20:38:55 mglocker Exp $ */ +/* $OpenBSD: uvideo.h,v 1.3 2008/04/10 09:22:15 mglocker Exp $ */ /* * Copyright (c) 2007 Robert Nagy <robert@openbsd.org> @@ -308,8 +308,9 @@ struct usb_video_frame_descriptor { uDWord dwMinBitRate; uDWord dwMaxBitRate; uDWord dwMaxVideoFrameBufferSize; - uWord dwDefaultFrameInterval; + uDWord dwDefaultFrameInterval; uByte bFrameIntervalType; + /* TODO add continous/discrete frame intervals (Table 3-3/3-4) */ } __packed; /* |