Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | fixes and improvements in ZBar module |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
c82e1d09884d045810286169e41d6423 |
User & Date: | chw 2015-10-24 18:14:45.011 |
Context
2015-10-25
| ||
07:59 | added TIP #414 as suggested by Jan Nijtmans check-in: 4332aaffeb user: chw tags: trunk | |
2015-10-24
| ||
18:14 | fixes and improvements in ZBar module check-in: c82e1d0988 user: chw tags: trunk | |
16:48 | added tk upstream changes check-in: d997849151 user: chw tags: trunk | |
Changes
Changes to jni/ZBar/Android.mk.
︙ | ︙ | |||
57 58 59 60 61 62 63 64 65 66 67 68 69 70 | zbar/qrcode/util.c \ icu4c/dl_icu.c \ tcl/tclzbar.c LOCAL_CFLAGS := $(tcl_cflags) $(tk_cflags) \ -DU_LIB_SUFFIX_C_NAME=_zbar \ -DUSE_UCNV=1 \ -O2 LOCAL_SHARED_LIBRARIES := tcl tk LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) | > > | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | zbar/qrcode/util.c \ icu4c/dl_icu.c \ tcl/tclzbar.c LOCAL_CFLAGS := $(tcl_cflags) $(tk_cflags) \ -DU_LIB_SUFFIX_C_NAME=_zbar \ -DUSE_UCNV=1 \ -DPACKAGE="\"zbar\"" \ -DPACKAGE_VERSION="\"0.10\"" \ -O2 LOCAL_SHARED_LIBRARIES := tcl tk LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) |
Changes to jni/ZBar/configure.ac.
︙ | ︙ | |||
175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 | [AS_HELP_STRING([--disable-video], [exclude video scanner features])], [], [enable_video="yes"]) have_v4l1="no" have_v4l2="no" AS_IF([test "x$enable_video" = "xno"], [], [test "x$win32" = "xno"], [AC_CHECK_HEADERS([linux/videodev.h], [have_v4l1="yes"]) AC_CHECK_HEADERS([linux/videodev2.h], [have_v4l2="yes"]) AS_IF([test "x$have_v4l2" = "xno" && test "x$have_v4l1" = "xno"], [AC_MSG_FAILURE([test for video support failed! rebuild your kernel to include video4linux support or configure --disable-video to skip building video support.])], [test "x$have_v4l2" = "xno"], [AC_MSG_WARN([v4l2 API not detected, upgrade your kernel!])])], [AC_CHECK_HEADERS([vfw.h], [with_video="vfw"], [AC_MSG_FAILURE([test for VfW video support failed! configure --disable-video to skip building video support.])])]) AM_CONDITIONAL([HAVE_VIDEO], [test "x$enable_video" != "xno"]) AM_CONDITIONAL([HAVE_V4L1], [test "x$have_v4l1" != "xno"]) AM_CONDITIONAL([HAVE_V4L2], [test "x$have_v4l2" != "xno"]) dnl X AC_ARG_VAR([XSHM_LIBS], [linker flags for X shared memory extension]) AS_IF([test "x$win32" != "xno"], [have_x="no"], [AC_PATH_XTRA | > > > > > > > > | 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 | [AS_HELP_STRING([--disable-video], [exclude video scanner features])], [], [enable_video="yes"]) have_v4l1="no" have_v4l2="no" have_libv4l="no" AS_IF([test "x$enable_video" = "xno"], [], [test "x$win32" = "xno"], [AC_CHECK_HEADERS([linux/videodev.h], [have_v4l1="yes"]) AC_CHECK_HEADERS([linux/videodev2.h], [have_v4l2="yes"]) AC_CHECK_HEADERS([libv4l2.h], [have_libv4l="yes"]) AS_IF([test "x$have_v4l2" = "xno" && test "x$have_v4l1" = "xno"], [AC_MSG_FAILURE([test for video support failed! rebuild your kernel to include video4linux support or configure --disable-video to skip building video support.])], [test "x$have_v4l2" = "xno"], [AC_MSG_WARN([v4l2 API not detected, upgrade your kernel!])])], [AC_CHECK_HEADERS([vfw.h], [with_video="vfw"], [AC_MSG_FAILURE([test for VfW video support failed! configure --disable-video to skip building video support.])])]) AS_IF([test "x$have_libv4l" = "xyes"], AC_CHECK_LIB([v4l2], [v4l2_open], [], [AC_MSG_FAILURE([unable to find libv4l.so])]), [AC_MSG_WARN([libv4l not detected. Install it to support more cameras!])]) AM_CONDITIONAL([HAVE_VIDEO], [test "x$enable_video" != "xno"]) AM_CONDITIONAL([HAVE_V4L1], [test "x$have_v4l1" != "xno"]) AM_CONDITIONAL([HAVE_V4L2], [test "x$have_v4l2" != "xno"]) AM_CONDITIONAL([HAVE_LIBV4L], [test "x$have_libv4l" != "xno"]) dnl X AC_ARG_VAR([XSHM_LIBS], [linker flags for X shared memory extension]) AS_IF([test "x$win32" != "xno"], [have_x="no"], [AC_PATH_XTRA |
︙ | ︙ | |||
567 568 569 570 571 572 573 574 575 576 577 578 579 580 | echo "please verify that the detected configuration matches your expectations:" echo "------------------------------------------------------------------------" echo "X --with-x=$have_x" echo "pthreads --enable-pthread=$enable_pthread" echo "v4l --enable-video=$enable_video" AS_IF([test "x$enable_video" != "xyes"], [echo " => zbarcam video scanner will *NOT* be built"]) echo "jpeg --with-jpeg=$with_jpeg" AS_IF([test "x$with_jpeg" != "xyes"], [echo " => JPEG image conversions will *NOT* be supported"]) AS_IF([test "x$have_GM" = "xyes"], [echo "GraphicsMagick --with-graphicsmagick=yes"], [echo "ImageMagick --with-imagemagick=$with_imagemagick"]) AS_IF([test "x$have_IM" != "xyes" && test "x$have_GM" != "xyes"], | > > | 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 | echo "please verify that the detected configuration matches your expectations:" echo "------------------------------------------------------------------------" echo "X --with-x=$have_x" echo "pthreads --enable-pthread=$enable_pthread" echo "v4l --enable-video=$enable_video" AS_IF([test "x$enable_video" != "xyes"], [echo " => zbarcam video scanner will *NOT* be built"]) AS_IF([test "x$have_libv4l" != "xyes"], [echo " => libv4l will *NOT* be used"]) echo "jpeg --with-jpeg=$with_jpeg" AS_IF([test "x$with_jpeg" != "xyes"], [echo " => JPEG image conversions will *NOT* be supported"]) AS_IF([test "x$have_GM" = "xyes"], [echo "GraphicsMagick --with-graphicsmagick=yes"], [echo "ImageMagick --with-imagemagick=$with_imagemagick"]) AS_IF([test "x$have_IM" != "xyes" && test "x$have_GM" != "xyes"], |
︙ | ︙ |
Changes to jni/ZBar/tcl/tclzbar.c.
︙ | ︙ | |||
23 24 25 26 27 28 29 | #else #include <tk.h> #endif #include <tcl.h> | < | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | #else #include <tk.h> #endif #include <tcl.h> #include <zbar.h> #include <string.h> /* * Symbology mapping. */ |
︙ | ︙ | |||
170 171 172 173 174 175 176 | 1726544, 1733986, 1741428, 1748870, 1756312, 1763754, 1771196, 1778638, 1786080, 1793522, 1800964, 1808406, 1815848, 1823290, 1830732, 1838174, 1845616, 1853058, 1860500, 1867942, 1875384, 1882826, 1890268, 1897710 }; #endif /* !defined(__arm__) */ | < < < < < < < < < < < < < < < < < < < < < < < < | 169 170 171 172 173 174 175 176 177 178 179 180 181 182 | 1726544, 1733986, 1741428, 1748870, 1756312, 1763754, 1771196, 1778638, 1786080, 1793522, 1800964, 1808406, 1815848, 1823290, 1830732, 1838174, 1845616, 1853058, 1860500, 1867942, 1875384, 1882826, 1890268, 1897710 }; #endif /* !defined(__arm__) */ /* * Return string object given symbol type or list of * all known symbol types. */ static Tcl_Obj * ZbarGetSymbolObj(zbar_symbol_type_t t, int all) |
︙ | ︙ | |||
246 247 248 249 250 251 252 253 254 255 256 257 258 259 | *idxPtr = i; } return ZbarSyms[i].type; } } return ZBAR_SYMBOL; /* no match */ } /* * Decoder thread, waits per condition for a decode request. * Reports the result back by an asynchronous event which * triggers a do-when-idle handler in the requesting thread. */ | > > > > > > > > > > > > > > > > > > > > > > > > | 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 | *idxPtr = i; } return ZbarSyms[i].type; } } return ZBAR_SYMBOL; /* no match */ } #ifdef TCL_THREADS /* * Structure used for asynchronous decoding carried out by * a dedicated thread. At most, one decoding job can be * outstanding at any one time. */ typedef struct { int run; /* Controls thread loop */ Tcl_Mutex mutex; /* Lock for this struct */ Tcl_Condition cond; /* For waking up thread */ Tcl_ThreadId tid; /* Thread identifier */ Tcl_Interp *interp; /* Interpreter using Zbar decoder */ Tcl_AsyncHandler async; /* For signalling result */ unsigned char *pixPtr; /* Thread input: pixel array or NULL */ zbar_image_t *imgPtr; /* Thread input: ZBar image struct */ int nCmdObjs; /* Callback, number Tcl_Objs */ Tcl_Obj **cmdObjs; /* Callback, nCmdObjs plus 3 for result */ /* Thread input: enabled symbologies */ unsigned char enabled[sizeof (ZbarSyms) / sizeof (ZbarSyms[0])]; } AsyncDecode; /* * Decoder thread, waits per condition for a decode request. * Reports the result back by an asynchronous event which * triggers a do-when-idle handler in the requesting thread. */ |
︙ | ︙ | |||
389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 | Tcl_DecrRefCount(cmdObjs[i]); cmdObjs[i] = NULL; } } ckfree((char *) cmdObjs); if (ret == TCL_ERROR) { Tcl_AddErrorInfo(aPtr->interp, "\n (zbar event handler)"); Tcl_BackgroundException(aPtr->interp, ret); } } Tcl_Release(aPtr->interp); Tcl_Release(aPtr); } /* | > > > > | 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 | Tcl_DecrRefCount(cmdObjs[i]); cmdObjs[i] = NULL; } } ckfree((char *) cmdObjs); if (ret == TCL_ERROR) { Tcl_AddErrorInfo(aPtr->interp, "\n (zbar event handler)"); #if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6) Tcl_BackgroundError(aPtr->interp); #else Tcl_BackgroundException(aPtr->interp, ret); #endif } } Tcl_Release(aPtr->interp); Tcl_Release(aPtr); } /* |
︙ | ︙ | |||
874 875 876 877 878 879 880 881 882 883 884 885 886 887 | tmp += 7442 * *srcPtr++; #endif *dstPtr++ = tmp >> 16; } } } } else { Tk_PhotoHandle handle; handle = Tk_FindPhoto(interp, Tcl_GetString(objv[1])); if (handle == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf("photo \"%s\" not found", Tcl_GetString(objv[1]))); return TCL_ERROR; | > > > > > | 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 | tmp += 7442 * *srcPtr++; #endif *dstPtr++ = tmp >> 16; } } } } else { #ifdef ZBAR_NO_TK Tcl_SetResult(interp, "need list of width, height, bpp, bytes", TCL_STATIC); return TCL_ERROR; #else Tk_PhotoHandle handle; handle = Tk_FindPhoto(interp, Tcl_GetString(objv[1])); if (handle == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf("photo \"%s\" not found", Tcl_GetString(objv[1]))); return TCL_ERROR; |
︙ | ︙ | |||
922 923 924 925 926 927 928 929 930 931 932 933 934 935 | #endif dstPtr[0] = tmp >> 16; } dstPtr += 1; srcPtr += block.pixelSize; } } } scanPtr = zbar_image_scanner_create(); if (scanPtr == NULL) { if (pixPtr != NULL) { ckfree((char *) pixPtr); } Tcl_SetResult(interp, "error creating image scanner", TCL_STATIC); | > | 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 | #endif dstPtr[0] = tmp >> 16; } dstPtr += 1; srcPtr += block.pixelSize; } } #endif } scanPtr = zbar_image_scanner_create(); if (scanPtr == NULL) { if (pixPtr != NULL) { ckfree((char *) pixPtr); } Tcl_SetResult(interp, "error creating image scanner", TCL_STATIC); |
︙ | ︙ |
Changes to jni/ZBar/zbar/convert.c.
︙ | ︙ | |||
1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 | if(min_cost > cost) { min_cost = cost; min_fmt = *fmt; if(!cost) break; } } if(win) (void)window_unlock(win); if(!min_fmt) return(err_capture(errdst, SEV_ERROR, ZBAR_ERR_UNSUPPORTED, __func__, "no supported image formats available")); if(!vdo) | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 | if(min_cost > cost) { min_cost = cost; min_fmt = *fmt; if(!cost) break; } } if(!min_fmt && vdo->emu_formats) { /* As vdo->formats aren't compatible, just free them */ free(vdo->formats); vdo->formats = vdo->emu_formats; vdo->emu_formats = NULL; /* * Use the same cost algorithm to select emulated formats. * This might select a sub-optimal conversion, but, in practice, * it will select a conversion to YUV at libv4l, and a YUY->Y8 * in zbar, with it is OK. Yet, it is better to not select the * most performatic conversion than to not support the webcam. */ for(fmt = _zbar_formats; *fmt; fmt++) { /* only consider formats supported by video device */ uint32_t win_fmt = 0; int cost; if(!has_format(*fmt, srcs)) continue; cost = _zbar_best_format(*fmt, &win_fmt, dsts); if(cost < 0) { zprintf(4, "%.4s(%08" PRIx32 ") -> ? (unsupported)\n", (char*)fmt, *fmt); continue; } zprintf(4, "%.4s(%08" PRIx32 ") -> %.4s(%08" PRIx32 ") (%d)\n", (char*)fmt, *fmt, (char*)&win_fmt, win_fmt, cost); if(min_cost > cost) { min_cost = cost; min_fmt = *fmt; if(!cost) break; } } } if(win) (void)window_unlock(win); if(!min_fmt) return(err_capture(errdst, SEV_ERROR, ZBAR_ERR_UNSUPPORTED, __func__, "no supported image formats available")); if(!vdo) |
︙ | ︙ |
Changes to jni/ZBar/zbar/video.c.
︙ | ︙ | |||
107 108 109 110 111 112 113 114 115 116 117 118 119 120 | img->data = NULL; free(img); } if(vdo->buf) free(vdo->buf); if(vdo->formats) free(vdo->formats); err_cleanup(&vdo->err); _zbar_mutex_destroy(&vdo->qlock); #ifdef HAVE_LIBJPEG if(vdo->jpeg_img) { zbar_image_destroy(vdo->jpeg_img); vdo->jpeg_img = NULL; | > > > | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 | img->data = NULL; free(img); } if(vdo->buf) free(vdo->buf); if(vdo->formats) free(vdo->formats); if(vdo->emu_formats) free(vdo->emu_formats); err_cleanup(&vdo->err); _zbar_mutex_destroy(&vdo->qlock); #ifdef HAVE_LIBJPEG if(vdo->jpeg_img) { zbar_image_destroy(vdo->jpeg_img); vdo->jpeg_img = NULL; |
︙ | ︙ |
Changes to jni/ZBar/zbar/video.h.
︙ | ︙ | |||
65 66 67 68 69 70 71 72 73 74 75 76 77 78 | video_iomode_t iomode; /* video data transfer mode */ unsigned initialized : 1; /* format selected and images mapped */ unsigned active : 1; /* current streaming state */ uint32_t format; /* selected fourcc */ unsigned palette; /* v4l1 format index corresponding to format */ uint32_t *formats; /* 0 terminated list of supported formats */ unsigned long datalen; /* size of image data for selected format */ unsigned long buflen; /* total size of image data buffer */ void *buf; /* image data buffer */ unsigned frame; /* frame count */ | > | 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | video_iomode_t iomode; /* video data transfer mode */ unsigned initialized : 1; /* format selected and images mapped */ unsigned active : 1; /* current streaming state */ uint32_t format; /* selected fourcc */ unsigned palette; /* v4l1 format index corresponding to format */ uint32_t *formats; /* 0 terminated list of supported formats */ uint32_t *emu_formats; /* 0 terminated list of emulated formats */ unsigned long datalen; /* size of image data for selected format */ unsigned long buflen; /* total size of image data buffer */ void *buf; /* image data buffer */ unsigned frame; /* frame count */ |
︙ | ︙ |
Changes to jni/ZBar/zbar/video/v4l.c.
︙ | ︙ | |||
30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | #endif #ifdef HAVE_FCNTL_H # include <fcntl.h> #endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif #include "video.h" extern int _zbar_v4l1_probe(zbar_video_t*); extern int _zbar_v4l2_probe(zbar_video_t*); int _zbar_video_open (zbar_video_t *vdo, const char *dev) { | > > > > > > > | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | #endif #ifdef HAVE_FCNTL_H # include <fcntl.h> #endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif #ifdef HAVE_LIBV4L2_H # include <fcntl.h> # include <libv4l2.h> #else # define v4l2_open open # define v4l2_close close #endif #include "video.h" extern int _zbar_v4l1_probe(zbar_video_t*); extern int _zbar_v4l2_probe(zbar_video_t*); int _zbar_video_open (zbar_video_t *vdo, const char *dev) { vdo->fd = v4l2_open(dev, O_RDWR); if(vdo->fd < 0) return(err_capture_str(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, "opening video device '%s'", dev)); zprintf(1, "opened camera device %s (fd=%d)\n", dev, vdo->fd); int rc = -1; #ifdef HAVE_LINUX_VIDEODEV2_H if(vdo->intf != VIDEO_V4L1) rc = _zbar_v4l2_probe(vdo); #endif #ifdef HAVE_LINUX_VIDEODEV_H if(rc && vdo->intf != VIDEO_V4L2) rc = _zbar_v4l1_probe(vdo); #endif if(rc && vdo->fd >= 0) { v4l2_close(vdo->fd); vdo->fd = -1; } return(rc); } |
Changes to jni/ZBar/zbar/video/v4l2.c.
︙ | ︙ | |||
34 35 36 37 38 39 40 41 42 43 44 45 46 47 | #include <assert.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif #include <linux/videodev2.h> #include "video.h" #include "image.h" #define V4L2_FORMATS_MAX 64 | > > > > > > > > > | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | #include <assert.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif #ifdef HAVE_LIBV4L2_H # include <fcntl.h> # include <libv4l2.h> #else # define v4l2_close close # define v4l2_ioctl ioctl # define v4l2_mmap mmap # define v4l2_munmap munmap #endif #include <linux/videodev2.h> #include "video.h" #include "image.h" #define V4L2_FORMATS_MAX 64 |
︙ | ︙ | |||
63 64 65 66 67 68 69 | } else { vbuf.memory = V4L2_MEMORY_USERPTR; vbuf.m.userptr = (unsigned long)img->data; vbuf.length = img->datalen; vbuf.index = img->srcidx; /* FIXME workaround broken drivers */ } | | | 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 | } else { vbuf.memory = V4L2_MEMORY_USERPTR; vbuf.m.userptr = (unsigned long)img->data; vbuf.length = img->datalen; vbuf.index = img->srcidx; /* FIXME workaround broken drivers */ } if(v4l2_ioctl(vdo->fd, VIDIOC_QBUF, &vbuf) < 0) return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, "queuing video buffer (VIDIOC_QBUF)")); return(0); } static zbar_image_t *v4l2_dq (zbar_video_t *vdo) { |
︙ | ︙ | |||
87 88 89 90 91 92 93 | memset(&vbuf, 0, sizeof(vbuf)); vbuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; if(iomode == VIDEO_MMAP) vbuf.memory = V4L2_MEMORY_MMAP; else vbuf.memory = V4L2_MEMORY_USERPTR; | | | 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 | memset(&vbuf, 0, sizeof(vbuf)); vbuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; if(iomode == VIDEO_MMAP) vbuf.memory = V4L2_MEMORY_MMAP; else vbuf.memory = V4L2_MEMORY_USERPTR; if(v4l2_ioctl(fd, VIDIOC_DQBUF, &vbuf) < 0) return(NULL); if(iomode == VIDEO_MMAP) { assert(vbuf.index >= 0); assert(vbuf.index < vdo->num_images); img = vdo->images[vbuf.index]; } |
︙ | ︙ | |||
128 129 130 131 132 133 134 | static int v4l2_start (zbar_video_t *vdo) { if(vdo->iomode == VIDEO_READWRITE) return(0); enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE; | | | | | | | < < < < < < < < < < < < < < < | | | 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 | static int v4l2_start (zbar_video_t *vdo) { if(vdo->iomode == VIDEO_READWRITE) return(0); enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE; if(v4l2_ioctl(vdo->fd, VIDIOC_STREAMON, &type) < 0) return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, "starting video stream (VIDIOC_STREAMON)")); return(0); } static int v4l2_stop (zbar_video_t *vdo) { if(vdo->iomode == VIDEO_READWRITE) return(0); enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE; if(v4l2_ioctl(vdo->fd, VIDIOC_STREAMOFF, &type) < 0) return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, "stopping video stream (VIDIOC_STREAMOFF)")); return(0); } static int v4l2_cleanup (zbar_video_t *vdo) { if(vdo->iomode == VIDEO_READWRITE) return(0); struct v4l2_requestbuffers rb; memset(&rb, 0, sizeof(rb)); rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; if(vdo->iomode == VIDEO_MMAP) { rb.memory = V4L2_MEMORY_MMAP; int i; for(i = 0; i < vdo->num_images; i++) { zbar_image_t *img = vdo->images[i]; if(img->data && v4l2_munmap((void*)img->data, img->datalen)) err_capture(vdo, SEV_WARNING, ZBAR_ERR_SYSTEM, __func__, "unmapping video frame buffers"); img->data = NULL; img->datalen = 0; } } else rb.memory = V4L2_MEMORY_USERPTR; /* requesting 0 buffers * should implicitly disable streaming */ if(v4l2_ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0) err_capture(vdo, SEV_WARNING, ZBAR_ERR_SYSTEM, __func__, "releasing video frame buffers (VIDIOC_REQBUFS)"); /* v4l2_close v4l2_open device */ if(vdo->fd >= 0) { v4l2_close(vdo->fd); vdo->fd = -1; } return(0); } static int v4l2_mmap_buffers (zbar_video_t *vdo) { struct v4l2_buffer vbuf; memset(&vbuf, 0, sizeof(vbuf)); vbuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; vbuf.memory = V4L2_MEMORY_MMAP; int i; for(i = 0; i < vdo->num_images; i++) { vbuf.index = i; if(v4l2_ioctl(vdo->fd, VIDIOC_QUERYBUF, &vbuf) < 0) /* FIXME cleanup */ return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, "querying video buffer (VIDIOC_QUERYBUF)")); if(vbuf.length < vdo->datalen) fprintf(stderr, "WARNING: insufficient v4l2 video buffer size:\n" "\tvbuf[%d].length=%x datalen=%lx image=%d x %d %.4s(%08x)\n", i, vbuf.length, vdo->datalen, vdo->width, vdo->height, (char*)&vdo->format, vdo->format); zbar_image_t *img = vdo->images[i]; img->datalen = vbuf.length; img->data = v4l2_mmap(NULL, vbuf.length, PROT_READ | PROT_WRITE, MAP_SHARED, vdo->fd, vbuf.m.offset); if(img->data == MAP_FAILED) /* FIXME cleanup */ return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, "mapping video frame buffers")); zprintf(2, " buf[%d] 0x%lx bytes @%p\n", i, img->datalen, img->data); |
︙ | ︙ | |||
249 250 251 252 253 254 255 | memset(&vfmt, 0, sizeof(vfmt)); vfmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; vpix->width = vdo->width; vpix->height = vdo->height; vpix->pixelformat = fmt; vpix->field = V4L2_FIELD_NONE; int rc = 0; | | | | | 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 | memset(&vfmt, 0, sizeof(vfmt)); vfmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; vpix->width = vdo->width; vpix->height = vdo->height; vpix->pixelformat = fmt; vpix->field = V4L2_FIELD_NONE; int rc = 0; if((rc = v4l2_ioctl(vdo->fd, VIDIOC_S_FMT, &vfmt)) < 0) { /* several broken drivers return an error if we request * no interlacing (NB v4l2 spec violation) * ...try again with an interlaced request */ zprintf(1, "VIDIOC_S_FMT returned %d(%d), trying interlaced...\n", rc, errno); /* FIXME this might be _ANY once we can de-interlace */ vpix->field = V4L2_FIELD_INTERLACED; if(v4l2_ioctl(vdo->fd, VIDIOC_S_FMT, &vfmt) < 0) return(err_capture_int(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, "setting format %x (VIDIOC_S_FMT)", fmt)); zprintf(0, "WARNING: broken driver returned error when non-interlaced" " format requested\n"); } struct v4l2_format newfmt; struct v4l2_pix_format *newpix = &newfmt.fmt.pix; memset(&newfmt, 0, sizeof(newfmt)); newfmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; if(v4l2_ioctl(vdo->fd, VIDIOC_G_FMT, &newfmt) < 0) return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, "querying format (VIDIOC_G_FMT)")); if(newpix->field != V4L2_FIELD_NONE) err_capture(vdo, SEV_WARNING, ZBAR_ERR_INVALID, __func__, "video driver only supports interlaced format," " vertical scanning may not work"); |
︙ | ︙ | |||
300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 | vdo->datalen); return(0); } static int v4l2_init (zbar_video_t *vdo, uint32_t fmt) { if(v4l2_set_format(vdo, fmt)) return(-1); if(vdo->iomode == VIDEO_MMAP) return(v4l2_mmap_buffers(vdo)); return(0); } static int v4l2_probe_iomode (zbar_video_t *vdo) { struct v4l2_requestbuffers rb; memset(&rb, 0, sizeof(rb)); | > > > > > > > > > > > > > > > > > > > > > > > > | | > > > > > | > > > > > > > > > > > > > > | | | > > > > > > | | | | > | > > > > > > > > > > > > > > > | | 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 | vdo->datalen); return(0); } static int v4l2_init (zbar_video_t *vdo, uint32_t fmt) { struct v4l2_requestbuffers rb; if(v4l2_set_format(vdo, fmt)) return(-1); memset(&rb, 0, sizeof(rb)); rb.count = vdo->num_images; rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; if(vdo->iomode == VIDEO_MMAP) rb.memory = V4L2_MEMORY_MMAP; else rb.memory = V4L2_MEMORY_USERPTR; if(v4l2_ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0) return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, "requesting video frame buffers (VIDIOC_REQBUFS)")); if(!rb.count) return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_INVALID, __func__, "driver returned 0 buffers")); if(vdo->num_images > rb.count) vdo->num_images = rb.count; zprintf(1, "using %u buffers (of %d requested)\n", rb.count, vdo->num_images); if(vdo->iomode == VIDEO_MMAP) return(v4l2_mmap_buffers(vdo)); return(0); } static int v4l2_probe_iomode (zbar_video_t *vdo) { struct v4l2_requestbuffers rb; memset(&rb, 0, sizeof(rb)); rb.count = vdo->num_images; rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; if(vdo->iomode == VIDEO_MMAP) rb.memory = V4L2_MEMORY_MMAP; else rb.memory = V4L2_MEMORY_USERPTR; if(v4l2_ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0) { if(vdo->iomode) return(err_capture_int(vdo, SEV_ERROR, ZBAR_ERR_INVALID, __func__, "unsupported iomode requested (%d)", vdo->iomode)); else if(errno != EINVAL) return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, "querying streaming mode (VIDIOC_REQBUFS)")); #ifdef HAVE_SYS_MMAN_H err_capture(vdo, SEV_WARNING, ZBAR_ERR_SYSTEM, __func__, "USERPTR failed. Falling back to mmap"); vdo->iomode = VIDEO_MMAP; #else return err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, "Userptr not supported, and zbar was compiled without mmap support")); #endif } else { if(!vdo->iomode) rb.memory = V4L2_MEMORY_USERPTR; /* Update the num_images with the max supported by the driver */ if(rb.count) vdo->num_images = rb.count; else err_capture(vdo, SEV_WARNING, ZBAR_ERR_SYSTEM, __func__, "Something is wrong: number of buffers returned by REQBUF is zero!"); /* requesting 0 buffers * This cleans up the buffers allocated previously on probe */ rb.count = 0; if(v4l2_ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0) err_capture(vdo, SEV_WARNING, ZBAR_ERR_SYSTEM, __func__, "releasing video frame buffers (VIDIOC_REQBUFS)"); } return(0); } static inline int v4l2_probe_formats (zbar_video_t *vdo) { int n_formats = 0, n_emu_formats = 0; zprintf(2, "enumerating supported formats:\n"); struct v4l2_fmtdesc desc; memset(&desc, 0, sizeof(desc)); desc.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; for(desc.index = 0; desc.index < V4L2_FORMATS_MAX; desc.index++) { if(v4l2_ioctl(vdo->fd, VIDIOC_ENUM_FMT, &desc) < 0) break; zprintf(2, " [%d] %.4s : %s%s%s\n", desc.index, (char*)&desc.pixelformat, desc.description, (desc.flags & V4L2_FMT_FLAG_COMPRESSED) ? " COMPRESSED" : "", (desc.flags & V4L2_FMT_FLAG_EMULATED) ? " EMULATED" : ""); if (desc.flags & V4L2_FMT_FLAG_EMULATED) { vdo->emu_formats = realloc(vdo->emu_formats, (n_emu_formats + 2) * sizeof(uint32_t)); vdo->emu_formats[n_emu_formats++] = desc.pixelformat; } else { vdo->formats = realloc(vdo->formats, (n_formats + 2) * sizeof(uint32_t)); vdo->formats[n_formats++] = desc.pixelformat; } } if(!desc.index) return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, "enumerating video formats (VIDIOC_ENUM_FMT)")); if(vdo->formats) vdo->formats[n_formats] = 0; if(vdo->emu_formats) vdo->emu_formats[n_emu_formats] = 0; if(!vdo->formats && vdo->emu_formats) { /* * If only emu formats are available, just move them to vdo->formats. * This happens when libv4l detects that the only available fourcc * formats are webcam proprietary formats or bayer formats. */ vdo->formats = vdo->emu_formats; vdo->emu_formats = NULL; } zprintf(2, "Found %d formats and %d emulated formats.\n", n_formats, n_emu_formats); struct v4l2_format fmt; struct v4l2_pix_format *pix = &fmt.fmt.pix; memset(&fmt, 0, sizeof(fmt)); fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; if(v4l2_ioctl(vdo->fd, VIDIOC_G_FMT, &fmt) < 0) return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, "querying current video format (VIDIO_G_FMT)")); zprintf(1, "current format: %.4s(%08x) %u x %u%s (line=0x%x size=0x%x)\n", (char*)&pix->pixelformat, pix->pixelformat, pix->width, pix->height, (pix->field != V4L2_FIELD_NONE) ? " INTERLACED" : "", |
︙ | ︙ | |||
386 387 388 389 390 391 392 | struct v4l2_format maxfmt; struct v4l2_pix_format *maxpix = &maxfmt.fmt.pix; memcpy(&maxfmt, &fmt, sizeof(maxfmt)); maxpix->width = vdo->width; maxpix->height = vdo->height; zprintf(1, "setting requested size: %d x %d\n", vdo->width, vdo->height); | | | | | 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 | struct v4l2_format maxfmt; struct v4l2_pix_format *maxpix = &maxfmt.fmt.pix; memcpy(&maxfmt, &fmt, sizeof(maxfmt)); maxpix->width = vdo->width; maxpix->height = vdo->height; zprintf(1, "setting requested size: %d x %d\n", vdo->width, vdo->height); if(v4l2_ioctl(vdo->fd, VIDIOC_S_FMT, &maxfmt) < 0) { zprintf(1, "set FAILED...trying to recover original format\n"); /* ignore errors (driver broken anyway) */ v4l2_ioctl(vdo->fd, VIDIOC_S_FMT, &fmt); } memset(&fmt, 0, sizeof(fmt)); fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; if(v4l2_ioctl(vdo->fd, VIDIOC_G_FMT, &fmt) < 0) return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, "querying current video format (VIDIOC_G_FMT)")); zprintf(1, "final format: %.4s(%08x) %u x %u%s (line=0x%x size=0x%x)\n", (char*)&pix->pixelformat, pix->pixelformat, pix->width, pix->height, (pix->field != V4L2_FIELD_NONE) ? " INTERLACED" : "", |
︙ | ︙ | |||
416 417 418 419 420 421 422 | static inline int v4l2_reset_crop (zbar_video_t *vdo) { /* check cropping */ struct v4l2_cropcap ccap; memset(&ccap, 0, sizeof(ccap)); ccap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; | | | 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 | static inline int v4l2_reset_crop (zbar_video_t *vdo) { /* check cropping */ struct v4l2_cropcap ccap; memset(&ccap, 0, sizeof(ccap)); ccap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; if(v4l2_ioctl(vdo->fd, VIDIOC_CROPCAP, &ccap) < 0) return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, "querying crop support (VIDIOC_CROPCAP)")); zprintf(1, "crop bounds: %d x %d @ (%d, %d)\n", ccap.bounds.width, ccap.bounds.height, ccap.bounds.left, ccap.bounds.top); zprintf(1, "current crop win: %d x %d @ (%d, %d) aspect %d / %d\n", |
︙ | ︙ | |||
438 439 440 441 442 443 444 | } /* reset crop parameters */ struct v4l2_crop crop; memset(&crop, 0, sizeof(crop)); crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; crop.c = ccap.defrect; | | | | 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 | } /* reset crop parameters */ struct v4l2_crop crop; memset(&crop, 0, sizeof(crop)); crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; crop.c = ccap.defrect; if(v4l2_ioctl(vdo->fd, VIDIOC_S_CROP, &crop) < 0 && errno != EINVAL) return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, "setting default crop window (VIDIOC_S_CROP)")); return(0); } int _zbar_v4l2_probe (zbar_video_t *vdo) { /* check capabilities */ struct v4l2_capability vcap; memset(&vcap, 0, sizeof(vcap)); if(v4l2_ioctl(vdo->fd, VIDIOC_QUERYCAP, &vcap) < 0) return(err_capture(vdo, SEV_WARNING, ZBAR_ERR_UNSUPPORTED, __func__, "video4linux version 2 not supported (VIDIOC_QUERYCAP)")); zprintf(1, "%.32s on %.32s driver %.16s (version %u.%u.%u)\n", vcap.card, (vcap.bus_info[0]) ? (char*)vcap.bus_info : "<unknown>", vcap.driver, (vcap.version >> 16) & 0xff, |
︙ | ︙ |