Changeset 42

Timestamp:

18/02/11 13:04:53 (15 months ago)

Author:

arthur

Message:

update doorcam for new libdmtx and avcodec

Location:

trunk/doorcam

Files:

• Makefile (modified) (1 diff)
• grab.c (modified) (10 diffs)

trunk/doorcam/Makefile

@@ -1 @@
-CFLAGS=-Wall -pedantic -I.. -g
-LDFLAGS=-ljpeg -lm -lpthread -lcurl -lavcodec -g
+CFLAGS=-Wall -pedantic -I.. -g -cstd=gnu99
+LDFLAGS=-g
+LDLIBS=-ljpeg -lm -lpthread -lcurl -lavcodec -ldmtx -lswscale
 
 all: grab
 
 grab: grab.o web.o
-        cc -o grab grab.o web.o ../.libs/libdmtx.a $(LDFLAGS)

trunk/doorcam/grab.c

@@ -3 +3 @@
 #include <sys/ioctl.h>
 #include <errno.h>
+#include <err.h>
 #include <string.h>
 #include <unistd.h>
@@ -15 +16 @@
 #include <sys/time.h>
 #include <curl/curl.h>
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
+#include <libswscale/swscale.h>
 
 int verbose=0;
@@ -410 +412 @@
         /* look for barcodes */
         DmtxImage *image;
-        DmtxDecode decode;
-        DmtxRegion region;
+        DmtxDecode *decode;
+        DmtxRegion *region;
         DmtxMessage *message;
-        DmtxPixelLoc pMin,pMax;
         DmtxTime timeout;
         int count=0, errors=0;
@@ -419 +420 @@
         struct gotlist *fp;
 
-                
-        pMin.X = 0;
-        pMin.Y = 0;
-        pMax.X = gwidth - 1;
-        pMax.Y = gheight - 1;
-
-        image = dmtxImageMalloc(gwidth, gheight);
-        memcpy(image->pxl, img, gwidth*gheight*3);
-        image->pageCount = 1;
-
-        decode = dmtxDecodeStructInit(image);
+        image = dmtxImageCreate(img, gwidth, gheight, DmtxPack24bppRGB);
+        dmtxImageSetProp(image, DmtxPropImageFlip, DmtxFlipNone);
+        decode = dmtxDecodeCreate(image, 1);
+
         while (1) {
                 /* waste at most 300mS looking for the first block */
                 timeout = dmtxTimeAdd(dmtxTimeNow(), decode_timeout);
-                region = dmtxDecodeFindNextRegion(&decode, &timeout);
-                if (region.found != DMTX_REGION_FOUND) break;
+                region = dmtxRegionFindNext(decode, &timeout);
+                if (region == NULL) break;
                 count++;
 
-                message = dmtxDecodeMatrixRegion(image, &region, 1);
+                message = dmtxDecodeMatrixRegion(decode, region, DmtxUndefined);
+
                 if (message == NULL) {
                         errors++;
+                        dmtxRegionDestroy(&region);
                         continue;
                 }
@@ -455 +451 @@
                         found = fp;
                 }
