summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.com>2020-01-27 10:07:03 -0500
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-07 01:58:08 +0200
commit6d0cf98bb1a808e767f7d0fe91599848ce955227 (patch)
tree6decfb1d7de07b68a269840612bc031a9aca5f98
parenta801f5e4f670475fdea3028f247a4aa3774b801e (diff)
gst: libcamerasrc: Allocate and release buffers
Setup the allocation and the release of buffers in the element. We have one pooling GstAllocator that wraps the FrameBufferAllocator and tracks the lifetime of FrameBuffer objects. Then, for each pad we have a GstBufferPool object which is only used to avoid re-allocating the GstBuffer structure every time we push a buffer. Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--src/gstreamer/gstlibcamerasrc.cpp28
1 files changed, 28 insertions, 0 deletions
diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp
index 540a0945..dfbf092e 100644
--- a/src/gstreamer/gstlibcamerasrc.cpp
+++ b/src/gstreamer/gstlibcamerasrc.cpp
@@ -19,7 +19,9 @@
#include <libcamera/camera.h>
#include <libcamera/camera_manager.h>
+#include "gstlibcameraallocator.h"
#include "gstlibcamerapad.h"
+#include "gstlibcamerapool.h"
#include "gstlibcamera-utils.h"
using namespace libcamera;
@@ -44,6 +46,7 @@ struct _GstLibcameraSrc {
gchar *camera_name;
GstLibcameraSrcState *state;
+ GstLibcameraAllocator *allocator;
};
enum {
@@ -221,6 +224,23 @@ gst_libcamera_src_task_enter(GstTask *task, GThread *thread, gpointer user_data)
return;
}
+ self->allocator = gst_libcamera_allocator_new(state->cam_);
+ if (!self->allocator) {
+ GST_ELEMENT_ERROR(self, RESOURCE, NO_SPACE_LEFT,
+ ("Failed to allocate memory"),
+ ("gst_libcamera_allocator_new() failed."));
+ gst_task_stop(task);
+ return;
+ }
+
+ for (gsize i = 0; i < state->srcpads_.size(); i++) {
+ GstPad *srcpad = state->srcpads_[i];
+ const StreamConfiguration &stream_cfg = state->config_->at(i);
+ GstLibcameraPool *pool = gst_libcamera_pool_new(self->allocator,
+ stream_cfg.stream());
+ gst_libcamera_pad_set_pool(srcpad, pool);
+ }
+
done:
switch (flow_ret) {
case GST_FLOW_NOT_NEGOTIATED:
@@ -236,8 +256,14 @@ static void
gst_libcamera_src_task_leave(GstTask *task, GThread *thread, gpointer user_data)
{
GstLibcameraSrc *self = GST_LIBCAMERA_SRC(user_data);
+ GstLibcameraSrcState *state = self->state;
GST_DEBUG_OBJECT(self, "Streaming thread is about to stop");
+
+ for (GstPad *srcpad : state->srcpads_)
+ gst_libcamera_pad_set_pool(srcpad, nullptr);
+
+ g_clear_object(&self->allocator);
}
static void
@@ -246,6 +272,8 @@ gst_libcamera_src_close(GstLibcameraSrc *self)
GstLibcameraSrcState *state = self->state;
gint ret;
+ GST_DEBUG_OBJECT(self, "Releasing resources");
+
ret = state->cam_->release();
if (ret) {
GST_ELEMENT_WARNING(self, RESOURCE, BUSY,