PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: Remove libcamera::LOG(...) occurrences

Browse Source 
When a class inherits from `Loggable`, it will have a protected `_log()`
function and that will be used instead of the global `_log()` function in the
expansion of the `LOG()` macro. However, if such a class has static member
functions, then simply writing `LOG()` will not work because name lookup will
find the non-static member function and not the global function, resulting in
a compiler error because the non-static member cannot be invoked without an
object, and there is no object in a static member function.

This can be avoided by using `using libcamera::_log;`, thereby bringing the
global declaration into the current scope.

Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Barnabás Pőcze
2025-03-03 16:08:21 +01:00
parent 6725ea8edd
commit 95bf04298e
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libcamera/sensor/camera_sensor_raw.cpp
View File

@@ -172,10 +172,12 @@ CameraSensorRaw::~CameraSensorRaw() = default;
std::variant<std::unique_ptr<CameraSensor>, int>
CameraSensorRaw::match(MediaEntity *entity)
{
using libcamera::_log;
/* Check the entity type. */
if (entity->type() != MediaEntity::Type::V4L2Subdevice ||
entity->function() != MEDIA_ENT_F_CAM_SENSOR) {
libcamera::LOG(CameraSensor, Debug)
LOG(CameraSensor, Debug)
<< entity->name() << ": unsupported entity type ("
<< utils::to_underlying(entity->type())
<< ") or function (" << utils::hex(entity->function()) << ")";
@@ -200,7 +202,7 @@ CameraSensorRaw::match(MediaEntity *entity)
break;
default:
libcamera::LOG(CameraSensor, Debug)
LOG(CameraSensor, Debug)
<< entity->name() << ": unsupported pad " << pad->index()
<< " type " << utils::hex(pad->flags());
return { 0 };
@@ -208,7 +210,7 @@ CameraSensorRaw::match(MediaEntity *entity)
}
if (numSinks < 1 || numSinks > 2 || numSources != 1) {
libcamera::LOG(CameraSensor, Debug)
LOG(CameraSensor, Debug)
<< entity->name() << ": unsupported number of sinks ("
<< numSinks << ") or sources (" << numSources << ")";
return { 0 };

10
src/libcamera/v4l2_device.cpp
View File

@@ -1032,6 +1032,8 @@ template std::optional<ColorSpace> V4L2Device::toColorSpace(const struct v4l2_mb
template<typename T>
int V4L2Device::fromColorSpace(const std::optional<ColorSpace> &colorSpace, T &v4l2Format)
{
using libcamera::_log;
v4l2Format.colorspace = V4L2_COLORSPACE_DEFAULT;
v4l2Format.xfer_func = V4L2_XFER_FUNC_DEFAULT;
v4l2Format.ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;
@@ -1060,7 +1062,7 @@ int V4L2Device::fromColorSpace(const std::optional<ColorSpace> &colorSpace, T &v
if (itPrimaries != primariesToV4l2.end()) {
v4l2Format.colorspace = itPrimaries->second;
} else {
libcamera::LOG(V4L2, Warning)
LOG(V4L2, Warning)
<< "Unrecognised primaries in "
<< ColorSpace::toString(colorSpace);
ret = -EINVAL;
@@ -1070,7 +1072,7 @@ int V4L2Device::fromColorSpace(const std::optional<ColorSpace> &colorSpace, T &v
if (itTransfer != transferFunctionToV4l2.end()) {
v4l2Format.xfer_func = itTransfer->second;
} else {
libcamera::LOG(V4L2, Warning)
LOG(V4L2, Warning)
<< "Unrecognised transfer function in "
<< ColorSpace::toString(colorSpace);
ret = -EINVAL;
@@ -1080,7 +1082,7 @@ int V4L2Device::fromColorSpace(const std::optional<ColorSpace> &colorSpace, T &v
if (itYcbcrEncoding != ycbcrEncodingToV4l2.end()) {
v4l2Format.ycbcr_enc = itYcbcrEncoding->second;
} else {
libcamera::LOG(V4L2, Warning)
LOG(V4L2, Warning)
<< "Unrecognised YCbCr encoding in "
<< ColorSpace::toString(colorSpace);
ret = -EINVAL;
@@ -1090,7 +1092,7 @@ int V4L2Device::fromColorSpace(const std::optional<ColorSpace> &colorSpace, T &v
if (itRange != rangeToV4l2.end()) {
v4l2Format.quantization = itRange->second;
} else {
libcamera::LOG(V4L2, Warning)
LOG(V4L2, Warning)
<< "Unrecognised quantization in "
<< ColorSpace::toString(colorSpace);
ret = -EINVAL;