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

libcamera: pipeline: ipa: raspberrypi: Rework drop frame signalling

Browse source 
The IPA now signals up front how many frames it wants the pipeline
handler to drop. This makes it easier to handle up-coming changes to the
buffer handling for import/export buffers.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: David Plowman <david.plowman@raspberrypi.com>
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Naushir Patuck 2020-09-18 10:42:23 +01:00 • committed by Niklas Söderlund
parent 6bca768a0b
commit 8404d02d75
3 changed files with 33 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/ipa/raspberrypi/raspberrypi.cpp
View file

@ -65,8 +65,8 @@ class IPARPi : public IPAInterface
public:
IPARPi()
: lastMode_({}), controller_(), controllerInit_(false),
frame_count_(0), check_count_(0), hide_count_(0),
mistrust_count_(0), lsTable_(nullptr)
frame_count_(0), check_count_(0), mistrust_count_(0),
lsTable_(nullptr)
{
}
@ -137,8 +137,6 @@ private:
uint64_t frame_count_;
/* For checking the sequencing of Prepare/Process calls. */
uint64_t check_count_;
/* How many frames the pipeline handler should hide, or "drop". */
unsigned int hide_count_;
/* How many frames we should avoid running control algos on. */
unsigned int mistrust_count_;
/* LS table allocation passed in from the pipeline handler. */
@ -242,14 +240,18 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,
*/
frame_count_ = 0;
check_count_ = 0;
unsigned int drop_frame = 0;
if (controllerInit_) {
hide_count_ = helper_->HideFramesModeSwitch();
drop_frame = helper_->HideFramesModeSwitch();
mistrust_count_ = helper_->MistrustFramesModeSwitch();
} else {
hide_count_ = helper_->HideFramesStartup();
drop_frame = helper_->HideFramesStartup();
mistrust_count_ = helper_->MistrustFramesStartup();
}
result->data.push_back(drop_frame);
result->operation |= RPI_IPA_CONFIG_DROP_FRAMES;
struct AgcStatus agcStatus;
/* These zero values mean not program anything (unless overwritten). */
agcStatus.shutter_time = 0.0;
@ -366,13 +368,11 @@ void IPARPi::processEvent(const IPAOperationData &event)
* they are "unreliable".
*/
prepareISP(embeddedbufferId);
frame_count_++;
/* Ready to push the input buffer into the ISP. */
IPAOperationData op;
if (++frame_count_ > hide_count_)
op.operation = RPI_IPA_ACTION_RUN_ISP;
else
op.operation = RPI_IPA_ACTION_RUN_ISP_AND_DROP_FRAME;
op.operation = RPI_IPA_ACTION_RUN_ISP;
op.data = { bayerbufferId & RPiIpaMask::ID };
queueFrameAction.emit(0, op);
break;