diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2018-10-09 22:06:53 +0200 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2018-10-09 22:06:53 +0200 |
| commit | 5d818715ae58d1425ec94ea9449bb7bb4247f8bf (patch) | |
| tree | 2e9edf1878620379056cd474f66f1114a9dd0c96 | |
| parent | 0ed858e99a22c4d39a8fee910eb7376cc6384b76 (diff) | |
| download | libufodecode-5d818715ae58d1425ec94ea9449bb7bb4247f8bf.tar.gz libufodecode-5d818715ae58d1425ec94ea9449bb7bb4247f8bf.tar.bz2 libufodecode-5d818715ae58d1425ec94ea9449bb7bb4247f8bf.tar.xz libufodecode-5d818715ae58d1425ec94ea9449bb7bb4247f8bf.zip | |
Clean more mess in configuration of different cameras and set defaults to HZG 20MPix
| -rw-r--r-- | src/ufodecode.c | 9 | ||||
| -rw-r--r-- | test/ipedec.c | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/ufodecode.c b/src/ufodecode.c index 7d65d28..d33a1e5 100644 --- a/src/ufodecode.c +++ b/src/ufodecode.c @@ -15,9 +15,8 @@ #define IPECAMERA_BUG_BROKEN_TAIL -#define IPECAMERA_NUM_ROWS 1088 -#define IPECAMERA_NUM_CHANNELS 16 /**< Number of channels per row */ -#define IPECAMERA_PIXELS_PER_CHANNEL 128 /**< Number of pixels per channel */ +#define IPECAMERA_NUM_ROWS 5120 +#define IPECAMERA_PIXELS_PER_CHANNEL 640 /**< Number of pixels per channel */ #define IPECAMERA_MODE_16_CHAN_IO 0 #define IPECAMERA_MODE_4_CHAN_IO 2 @@ -235,13 +234,15 @@ ufo_decode_frame_channels_v6 (UfoDecoder *decoder, uint16_t *pixel_buffer, uint3 { size_t base = 0; size_t index = 0; - const size_t space = IPECAMERA_PIXELS_PER_CHANNEL; + const size_t space = IPECAMERA_WIDTH / 8 #ifdef HAVE_SSE const __m64 mask_fff = _mm_set_pi32 (0xfff, 0xfff); __m64 mm_r; #endif + //memset(pixel_buffer, 0xFF, num_rows * IPECAMERA_WIDTH * sizeof(uint16_t)); + while ((raw[base] != 0xAAAAAAA) && ((num_bytes - base * 4) >= 32)) { const size_t row_number = (raw[base] & 0xfff) - start_offset; const size_t pixel_number = (raw[base + 1] >> 16) & 0xfff; diff --git a/test/ipedec.c b/test/ipedec.c index 42a856c..32569b9 100644 --- a/test/ipedec.c +++ b/test/ipedec.c @@ -268,8 +268,8 @@ int main(int argc, char const* argv[]) }; static Options opts = { - .num_rows = 1088, - .num_columns = 2048, + .num_rows = 3842, + .num_columns = 5120, .verbose = 0, .dry_run = 0, .clear_frame = 0, |