Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-15 16:35:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

android: camera_stream: Replace post-processor nullptr check

Browse source 
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>
This commit is contained in:
Umang Jain 2021-10-26 12:51:42 +05:30
parent 88a90ba2a7
commit d559905c5f
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/android/camera_stream.cpp
View file

@ -150,6 +150,8 @@ int CameraStream::process(const FrameBuffer &source,
Camera3RequestDescriptor::StreamBuffer &dest, Camera3RequestDescriptor::StreamBuffer &dest,
Camera3RequestDescriptor *request) Camera3RequestDescriptor *request)
{ {
ASSERT(type_ != Type::Direct);
/* Handle waiting on fences on the destination buffer. */ /* Handle waiting on fences on the destination buffer. */
if (dest.fence != -1) { if (dest.fence != -1) {
int ret = waitFence(dest.fence); int ret = waitFence(dest.fence);
@ -163,9 +165,6 @@ int CameraStream::process(const FrameBuffer &source,
dest.fence = -1; dest.fence = -1;
} }
if (!postProcessor_)
return 0;
/* /*
* \todo Buffer mapping and processing should be moved to a * \todo Buffer mapping and processing should be moved to a
* separate thread. * separate thread.