Ignore pad bytes on camera streams

On a perfect world, the memory mapped buffer would contain
the exact frame image. However, due to hardware constraints
(typically at their DMA engines), sometimes there are pad
bytes after the end of each line.

So, change the memcpy algorithm to take it into account.

1 files changed, 9 insertions, 3 deletions

diff --git a/src/v4l.c b/src/v4l.c
index b6483a4..f265512 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -384,10 +384,11 @@ void start_streaming(cam * cam)
    }
 }
 
-void capture_buffers(cam * cam, char *outbuf, int len)
+void capture_buffers(cam * cam, unsigned char *outbuf, int len)
 {
    char *msg;
-   int r;
+   unsigned char *inbuf;
+   int r, y;
    fd_set fds;
    struct v4l2_buffer buf;
    struct timeval tv;
@@ -418,7 +419,12 @@ void capture_buffers(cam * cam, char *outbuf, int len)
    if (len > buf.bytesused)
       len = buf.bytesused;
 
-   memcpy(outbuf, cam->buffers[buf.index].start, len);
+   inbuf = cam->buffers[buf.index].start;
+   for (y = 0; y < cam->height; y++) {
+      memcpy(outbuf, inbuf, cam->width * cam->depth / 8);
+      outbuf += cam->width * cam->depth / 8;
+      inbuf += cam->bytesperline;
+   }
 
    v4l2_ioctl(cam->dev, VIDIOC_QBUF, &buf);
 }