gstreamer: Provide framerate support for libcamerasrc
Control the framerate by passing the controls::FrameDurationLimits during Camera::start(). Framerate in gstreamer is expressed as GST_TYPE_FRACTION so we maximise on maintaining it as a fraction throughout and only do arithematic computations as and when required (to compute frame-duration and vice-versa). To weed out abritrary framerate as input, place the clamping via the controls::FrameDurationLimits provided after camera::configure() phase. This is handled by a helper function gst_libcamera_clamp_and_set_frameduration(). Set the bound checked framerate (done in the above mentioned helper) into the caps and pass the ControlList containing the frame-duration to Camera::start(ctrls). Signed-off-by: Rishikesh Donadkar <rishikeshdonadkar@gmail.com> Signed-off-by: Umang Jain <umang.jain@ideasonboard.com> Tested-by: Umang Jain <umang.jain@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
This commit is contained in:
parent
872588301f
commit
ccfe0a1af7
3 changed files with 97 additions and 1 deletions
|
@ -8,6 +8,7 @@
|
|||
|
||||
#include "gstlibcamera-utils.h"
|
||||
|
||||
#include <libcamera/control_ids.h>
|
||||
#include <libcamera/formats.h>
|
||||
|
||||
using namespace libcamera;
|
||||
|
@ -407,6 +408,83 @@ gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg,
|
|||
}
|
||||
}
|
||||
|
||||
void gst_libcamera_get_framerate_from_caps(GstCaps *caps,
|
||||
GstStructure *element_caps)
|
||||
{
|
||||
GstStructure *s = gst_caps_get_structure(caps, 0);
|
||||
/*
|
||||
* Default to 30 fps. If the "framerate" fraction is invalid below,
|
||||
* libcamerasrc will set 30fps as the framerate.
|
||||
*/
|
||||
gint fps_n = 30, fps_d = 1;
|
||||
|
||||
if (gst_structure_has_field_typed(s, "framerate", GST_TYPE_FRACTION)) {
|
||||
if (!gst_structure_get_fraction(s, "framerate", &fps_n, &fps_d))
|
||||
GST_WARNING("Invalid framerate in the caps");
|
||||
}
|
||||
|
||||
gst_structure_set(element_caps, "framerate", GST_TYPE_FRACTION,
|
||||
fps_n, fps_d, nullptr);
|
||||
}
|
||||
|
||||
void gst_libcamera_clamp_and_set_frameduration(ControlList &initCtrls,
|
||||
const ControlInfoMap &cam_ctrls,
|
||||
GstStructure *element_caps)
|
||||
{
|
||||
gint fps_caps_n, fps_caps_d;
|
||||
|
||||
if (!gst_structure_has_field_typed(element_caps, "framerate", GST_TYPE_FRACTION))
|
||||
return;
|
||||
|
||||
auto iterFrameDuration = cam_ctrls.find(controls::FrameDurationLimits.id());
|
||||
if (iterFrameDuration == cam_ctrls.end()) {
|
||||
GST_WARNING("FrameDurationLimits not found in camera controls.");
|
||||
return;
|
||||
}
|
||||
|
||||
const GValue *framerate = gst_structure_get_value(element_caps, "framerate");
|
||||
|
||||
fps_caps_n = gst_value_get_fraction_numerator(framerate);
|
||||
fps_caps_d = gst_value_get_fraction_denominator(framerate);
|
||||
|
||||
int64_t target_duration = (fps_caps_d * 1000000.0) / fps_caps_n;
|
||||
int64_t min_frame_duration = iterFrameDuration->second.min().get<int64_t>();
|
||||
int64_t max_frame_duration = iterFrameDuration->second.max().get<int64_t>();
|
||||
|
||||
int64_t frame_duration = std::clamp(target_duration,
|
||||
min_frame_duration,
|
||||
max_frame_duration);
|
||||
|
||||
if (frame_duration != target_duration) {
|
||||
gint framerate_clamped = 1000000 / frame_duration;
|
||||
|
||||
/*
|
||||
* Update the clamped framerate which then will be exposed in
|
||||
* downstream caps.
|
||||
*/
|
||||
gst_structure_set(element_caps, "framerate", GST_TYPE_FRACTION,
|
||||
framerate_clamped, 1, nullptr);
|
||||
}
|
||||
|
||||
initCtrls.set(controls::FrameDurationLimits,
|
||||
{ frame_duration, frame_duration });
|
||||
}
|
||||
|
||||
void gst_libcamera_framerate_to_caps(GstCaps *caps, const GstStructure *element_caps)
|
||||
{
|
||||
const GValue *framerate = gst_structure_get_value(element_caps, "framerate");
|
||||
if (!GST_VALUE_HOLDS_FRACTION(framerate))
|
||||
return;
|
||||
|
||||
GstStructure *s = gst_caps_get_structure(caps, 0);
|
||||
gint fps_caps_n, fps_caps_d;
|
||||
|
||||
fps_caps_n = gst_value_get_fraction_numerator(framerate);
|
||||
fps_caps_d = gst_value_get_fraction_denominator(framerate);
|
||||
|
||||
gst_structure_set(s, "framerate", GST_TYPE_FRACTION, fps_caps_n, fps_caps_d, nullptr);
|
||||
}
|
||||
|
||||
#if !GST_CHECK_VERSION(1, 17, 1)
|
||||
gboolean
|
||||
gst_task_resume(GstTask *task)
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <libcamera/camera_manager.h>
|
||||
#include <libcamera/controls.h>
|
||||
#include <libcamera/stream.h>
|
||||
|
||||
#include <gst/gst.h>
|
||||
|
@ -18,6 +19,12 @@ GstCaps *gst_libcamera_stream_formats_to_caps(const libcamera::StreamFormats &fo
|
|||
GstCaps *gst_libcamera_stream_configuration_to_caps(const libcamera::StreamConfiguration &stream_cfg);
|
||||
void gst_libcamera_configure_stream_from_caps(libcamera::StreamConfiguration &stream_cfg,
|
||||
GstCaps *caps);
|
||||
void gst_libcamera_get_framerate_from_caps(GstCaps *caps, GstStructure *element_caps);
|
||||
void gst_libcamera_clamp_and_set_frameduration(libcamera::ControlList &controls,
|
||||
const libcamera::ControlInfoMap &camera_controls,
|
||||
GstStructure *element_caps);
|
||||
void gst_libcamera_framerate_to_caps(GstCaps *caps, const GstStructure *element_caps);
|
||||
|
||||
#if !GST_CHECK_VERSION(1, 17, 1)
|
||||
gboolean gst_task_resume(GstTask *task);
|
||||
#endif
|
||||
|
|
|
@ -131,6 +131,7 @@ struct GstLibcameraSrcState {
|
|||
std::queue<std::unique_ptr<RequestWrap>> completedRequests_
|
||||
LIBCAMERA_TSA_GUARDED_BY(lock_);
|
||||
|
||||
ControlList initControls_;
|
||||
guint group_id_;
|
||||
|
||||
int queueRequest();
|
||||
|
@ -462,6 +463,8 @@ gst_libcamera_src_task_enter(GstTask *task, [[maybe_unused]] GThread *thread,
|
|||
GstFlowReturn flow_ret = GST_FLOW_OK;
|
||||
gint ret;
|
||||
|
||||
g_autoptr(GstStructure) element_caps = gst_structure_new_empty("caps");
|
||||
|
||||
GST_DEBUG_OBJECT(self, "Streaming thread has started");
|
||||
|
||||
gint stream_id_num = 0;
|
||||
|
@ -504,6 +507,7 @@ gst_libcamera_src_task_enter(GstTask *task, [[maybe_unused]] GThread *thread,
|
|||
/* Fixate caps and configure the stream. */
|
||||
caps = gst_caps_make_writable(caps);
|
||||
gst_libcamera_configure_stream_from_caps(stream_cfg, caps);
|
||||
gst_libcamera_get_framerate_from_caps(caps, element_caps);
|
||||
}
|
||||
|
||||
if (flow_ret != GST_FLOW_OK)
|
||||
|
@ -525,6 +529,10 @@ gst_libcamera_src_task_enter(GstTask *task, [[maybe_unused]] GThread *thread,
|
|||
goto done;
|
||||
}
|
||||
|
||||
/* Check frame duration bounds within controls::FrameDurationLimits */
|
||||
gst_libcamera_clamp_and_set_frameduration(state->initControls_,
|
||||
state->cam_->controls(), element_caps);
|
||||
|
||||
/*
|
||||
* Regardless if it has been modified, create clean caps and push the
|
||||
* caps event. Downstream will decide if the caps are acceptable.
|
||||
|
@ -534,6 +542,8 @@ gst_libcamera_src_task_enter(GstTask *task, [[maybe_unused]] GThread *thread,
|
|||
const StreamConfiguration &stream_cfg = state->config_->at(i);
|
||||
|
||||
g_autoptr(GstCaps) caps = gst_libcamera_stream_configuration_to_caps(stream_cfg);
|
||||
gst_libcamera_framerate_to_caps(caps, element_caps);
|
||||
|
||||
if (!gst_pad_push_event(srcpad, gst_event_new_caps(caps))) {
|
||||
flow_ret = GST_FLOW_NOT_NEGOTIATED;
|
||||
break;
|
||||
|
@ -567,7 +577,7 @@ gst_libcamera_src_task_enter(GstTask *task, [[maybe_unused]] GThread *thread,
|
|||
gst_flow_combiner_add_pad(self->flow_combiner, srcpad);
|
||||
}
|
||||
|
||||
ret = state->cam_->start();
|
||||
ret = state->cam_->start(&state->initControls_);
|
||||
if (ret) {
|
||||
GST_ELEMENT_ERROR(self, RESOURCE, SETTINGS,
|
||||
("Failed to start the camera: %s", g_strerror(-ret)),
|
||||
|
@ -577,6 +587,7 @@ gst_libcamera_src_task_enter(GstTask *task, [[maybe_unused]] GThread *thread,
|
|||
}
|
||||
|
||||
done:
|
||||
state->initControls_.clear();
|
||||
switch (flow_ret) {
|
||||
case GST_FLOW_NOT_NEGOTIATED:
|
||||
GST_ELEMENT_FLOW_ERROR(self, flow_ret);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue