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

libcamera: ipu3: Fold mediaBusToFormat() into only caller

Browse source 
Make the code easier to read and refactor.

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-01 22:17:55 +02:00
parent cbf0a92185
commit 82ddb680a8
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/libcamera/pipeline/ipu3/ipu3.cpp
View file

@ -134,8 +134,6 @@ public:
int start(); int start();
int stop(); int stop();
static V4L2PixelFormat mediaBusToFormat(unsigned int code);
V4L2VideoDevice *output_; V4L2VideoDevice *output_;
V4L2Subdevice *csi2_; V4L2Subdevice *csi2_;
CameraSensor *sensor_; CameraSensor *sensor_;
@ -1506,7 +1504,25 @@ int CIO2Device::configure(const Size &size,
if (ret) if (ret)
return ret; return ret;
outputFormat->fourcc = mediaBusToFormat(sensorFormat.mbus_code); V4L2PixelFormat v4l2Format;
switch (sensorFormat.mbus_code) {
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;
}
outputFormat->fourcc = v4l2Format;
outputFormat->size = sensorFormat.size; outputFormat->size = sensorFormat.size;
outputFormat->planesCount = 1; outputFormat->planesCount = 1;
@ -1580,22 +1596,6 @@ int CIO2Device::stop()
return output_->streamOff(); return output_->streamOff();
} }
V4L2PixelFormat CIO2Device::mediaBusToFormat(unsigned int code)
{
switch (code) {
case MEDIA_BUS_FMT_SBGGR10_1X10:
return V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SBGGR10);
case MEDIA_BUS_FMT_SGBRG10_1X10:
return V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SGBRG10);
case MEDIA_BUS_FMT_SGRBG10_1X10:
return V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SGRBG10);
case MEDIA_BUS_FMT_SRGGB10_1X10:
return V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SRGGB10);
default:
return {};
}
}
REGISTER_PIPELINE_HANDLER(PipelineHandlerIPU3); REGISTER_PIPELINE_HANDLER(PipelineHandlerIPU3);
} /* namespace libcamera */ } /* namespace libcamera */