From patchwork Tue Dec 10 14:23:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cheng-Hao Yang X-Patchwork-Id: 22274 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 12366C3257 for ; Tue, 10 Dec 2024 14:26:18 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B9C1D67E87; Tue, 10 Dec 2024 15:26:17 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="SsSyDbz4"; dkim-atps=neutral Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id F0A0567E8E for ; Tue, 10 Dec 2024 15:26:12 +0100 (CET) Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-7fd2ff40782so3410448a12.2 for ; Tue, 10 Dec 2024 06:26:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1733840771; x=1734445571; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FLTZqIt8KEFAnYaGSx3c4gSKC7oTYw6EkdvadMeeIRk=; b=SsSyDbz4WDublwo8jHRNZ1Y5YaGni4e7t1lDVihO/s02xKr90Iz3mXj678Xkq/xppJ hb1p3zbuEVaE4NQtODVkohvlBelCZGDCcNiB4XqTunLu0MdaQTAprnYwCW9mZ0g0yUi2 ukc9cLEocK1sB5AAROXEyzA+077tvTXqnEoxU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733840771; x=1734445571; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FLTZqIt8KEFAnYaGSx3c4gSKC7oTYw6EkdvadMeeIRk=; b=eIGbtPMcybzWFaia4+wm5euPFYvoW+Vvjp2wYGHlCmOOxfThK9Rn8w1fo7LfVr6q8+ bF+yM5GBtlpoLzrLNET0V6EAxtNIl0N7DgNPlPhBELHQwv4QDeXkhr8lex9d6clH/Qs8 zXyXlZ6Ij+TTZ4D0Mx4T/eiYlP9kRBAgGiUn6TJ66DwNXjky0A9U/rBqRAWzb8vjduDS RzgmJ0+8ahHnkrCErRWVfMdjor5jsMC3kEKMQNaY7/SOZcNBRBD7PhMVVf2jqh6oJN3L 1Tyx9fcvQQSqYJrPR08P3kIVcVJF/E8c+httGgZT4ozqKPVtJCOE2p2DK9LRLEVnnAhD 99PA== X-Gm-Message-State: AOJu0YwH+EnSjbqsGRDqKRItfxCqOKseudBh0zdKrvy0z7CA+7EgxDEe p/ooj8Zn/EzPbCN4SJn0RtjqOd7//vmm4ijYhxKm9FRg0q/0uoYe0ffbA38n+sKvKJaKa1qOnTU = X-Gm-Gg: ASbGnctIrcD4nN9p5rSMOPoHhKgQkB7kZOfgPmx19q2DyQrVwUNbWJPa8c4wu6Cog9d xX4ofEDNBgReAaRWhS0EtQogXQPB+Vt2TPJ0DCKQM315xd2g7kUR30HZSGMml6bpW0qLnY2+A7Q tTU+KdszHmYw71bcMZWhRt0vCPmNWnqRoN8fOuT+jSZ7UEdpM0nf+L8hHOpf/WIFz1pYQhg0Z4l wFjGxKlEYoZ0L6K/Y4Ylm42vUWN7zcZW2SRoG2tkOiE9U7xaVQzGLhS6DFgY0kHcS6AwioQMFic 3qx6FeTNVNNYXZKkpSQXgm8RziUjJotXPE66ti7OBTsPVE45Y/qvlydBOftB X-Google-Smtp-Source: AGHT+IF6M579DIVfStKTVeNnIJUYHLFxMaFwGSkzzttNyJUMjFutqo+MY0vju63/d+qq5M2MDo0Vww== X-Received: by 2002:a17:90b:5111:b0:2ee:ab29:1482 with SMTP id 98e67ed59e1d1-2efcf18d802mr7692187a91.16.1733840770955; Tue, 10 Dec 2024 06:26:10 -0800 (PST) Received: from chenghaoyang-low.c.googlers.com.com (112.212.229.35.bc.googleusercontent.com. [35.229.212.112]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ef26ff97f2sm11812053a91.11.2024.12.10.06.26.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2024 06:26:10 -0800 (PST) From: Harvey Yang To: libcamera-devel@lists.libcamera.org Cc: Harvey Yang , Han-Lin Chen , Jacopo Mondi Subject: [PATCH v4 6/7] android: notify CAMERA3_MSG_ERROR_REQUEST out of order Date: Tue, 10 Dec 2024 14:23:59 +0000 Message-ID: <20241210142557.2886315-7-chenghaoyang@chromium.org> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog In-Reply-To: <20241210142557.2886315-1-chenghaoyang@chromium.org> References: <20241210142557.2886315-1-chenghaoyang@chromium.org> MIME-Version: 1.0 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" When a request hasn't done any processing, CAMERA3_MSG_ERROR_REQUEST and the following process_capture_result don't need to wait for the previous requests' completion. This patch avoids pushing the aborted requests into the request queue. Signed-off-by: Han-Lin Chen Co-developed-by: Harvey Yang Signed-off-by: Harvey Yang Reviewed-by: Jacopo Mondi --- src/android/camera_device.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 3b10f207e..a95114c8d 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -867,6 +867,8 @@ void CameraDevice::abortRequest(Camera3RequestDescriptor *descriptor) const buffer.status = StreamBuffer::Status::Error; descriptor->status_ = Camera3RequestDescriptor::Status::Error; + + sendCaptureResult(descriptor); } bool CameraDevice::isValidRequest(camera3_capture_request_t *camera3Request) const @@ -1135,14 +1137,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques MutexLocker stateLock(stateMutex_); if (state_ == State::Flushing) { - Camera3RequestDescriptor *rawDescriptor = descriptor.get(); - { - MutexLocker descriptorsLock(descriptorsMutex_); - descriptors_.push(std::move(descriptor)); - } - abortRequest(rawDescriptor); - completeDescriptor(rawDescriptor); - + abortRequest(descriptor.get()); return 0; }