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

libcamera: ipu3: cio2: Consolidate information about formats

Browse source 
Instead of spreading the mapping between media bus codes and V4L2 FourCC
all over the CIO2 code collect it in a single map and extract the data
from it. This is done in preparation of adding PixelFormat information
to the mix.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund 2020-06-22 23:46:29 +02:00
parent 6bd3d7259f
commit 906ff25ef8
1 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/libcamera/pipeline/ipu3/cio2.cpp
View file

@ -18,6 +18,17 @@ namespace libcamera {
LOG_DECLARE_CATEGORY(IPU3) LOG_DECLARE_CATEGORY(IPU3)
namespace {
static const std::map<uint32_t, V4L2PixelFormat> mbusCodesToInfo = {
{ MEDIA_BUS_FMT_SBGGR10_1X10, V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SBGGR10) },
{ MEDIA_BUS_FMT_SGBRG10_1X10, V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SGBRG10) },
{ MEDIA_BUS_FMT_SGRBG10_1X10, V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SGRBG10) },
{ MEDIA_BUS_FMT_SRGGB10_1X10, V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SRGGB10) },
};
} /* namespace */
CIO2Device::CIO2Device() CIO2Device::CIO2Device()
: output_(nullptr), csi2_(nullptr), sensor_(nullptr) : output_(nullptr), csi2_(nullptr), sensor_(nullptr)
{ {
@ -81,10 +92,11 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)
* utils::set_overlap requires the ranges to be sorted, keep the * utils::set_overlap requires the ranges to be sorted, keep the
* cio2Codes vector sorted in ascending order. * cio2Codes vector sorted in ascending order.
*/ */
const std::vector<unsigned int> cio2Codes{ MEDIA_BUS_FMT_SBGGR10_1X10, std::vector<unsigned int> cio2Codes;
MEDIA_BUS_FMT_SGRBG10_1X10, cio2Codes.reserve(mbusCodesToInfo.size());
MEDIA_BUS_FMT_SGBRG10_1X10, std::transform(mbusCodesToInfo.begin(), mbusCodesToInfo.end(),
MEDIA_BUS_FMT_SRGGB10_1X10 }; std::back_inserter(cio2Codes),
[](auto &pair) { return pair.first; });
const std::vector<unsigned int> &sensorCodes = sensor_->mbusCodes(); const std::vector<unsigned int> &sensorCodes = sensor_->mbusCodes();
if (!utils::set_overlap(sensorCodes.begin(), sensorCodes.end(), if (!utils::set_overlap(sensorCodes.begin(), sensorCodes.end(),
cio2Codes.begin(), cio2Codes.end())) { cio2Codes.begin(), cio2Codes.end())) {
@ -128,11 +140,13 @@ int CIO2Device::configure(const Size &size, V4L2DeviceFormat *outputFormat)
* Apply the selected format to the sensor, the CSI-2 receiver and * Apply the selected format to the sensor, the CSI-2 receiver and
* the CIO2 output device. * the CIO2 output device.
*/ */
sensorFormat = sensor_->getFormat({ MEDIA_BUS_FMT_SBGGR10_1X10, std::vector<unsigned int> mbusCodes;
MEDIA_BUS_FMT_SGBRG10_1X10, mbusCodes.reserve(mbusCodesToInfo.size());
MEDIA_BUS_FMT_SGRBG10_1X10, std::transform(mbusCodesToInfo.begin(), mbusCodesToInfo.end(),
MEDIA_BUS_FMT_SRGGB10_1X10 }, std::back_inserter(mbusCodes),
size); [](auto &pair) { return pair.first; });
sensorFormat = sensor_->getFormat(mbusCodes, size);
ret = sensor_->setFormat(&sensorFormat); ret = sensor_->setFormat(&sensorFormat);
if (ret) if (ret)
return ret; return ret;
@ -141,25 +155,11 @@ int CIO2Device::configure(const Size &size, V4L2DeviceFormat *outputFormat)
if (ret) if (ret)
return ret; return ret;
V4L2PixelFormat v4l2Format; const auto &itInfo = mbusCodesToInfo.find(sensorFormat.mbus_code);
switch (sensorFormat.mbus_code) { if (itInfo == mbusCodesToInfo.end())
case MEDIA_BUS_FMT_SBGGR10_1X10:
v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SBGGR10);
break;
case MEDIA_BUS_FMT_SGBRG10_1X10:
v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SGBRG10);
break;
case MEDIA_BUS_FMT_SGRBG10_1X10:
v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SGRBG10);
break;
case MEDIA_BUS_FMT_SRGGB10_1X10:
v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SRGGB10);
break;
default:
return -EINVAL; return -EINVAL;
}
outputFormat->fourcc = v4l2Format; outputFormat->fourcc = itInfo->second;
outputFormat->size = sensorFormat.size; outputFormat->size = sensorFormat.size;
outputFormat->planesCount = 1; outputFormat->planesCount = 1;