[{"id":16279,"web_url":"https://patchwork.libcamera.org/comment/16279/","msgid":"","date":"2021-04-14T14:08:49","subject":"Re: [libcamera-devel] [PATCH 3/3] libcamera: pipeline: rkisp1:\n\tAllow requests to be cancelled","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Nícolas,\n\nThanks for your work.\n\nOn 2021-04-06 15:23:35 -0300, Nícolas F. R. A. Prado wrote:\n> Previously when a frame got cancelled, the frameInfo flags\n> metadataProcessed and paramDequeued wouldn't get set, meaning that the\n> request wasn't able to be completed and cancelled.\n> \n> Make sure that these flags are set when the frame gets cancelled so that\n> the request can be cancelled.\n> \n> This issue happened while running lc-compliance.\n> \n> Suggested-by: Kieran Bingham \n> Signed-off-by: Nícolas F. R. A. Prado \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 12 ++++++------\n> 1 file changed, 6 insertions(+), 6 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 3c8d9dfe6f87..549f4a4e61a8 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -1073,9 +1073,6 @@ void PipelineHandlerRkISP1::bufferReady(FrameBuffer *buffer)\n> \n> void PipelineHandlerRkISP1::paramReady(FrameBuffer *buffer)\n> {\n> -\tif (buffer->metadata().status == FrameMetadata::FrameCancelled)\n> -\t\treturn;\n> -\n> \tASSERT(activeCamera_);\n> \tRkISP1CameraData *data = cameraData(activeCamera_);\n> \n> @@ -1087,9 +1084,6 @@ void PipelineHandlerRkISP1::paramReady(FrameBuffer *buffer)\n> \n> void PipelineHandlerRkISP1::statReady(FrameBuffer *buffer)\n> {\n> -\tif (buffer->metadata().status == FrameMetadata::FrameCancelled)\n> -\t\treturn;\n> -\n> \tASSERT(activeCamera_);\n> \tRkISP1CameraData *data = cameraData(activeCamera_);\n> \n> @@ -1097,6 +1091,12 @@ void PipelineHandlerRkISP1::statReady(FrameBuffer *buffer)\n> \tif (!info)\n> \t\treturn;\n> \n> +\tif (buffer->metadata().status == FrameMetadata::FrameCancelled) {\n> +\t\tinfo->metadataProcessed = true;\n> +\t\ttryCompleteRequest(info->request);\n> +\t\treturn;\n> +\t}\n> +\n> \tif (data->frame_ <= buffer->metadata().sequence)\n> \t\tdata->frame_ = buffer->metadata().sequence + 1;\n> \n> -- \n> 2.31.1\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id DF84FBD1F6\n\tfor ;\n\tWed, 14 Apr 2021 14:08:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9FAAB6880C;\n\tWed, 14 Apr 2021 16:08:52 +0200 (CEST)","from mail-lf1-x134.google.com (mail-lf1-x134.google.com\n\t[IPv6:2a00:1450:4864:20::134])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BBE0E68803\n\tfor ;\n\tWed, 14 Apr 2021 16:08:50 +0200 (CEST)","by mail-lf1-x134.google.com with SMTP id n8so33507854lfh.1\n\tfor ;\n\tWed, 14 Apr 2021 07:08:50 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tb29sm4412644lfo.62.2021.04.14.07.08.49\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 14 Apr 2021 07:08:49 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com\n\theader.b=\"vW9AyxMl\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=EaGSVUdWoXmN2C6Jmsr746etLk3IUwqe+GakrW/NYvk=;\n\tb=vW9AyxMlsCczFjrlV1j5VB1D57vewzsjAj9qjLNRCwvi2l5tfRF1xhwY/zqejFslA2\n\t6xYRpHi8YND/NSFlAhy6YVUxIaRTUHJq+bgjRtTgt80BJw3a7luAY68NdK5cO0uGnCRM\n\tIA40zcoAwUFa7uI45TMeGhs1P+ZGwq/MajHUhHpiWxIoukVqlkPF8USb/KgX1LaJy4yd\n\telpMQL6Gz+Fkvu2/jewx6Sri36WjA9Ne+h75QA4OgjvD/40eO48L6ehB+jrjEF3p65dk\n\tV+BIOXOFK9553KNWSgXywIcoL4+Eo5r5BYtGjNkpIbJ3+nWV7LHxz72e9hNr3LjQaHVP\n\tm4kA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=EaGSVUdWoXmN2C6Jmsr746etLk3IUwqe+GakrW/NYvk=;\n\tb=lVJEMYelXOV+DLtQ0HYK6CYnI6IxXiXOW4nFC88yuk1xXRfovsFyZA1HqbV0mQrCXj\n\toD3rnI2KtZ3QMgpUpkDwnRg/Nh5/sb/WNSov/+4gAvXrHL1d8NLCmcZzE0IB5dXq2uQF\n\t9luNz0JTJSPnCGvvPDFk2ymzAyS977R/FRXBJyEKwWFyJF8vFeugCULqzTOvsHicEEOU\n\tjTTRTfC+P0zWf3WM3j76E7lI1K46NjswbsuJvxtMR2NgVhW0dCO8hBHEOjL+NszmQIvN\n\tx9Ic68KqubQ3RtbQ1wp9ScqX++7g7b4p2gG84yVJs7Vp0G1QrZnmQ5xGsZuLOAx4w3Qf\n\tzPRQ==","X-Gm-Message-State":"AOAM532qltrzND3muVDh7DVr7KRsEU6aFDjsUDDqwim3sHPJjmoicEPB\n\tjjfOgVqJJ9kx4MZj+JisvbAgCA==","X-Google-Smtp-Source":"ABdhPJwvfZv622BFXwwk4clddI+Hw9voyTFJLklUItzhzwFs8+DYCrKWFp/5PL6KyakW2cvrVAMrPg==","X-Received":"by 2002:ac2:48ac:: with SMTP id\n\tu12mr3028968lfg.604.1618409330287; \n\tWed, 14 Apr 2021 07:08:50 -0700 (PDT)","Date":"Wed, 14 Apr 2021 16:08:49 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"=?iso-8859-1?q?N=EDcolas_F=2E_R=2E_A=2E?= Prado ","Message-ID":"","References":"<20210406182335.85847-1-nfraprado@collabora.com>\n\t<20210406182335.85847-4-nfraprado@collabora.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210406182335.85847-4-nfraprado@collabora.com>","Subject":"Re: [libcamera-devel] [PATCH 3/3] libcamera: pipeline: rkisp1:\n\tAllow requests to be cancelled","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org,\n\tCollabora Kernel ML ","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":16282,"web_url":"https://patchwork.libcamera.org/comment/16282/","msgid":"<7fb3b116-a1ed-6e30-ee6d-bf7783b216cc@ideasonboard.com>","date":"2021-04-14T14:12:13","subject":"Re: [libcamera-devel] [PATCH 3/3] libcamera: pipeline: rkisp1:\n\tAllow requests to be cancelled","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 06/04/2021 19:23, Nícolas F. R. A. Prado wrote:\n> Previously when a frame got cancelled, the frameInfo flags\n> metadataProcessed and paramDequeued wouldn't get set, meaning that the\n> request wasn't able to be completed and cancelled.\n> \n> Make sure that these flags are set when the frame gets cancelled so that\n> the request can be cancelled.\n> \n> This issue happened while running lc-compliance.\n> \n> Suggested-by: Kieran Bingham \n> Signed-off-by: Nícolas F. R. A. Prado \n\nReviewed-by: Kieran Bingham \n\n\n> ---\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 12 ++++++------\n> 1 file changed, 6 insertions(+), 6 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 3c8d9dfe6f87..549f4a4e61a8 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -1073,9 +1073,6 @@ void PipelineHandlerRkISP1::bufferReady(FrameBuffer *buffer)\n> \n> void PipelineHandlerRkISP1::paramReady(FrameBuffer *buffer)\n> {\n> -\tif (buffer->metadata().status == FrameMetadata::FrameCancelled)\n> -\t\treturn;\n> -\n> \tASSERT(activeCamera_);\n> \tRkISP1CameraData *data = cameraData(activeCamera_);\n> \n> @@ -1087,9 +1084,6 @@ void PipelineHandlerRkISP1::paramReady(FrameBuffer *buffer)\n> \n> void PipelineHandlerRkISP1::statReady(FrameBuffer *buffer)\n> {\n> -\tif (buffer->metadata().status == FrameMetadata::FrameCancelled)\n> -\t\treturn;\n> -\n> \tASSERT(activeCamera_);\n> \tRkISP1CameraData *data = cameraData(activeCamera_);\n> \n> @@ -1097,6 +1091,12 @@ void PipelineHandlerRkISP1::statReady(FrameBuffer *buffer)\n> \tif (!info)\n> \t\treturn;\n> \n> +\tif (buffer->metadata().status == FrameMetadata::FrameCancelled) {\n> +\t\tinfo->metadataProcessed = true;\n> +\t\ttryCompleteRequest(info->request);\n> +\t\treturn;\n> +\t}\n> +\n> \tif (data->frame_ <= buffer->metadata().sequence)\n> \t\tdata->frame_ = buffer->metadata().sequence + 1;\n> \n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id C43E1BD224\n\tfor ;\n\tWed, 14 Apr 2021 14:12:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 830AA6880C;\n\tWed, 14 Apr 2021 16:12:18 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1910368803\n\tfor ;\n\tWed, 14 Apr 2021 16:12:17 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6CEE26F2;\n\tWed, 14 Apr 2021 16:12:16 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"dZJWknd3\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1618409536;\n\tbh=7x8Vas0K97+mFnTc6yx5y/GGJS0vJB6lVZKFBLMzfkc=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=dZJWknd3MrFYkWA8fB5p/YcjWSJExKW40wfsd2z4zp2CFpOs7v0fcM9amEUussGQz\n\tMAgbjzEAFfndzXorSfxmSHWlH3qnOajGGxg5uPbn0c8gGt2lbGp9yubZF3NUWQlMiU\n\tPsuqfDZP3O4CPji5UrNAv4i58s7JzUg+mpV8D+XA=","To":"=?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210406182335.85847-1-nfraprado@collabora.com>\n\t<20210406182335.85847-4-nfraprado@collabora.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<7fb3b116-a1ed-6e30-ee6d-bf7783b216cc@ideasonboard.com>","Date":"Wed, 14 Apr 2021 15:12:13 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20210406182335.85847-4-nfraprado@collabora.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH 3/3] libcamera: pipeline: rkisp1:\n\tAllow requests to be cancelled","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Reply-To":"kieran.bingham@ideasonboard.com","Cc":"Collabora Kernel ML ","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]