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

libcamera: pipeline: rkisp1: fix crop configuration

Browse Source 
Crop rectangle was not being configured on the isp output pad nor in the
resizer input pad, causing an unecessary crop in the image and an
unecessary scaling by the resizer when streaming with a higher
resolution then the default 800x600.

Example:
    cam -c 1 -C -s width=3280,height=2464

In the pipeline:
    sensor->isp->resizer->dma_engine

isp output crop is set to 800x600, which limits the output format to
800x600, which is propagated to the resizer input format set to 800x600,
and the resizer output format is set to the desired end resolution
3280x2464.

Signed-off-by: Helen Koike <helen.koike@collabora.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Helen Koike
2020-11-06 17:32:27 -03:00
committed by Niklas Söderlund
parent 6669051825
commit a4e8a3bf3d
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libcamera/pipeline/rkisp1/rkisp1.cpp
View File

@@ -698,17 +698,27 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)
if (ret < 0)
return ret;
LOG(RkISP1, Debug) << "ISP input pad configured with " << format.toString();
LOG(RkISP1, Debug)
<< "ISP input pad configured with " << format.toString()
<< " crop " << rect.toString();
/* YUYV8_2X8 is required on the ISP source path pad for YUV output. */
format.mbus_code = MEDIA_BUS_FMT_YUYV8_2X8;
LOG(RkISP1, Debug) << "Configuring ISP output pad with " << format.toString();
LOG(RkISP1, Debug)
<< "Configuring ISP output pad with " << format.toString()
<< " crop " << rect.toString();
ret = isp_->setSelection(2, V4L2_SEL_TGT_CROP, &rect);
if (ret < 0)
return ret;
ret = isp_->setFormat(2, &format);
if (ret < 0)
return ret;
LOG(RkISP1, Debug) << "ISP output pad configured with " << format.toString();
LOG(RkISP1, Debug)
<< "ISP output pad configured with " << format.toString()
<< " crop " << rect.toString();
for (const StreamConfiguration &cfg : *config) {
if (cfg.stream() == &data->mainPathStream_)

7
src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
View File

@@ -117,9 +117,14 @@ int RkISP1Path::configure(const StreamConfiguration &config,
if (ret < 0)
return ret;
Rectangle rect(0, 0, ispFormat.size);
ret = resizer_->setSelection(0, V4L2_SEL_TGT_CROP, &rect);
if (ret < 0)
return ret;
LOG(RkISP1, Debug)
<< "Configured " << name_ << " resizer input pad with "
<< ispFormat.toString();
<< ispFormat.toString() << " crop " << rect.toString();
ispFormat.size = config.size;