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

libcamera: software_isp: Dispatch messages on stop

Browse source 
There may be pending messages in SoftwareIsp message queue when
SoftwareIsp stops.  The call to IPAProxySoft::stop() will dispatch them
before SoftwareIsp::stop() finishes.  But this is dependent on
IPAProxySoft::stop() implementation, let's break this dependency and
dispatch messages to SoftwareIsp explicitly in SoftwareIsp::stop().

This also allows dropping `running_' flag.  Since the SoftwareIsp
messages get processed and invoke IPA calls before the IPA proxy is set
to ProxyStopping state and the SoftwareIsp worker thread is no longer
running, it's guaranteed that no new messages come to SoftwareIsp and
attempt to call the stopped IPA proxy.

Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Milan Zamazal 2025-02-25 16:06:11 +01:00 • committed by Kieran Bingham
parent 72a890e11a
commit 86ffaf936d
2 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/libcamera/internal/software_isp/software_isp.h
View file

@ -101,7 +101,6 @@ private:
DmaBufAllocator dmaHeap_;
std::unique_ptr<ipa::soft::IPAProxySoft> ipa_;
bool running_;
std::deque<FrameBuffer *> queuedInputBuffers_;
std::deque<FrameBuffer *> queuedOutputBuffers_;
};

10
src/libcamera/software_isp/software_isp.cpp
View file

@ -14,6 +14,7 @@
#include <unistd.h>
#include <libcamera/base/log.h>
#include <libcamera/base/thread.h>
#include <libcamera/controls.h>
#include <libcamera/formats.h>
@ -323,7 +324,6 @@ int SoftwareIsp::start()
int ret = ipa_->start();
if (ret)
return ret;
running_ = true;
ispWorkerThread_.start();
return 0;
@ -340,7 +340,8 @@ void SoftwareIsp::stop()
ispWorkerThread_.exit();
ispWorkerThread_.wait();
running_ = false;
Thread::current()->dispatchMessages(Message::Type::InvokeMessage, this);
ipa_->stop();
for (auto buffer : queuedOutputBuffers_) {
@ -383,26 +384,21 @@ void SoftwareIsp::setSensorCtrls(const ControlList &sensorControls)
void SoftwareIsp::statsReady(uint32_t frame, uint32_t bufferId)
{
if (running_)
ispStatsReady.emit(frame, bufferId);
}
void SoftwareIsp::inputReady(FrameBuffer *input)
{
if (running_) {
ASSERT(queuedInputBuffers_.front() == input);
queuedInputBuffers_.pop_front();
inputBufferReady.emit(input);
}
}
void SoftwareIsp::outputReady(FrameBuffer *output)
{
if (running_) {
ASSERT(queuedOutputBuffers_.front() == output);
queuedOutputBuffers_.pop_front();
outputBufferReady.emit(output);
}
}
} /* namespace libcamera */