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

libcamera: ipu3: imgu: Filter BDS by height

Browse source 
Apply to calculateBDS() function the content of commit 243d134 ("Fix
some bug for some resolutions") from
https://github.com/intel/intel-ipu3-pipecfg.git.

The calculated BDS sizes are filtered by height and not only by width
anymore.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Tested-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Acked-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
This commit is contained in:
Jacopo Mondi 2021-03-17 13:40:34 +01:00
parent 1da35058ec
commit c1b0e931a6
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/libcamera/pipeline/ipu3/imgu.cpp
View file

@ -33,6 +33,7 @@ namespace {
* at revision: 61e83f2f7606 ("Add more information into README") * at revision: 61e83f2f7606 ("Add more information into README")
*/ */
static constexpr unsigned int FILTER_W = 4;
static constexpr unsigned int FILTER_H = 4; static constexpr unsigned int FILTER_H = 4;
static constexpr unsigned int IF_ALIGN_W = 2; static constexpr unsigned int IF_ALIGN_W = 2;
@ -194,15 +195,20 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc
void calculateBDS(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc, float bdsSF) void calculateBDS(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc, float bdsSF)
{ {
unsigned int minBDSWidth = gdc.width + FILTER_H * 2; unsigned int minBDSWidth = gdc.width + FILTER_W * 2;
unsigned int minBDSHeight = gdc.height + FILTER_H * 2;
float sf = bdsSF; float sf = bdsSF;
while (sf <= BDS_SF_MAX && sf >= BDS_SF_MIN) { while (sf <= BDS_SF_MAX && sf >= BDS_SF_MIN) {
float bdsWidth = static_cast<float>(iif.width) / sf; float bdsWidth = static_cast<float>(iif.width) / sf;
float bdsHeight = static_cast<float>(iif.height) / sf;
if (std::fmod(bdsWidth, 1.0) == 0) { if (std::fmod(bdsWidth, 1.0) == 0 &&
std::fmod(bdsHeight, 1.0) == 0) {
unsigned int bdsIntWidth = static_cast<unsigned int>(bdsWidth); unsigned int bdsIntWidth = static_cast<unsigned int>(bdsWidth);
if (!(bdsIntWidth % BDS_ALIGN_W) && bdsWidth >= minBDSWidth) unsigned int bdsIntHeight = static_cast<unsigned int>(bdsHeight);
if (!(bdsIntWidth % BDS_ALIGN_W) && bdsWidth >= minBDSWidth &&
!(bdsIntHeight % BDS_ALIGN_H) && bdsHeight >= minBDSHeight)
calculateBDSHeight(pipe, iif, gdc, bdsIntWidth, sf); calculateBDSHeight(pipe, iif, gdc, bdsIntWidth, sf);
} }
@ -212,10 +218,14 @@ void calculateBDS(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc, floa
sf = bdsSF; sf = bdsSF;
while (sf <= BDS_SF_MAX && sf >= BDS_SF_MIN) { while (sf <= BDS_SF_MAX && sf >= BDS_SF_MIN) {
float bdsWidth = static_cast<float>(iif.width) / sf; float bdsWidth = static_cast<float>(iif.width) / sf;
float bdsHeight = static_cast<float>(iif.height) / sf;
if (std::fmod(bdsWidth, 1.0) == 0) { if (std::fmod(bdsWidth, 1.0) == 0 &&
std::fmod(bdsHeight, 1.0) == 0) {
unsigned int bdsIntWidth = static_cast<unsigned int>(bdsWidth); unsigned int bdsIntWidth = static_cast<unsigned int>(bdsWidth);
if (!(bdsIntWidth % BDS_ALIGN_W) && bdsWidth >= minBDSWidth) unsigned int bdsIntHeight = static_cast<unsigned int>(bdsHeight);
if (!(bdsIntWidth % BDS_ALIGN_W) && bdsWidth >= minBDSWidth &&
!(bdsIntHeight % BDS_ALIGN_H) && bdsHeight >= minBDSHeight)
calculateBDSHeight(pipe, iif, gdc, bdsIntWidth, sf); calculateBDSHeight(pipe, iif, gdc, bdsIntWidth, sf);
} }