aboutsummaryrefslogtreecommitdiffstats
path: root/include/media/v4l2-event.h
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2011-06-13 18:24:17 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 16:53:31 -0400
commitf1e393de382af9b9bd2462a42bfa16b8c501d81b (patch)
tree1135a4a27166d3947ebfcf2be171efa2d8cd3228 /include/media/v4l2-event.h
parent77068d36d8b9e9902a89b4bb01011d41926f5420 (diff)
[media] v4l2-event/ctrls/fh: allocate events per fh and per type instead of just per-fh
The driver had to decide how many events to allocate when the v4l2_fh struct was created. It was possible to add more events afterwards, but there was no way to ensure that you wouldn't miss important events if the event queue would fill up for that filehandle. In addition, once there were no more free events, any new events were simply dropped on the floor. For the control event in particular this made life very difficult since control status/value changes could just be missed if the number of allocated events and the speed at which the application read events was too low to keep up with the number of generated events. The application would have no idea what the latest state was for a control since it could have missed the latest control change. So this patch makes some major changes in how events are allocated. Instead of allocating events per-filehandle they are now allocated when subscribing an event. So for that particular event type N events (determined by the driver) are allocated. Those events are reserved for that particular event type. This ensures that you will not miss events for a particular type altogether. In addition, if there are N events in use and a new event is raised, then the oldest event is dropped and the new one is added. So the latest event is always available. This can be further improved by adding the ability to merge the state of two events together, ensuring that no data is lost at all. This will be added in the next patch. This also makes it possible to allow the user to determine the number of events that will be allocated. This is not implemented at the moment, but would be trivial. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media/v4l2-event.h')
-rw-r--r--include/media/v4l2-event.h18
1 files changed, 15 insertions, 3 deletions
diff --git a/include/media/v4l2-event.h b/include/media/v4l2-event.h
index eda17f8d78bc..8d681e5ca552 100644
--- a/include/media/v4l2-event.h
+++ b/include/media/v4l2-event.h
@@ -30,10 +30,15 @@
30#include <linux/wait.h> 30#include <linux/wait.h>
31 31
32struct v4l2_fh; 32struct v4l2_fh;
33struct v4l2_subscribed_event;
33struct video_device; 34struct video_device;
34 35
35struct v4l2_kevent { 36struct v4l2_kevent {
37 /* list node for the v4l2_fh->available list */
36 struct list_head list; 38 struct list_head list;
39 /* pointer to parent v4l2_subscribed_event */
40 struct v4l2_subscribed_event *sev;
41 /* event itself */
37 struct v4l2_event event; 42 struct v4l2_event event;
38}; 43};
39 44
@@ -50,18 +55,25 @@ struct v4l2_subscribed_event {
50 struct v4l2_fh *fh; 55 struct v4l2_fh *fh;
51 /* list node that hooks into the object's event list (if there is one) */ 56 /* list node that hooks into the object's event list (if there is one) */
52 struct list_head node; 57 struct list_head node;
58 /* the number of elements in the events array */
59 unsigned elems;
60 /* the index of the events containing the oldest available event */
61 unsigned first;
62 /* the number of queued events */
63 unsigned in_use;
64 /* an array of elems events */
65 struct v4l2_kevent events[];
53}; 66};
54 67
55int v4l2_event_alloc(struct v4l2_fh *fh, unsigned int n);
56void v4l2_event_free(struct v4l2_fh *fh);
57int v4l2_event_dequeue(struct v4l2_fh *fh, struct v4l2_event *event, 68int v4l2_event_dequeue(struct v4l2_fh *fh, struct v4l2_event *event,
58 int nonblocking); 69 int nonblocking);
59void v4l2_event_queue(struct video_device *vdev, const struct v4l2_event *ev); 70void v4l2_event_queue(struct video_device *vdev, const struct v4l2_event *ev);
60void v4l2_event_queue_fh(struct v4l2_fh *fh, const struct v4l2_event *ev); 71void v4l2_event_queue_fh(struct v4l2_fh *fh, const struct v4l2_event *ev);
61int v4l2_event_pending(struct v4l2_fh *fh); 72int v4l2_event_pending(struct v4l2_fh *fh);
62int v4l2_event_subscribe(struct v4l2_fh *fh, 73int v4l2_event_subscribe(struct v4l2_fh *fh,
63 struct v4l2_event_subscription *sub); 74 struct v4l2_event_subscription *sub, unsigned elems);
64int v4l2_event_unsubscribe(struct v4l2_fh *fh, 75int v4l2_event_unsubscribe(struct v4l2_fh *fh,
65 struct v4l2_event_subscription *sub); 76 struct v4l2_event_subscription *sub);
77void v4l2_event_unsubscribe_all(struct v4l2_fh *fh);
66 78
67#endif /* V4L2_EVENT_H */ 79#endif /* V4L2_EVENT_H */