summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2018-08-30 15:52:56 +0200
committerSuren A. Chilingaryan <csa@suren.me>2018-08-30 15:52:56 +0200
commit010b46493f7393f2d67276b292e355e2b992f43f (patch)
tree03a1c8f1d39b0af12e71a0bd8214cc2d8c283468
parent4d1b81680849492bea72907e22e276fcdfdd756a (diff)
downloadipecamera-010b46493f7393f2d67276b292e355e2b992f43f.tar.gz
ipecamera-010b46493f7393f2d67276b292e355e2b992f43f.tar.bz2
ipecamera-010b46493f7393f2d67276b292e355e2b992f43f.tar.xz
ipecamera-010b46493f7393f2d67276b292e355e2b992f43f.zip
Fix estimation of size of UFO6 frame (works for Desy camera)
-rw-r--r--base.c3
-rw-r--r--private.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/base.c b/base.c
index a6c0d91..f8e6457 100644
--- a/base.c
+++ b/base.c
@@ -361,7 +361,8 @@ int ipecamera_start(pcilib_context_t *vctx, pcilib_event_t event_mask, pcilib_ev
ctx->dim.width = CMOSIS20_WIDTH;
ctx->dim.height = CMOSIS20_MAX_LINES;
- ctx->data_line_size = (2 + CMOSIS20_PIXELS_PER_CHANNEL) * 32;
+ // There is skipped C0 line once per every two lines (which are in fact encoded together)
+ ctx->data_line_size = CMOSIS20_PIXELS_PER_CHANNEL * 32 + 16;
break;
default:
UNLOCK(run);
diff --git a/private.h b/private.h
index 12867c3..98fc1bd 100644
--- a/private.h
+++ b/private.h
@@ -70,7 +70,7 @@
#define CMOSIS20_WIDTH (CMOSIS20_MAX_CHANNELS * CMOSIS20_PIXELS_PER_CHANNEL)
*/
#define CMOSIS20_PIXELS_PER_CHANNEL 320
-#define CMOSIS20_WIDTH (CMOSIS_MAX_CHANNELS * CMOSIS_PIXELS_PER_CHANNEL)
+#define CMOSIS20_WIDTH (CMOSIS_MAX_CHANNELS * CMOSIS20_PIXELS_PER_CHANNEL)
#define CMOSIS20_MAX_LINES 3840
#define IPECAMERA_FRAME_REQUEST 0x209 // 0x80000209 // 0x1E9