From d559905c5f4e844c742aaf31c56883e60f15699a Mon Sep 17 00:00:00 2001 From: Umang Jain Date: Tue, 26 Oct 2021 12:51:42 +0530 Subject: android: camera_stream: Replace post-processor nullptr check Instead of checking postProcessor for nullptr, replace this check with an assertion that checks if the camera stream's type is not Type::Direct. Since it makes no sense to call CameraStream::process() on a Type::Direct camera stream. Signed-off-by: Umang Jain Reviewed-by: Laurent Pinchart Reviewed-by: Hirokazu Honda Reviewed-by: Kieran Bingham --- src/android/camera_stream.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp index f44a2717..5d991fe5 100644 --- a/src/android/camera_stream.cpp +++ b/src/android/camera_stream.cpp @@ -150,6 +150,8 @@ int CameraStream::process(const FrameBuffer &source, Camera3RequestDescriptor::StreamBuffer &dest, Camera3RequestDescriptor *request) { + ASSERT(type_ != Type::Direct); + /* Handle waiting on fences on the destination buffer. */ if (dest.fence != -1) { int ret = waitFence(dest.fence); @@ -163,9 +165,6 @@ int CameraStream::process(const FrameBuffer &source, dest.fence = -1; } - if (!postProcessor_) - return 0; - /* * \todo Buffer mapping and processing should be moved to a * separate thread. -- cgit v1.2.1