From cde8c8bdc4b856bcb3a4ac40ad4b48c7180f3526 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Tue, 12 Jun 2007 11:23:01 +0000 Subject: sys/v4l2/v4l2src_calls.c (gst_v4l2_buffer_finalize) (gst_v4l2_buffer_class_init, gst_v4l2_buffer_get_type) Original commit message from CVS: 2007-06-12 Andy Wingo * sys/v4l2/v4l2src_calls.c (gst_v4l2_buffer_finalize) (gst_v4l2_buffer_class_init, gst_v4l2_buffer_get_type) (gst_v4l2_buffer_new): Behave more like ximagesink's buffers, with finalization and resuscitation. No longer public. (gst_v4l2_buffer_pool_finalize, gst_v4l2_buffer_pool_init) (gst_v4l2_buffer_pool_class_init, gst_v4l2_buffer_pool_get_type) (gst_v4l2_buffer_pool_new, gst_v4l2_buffer_pool_activate) (gst_v4l2_buffer_pool_destroy): Make the pool follow common miniobject semantics, and be threadsafe. (gst_v4l2src_queue_frame): Remove this function, as we just call the ioctls directly in the two places where we queue buffers. (gst_v4l2src_grab_frame): Return a flowreturn and fill the buffer directly. (gst_v4l2src_capture_init): Use the new buffer_pool_new function to allocate the pool, which also preallocates the GstBuffers. (gst_v4l2src_capture_start): Call buffer_pool_activate instead of queueing the frames directly. * sys/v4l2/gstv4l2src.h (struct _GstV4l2BufferPool): Make this a real MiniObject instead of rolling our own refcounting and finalizing. Give it a lock. (struct _GstV4l2Buffer): Remove one intermediary object, having the buffers hold the struct v4l2_buffer directly. * sys/v4l2/gstv4l2src.c (gst_v4l2src_set_caps): Pass the caps to capture_init so that it can set them on the buffers that it will create. (gst_v4l2src_get_read): For better or for worse, include the timestamping and offsetting code here; really we should be using bufferalloc though. (gst_v4l2src_get_mmap): Just make grab_frame return one of our preallocated, mmap'd buffers. --- sys/v4l2/gstv4l2src.h | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'sys/v4l2/gstv4l2src.h') diff --git a/sys/v4l2/gstv4l2src.h b/sys/v4l2/gstv4l2src.h index 0162acda..809ddb46 100644 --- a/sys/v4l2/gstv4l2src.h +++ b/sys/v4l2/gstv4l2src.h @@ -54,18 +54,22 @@ typedef struct _GstV4l2SrcClass GstV4l2SrcClass; /* global info */ struct _GstV4l2BufferPool { - gint refcount; /* number of users: 1 for every buffer, 1 for element */ - gint video_fd; + GstMiniObject parent; + + GMutex *lock; + gboolean running; /* with lock */ + gint num_live_buffers; /* with lock */ + gint video_fd; /* a dup(2) of the v4l2object's video_fd */ guint buffer_count; - GstV4l2Buffer *buffers; + GstV4l2Buffer **buffers; /* with lock; buffers[n] is NULL that buffer has been + * dequeued and pushed out */ }; -struct _GstV4l2Buffer -{ - struct v4l2_buffer buffer; - guint8 *start; - guint length; - gint refcount; /* add 1 if in use by element, add 1 if in use by GstBuffer */ +struct _GstV4l2Buffer { + GstBuffer buffer; + + struct v4l2_buffer vbuffer; + GstV4l2BufferPool *pool; }; -- cgit