mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Loop through the read buffers to avoid getting stale frames

merge-requests/1/head
Marc Deslauriers 2010-11-07 10:17:53 +01:00 zatwierdzone przez Julien BLACHE
rodzic 4d0cd3c5b1
commit b5f4056635
2 zmienionych plików z 26 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
ChangeLog
Wyświetl plik

@ -1,3 +1,7 @@
2010-11-07 Marc Deslauriers <marc.deslauriers@ubuntu.com>
* backend/v4l.c: loop through the read buffers in the v4l backend so
we don't get stale frames.
2010-11-06 Stéphane Voltz <stef.dev@free.fr>
* frontend/scanimage.c doc/scanimage.man: add -A/--all-options to list
all control options exposed by a backend.

38
backend/v4l.c
Wyświetl plik

@ -949,7 +949,7 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
SANE_Status
sane_start (SANE_Handle handle)
{
int len;
int len, loop;
V4L_Scanner *s;
DBG (2, "sane_start\n");
@ -1005,21 +1005,27 @@ sane_start (SANE_Handle handle)
s->mmap.format = s->pict.palette;
DBG (2, "sane_start: mmapped frame %d x %d with palette %d\n",
s->mmap.width, s->mmap.height, s->mmap.format);
len = v4l1_ioctl (s->fd, VIDIOCMCAPTURE, &s->mmap);
if (len == -1)
{
DBG (1, "sane_start: ioctl VIDIOCMCAPTURE failed: %s\n",
strerror (errno));
return SANE_STATUS_INVAL;
}
DBG (3, "sane_start: waiting for frame %x\n", s->mmap.frame);
len = v4l1_ioctl (s->fd, VIDIOCSYNC, &(s->mmap.frame));
if (-1 == len)
{
DBG (1, "sane_start: call to ioctl(%d, VIDIOCSYNC, ..) failed\n",
s->fd);
return SANE_STATUS_INVAL;
}
/* We need to loop here to empty the read buffers, so we don't
get a stale image */
for (loop = 0; loop <= s->mbuf.frames; loop++)
{
len = v4l1_ioctl (s->fd, VIDIOCMCAPTURE, &s->mmap);
if (len == -1)
{
DBG (1, "sane_start: ioctl VIDIOCMCAPTURE failed: %s\n",
strerror (errno));
return SANE_STATUS_INVAL;
}
DBG (3, "sane_start: waiting for frame %x, loop %d\n", s->mmap.frame, loop);
len = v4l1_ioctl (s->fd, VIDIOCSYNC, &(s->mmap.frame));
if (-1 == len)
{
DBG (1, "sane_start: call to ioctl(%d, VIDIOCSYNC, ..) failed\n",
s->fd);
return SANE_STATUS_INVAL;
}
}
DBG (3, "sane_start: frame %x done\n", s->mmap.frame);
}
DBG (3, "sane_start: done\n");