Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-13 15:29:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

ipa: vimc: Synchronise parameter buffer ops naming

Browse source 
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>
This commit is contained in:
Umang Jain 2022-04-08 16:19:17 +05:30
parent 52cd4dacd0
commit cef3e15324
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,9 +37,9 @@ interface IPAVimcInterface {
* interface functions that mimick how other pipeline handlers typically * interface functions that mimick how other pipeline handlers typically
* handle parameters at runtime. * handle parameters at runtime.
*/ */
[async] fillParams(uint32 frame, uint32 bufferId); [async] fillParamsBuffer(uint32 frame, uint32 bufferId);
}; };
interface IPAVimcEventInterface { interface IPAVimcEventInterface {
paramsFilled(uint32 bufferId); paramsBufferReady(uint32 bufferId);
}; };

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

@ -44,7 +44,7 @@ public:
void unmapBuffers(const std::vector<unsigned int> &ids) override; void unmapBuffers(const std::vector<unsigned int> &ids) override;
void queueRequest(uint32_t frame, const ControlList &controls) 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: private:
void initTrace(); 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); auto it = buffers_.find(bufferId);
if (it == buffers_.end()) { if (it == buffers_.end()) {
@ -142,7 +142,7 @@ void IPAVimc::fillParams([[maybe_unused]] uint32_t frame, uint32_t bufferId)
return; return;
} }
paramsFilled.emit(bufferId); paramsBufferReady.emit(bufferId);
} }
void IPAVimc::initTrace() void IPAVimc::initTrace()

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

@ -53,7 +53,7 @@ public:
int init(); int init();
int allocateMockIPABuffers(); int allocateMockIPABuffers();
void bufferReady(FrameBuffer *buffer); void bufferReady(FrameBuffer *buffer);
void paramsFilled(unsigned int id); void paramsBufferReady(unsigned int id);
MediaDevice *media_; MediaDevice *media_;
std::unique_ptr<CameraSensor> sensor_; std::unique_ptr<CameraSensor> sensor_;
@ -467,7 +467,7 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)
return false; 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"); std::string conf = data->ipa_->configurationFile("vimc.conf");
data->ipa_->init(IPASettings{ conf, data->sensor_->model() }); data->ipa_->init(IPASettings{ conf, data->sensor_->model() });
@ -589,7 +589,7 @@ void VimcCameraData::bufferReady(FrameBuffer *buffer)
pipe->completeBuffer(request, buffer); pipe->completeBuffer(request, buffer);
pipe->completeRequest(request); pipe->completeRequest(request);
ipa_->fillParams(request->sequence(), mockIPABufs_[0]->cookie()); ipa_->fillParamsBuffer(request->sequence(), mockIPABufs_[0]->cookie());
} }
int VimcCameraData::allocateMockIPABuffers() int VimcCameraData::allocateMockIPABuffers()
@ -607,7 +607,7 @@ int VimcCameraData::allocateMockIPABuffers()
return video_->exportBuffers(kBufCount, &mockIPABufs_); return video_->exportBuffers(kBufCount, &mockIPABufs_);
} }
void VimcCameraData::paramsFilled([[maybe_unused]] unsigned int id) void VimcCameraData::paramsBufferReady([[maybe_unused]] unsigned int id)
{ {
} }