summaryrefslogtreecommitdiff
path: root/src/ipa/raspberrypi
diff options
context:
space:
mode:
authorNaushir Patuck <naush@raspberrypi.com>2020-09-18 10:42:33 +0100
committerNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-09-21 13:10:49 +0200
commit39798e8777b553ed9ae9863da02e16e417d8307e (patch)
treee2915e2dd0b0bc015227077851f4095cad59c7d4 /src/ipa/raspberrypi
parentdd0df6d73965bc8566ad97d0e005545a71b7b409 (diff)
pipeline: ipa: raspberrypi: Handle any externally allocated FrameBuffer
Handle the case where a FrameBuffer that has been externally allocated (i.e. not through the v4l2 video device) is passed into a Request. We must store the buffer pointer in the stream internal buffer list to identify when used. Signed-off-by: Naushir Patuck <naush@raspberrypi.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Diffstat (limited to 'src/ipa/raspberrypi')
-rw-r--r--src/ipa/raspberrypi/raspberrypi.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
index 688d2efc..0555cc4e 100644
--- a/src/ipa/raspberrypi/raspberrypi.cpp
+++ b/src/ipa/raspberrypi/raspberrypi.cpp
@@ -352,7 +352,7 @@ void IPARPi::processEvent(const IPAOperationData &event)
IPAOperationData op;
op.operation = RPI_IPA_ACTION_STATS_METADATA_COMPLETE;
- op.data = { bufferId & RPiIpaMask::ID };
+ op.data = { bufferId & RPiBufferMask::ID };
op.controls = { libcameraMetadata_ };
queueFrameAction.emit(0, op);
break;
@@ -373,7 +373,7 @@ void IPARPi::processEvent(const IPAOperationData &event)
/* Ready to push the input buffer into the ISP. */
IPAOperationData op;
op.operation = RPI_IPA_ACTION_RUN_ISP;
- op.data = { bayerbufferId & RPiIpaMask::ID };
+ op.data = { bayerbufferId & RPiBufferMask::ID };
queueFrameAction.emit(0, op);
break;
}
@@ -700,7 +700,7 @@ void IPARPi::returnEmbeddedBuffer(unsigned int bufferId)
{
IPAOperationData op;
op.operation = RPI_IPA_ACTION_EMBEDDED_COMPLETE;
- op.data = { bufferId & RPiIpaMask::ID };
+ op.data = { bufferId & RPiBufferMask::ID };
queueFrameAction.emit(0, op);
}