[libcamera-devel,v3,20/27] gst: Add getters for Stream and FrameBuffer

Message ID 20200306202637.525587-21-nicolas@ndufresne.ca
State Accepted
Headers show
Series
  • GStreamer Element for libcamera
Related show

Commit Message

Nicolas Dufresne March 6, 2020, 8:26 p.m. UTC
From: Nicolas Dufresne <nicolas.dufresne@collabora.com>

This adds getters on pad/pool/allocator so that we can retrieve the
Stream or FrameBuffer.

Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/gstreamer/gstlibcameraallocator.cpp |  8 ++++++++
 src/gstreamer/gstlibcameraallocator.h   |  2 ++
 src/gstreamer/gstlibcamerapad.cpp       | 11 +++++++++++
 src/gstreamer/gstlibcamerapad.h         |  2 ++
 src/gstreamer/gstlibcamerapool.cpp      | 20 ++++++++++++++++++++
 src/gstreamer/gstlibcamerapool.h        |  7 +++++++
 6 files changed, 50 insertions(+)

Patch

diff --git a/src/gstreamer/gstlibcameraallocator.cpp b/src/gstreamer/gstlibcameraallocator.cpp
index 861af59..d0b90ec 100644
--- a/src/gstreamer/gstlibcameraallocator.cpp
+++ b/src/gstreamer/gstlibcameraallocator.cpp
@@ -243,3 +243,11 @@  gst_libcamera_allocator_get_pool_size(GstLibcameraAllocator *self,
 
 	return pool->length;
 }
+
+FrameBuffer *
+gst_libcamera_memory_get_frame_buffer(GstMemory *mem)
+{
+	auto *frame = reinterpret_cast<FrameWrap *>(gst_mini_object_get_qdata(GST_MINI_OBJECT_CAST(mem),
+									      FrameWrap::getQuark()));
+	return frame->buffer_;
+}
diff --git a/src/gstreamer/gstlibcameraallocator.h b/src/gstreamer/gstlibcameraallocator.h
index b3f7f36..befdcad 100644
--- a/src/gstreamer/gstlibcameraallocator.h
+++ b/src/gstreamer/gstlibcameraallocator.h
@@ -27,4 +27,6 @@  bool gst_libcamera_allocator_prepare_buffer(GstLibcameraAllocator *self,
 gsize gst_libcamera_allocator_get_pool_size(GstLibcameraAllocator *allocator,
 					    libcamera::Stream *stream);
 
+libcamera::FrameBuffer *gst_libcamera_memory_get_frame_buffer(GstMemory *mem);
+
 #endif /* __GST_LIBCAMERA_ALLOCATOR_H__ */
diff --git a/src/gstreamer/gstlibcamerapad.cpp b/src/gstreamer/gstlibcamerapad.cpp
index dbe3361..8616e06 100644
--- a/src/gstreamer/gstlibcamerapad.cpp
+++ b/src/gstreamer/gstlibcamerapad.cpp
@@ -126,3 +126,14 @@  gst_libcamera_pad_set_pool(GstPad *pad, GstLibcameraPool *pool)
 		g_object_unref(self->pool);
 	self->pool = pool;
 }
+
+Stream *
+gst_libcamera_pad_get_stream(GstPad *pad)
+{
+	auto *self = GST_LIBCAMERA_PAD(pad);
+
+	if (self->pool)
+		return gst_libcamera_pool_get_stream(self->pool);
+
+	return nullptr;
+}
diff --git a/src/gstreamer/gstlibcamerapad.h b/src/gstreamer/gstlibcamerapad.h
index b03f47a..f7dfc28 100644
--- a/src/gstreamer/gstlibcamerapad.h
+++ b/src/gstreamer/gstlibcamerapad.h
@@ -24,4 +24,6 @@  GstLibcameraPool *gst_libcamera_pad_get_pool(GstPad *pad);
 
 void gst_libcamera_pad_set_pool(GstPad *pad, GstLibcameraPool *pool);
 
+libcamera::Stream *gst_libcamera_pad_get_stream(GstPad *pad);
+
 #endif /* __GST_LIBCAMERA_PAD_H__ */
diff --git a/src/gstreamer/gstlibcamerapool.cpp b/src/gstreamer/gstlibcamerapool.cpp
index 75e189a..3868905 100644
--- a/src/gstreamer/gstlibcamerapool.cpp
+++ b/src/gstreamer/gstlibcamerapool.cpp
@@ -108,3 +108,23 @@  gst_libcamera_pool_new(GstLibcameraAllocator *allocator, Stream *stream)
 
 	return pool;
 }
+
+Stream *
+gst_libcamera_pool_get_stream(GstLibcameraPool *self)
+{
+	return self->stream;
+}
+
+Stream *
+gst_libcamera_buffer_get_stream(GstBuffer *buffer)
+{
+	auto *self = (GstLibcameraPool *)buffer->pool;
+	return self->stream;
+}
+
+FrameBuffer *
+gst_libcamera_buffer_get_frame_buffer(GstBuffer *buffer)
+{
+	GstMemory *mem = gst_buffer_peek_memory(buffer, 0);
+	return gst_libcamera_memory_get_frame_buffer(mem);
+}
diff --git a/src/gstreamer/gstlibcamerapool.h b/src/gstreamer/gstlibcamerapool.h
index c0a04cf..a3f1b68 100644
--- a/src/gstreamer/gstlibcamerapool.h
+++ b/src/gstreamer/gstlibcamerapool.h
@@ -24,4 +24,11 @@  G_DECLARE_FINAL_TYPE(GstLibcameraPool, gst_libcamera_pool, GST_LIBCAMERA, POOL,
 GstLibcameraPool *gst_libcamera_pool_new(GstLibcameraAllocator *allocator,
 					 libcamera::Stream *stream);
 
+libcamera::Stream *gst_libcamera_pool_get_stream(GstLibcameraPool *self);
+
+libcamera::Stream *gst_libcamera_buffer_get_stream(GstBuffer *buffer);
+
+libcamera::FrameBuffer *gst_libcamera_buffer_get_frame_buffer(GstBuffer *buffer);
+
+
 #endif /* __GST_LIBCAMERA_POOL_H__ */