summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorUmang Jain <umang.jain@ideasonboard.com>2021-10-26 12:51:42 +0530
committerUmang Jain <umang.jain@ideasonboard.com>2021-10-26 16:11:17 +0530
commitd559905c5f4e844c742aaf31c56883e60f15699a (patch)
treeda8dadfa0874d85a0bcd4704f74553dee262ceed /src
parent88a90ba2a7cc64c796d48b9a8a263e4c46d0b725 (diff)
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 <umang.jain@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Hirokazu Honda <hiroh@chromium.org> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'src')
-rw-r--r--src/android/camera_stream.cpp5
1 files 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.