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

libcamera: stream: Turn StreamRole into scoped enumeration

Browse source 
The StreamRole enum has enumerators such as 'Raw' that are too generic
to be in the global libcamera namespace. Turn it into a scoped enum to
avoid namespace clashes, and update users accordingly.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Laurent Pinchart 2022-10-23 02:51:10 +03:00
parent baf3be12ef
commit 81e7689bb1
5 changed files with 33 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/libcamera/stream.h
View file

@ -62,7 +62,7 @@ private:
StreamFormats formats_;
};
enum StreamRole {
enum class StreamRole {
Raw,
StillCapture,
VideoRecording,

2
src/android/camera_capabilities.cpp
View file

@ -488,7 +488,7 @@ int CameraCapabilities::initializeStreamConfigurations()
* \todo Get this from the camera properties once defined
*/
std::unique_ptr<CameraConfiguration> cameraConfig =
camera_->generateConfiguration({ StillCapture });
camera_->generateConfiguration({ StreamRole::StillCapture });
if (!cameraConfig) {
LOG(HAL, Error) << "Failed to get maximum resolution";
return -EINVAL;

17
src/apps/lc-compliance/capture_test.cpp
View file

@ -16,7 +16,12 @@
using namespace libcamera;
const std::vector<int> NUMREQUESTS = { 1, 2, 3, 5, 8, 13, 21, 34, 55, 89 };
const std::vector<StreamRole> ROLES = { Raw, StillCapture, VideoRecording, Viewfinder };
const std::vector<StreamRole> ROLES = {
StreamRole::Raw,
StreamRole::StillCapture,
StreamRole::VideoRecording,
StreamRole::Viewfinder
};
class SingleStream : public testing::TestWithParam<std::tuple<StreamRole, int>>
{
@ -54,10 +59,12 @@ void SingleStream::TearDown()
std::string SingleStream::nameParameters(const testing::TestParamInfo<SingleStream::ParamType> &info)
{
std::map<StreamRole, std::string> rolesMap = { { Raw, "Raw" },
{ StillCapture, "StillCapture" },
{ VideoRecording, "VideoRecording" },
{ Viewfinder, "Viewfinder" } };
std::map<StreamRole, std::string> rolesMap = {
{ StreamRole::Raw, "Raw" },
{ StreamRole::StillCapture, "StillCapture" },
{ StreamRole::VideoRecording, "VideoRecording" },
{ StreamRole::Viewfinder, "Viewfinder" }
};
std::string roleName = rolesMap[std::get<0>(info.param)];
std::string numRequestsName = std::to_string(std::get<1>(info.param));

20
src/gstreamer/gstlibcamerapad.cpp
View file

@ -54,7 +54,7 @@ gst_libcamera_pad_get_property(GObject *object, guint prop_id, GValue *value,
switch (prop_id) {
case PROP_STREAM_ROLE:
g_value_set_enum(value, self->role);
g_value_set_enum(value, static_cast<gint>(self->role));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@ -87,9 +87,19 @@ gst_libcamera_stream_role_get_type()
{
static GType type = 0;
static const GEnumValue values[] = {
{ StillCapture, "libcamera::StillCapture", "still-capture" },
{ VideoRecording, "libcamera::VideoRecording", "video-recording" },
{ Viewfinder, "libcamera::Viewfinder", "view-finder" },
{
static_cast<gint>(StreamRole::StillCapture),
"libcamera::StillCapture",
"still-capture",
}, {
static_cast<gint>(StreamRole::VideoRecording),
"libcamera::VideoRecording",
"video-recording",
}, {
static_cast<gint>(StreamRole::Viewfinder),
"libcamera::Viewfinder",
"view-finder",
},
{ 0, NULL, NULL }
};
@ -110,7 +120,7 @@ gst_libcamera_pad_class_init(GstLibcameraPadClass *klass)
auto *spec = g_param_spec_enum("stream-role", "Stream Role",
"The selected stream role",
gst_libcamera_stream_role_get_type(),
VideoRecording,
static_cast<gint>(StreamRole::VideoRecording),
(GParamFlags)(GST_PARAM_MUTABLE_READY
| G_PARAM_CONSTRUCT
| G_PARAM_READWRITE

8
src/libcamera/pipeline/imx8-isi/imx8-isi.cpp
View file

@ -599,7 +599,7 @@ PipelineHandlerISI::generateConfiguration(Camera *camera,
Size size;
switch (role) {
case StillCapture:
case StreamRole::StillCapture:
/*
* \todo Make sure the sensor can produce non-RAW formats
* compatible with the ones supported by the pipeline.
@ -608,8 +608,8 @@ PipelineHandlerISI::generateConfiguration(Camera *camera,
pixelFormat = formats::YUYV;
break;
case Viewfinder:
case VideoRecording:
case StreamRole::Viewfinder:
case StreamRole::VideoRecording:
/*
* \todo Make sure the sensor can produce non-RAW formats
* compatible with the ones supported by the pipeline.
@ -618,7 +618,7 @@ PipelineHandlerISI::generateConfiguration(Camera *camera,
pixelFormat = formats::YUYV;
break;
case Raw: {
case StreamRole::Raw: {
/*
* Make sure the sensor can generate a RAW format and
* prefer the ones with a larger bitdepth.