libcamera: camera_sensor: Store Bayer pattern in class member
The Bayer pattern is retrieved based on the media bus formats supported by the sensor, when registering camera sensor properties. To prepare for its usage elsewhere in the CameraSensor class, store it in a private member variable. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
This commit is contained in:
@@ -163,7 +163,8 @@ LOG_DEFINE_CATEGORY(CameraSensor)
|
||||
* Once constructed the instance must be initialized with init().
|
||||
*/
|
||||
CameraSensor::CameraSensor(const MediaEntity *entity)
|
||||
: entity_(entity), pad_(UINT_MAX), properties_(properties::properties)
|
||||
: entity_(entity), pad_(UINT_MAX), bayerFormat_(nullptr),
|
||||
properties_(properties::properties)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -253,6 +254,15 @@ int CameraSensor::init()
|
||||
return initProperties();
|
||||
}
|
||||
|
||||
/* Get the color filter array pattern (only for RAW sensors). */
|
||||
for (unsigned int mbusCode : mbusCodes_) {
|
||||
const BayerFormat &bayerFormat = BayerFormat::fromMbusCode(mbusCode);
|
||||
if (bayerFormat.isValid()) {
|
||||
bayerFormat_ = &bayerFormat;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ret = validateSensorDriver();
|
||||
if (ret)
|
||||
return ret;
|
||||
@@ -436,14 +446,9 @@ int CameraSensor::initProperties()
|
||||
properties_.set(properties::PixelArrayActiveAreas, { activeArea_ });
|
||||
|
||||
/* Color filter array pattern, register only for RAW sensors. */
|
||||
for (const auto &format : formats_) {
|
||||
unsigned int mbusCode = format.first;
|
||||
BayerFormat bayerFormat = BayerFormat::fromMbusCode(mbusCode);
|
||||
if (!bayerFormat.isValid())
|
||||
continue;
|
||||
|
||||
if (bayerFormat_) {
|
||||
int32_t cfa;
|
||||
switch (bayerFormat.order) {
|
||||
switch (bayerFormat_->order) {
|
||||
case BayerFormat::BGGR:
|
||||
cfa = properties::draft::BGGR;
|
||||
break;
|
||||
@@ -459,7 +464,6 @@ int CameraSensor::initProperties()
|
||||
}
|
||||
|
||||
properties_.set(properties::draft::ColorFilterArrangement, cfa);
|
||||
break;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user