[{"id":3872,"web_url":"https://patchwork.libcamera.org/comment/3872/","msgid":"<20200229143244.GS18738@pendragon.ideasonboard.com>","date":"2020-02-29T14:32:44","subject":"Re: [libcamera-devel] [PATCH v2 20/27] gst: Add getters for Stream\n\tand FrameBuffer","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Nicolas,\n\nThank you for the patch.\n\nOn Thu, Feb 27, 2020 at 03:04:00PM -0500, Nicolas Dufresne wrote:\n> This adds getters on pad/pool/allocator so that we can retrieve the\n> Stream or FrameBuffer.\n> \n> Signed-off-by: Nicolas Dufresne \n> Reviewed-by: Laurent Pinchart \n> ---\n> src/gstreamer/gstlibcameraallocator.cpp | 8 ++++++++\n> src/gstreamer/gstlibcameraallocator.h | 2 ++\n> src/gstreamer/gstlibcamerapad.cpp | 11 +++++++++++\n> src/gstreamer/gstlibcamerapad.h | 2 ++\n> src/gstreamer/gstlibcamerapool.cpp | 20 ++++++++++++++++++++\n> src/gstreamer/gstlibcamerapool.h | 7 +++++++\n> src/gstreamer/gstlibcamerasrc.cpp | 1 -\n> 7 files changed, 50 insertions(+), 1 deletion(-)\n> \n> diff --git a/src/gstreamer/gstlibcameraallocator.cpp b/src/gstreamer/gstlibcameraallocator.cpp\n> index f268561..f87b52c 100644\n> --- a/src/gstreamer/gstlibcameraallocator.cpp\n> +++ b/src/gstreamer/gstlibcameraallocator.cpp\n> @@ -242,3 +242,11 @@ gst_libcamera_allocator_get_pool_size(GstLibcameraAllocator *self,\n> \n> \treturn pool->length;\n> }\n> +\n> +FrameBuffer *\n> +gst_libcamera_memory_get_frame_buffer(GstMemory *mem)\n> +{\n> +\tauto *frame = reinterpret_cast(gst_mini_object_get_qdata(GST_MINI_OBJECT_CAST(mem),\n> +\t\t\t\t\t\t\t\t\t FrameWrap::getQuark()));\n> +\treturn frame->buffer_;\n> +}\n> diff --git a/src/gstreamer/gstlibcameraallocator.h b/src/gstreamer/gstlibcameraallocator.h\n> index 25cbf85..8839040 100644\n> --- a/src/gstreamer/gstlibcameraallocator.h\n> +++ b/src/gstreamer/gstlibcameraallocator.h\n> @@ -26,4 +26,6 @@ bool gst_libcamera_allocator_prepare_buffer(GstLibcameraAllocator *self,\n> gsize gst_libcamera_allocator_get_pool_size(GstLibcameraAllocator *allocator,\n> \t\t\t\t\t libcamera::Stream *stream);\n> \n> +libcamera::FrameBuffer *gst_libcamera_memory_get_frame_buffer(GstMemory *mem);\n> +\n> #endif /* __GST_LIBCAMERA_ALLOCATOR_H__ */\n> diff --git a/src/gstreamer/gstlibcamerapad.cpp b/src/gstreamer/gstlibcamerapad.cpp\n> index c4c466d..4f96546 100644\n> --- a/src/gstreamer/gstlibcamerapad.cpp\n> +++ b/src/gstreamer/gstlibcamerapad.cpp\n> @@ -125,3 +125,14 @@ gst_libcamera_pad_set_pool(GstPad *pad, GstLibcameraPool *pool)\n> \t\tg_object_unref(self->pool);\n> \tself->pool = pool;\n> }\n> +\n> +Stream *\n> +gst_libcamera_pad_get_stream(GstPad *pad)\n> +{\n> +\tauto *self = GST_LIBCAMERA_PAD(pad);\n> +\n> +\tif (self->pool)\n> +\t\treturn gst_libcamera_pool_get_stream(self->pool);\n> +\n> +\treturn nullptr;\n> +}\n> diff --git a/src/gstreamer/gstlibcamerapad.h b/src/gstreamer/gstlibcamerapad.h\n> index 4570c0c..81d0d58 100644\n> --- a/src/gstreamer/gstlibcamerapad.h\n> +++ b/src/gstreamer/gstlibcamerapad.h\n> @@ -24,4 +24,6 @@ GstLibcameraPool *gst_libcamera_pad_get_pool(GstPad *pad);\n> \n> void gst_libcamera_pad_set_pool(GstPad *pad, GstLibcameraPool *pool);\n> \n> +libcamera::Stream *gst_libcamera_pad_get_stream(GstPad *pad);\n> +\n> #endif /* __GST_LIBCAMERA_PAD_H__ */\n> diff --git a/src/gstreamer/gstlibcamerapool.cpp b/src/gstreamer/gstlibcamerapool.cpp\n> index ee106a7..f85c3aa 100644\n> --- a/src/gstreamer/gstlibcamerapool.cpp\n> +++ b/src/gstreamer/gstlibcamerapool.cpp\n> @@ -107,3 +107,23 @@ gst_libcamera_pool_new(GstLibcameraAllocator *allocator, Stream *stream)\n> \n> \treturn pool;\n> }\n> +\n> +Stream *\n> +gst_libcamera_pool_get_stream(GstLibcameraPool *self)\n> +{\n> +\treturn self->stream;\n> +}\n> +\n> +Stream *\n> +gst_libcamera_buffer_get_stream(GstBuffer *buffer)\n> +{\n> +\tauto *self = (GstLibcameraPool *)buffer->pool;\n> +\treturn self->stream;\n> +}\n> +\n> +FrameBuffer *\n> +gst_libcamera_buffer_get_frame_buffer(GstBuffer *buffer)\n> +{\n> +\tGstMemory *mem = gst_buffer_peek_memory(buffer, 0);\n> +\treturn gst_libcamera_memory_get_frame_buffer(mem);\n> +}\n> diff --git a/src/gstreamer/gstlibcamerapool.h b/src/gstreamer/gstlibcamerapool.h\n> index a764c75..6fd2913 100644\n> --- a/src/gstreamer/gstlibcamerapool.h\n> +++ b/src/gstreamer/gstlibcamerapool.h\n> @@ -23,4 +23,11 @@ G_DECLARE_FINAL_TYPE(GstLibcameraPool, gst_libcamera_pool, GST_LIBCAMERA, POOL,\n> GstLibcameraPool *gst_libcamera_pool_new(GstLibcameraAllocator *allocator,\n> \t\t\t\t\t libcamera::Stream *stream);\n> \n> +libcamera::Stream *gst_libcamera_pool_get_stream(GstLibcameraPool *self);\n> +\n> +libcamera::Stream *gst_libcamera_buffer_get_stream(GstBuffer *buffer);\n> +\n> +libcamera::FrameBuffer *gst_libcamera_buffer_get_frame_buffer(GstBuffer *buffer);\n> +\n> +\n> #endif /* __GST_LIBCAMERA_POOL_H__ */\n> diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp\n> index fa9ff5b..83f93cc 100644\n> --- a/src/gstreamer/gstlibcamerasrc.cpp\n> +++ b/src/gstreamer/gstlibcamerasrc.cpp\n> @@ -256,7 +256,6 @@ gst_libcamera_src_task_leave(GstTask *task, GThread *thread, gpointer user_data)\n> \tGstLibcameraSrcState *state = self->state;\n> \n> \tGST_DEBUG_OBJECT(self, \"Streaming thread is about to stop\");\n> -\tstate->cam->stop();\n\nSomething went wrong in the rebase ? Looks like this belongs to the\nprevious patch.\n\n> \n> \tfor (GstPad *srcpad : state->srcpads)\n> \t\tgst_libcamera_pad_set_pool(srcpad, NULL);","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 243DE62689\n\tfor ;\n\tSat, 29 Feb 2020 15:33:08 +0100 (CET)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A7D7033E;\n\tSat, 29 Feb 2020 15:33:07 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1582986787;\n\tbh=UTQ04mutHaeLoNWNfaUNHkBsvppX+5IK6LYn9J35xkc=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Xc1nLoTgZwa8rK92BfSn3alB4c0Nz34WIyW/dbRQxwKtrbRTp08Vnb8jmz/tzDQGu\n\tCQXJvAKMPaox8ZYPShvailohpKFGNqle08+GAQ+NJLR4ve4aLEkIK2Fu55604f9FOm\n\tG/hmrFVaxOJNLXa5zBsAQyhFLSh4MRC/6rbHMxgA=","Date":"Sat, 29 Feb 2020 16:32:44 +0200","From":"Laurent Pinchart ","To":"Nicolas Dufresne ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200229143244.GS18738@pendragon.ideasonboard.com>","References":"<20200227200407.490616-1-nicolas.dufresne@collabora.com>\n\t<20200227200407.490616-21-nicolas.dufresne@collabora.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20200227200407.490616-21-nicolas.dufresne@collabora.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v2 20/27] gst: Add getters for Stream\n\tand FrameBuffer","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Sat, 29 Feb 2020 14:33:08 -0000"}}]