darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

also adjust the backoff logic for nikon cameras to wait longer

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15332 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2015-01-17 19:41:22 +00:00
parent 9661f42684
commit 6b8a5d334c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
camlibs/ptp2/library.c
View File

@@ -4027,7 +4027,7 @@ camera_wait_for_event (Camera *camera, int timeout,
if (_timeout_passed (&event_start, timeout))
break;
/* incremental backoff wait ... including this wait loop */
/* incremental backoff wait ... including this wait loop, will go up to 200ms. */
for (i=sleepcnt;i--;) {
int resttime;
struct timeval curtime;
@@ -4035,12 +4035,14 @@ camera_wait_for_event (Camera *camera, int timeout,
gp_context_idle (context);
gettimeofday (&curtime, 0);
resttime = ((curtime.tv_sec - event_start.tv_sec)*1000)+((curtime.tv_usec - event_start.tv_usec)/1000);
if (resttime < 20)
if (resttime <= 0)
break;
usleep(20*1000); /* 20 ms */
if (resttime > 50)
resttime = 50;
usleep(resttime*1000); /* at most 50 ms */
}
sleepcnt++; /* incremental back off */
if (sleepcnt>10) sleepcnt=10;
if (sleepcnt>4) sleepcnt = 4;
continue;
}
sleepcnt = 1;