| Message ID | 20261021144139.3366988-1-naush@raspberrypi.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
Quoting Naushir Patuck (2026-10-21 15:41:00) > This rename is in preparation for adding more Starvis 2 sensors to the > helper. > > Signed-off-by: Naushir Patuck <naush@raspberrypi.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > --- > ...per_imx678.cpp => cam_helper_starvis2.cpp} | 19 +++++++------------ > src/ipa/rpi/cam_helper/meson.build | 2 +- > 2 files changed, 8 insertions(+), 13 deletions(-) > rename src/ipa/rpi/cam_helper/{cam_helper_imx678.cpp => cam_helper_starvis2.cpp} (61%) > > diff --git a/src/ipa/rpi/cam_helper/cam_helper_imx678.cpp b/src/ipa/rpi/cam_helper/cam_helper_starvis2.cpp > similarity index 61% > rename from src/ipa/rpi/cam_helper/cam_helper_imx678.cpp > rename to src/ipa/rpi/cam_helper/cam_helper_starvis2.cpp > index 5be1fa795370..0a0f75e19c01 100644 > --- a/src/ipa/rpi/cam_helper/cam_helper_imx678.cpp > +++ b/src/ipa/rpi/cam_helper/cam_helper_starvis2.cpp > @@ -2,7 +2,7 @@ > /* > * Copyright (C) 2026, Will Whang > * > - * cam_helper_imx678.cpp - camera information for Sony IMX678 sensor > + * cam_helper_starvis2.cpp - camera information for Sony Starvis 2 family of sensors > */ > > #include <algorithm> > @@ -14,10 +14,10 @@ namespace { > > using namespace RPiController; > > -class CamHelperImx678 : public CamHelper > +class CamHelperStarvis2 : public CamHelper > { > public: > - CamHelperImx678(); > + CamHelperStarvis2(); > uint32_t gainCode(double gain) const override; > double gain(uint32_t gainCode) const override; > > @@ -29,30 +29,25 @@ private: > static constexpr int frameIntegrationDiff = 4; > }; > > -/* > - * IMX678 driver currently doesn't expose a metadata stream, so we have to use > - * the "unicam parser" which works by counting frames. > - */ > - > -CamHelperImx678::CamHelperImx678() > +CamHelperStarvis2::CamHelperStarvis2() > : CamHelper({}, frameIntegrationDiff) > { > } > > -uint32_t CamHelperImx678::gainCode(double gain) const > +uint32_t CamHelperStarvis2::gainCode(double gain) const > { > int code = 66.6667 * log10(gain); > return std::max(0, std::min(code, 0xf0)); > } > > -double CamHelperImx678::gain(uint32_t gainCode) const > +double CamHelperStarvis2::gain(uint32_t gainCode) const > { > return std::pow(10, 0.015 * gainCode); > } > > CamHelper *create() > { > - return new CamHelperImx678(); > + return new CamHelperStarvis2(); > } > > RegisterCamHelper reg("imx678", &create); > diff --git a/src/ipa/rpi/cam_helper/meson.build b/src/ipa/rpi/cam_helper/meson.build > index cc71bacb2c6a..6935cecf885f 100644 > --- a/src/ipa/rpi/cam_helper/meson.build > +++ b/src/ipa/rpi/cam_helper/meson.build > @@ -11,12 +11,12 @@ rpi_ipa_cam_helper_sources = files([ > 'cam_helper_imx415.cpp', > 'cam_helper_imx477.cpp', > 'cam_helper_imx519.cpp', > - 'cam_helper_imx678.cpp', > 'cam_helper_imx708.cpp', > 'cam_helper_mira220.cpp', > 'cam_helper_ov64a40.cpp', > 'cam_helper_ov7251.cpp', > 'cam_helper_ov9281.cpp', > + 'cam_helper_starvis2.cpp', > 'cam_helper_vd55g1.cpp', > 'cam_helper_vd56g3.cpp', > 'md_parser_smia.cpp', > -- > 2.53.0 >
diff --git a/src/ipa/rpi/cam_helper/cam_helper_imx678.cpp b/src/ipa/rpi/cam_helper/cam_helper_starvis2.cpp similarity index 61% rename from src/ipa/rpi/cam_helper/cam_helper_imx678.cpp rename to src/ipa/rpi/cam_helper/cam_helper_starvis2.cpp index 5be1fa795370..0a0f75e19c01 100644 --- a/src/ipa/rpi/cam_helper/cam_helper_imx678.cpp +++ b/src/ipa/rpi/cam_helper/cam_helper_starvis2.cpp @@ -2,7 +2,7 @@ /* * Copyright (C) 2026, Will Whang * - * cam_helper_imx678.cpp - camera information for Sony IMX678 sensor + * cam_helper_starvis2.cpp - camera information for Sony Starvis 2 family of sensors */ #include <algorithm> @@ -14,10 +14,10 @@ namespace { using namespace RPiController; -class CamHelperImx678 : public CamHelper +class CamHelperStarvis2 : public CamHelper { public: - CamHelperImx678(); + CamHelperStarvis2(); uint32_t gainCode(double gain) const override; double gain(uint32_t gainCode) const override; @@ -29,30 +29,25 @@ private: static constexpr int frameIntegrationDiff = 4; }; -/* - * IMX678 driver currently doesn't expose a metadata stream, so we have to use - * the "unicam parser" which works by counting frames. - */ - -CamHelperImx678::CamHelperImx678() +CamHelperStarvis2::CamHelperStarvis2() : CamHelper({}, frameIntegrationDiff) { } -uint32_t CamHelperImx678::gainCode(double gain) const +uint32_t CamHelperStarvis2::gainCode(double gain) const { int code = 66.6667 * log10(gain); return std::max(0, std::min(code, 0xf0)); } -double CamHelperImx678::gain(uint32_t gainCode) const +double CamHelperStarvis2::gain(uint32_t gainCode) const { return std::pow(10, 0.015 * gainCode); } CamHelper *create() { - return new CamHelperImx678(); + return new CamHelperStarvis2(); } RegisterCamHelper reg("imx678", &create); diff --git a/src/ipa/rpi/cam_helper/meson.build b/src/ipa/rpi/cam_helper/meson.build index cc71bacb2c6a..6935cecf885f 100644 --- a/src/ipa/rpi/cam_helper/meson.build +++ b/src/ipa/rpi/cam_helper/meson.build @@ -11,12 +11,12 @@ rpi_ipa_cam_helper_sources = files([ 'cam_helper_imx415.cpp', 'cam_helper_imx477.cpp', 'cam_helper_imx519.cpp', - 'cam_helper_imx678.cpp', 'cam_helper_imx708.cpp', 'cam_helper_mira220.cpp', 'cam_helper_ov64a40.cpp', 'cam_helper_ov7251.cpp', 'cam_helper_ov9281.cpp', + 'cam_helper_starvis2.cpp', 'cam_helper_vd55g1.cpp', 'cam_helper_vd56g3.cpp', 'md_parser_smia.cpp',
This rename is in preparation for adding more Starvis 2 sensors to the helper. Signed-off-by: Naushir Patuck <naush@raspberrypi.com> --- ...per_imx678.cpp => cam_helper_starvis2.cpp} | 19 +++++++------------ src/ipa/rpi/cam_helper/meson.build | 2 +- 2 files changed, 8 insertions(+), 13 deletions(-) rename src/ipa/rpi/cam_helper/{cam_helper_imx678.cpp => cam_helper_starvis2.cpp} (61%)