| Message ID | 20211022115537.2964533-5-naush@raspberrypi.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series |
|
| Related | show |
Hi Naush Thanks for this! On Fri, 22 Oct 2021 at 12:55, Naushir Patuck <naush@raspberrypi.com> wrote: > > With the recent change to switch to programming the sensor device directly, > the notion of packed vs unpacked modes are not relevent, since that is a > Unicam format construct. Remove any scoring based on packed/unpacked modes. > > Signed-off-by: Naushir Patuck <naush@raspberrypi.com> > --- > src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp > index 0f13127a7748..fc190e39732a 100644 > --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp > +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp > @@ -125,7 +125,6 @@ SensorMode findBestMode(const SensorFormats &formatsMap, const Size &req) > #define PENALTY_8BIT 2000.0 > #define PENALTY_10BIT 1000.0 > #define PENALTY_12BIT 0.0 > -#define PENALTY_UNPACKED 500.0 > > /* Calculate the closest/best mode from the user requested size. */ > for (const auto &iter : formatsMap) { > @@ -143,9 +142,6 @@ SensorMode findBestMode(const SensorFormats &formatsMap, const Size &req) > score += PENALTY_AR * scoreFormat(reqAr, modeAr); > > /* Add any penalties... this is not an exact science! */ > - if (!info.packed) > - score += PENALTY_UNPACKED; > - > if (info.bitsPerPixel == 12) > score += PENALTY_12BIT; > else if (info.bitsPerPixel == 10) > -- > 2.25.1 > I think I agree here, this doesn't feel like quite the right place to deal with packing. Thanks! David
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index 0f13127a7748..fc190e39732a 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -125,7 +125,6 @@ SensorMode findBestMode(const SensorFormats &formatsMap, const Size &req) #define PENALTY_8BIT 2000.0 #define PENALTY_10BIT 1000.0 #define PENALTY_12BIT 0.0 -#define PENALTY_UNPACKED 500.0 /* Calculate the closest/best mode from the user requested size. */ for (const auto &iter : formatsMap) { @@ -143,9 +142,6 @@ SensorMode findBestMode(const SensorFormats &formatsMap, const Size &req) score += PENALTY_AR * scoreFormat(reqAr, modeAr); /* Add any penalties... this is not an exact science! */ - if (!info.packed) - score += PENALTY_UNPACKED; - if (info.bitsPerPixel == 12) score += PENALTY_12BIT; else if (info.bitsPerPixel == 10)
With the recent change to switch to programming the sensor device directly, the notion of packed vs unpacked modes are not relevent, since that is a Unicam format construct. Remove any scoring based on packed/unpacked modes. Signed-off-by: Naushir Patuck <naush@raspberrypi.com> --- src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 4 ---- 1 file changed, 4 deletions(-)