diff options
| author | Andy Wingo <wingo@pobox.com> | 2007-06-12 11:23:01 +0000 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2007-06-12 11:23:01 +0000 |
| commit | cde8c8bdc4b856bcb3a4ac40ad4b48c7180f3526 (patch) | |
| tree | 76101a54266d81392ba72bcdd95cb8b84cde7d63 /sys/v4l2/v4l2src_calls.h | |
| parent | e359a4151702e89a27742d3905c2f59e821fbf23 (diff) | |
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 <wingo@pobox.com>
* 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.
Diffstat (limited to 'sys/v4l2/v4l2src_calls.h')
| -rw-r--r-- | sys/v4l2/v4l2src_calls.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/v4l2/v4l2src_calls.h b/sys/v4l2/v4l2src_calls.h index ea294815..450ea1af 100644 --- a/sys/v4l2/v4l2src_calls.h +++ b/sys/v4l2/v4l2src_calls.h @@ -33,11 +33,10 @@ gboolean gst_v4l2src_set_capture (GstV4l2Src * v4l2src, guint32 width, guint32 height, guint32 fps_n, guint32 fps_d); -gboolean gst_v4l2src_capture_init (GstV4l2Src * v4l2src); +gboolean gst_v4l2src_capture_init (GstV4l2Src * v4l2src, GstCaps *caps); gboolean gst_v4l2src_capture_start (GstV4l2Src * v4l2src); -gint gst_v4l2src_grab_frame (GstV4l2Src * v4l2src); -gboolean gst_v4l2src_queue_frame (GstV4l2Src * v4l2src, guint i); +GstFlowReturn gst_v4l2src_grab_frame (GstV4l2Src * v4l2src, GstBuffer **buf); gboolean gst_v4l2src_capture_stop (GstV4l2Src * v4l2src); gboolean gst_v4l2src_capture_deinit (GstV4l2Src * v4l2src); @@ -52,11 +51,5 @@ gboolean gst_v4l2src_get_size_limits (GstV4l2Src * v4l2src, struct v4l2_fmtdesc *fmt, gint * min_w, gint * max_w, gint * min_h, gint * max_h); -/* buffers */ -GstBuffer* gst_v4l2src_buffer_new (GstV4l2Src * v4l2src, - guint size, guint8 * data, - GstV4l2Buffer * srcbuf); -void gst_v4l2src_free_buffer (GstBuffer * buffer); - #endif /* __V4L2SRC_CALLS_H__ */ |