summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUmang Jain <umang.jain@ideasonboard.com>2022-04-08 16:19:17 +0530
committerUmang Jain <umang.jain@ideasonboard.com>2022-04-13 19:04:58 +0530
commitcef3e15324f3dbf35b1434cb901b91e2a8fc980b (patch)
tree85135c763e3f44af5d8da2bbc5d3013f3b9e7728
parent52cd4dacd0ee89a3785f661592d515537180fe64 (diff)
ipa: vimc: Synchronise parameter buffer ops naming
Synchronise the names of the operations with respect to parameters buffer with the names used in other IPA interfaces. Signed-off-by: Umang Jain <umang.jain@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
-rw-r--r--include/libcamera/ipa/vimc.mojom4
-rw-r--r--src/ipa/vimc/vimc.cpp6
-rw-r--r--src/libcamera/pipeline/vimc/vimc.cpp8
3 files changed, 9 insertions, 9 deletions
diff --git a/include/libcamera/ipa/vimc.mojom b/include/libcamera/ipa/vimc.mojom
index cdc03ffb..718b9674 100644
--- a/include/libcamera/ipa/vimc.mojom
+++ b/include/libcamera/ipa/vimc.mojom
@@ -37,9 +37,9 @@ interface IPAVimcInterface {
* interface functions that mimick how other pipeline handlers typically
* handle parameters at runtime.
*/
- [async] fillParams(uint32 frame, uint32 bufferId);
+ [async] fillParamsBuffer(uint32 frame, uint32 bufferId);
};
interface IPAVimcEventInterface {
- paramsFilled(uint32 bufferId);
+ paramsBufferReady(uint32 bufferId);
};
diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp
index a62e72b0..85afb279 100644
--- a/src/ipa/vimc/vimc.cpp
+++ b/src/ipa/vimc/vimc.cpp
@@ -44,7 +44,7 @@ public:
void unmapBuffers(const std::vector<unsigned int> &ids) override;
void queueRequest(uint32_t frame, const ControlList &controls) override;
- void fillParams(uint32_t frame, uint32_t bufferId) override;
+ void fillParamsBuffer(uint32_t frame, uint32_t bufferId) override;
private:
void initTrace();
@@ -134,7 +134,7 @@ void IPAVimc::queueRequest([[maybe_unused]] uint32_t frame,
{
}
-void IPAVimc::fillParams([[maybe_unused]] uint32_t frame, uint32_t bufferId)
+void IPAVimc::fillParamsBuffer([[maybe_unused]] uint32_t frame, uint32_t bufferId)
{
auto it = buffers_.find(bufferId);
if (it == buffers_.end()) {
@@ -142,7 +142,7 @@ void IPAVimc::fillParams([[maybe_unused]] uint32_t frame, uint32_t bufferId)
return;
}
- paramsFilled.emit(bufferId);
+ paramsBufferReady.emit(bufferId);
}
void IPAVimc::initTrace()
diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp
index 69b83d07..fff95a34 100644
--- a/src/libcamera/pipeline/vimc/vimc.cpp
+++ b/src/libcamera/pipeline/vimc/vimc.cpp
@@ -53,7 +53,7 @@ public:
int init();
int allocateMockIPABuffers();
void bufferReady(FrameBuffer *buffer);
- void paramsFilled(unsigned int id);
+ void paramsBufferReady(unsigned int id);
MediaDevice *media_;
std::unique_ptr<CameraSensor> sensor_;
@@ -467,7 +467,7 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)
return false;
}
- data->ipa_->paramsFilled.connect(data.get(), &VimcCameraData::paramsFilled);
+ data->ipa_->paramsBufferReady.connect(data.get(), &VimcCameraData::paramsBufferReady);
std::string conf = data->ipa_->configurationFile("vimc.conf");
data->ipa_->init(IPASettings{ conf, data->sensor_->model() });
@@ -589,7 +589,7 @@ void VimcCameraData::bufferReady(FrameBuffer *buffer)
pipe->completeBuffer(request, buffer);
pipe->completeRequest(request);
- ipa_->fillParams(request->sequence(), mockIPABufs_[0]->cookie());
+ ipa_->fillParamsBuffer(request->sequence(), mockIPABufs_[0]->cookie());
}
int VimcCameraData::allocateMockIPABuffers()
@@ -607,7 +607,7 @@ int VimcCameraData::allocateMockIPABuffers()
return video_->exportBuffers(kBufCount, &mockIPABufs_);
}
-void VimcCameraData::paramsFilled([[maybe_unused]] unsigned int id)
+void VimcCameraData::paramsBufferReady([[maybe_unused]] unsigned int id)
{
}