[{"id":16866,"web_url":"https://patchwork.libcamera.org/comment/16866/","msgid":"","date":"2021-05-10T20:28:51","subject":"Re: [libcamera-devel] [PATCH 4/8] android: camera_device: Replace\n\trunning_ with CameraState","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Jacopo,\n\nThanks for your work.\n\nOn 2021-05-10 12:52:31 +0200, Jacopo Mondi wrote:\n> The CameraDevice class maintains the camera state in the 'running_'\n> boolean flag to check if the camera has to be started at the first\n> received process_capture_request() call which happens after the camera\n> had been stopped.\n> \n> So far this was correct, as the operations that change the camera\n> could only start or stop the camera, so a simple boolean flag\n> was enough.\n> \n> To prepare to handle the flush() operation that will introduce a new\n> 'flushing' state, replace the simple plain boolean flag with an\n> enumeration of values that define the CameraState.\n> \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/android/camera_device.cpp | 10 +++++-----\n> src/android/camera_device.h | 8 +++++++-\n> 2 files changed, 12 insertions(+), 6 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index d8b7e62ef896..bdb5c8ed52aa 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -401,7 +401,7 @@ CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor(\n> */\n> \n> CameraDevice::CameraDevice(unsigned int id, std::shared_ptr camera)\n> -\t: id_(id), running_(false), camera_(std::move(camera)),\n> +\t: id_(id), state_(CameraStopped), camera_(std::move(camera)),\n> \t facing_(CAMERA_FACING_FRONT), orientation_(0)\n> {\n> \tcamera_->requestCompleted.connect(this, &CameraDevice::requestComplete);\n> @@ -757,14 +757,14 @@ void CameraDevice::close()\n> \n> void CameraDevice::stop()\n> {\n> -\tif (!running_)\n> +\tif (state_ == CameraStopped)\n> \t\treturn;\n> \n> \tworker_.stop();\n> \tcamera_->stop();\n> \n> \tdescriptors_.clear();\n> -\trunning_ = false;\n> +\tstate_ = CameraStopped;\n> }\n> \n> void CameraDevice::setCallbacks(const camera3_callback_ops_t *callbacks)\n> @@ -1913,7 +1913,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \t\treturn -EINVAL;\n> \n> \t/* Start the camera if that's the first request we handle. */\n> -\tif (!running_) {\n> +\tif (state_ == CameraStopped) {\n> \t\tworker_.start();\n> \n> \t\tint ret = camera_->start();\n> @@ -1922,7 +1922,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \t\t\treturn ret;\n> \t\t}\n> \n> -\t\trunning_ = true;\n> +\t\tstate_ = CameraRunning;\n> \t}\n> \n> \t/*\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 8d5da8bc59e1..30b364decaab 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -88,6 +88,11 @@ private:\n> \t\tint androidFormat;\n> \t};\n> \n> +\tenum State {\n> +\t\tCameraStopped,\n> +\t\tCameraRunning,\n> +\t};\n> +\n> \tvoid stop();\n> \n> \tint initializeStreamConfigurations();\n> @@ -115,7 +120,8 @@ private:\n> \n> \tCameraWorker worker_;\n> \n> -\tbool running_;\n> +\tState state_;\n> +\n> \tstd::shared_ptr camera_;\n> \tstd::unique_ptr config_;\n> \n> -- \n> 2.31.1\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","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 DDF1ABF829\n\tfor ;\n\tMon, 10 May 2021 20:28:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9C8A268911;\n\tMon, 10 May 2021 22:28:55 +0200 (CEST)","from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com\n\t[IPv6:2a00:1450:4864:20::12d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EF0E0602BE\n\tfor ;\n\tMon, 10 May 2021 22:28:54 +0200 (CEST)","by mail-lf1-x12d.google.com with SMTP id x20so25320766lfu.6\n\tfor ;\n\tMon, 10 May 2021 13:28:54 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tg28sm1040414ljn.134.2021.05.10.13.28.52\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 10 May 2021 13:28:52 -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=\"zq/RqGAh\"; 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=x+KjqS7GQi5Dd6h5PV4FjrkZNd1ji78V7RC63WN9Ets=;\n\tb=zq/RqGAhzLOBS0TM1wQYzhGFUwWbEY1luF36VPpmryBoGV8HUwoooZZPvLO/8rX7/3\n\ty30/YcvaEvvU4kCSOQEQisHwY6b2cN8MeLKciKpKvW+8KPKazTxitTpsh5jLv8aY5UsN\n\tZ2A59z/iB/z629PQLsmnzpYyErGKx/sRYCKKQBs1wSLJ6WN2qHmj31KKDX9/7oXwsoiM\n\t8IxI6PKb6OL/VFQVQ+BmzqgPbo9iUiyocgb2tIhQecpPCYvEdk3JSRCDZ8T1dvLV6c75\n\tMKZaiUnmhnjvrz5BgLCVRtWZ3cbfox1p2iCJdGG3Dt7PYHMU18nLmM3IOR+zZhpBhDDE\n\tg6aw==","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=x+KjqS7GQi5Dd6h5PV4FjrkZNd1ji78V7RC63WN9Ets=;\n\tb=DtgsTqNdMyI1grYj5QSagXyw9eDV3QHBdhELrZUvD7WySs3ZELprGDJACCrfJw8+yv\n\t+dYWcAnzna9JCkj6dYuDe0kP06rTQh0d0mlYRX4WqVqvDQiApLr4Ae0LEHDtGO/FuZP8\n\tYZk8HljqqSuGwr2gC63iSpkf6D3nj4j/yxxoUpOi3wh1F568iaVyDdlEybD10uMNyxYk\n\tqTX/P8J2t6g1agtZhhZxaMTxsqDcE9QNIFnakl8QktLUk5sO3u7vTig6T8kZVoFnKpVk\n\tze7Wzxne7eBBDjtpjBAN3L2NCD3STw8PQee0sqOTt73SiZNqgAKN0SIfNj7pek62Xmyv\n\t0/mA==","X-Gm-Message-State":"AOAM533MOzzTPd1iUISFE5XXqGBnJHMw94EwBnbXxq5cdCzU7ljJBs6s\n\ty4M7CgbG3i+lNHbbdICn6wX6fartoL94L1ZO","X-Google-Smtp-Source":"ABdhPJz+taVWuAVbCw85jaDSEz8ltSD7cqpkrlm6Va8rxGeA15Z1GM+NVJP4sq3EZd7ZJ57vSMCP4w==","X-Received":"by 2002:ac2:522b:: with SMTP id\n\ti11mr16216256lfl.93.1620678532972; \n\tMon, 10 May 2021 13:28:52 -0700 (PDT)","Date":"Mon, 10 May 2021 22:28:51 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Jacopo Mondi ","Message-ID":"","References":"<20210510105235.28319-1-jacopo@jmondi.org>\n\t<20210510105235.28319-5-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210510105235.28319-5-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH 4/8] android: camera_device: Replace\n\trunning_ with CameraState","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","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]