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

ipa: vimc: Add IPAOperationCode to init() parameter list

Browse source 
For the purpose of testing serializing/deserializing enums in function
parameters, add IPAOperationCode to the parameter list of init().

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Paul Elder 2022-08-02 16:39:12 +09:00
parent deaf13de9b
commit 23fd404690
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/libcamera/ipa/vimc.mojom
View file

@ -18,7 +18,7 @@ enum IPAOperationCode {
}; };
interface IPAVimcInterface { interface IPAVimcInterface {
init(libcamera.IPASettings settings) => (int32 ret); init(libcamera.IPASettings settings, IPAOperationCode code) => (int32 ret);
configure(libcamera.IPACameraSensorInfo sensorInfo, configure(libcamera.IPACameraSensorInfo sensorInfo,
map<uint32, libcamera.IPAStream> streamConfig, map<uint32, libcamera.IPAStream> streamConfig,

6
src/ipa/vimc/vimc.cpp
View file

@ -31,7 +31,7 @@ public:
IPAVimc(); IPAVimc();
~IPAVimc(); ~IPAVimc();
int init(const IPASettings &settings) override; int init(const IPASettings &settings, const ipa::vimc::IPAOperationCode code) override;
int start() override; int start() override;
void stop() override; void stop() override;
@ -66,7 +66,7 @@ IPAVimc::~IPAVimc()
::close(fd_); ::close(fd_);
} }
int IPAVimc::init(const IPASettings &settings) int IPAVimc::init(const IPASettings &settings, const ipa::vimc::IPAOperationCode code)
{ {
trace(ipa::vimc::IPAOperationInit); trace(ipa::vimc::IPAOperationInit);
@ -74,6 +74,8 @@ int IPAVimc::init(const IPASettings &settings)
<< "initializing vimc IPA with configuration file " << "initializing vimc IPA with configuration file "
<< settings.configurationFile; << settings.configurationFile;
LOG(IPAVimc, Debug) << "Got opcode " << code;
File conf(settings.configurationFile); File conf(settings.configurationFile);
if (!conf.open(File::OpenModeFlag::ReadOnly)) { if (!conf.open(File::OpenModeFlag::ReadOnly)) {
LOG(IPAVimc, Error) << "Failed to open configuration file"; LOG(IPAVimc, Error) << "Failed to open configuration file";

2
src/libcamera/pipeline/vimc/vimc.cpp
View file

@ -471,7 +471,7 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)
data->ipa_->paramsBufferReady.connect(data.get(), &VimcCameraData::paramsBufferReady); data->ipa_->paramsBufferReady.connect(data.get(), &VimcCameraData::paramsBufferReady);
std::string conf = data->ipa_->configurationFile("vimc.conf"); std::string conf = data->ipa_->configurationFile("vimc.conf");
data->ipa_->init(IPASettings{ conf, data->sensor_->model() }); data->ipa_->init(IPASettings{ conf, data->sensor_->model() }, ipa::vimc::IPAOperationInit);
/* Create and register the camera. */ /* Create and register the camera. */
std::set<Stream *> streams{ &data->stream_ }; std::set<Stream *> streams{ &data->stream_ };

2
test/ipa/ipa_interface_test.cpp
View file

@ -106,7 +106,7 @@ protected:
/* Test initialization of IPA module. */ /* Test initialization of IPA module. */
std::string conf = ipa_->configurationFile("vimc.conf"); std::string conf = ipa_->configurationFile("vimc.conf");
int ret = ipa_->init(IPASettings{ conf, "vimc" }); int ret = ipa_->init(IPASettings{ conf, "vimc" }, ipa::vimc::IPAOperationInit);
if (ret < 0) { if (ret < 0) {
cerr << "IPA interface init() failed" << endl; cerr << "IPA interface init() failed" << endl;
return TestFail; return TestFail;