-                dmtxMessageFree(&message);
-        }
-        dmtxDecodeStructDeInit(&decode);
-        dmtxImageFree(&image);
+                dmtxMessageDestroy(&message);
+                dmtxRegionDestroy(&region);
+        }
+        dmtxDecodeDestroy(&decode);
+        dmtxImageDestroy(&image);
         while (found != NULL) {
                 fp = found->next;
@@ -489 +486 @@
 
         if (verbose) printf("%s: %s (%s)\n", vcap.driver, vcap.card, vcap.bus_info);
-        if (!vcap.capabilities & V4L2_CAP_VIDEO_CAPTURE) {
+        if (!(vcap.capabilities & V4L2_CAP_VIDEO_CAPTURE)) {
                 fprintf(stderr, "%s does not support capture.\n", device);
                 return (void *)1;
         }
-        if (!vcap.capabilities & V4L2_CAP_STREAMING) {
+        if (!(vcap.capabilities & V4L2_CAP_STREAMING)) {
                 fprintf(stderr, "%s does not support streaming mode.\n", device)
 ;
@@ -766 +763 @@
         int done;
         int fsize = gwidth * gheight;
+        static struct SwsContext *img_convert_ctx = NULL;
 
         codec = avcodec_find_decoder(CODEC_ID_MJPEG);
@@ -778 +776 @@
         picture = avcodec_alloc_frame();
         if (avcodec_open(c, codec) < 0) {
-                err("failed to open decoder");
+                err(1, "failed to open decoder");
                 return 0;
         }
@@ -789 +787 @@
 #endif
         if (outlen < 0  || done==0 ) {
-                err("jpeg decode failed used=%d/%d done=%d", outlen, len, done);
+                warn("jpeg decode failed used=%d/%d done=%d", outlen, len, done);
                 avcodec_close(c);
                 av_free(picture);
@@ -797 +795 @@
         outlen = 0;
         if (pixfmt_out == V4L2_PIX_FMT_RGB24) {
+                if (img_convert_ctx == NULL)
+                        img_convert_ctx = sws_getContext(  c->width, c->height, c->pix_fmt, gwidth, gheight, PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
                 outpic.data[0] = data_out;
-                outpic.data[1] = NULL;
-                outpic.data[2] = NULL;
-                outpic.linesize[0] = gwidth * 3;
-                if (img_convert(&outpic, PIX_FMT_RGB24, (AVPicture *)picture, c->pix_fmt, gwidth, gheight))
-                        err("format convert to yuyv failed");
+                outpic.data[1] = NULL;
+                outpic.data[2] = NULL;
+                outpic.linesize[0] = gwidth * 3;
+                sws_scale(img_convert_ctx, picture->data, picture->linesize, 0, c->height, outpic.data, outpic.linesize);
                 outlen = fsize*3;
         } else
         if (pixfmt_out == V4L2_PIX_FMT_YUYV) {
+                if (img_convert_ctx == NULL)
+                        img_convert_ctx = sws_getContext(  c->width, c->height, c->pix_fmt, gwidth, gheight, PIX_FMT_YUYV422, SWS_BICUBIC, NULL, NULL, NULL);
                 outpic.data[0] = data_out;
-                outpic.data[1] = NULL;
-                outpic.data[2] = NULL;
-                outpic.linesize[0] = gwidth * 2;
-                if (img_convert(&outpic, PIX_FMT_YUYV422, (AVPicture *)picture, c->pix_fmt, gwidth, gheight)) 
-                        err("format convert to yuyv failed");
+                outpic.data[1] = NULL;
+                outpic.data[2] = NULL;
+                outpic.linesize[0] = gwidth * 2;
+                sws_scale(img_convert_ctx, picture->data, picture->linesize, 0, c->height, outpic.data, outpic.linesize);
                 outlen = fsize*2;
         } else
         if (pixfmt_out == V4L2_PIX_FMT_YUV420) {
-#if 0
-                uint8_t *p = data_out;
-                memcpy(p, picture->data[0], fsize);
-                p += fsize;
-                memcpy(p, picture->data[1], fsize/4);
-                p += fsize/4;
-                memcpy(p, picture->data[2], fsize/4);
-                outlen = fsize + fsize/2;
-#else
+                if (img_convert_ctx == NULL)
+                        img_convert_ctx = sws_getContext(  c->width, c->height, c->pix_fmt, gwidth, gheight, PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL);
                 outpic.data[0] = data_out;
-                outpic.data[1] = outpic.data[0] + fsize;
-                outpic.data[2] = outpic.data[1] + fsize/4;
-                outpic.linesize[0] = gwidth;
-                outpic.linesize[1] = gwidth/2;
-                outpic.linesize[2] = gwidth/2;
-                //420 yu12
-                if (img_convert(&outpic, PIX_FMT_YUV420P, (AVPicture *)picture, c->pix_fmt, gwidth, gheight)) 
-                        err("image convert to 420p failed");
-#endif
+                outpic.data[1] = outpic.data[0] + fsize;
+                outpic.data[2] = outpic.data[1] + fsize/4;
+                outpic.linesize[0] = gwidth;
+                outpic.linesize[1] = gwidth/2;
+                outpic.linesize[2] = gwidth/2;
+                sws_scale(img_convert_ctx, picture->data, picture->linesize, 0, c->height, outpic.data, outpic.linesize);
                 outlen = fsize + fsize/2;
         }else {
-                err("unrecognised format in decode");
+                warn("unrecognised format in decode");
                 outlen = 0;
         }