From patchwork Mon Jul 6 15:38:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 8659 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 9FAE2BD790 for ; Mon, 6 Jul 2020 15:38:20 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 62C5D60E37; Mon, 6 Jul 2020 17:38:20 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="DDJZ6eES"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E835C60E43 for ; Mon, 6 Jul 2020 17:38:15 +0200 (CEST) Received: from Q.local (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6C4ECA16; Mon, 6 Jul 2020 17:38:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1594049895; bh=PBdLF9d9XJ9Ifeo73geGqBk2Gs4+P2YX4dlHv7Td2us=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DDJZ6eESK29m+BNkli9Kp7H3iKSnB148tv8xg4Bk8NJEbYNO6v8IpD558WQWDYyAU uJuZDkCLExjayw9G6Qz9ah6Mz+Iu5RkKQLjuMD30TrKjjfTDRjp5mn08NNgRhfBoBh RFDdWv0SI6yDtuil1YwKI+c+mEc60SQapasdz8BM= From: Kieran Bingham To: libcamera devel Date: Mon, 6 Jul 2020 16:38:08 +0100 Message-Id: <20200706153808.2340919-9-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200706153808.2340919-1-kieran.bingham@ideasonboard.com> References: <20200706153808.2340919-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 8/8] android: camera_device: Remove single buffer restriction. X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" A capture request is no longer limited to a single output buffer. Remove the limitation, but (for now) keep the check to ensure that at least one buffer is always provided. Signed-off-by: Kieran Bingham Reviewed-by: Niklas Söderlund Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- src/android/camera_device.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index f368726091f4..e7ed873d64c0 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1050,9 +1050,8 @@ FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Request) { - if (camera3Request->num_output_buffers != 1) { - LOG(HAL, Error) << "Invalid number of output buffers: " - << camera3Request->num_output_buffers; + if (!camera3Request->num_output_buffers) { + LOG(HAL, Error) << "No output buffers provided"; return -EINVAL; }