From a857a150e13d71abdc0b321984f08bd0a173a3b2 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 22 Nov 2022 15:42:35 +0000 Subject: pipeline: raspberrypi: Remove enum BuffferMask from the mojom interface The BufferMask enum provides a way of identifying which stream a frame buffer belongs to. This enum is defined in the raspberrypi.mojom interface file. However, the IPA does not need these enum definitions to mmap buffers that it uses. Move this enum out of the raspberrypi.mojom interface file and put it into the RPi namespace visible only to the pipeline handler. This removes the need to include the auto-generated IPA interface header in the RPi::Stream definition. Signed-off-by: Naushir Patuck Reviewed-by: Laurent Pinchart Reviewed-by: David Plowman Signed-off-by: Laurent Pinchart --- src/ipa/raspberrypi/raspberrypi.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ipa/raspberrypi/raspberrypi.cpp') diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index beb076dc..4e10c57d 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -515,7 +515,7 @@ void IPARPi::signalStatReady(uint32_t bufferId) reportMetadata(); - statsMetadataComplete.emit(bufferId & MaskID, libcameraMetadata_); + statsMetadataComplete.emit(bufferId, libcameraMetadata_); } void IPARPi::signalQueueRequest(const ControlList &controls) @@ -534,7 +534,7 @@ void IPARPi::signalIspPrepare(const ISPConfig &data) frameCount_++; /* Ready to push the input buffer into the ISP. */ - runIsp.emit(data.bayerBufferId & MaskID); + runIsp.emit(data.bayerBufferId); } void IPARPi::reportMetadata() @@ -1001,7 +1001,7 @@ void IPARPi::queueRequest(const ControlList &controls) void IPARPi::returnEmbeddedBuffer(unsigned int bufferId) { - embeddedComplete.emit(bufferId & MaskID); + embeddedComplete.emit(bufferId); } void IPARPi::prepareISP(const ISPConfig &data) -- cgit v1.2.1