diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2013-06-19 14:25:29 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2013-06-19 14:25:29 +0200 |
| commit | adaf0ef2f4e046a8f0a16ca8f2f7ffd933306a39 (patch) | |
| tree | c1d98239f67f7496e9c643c1083c3b6ac360bc40 /src | |
| parent | 15b142fc8200f900c45e12841feb11c812fa7770 (diff) | |
| download | libufodecode-adaf0ef2f4e046a8f0a16ca8f2f7ffd933306a39.tar.gz libufodecode-adaf0ef2f4e046a8f0a16ca8f2f7ffd933306a39.tar.bz2 libufodecode-adaf0ef2f4e046a8f0a16ca8f2f7ffd933306a39.tar.xz libufodecode-adaf0ef2f4e046a8f0a16ca8f2f7ffd933306a39.zip | |
Try to use number of rows from header data
Diffstat (limited to 'src')
| -rw-r--r-- | src/ufodecode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ufodecode.c b/src/ufodecode.c index 635f397..8a6b53a 100644 --- a/src/ufodecode.c +++ b/src/ufodecode.c @@ -558,6 +558,7 @@ size_t ufo_decoder_decode_frame(UfoDecoder *decoder, meta->frame_number = raw[pos++] & 0xFFFFFFF; CHECK_VALUE(raw[pos] >> 28, 0x5); meta->time_stamp = raw[pos++] & 0xFFFFFFF; + meta->n_rows = 1088; break; case 4: @@ -576,9 +577,7 @@ size_t ufo_decoder_decode_frame(UfoDecoder *decoder, pos++; if ((meta->output_mode != IPECAMERA_MODE_4_CHAN_IO) && (meta->output_mode != IPECAMERA_MODE_16_CHAN_IO)) { -#ifdef DEBUG fprintf(stderr, "Output mode 0x%x is not supported\n", meta->output_mode); -#endif return EILSEQ; } break; @@ -593,11 +592,13 @@ size_t ufo_decoder_decode_frame(UfoDecoder *decoder, #else switch (version) { case 0: + meta->n_rows = 1088; meta->frame_number = raw[pos + 6] & 0xFFFFFFF; meta->time_stamp = raw[pos + 7] & 0xFFFFFFF; break; case 4: case 5: + meta->n_rows = rows_per_frame = raw[pos] & 0x7FF; meta->frame_number = raw[pos + 6] & 0x1FFFFFF; meta->time_stamp = raw[pos + 7] & 0xFFFFFF; meta->output_mode = (raw[pos + 7] >> 24) & 0x3; |