android: post_processor: Drop return value for process()

PostProcessor::process() is invoked by CameraStream class
in case any post-processing is required for the camera stream.
The failure or success is checked via the value returned by
CameraStream::process().

Now that the post-processor notifies about the post-processing
completion operation, we can drop the return value of
PostProcessor::process(). The status of post-processing is passed
to CameraDevice::streamProcessingComplete() by the
PostProcessor::processComplete signal's slot.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
This commit is contained in:
Umang Jain
2021-10-26 12:51:47 +05:30
parent 6b706e1c3e
commit 05862a7e35
6 changed files with 12 additions and 14 deletions
+4 -6
View File
@@ -49,21 +49,21 @@ int PostProcessorYuv::configure(const StreamConfiguration &inCfg,
return 0;
}
int PostProcessorYuv::process(Camera3RequestDescriptor::StreamBuffer *streamBuffer)
void PostProcessorYuv::process(Camera3RequestDescriptor::StreamBuffer *streamBuffer)
{
const FrameBuffer &source = *streamBuffer->srcBuffer;
CameraBuffer *destination = streamBuffer->dstBuffer.get();
if (!isValidBuffers(source, *destination)) {
processComplete.emit(streamBuffer, PostProcessor::Status::Error);
return -EINVAL;
return;
}
const MappedFrameBuffer sourceMapped(&source, MappedFrameBuffer::MapFlag::Read);
if (!sourceMapped.isValid()) {
LOG(YUV, Error) << "Failed to mmap camera frame buffer";
processComplete.emit(streamBuffer, PostProcessor::Status::Error);
return -EINVAL;
return;
}
int ret = libyuv::NV12Scale(sourceMapped.planes()[0].data(),
@@ -81,12 +81,10 @@ int PostProcessorYuv::process(Camera3RequestDescriptor::StreamBuffer *streamBuff
if (ret) {
LOG(YUV, Error) << "Failed NV12 scaling: " << ret;
processComplete.emit(streamBuffer, PostProcessor::Status::Error);
return -EINVAL;
return;
}
processComplete.emit(streamBuffer, PostProcessor::Status::Success);
return 0;
}
bool PostProcessorYuv::isValidBuffers(const FrameBuffer &source,
+1 -1
View File
@@ -18,7 +18,7 @@ public:
int configure(const libcamera::StreamConfiguration &incfg,
const libcamera::StreamConfiguration &outcfg) override;
int process(Camera3RequestDescriptor::StreamBuffer *streamBuffer) override;
void process(Camera3RequestDescriptor::StreamBuffer *streamBuffer) override;
private:
bool isValidBuffers(const libcamera::FrameBuffer &source,