diff options
| author | Suren A. Chilingaryan <csa@dside.dyndns.org> | 2012-07-24 15:47:34 +0200 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@dside.dyndns.org> | 2012-07-24 15:47:34 +0200 |
| commit | 8643089a3d39b49115c547c3b9c27c0086754ec5 (patch) | |
| tree | d08adf18760325c40cfab8134a8e3b8e9518fbc2 /ipecamera/data.c | |
| parent | f836cce5a89e5757111c6962bd8fa308d0685959 (diff) | |
| download | ipecamera-8643089a3d39b49115c547c3b9c27c0086754ec5.tar.gz ipecamera-8643089a3d39b49115c547c3b9c27c0086754ec5.tar.bz2 ipecamera-8643089a3d39b49115c547c3b9c27c0086754ec5.tar.xz ipecamera-8643089a3d39b49115c547c3b9c27c0086754ec5.zip | |
Support for new ufodecode and updated register model in ipecamera
Diffstat (limited to 'ipecamera/data.c')
| -rw-r--r-- | ipecamera/data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipecamera/data.c b/ipecamera/data.c index ff0813c..d753d43 100644 --- a/ipecamera/data.c +++ b/ipecamera/data.c @@ -37,8 +37,8 @@ static int ipecamera_resolve_event_id(ipecamera_t *ctx, pcilib_event_id_t evid) inline static int ipecamera_decode_frame(ipecamera_t *ctx, pcilib_event_id_t event_id) { int err = 0; size_t res; - uint32_t tmp; uint16_t *pixels; + UfoDecoderMeta meta; int buf_ptr = ipecamera_resolve_event_id(ctx, event_id); if (buf_ptr < 0) return PCILIB_ERROR_TIMEOUT; @@ -54,7 +54,7 @@ inline static int ipecamera_decode_frame(ipecamera_t *ctx, pcilib_event_id_t eve pixels = ctx->image + buf_ptr * ctx->image_size; memset(ctx->cmask + ctx->buffer_pos * ctx->dim.height, 0, ctx->dim.height * sizeof(ipecamera_change_mask_t)); - res = ufo_decoder_decode_frame(ctx->ipedec, ctx->buffer + buf_ptr * ctx->padded_size, ctx->raw_size, pixels, &tmp, &tmp, &tmp, ctx->cmask + ctx->buffer_pos * ctx->dim.height); + res = ufo_decoder_decode_frame(ctx->ipedec, ctx->buffer + buf_ptr * ctx->padded_size, ctx->raw_size, pixels, &meta); if (!res) { ctx->frame[buf_ptr].event.image_broken = 1; err = PCILIB_ERROR_FAILED; |