diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-07 01:17:45 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-07 01:17:45 -0300 |
commit | c8d4bba77d042c9ede4936550f38666cde85a50c (patch) | |
tree | ee7aa9817d9af2ca9edfb26a137c6192fa6c2072 /v4l2-apps/libv4l/libv4lconvert/processing/libv4lprocessing.c | |
parent | 38df09ba8b967b4d219c2afe04dcc1ae743e766f (diff) | |
parent | b90712cf41e75451c3b515ed41d2eda714db3de1 (diff) | |
download | mediapointer-dvb-s2-c8d4bba77d042c9ede4936550f38666cde85a50c.tar.gz mediapointer-dvb-s2-c8d4bba77d042c9ede4936550f38666cde85a50c.tar.bz2 |
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l2-apps/libv4l/libv4lconvert/processing/libv4lprocessing.c')
-rw-r--r-- | v4l2-apps/libv4l/libv4lconvert/processing/libv4lprocessing.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/v4l2-apps/libv4l/libv4lconvert/processing/libv4lprocessing.c b/v4l2-apps/libv4l/libv4lconvert/processing/libv4lprocessing.c index cbbcca73c..424173ec5 100644 --- a/v4l2-apps/libv4l/libv4lconvert/processing/libv4lprocessing.c +++ b/v4l2-apps/libv4l/libv4lconvert/processing/libv4lprocessing.c @@ -38,8 +38,10 @@ struct v4lprocessing_data *v4lprocessing_create(int fd, struct v4lcontrol_data* struct v4lprocessing_data *data = calloc(1, sizeof(struct v4lprocessing_data)); - if (!data) + if (!data) { + fprintf(stderr, "libv4lprocessing: error: out of memory!\n"); return NULL; + } data->fd = fd; data->control = control; @@ -62,6 +64,8 @@ int v4lprocessing_pre_processing(struct v4lprocessing_data *data) data->do_process = 1; } + data->controls_changed |= v4lcontrol_controls_changed(data->control); + return data->do_process; } @@ -167,9 +171,10 @@ void v4lprocessing_processing(struct v4lprocessing_data *data, return; /* Non supported pix format */ } - if (v4lcontrol_controls_changed(data->control) || + if (data->controls_changed || data->lookup_table_update_counter == V4L2PROCESSING_UPDATE_RATE) { v4lprocessing_update_lookup_tables(data, buf, fmt); + data->controls_changed = 0; data->lookup_table_update_counter = 0; } else data->lookup_table_update_counter++; |