NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

gstreamer: Use gst_task_resume() when available

Browse source 
The gst_libcamera_resume_task() helper is an implementation of the
gst_task_resume() function that predates its addition to GStreamer. Use
gst_task_resume() when available, and rename gst_libcamera_resume_task()
to gst_task_resume() to support older GStreamer versions.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Vedant Paranjape <vedantparanjape160201@gmail.com>
This commit is contained in:
Laurent Pinchart 2022-06-21 22:47:53 +03:00
parent d5b0cec839
commit 053ffcca06
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/gstreamer/gstlibcamera-utils.cpp
View file

@ -224,16 +224,20 @@ gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg,
stream_cfg.size.height = height; stream_cfg.size.height = height;
} }
void #if !GST_CHECK_VERSION(1, 17, 1)
gst_libcamera_resume_task(GstTask *task) gboolean
gst_task_resume(GstTask *task)
{ {
/* We only want to resume the task if it's paused. */ /* We only want to resume the task if it's paused. */
GLibLocker lock(GST_OBJECT(task)); GLibLocker lock(GST_OBJECT(task));
if (GST_TASK_STATE(task) == GST_TASK_PAUSED) { if (GST_TASK_STATE(task) != GST_TASK_PAUSED)
GST_TASK_STATE(task) = GST_TASK_STARTED; return FALSE;
GST_TASK_SIGNAL(task);
} GST_TASK_STATE(task) = GST_TASK_STARTED;
GST_TASK_SIGNAL(task);
return TRUE;
} }
#endif
G_LOCK_DEFINE_STATIC(cm_singleton_lock); G_LOCK_DEFINE_STATIC(cm_singleton_lock);
static std::weak_ptr<CameraManager> cm_singleton_ptr; static std::weak_ptr<CameraManager> cm_singleton_ptr;

4
src/gstreamer/gstlibcamera-utils.h
View file

@ -18,7 +18,9 @@ GstCaps *gst_libcamera_stream_formats_to_caps(const libcamera::StreamFormats &fo
GstCaps *gst_libcamera_stream_configuration_to_caps(const libcamera::StreamConfiguration &stream_cfg); GstCaps *gst_libcamera_stream_configuration_to_caps(const libcamera::StreamConfiguration &stream_cfg);
void gst_libcamera_configure_stream_from_caps(libcamera::StreamConfiguration &stream_cfg, void gst_libcamera_configure_stream_from_caps(libcamera::StreamConfiguration &stream_cfg,
GstCaps *caps); GstCaps *caps);
void gst_libcamera_resume_task(GstTask *task); #if !GST_CHECK_VERSION(1, 17, 1)
gboolean gst_task_resume(GstTask *task);
#endif
std::shared_ptr<libcamera::CameraManager> gst_libcamera_get_camera_manager(int &ret); std::shared_ptr<libcamera::CameraManager> gst_libcamera_get_camera_manager(int &ret);
/** /**

4
src/gstreamer/gstlibcamerasrc.cpp
View file

@ -192,7 +192,7 @@ GstLibcameraSrcState::requestCompleted(Request *request)
gst_libcamera_pad_queue_buffer(srcpad, buffer); gst_libcamera_pad_queue_buffer(srcpad, buffer);
} }
gst_libcamera_resume_task(this->src_->task); gst_task_resume(src_->task);
} }
static bool static bool
@ -453,7 +453,7 @@ gst_libcamera_src_task_enter(GstTask *task, [[maybe_unused]] GThread *thread,
GstLibcameraPool *pool = gst_libcamera_pool_new(self->allocator, GstLibcameraPool *pool = gst_libcamera_pool_new(self->allocator,
stream_cfg.stream()); stream_cfg.stream());
g_signal_connect_swapped(pool, "buffer-notify", g_signal_connect_swapped(pool, "buffer-notify",
G_CALLBACK(gst_libcamera_resume_task), task); G_CALLBACK(gst_task_resume), task);
gst_libcamera_pad_set_pool(srcpad, pool); gst_libcamera_pad_set_pool(srcpad, pool);
gst_flow_combiner_add_pad(self->flow_combiner, srcpad); gst_flow_combiner_add_pad(self->flow_combiner, srcpad);