[{"id":18308,"web_url":"https://patchwork.libcamera.org/comment/18308/","msgid":"","date":"2021-07-24T07:26:24","subject":"Re: [libcamera-devel] [RFC PATCH 12/17] libcamera: pipeline: vimc:\n\tMigrate to Camera::Private","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your patch.\n\nOn 2021-07-23 07:00:31 +0300, Laurent Pinchart wrote:\n> As part of the effort to remove the CameraData class, migrate the\n> pipeline handler-specific camera data from CameraData to the\n> Camera::Private class.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/libcamera/pipeline/vimc/vimc.cpp | 19 +++++++++----------\n> 1 file changed, 9 insertions(+), 10 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\n> index d63562b1ee54..866c993d7e50 100644\n> --- a/src/libcamera/pipeline/vimc/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc/vimc.cpp\n> @@ -42,11 +42,11 @@ namespace libcamera {\n> \n> LOG_DEFINE_CATEGORY(VIMC)\n> \n> -class VimcCameraData : public CameraData\n> +class VimcCameraData : public Camera::Private\n> {\n> public:\n> \tVimcCameraData(PipelineHandler *pipe, MediaDevice *media)\n> -\t\t: CameraData(pipe), media_(media)\n> +\t\t: Camera::Private(pipe), media_(media)\n> \t{\n> \t}\n> \n> @@ -97,10 +97,9 @@ public:\n> private:\n> \tint processControls(VimcCameraData *data, Request *request);\n> \n> -\tVimcCameraData *cameraData(const Camera *camera)\n> +\tVimcCameraData *cameraData(Camera *camera)\n> \t{\n> -\t\treturn static_cast(\n> -\t\t\tPipelineHandler::cameraData(camera));\n> +\t\treturn static_cast(camera->_d());\n> \t}\n> };\n> \n> @@ -438,10 +437,10 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n> \n> \t/* Create and register the camera. */\n> \tstd::set streams{ &data->stream_ };\n> +\tconst std::string &id = data->sensor_->id();\n> \tstd::shared_ptr camera =\n> -\t\tCamera::create(new Camera::Private(this), data->sensor_->id(),\n> -\t\t\t streams);\n> -\tregisterCamera(std::move(camera), std::move(data));\n> +\t\tCamera::create(data.release(), id, streams);\n> +\tregisterCamera(std::move(camera), nullptr);\n> \n> \treturn true;\n> }\n> @@ -530,8 +529,8 @@ void VimcCameraData::bufferReady(FrameBuffer *buffer)\n> \trequest->metadata().set(controls::SensorTimestamp,\n> \t\t\t\tbuffer->metadata().timestamp);\n> \n> -\tpipe_->completeBuffer(request, buffer);\n> -\tpipe_->completeRequest(request);\n> +\tpipe()->completeBuffer(request, buffer);\n> +\tpipe()->completeRequest(request);\n> }\n> \n> REGISTER_PIPELINE_HANDLER(PipelineHandlerVimc)\n> -- \n> Regards,\n> \n> Laurent Pinchart\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 EC251C0109\n\tfor ;\n\tSat, 24 Jul 2021 07:26:26 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A7077687AC;\n\tSat, 24 Jul 2021 09:26:26 +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 7F0E868540\n\tfor ;\n\tSat, 24 Jul 2021 09:26:25 +0200 (CEST)","by mail-lf1-x12d.google.com with SMTP id d17so5951004lfv.0\n\tfor ;\n\tSat, 24 Jul 2021 00:26:25 -0700 (PDT)","from localhost (h-46-59-88-219.A463.priv.bahnhof.se.\n\t[46.59.88.219]) by smtp.gmail.com with ESMTPSA id\n\tn8sm2197893lfk.198.2021.07.24.00.26.24\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 24 Jul 2021 00:26:24 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com\n\theader.b=\"uPXu9Xtt\"; 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=JS+Pyf/zZdX7YqNW0bYrqYAi+FnYqTsFckeASUgR4Lg=;\n\tb=uPXu9Xtt610r9HeIPCU9ZollgXWIEIx9pRZ1xSkjdNA1heyFWVzL5W/o4eu7T6+9Nt\n\tvST6K6LVCHFwr9667TG+8V2t/vCoRXfMlW9mbGCvEFJ0T3XLq+KVkEeO8XPX6S3Sg0xc\n\tqMuloi9gY5pKN+67+4Xjg/0x5VQlCwhWBTVQ4L5wWPKIoRHpGI+7Q8f4+eB1uvpbOKHK\n\tM2F4nl+XawMHmtqVkVF+3h/RXdQ/KHRF3FtKEgg7GcHnO0i/5nC8hVo18be3FTqeUbUY\n\tqv6mM0XPMwIv9L1p14BE+OGZ4e/DqenQrjLCta4wq+U7tXVdGfgGsL4YiOJ23UgL3X9X\n\t3tDw==","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=JS+Pyf/zZdX7YqNW0bYrqYAi+FnYqTsFckeASUgR4Lg=;\n\tb=TDIfgyLBhLtTMtWhe3+PdDbJckyrHea1Y0YnWuZCa6Djn3NwzIYHzKDTA/ol98Jl9I\n\tl9zyqQpEATUBBbrFHY9SpaG/Kf9I+ALrFgtLezS37MiQIGQFwZvr6m1YfkiC4hWJABii\n\tI7Ms0Jdfa3osaffU9tNgRQBjg2RHzGwZ+y7ARndR4sdlabEPuGZ1MBz/e9xjvdRWzQAh\n\t31YPrVPkbl9AVMvLIJVWF3OwzaLO8Z7V4xFM0rPK58N/kTPAA+43UejPbMQ5JaOM0fCX\n\tXlJvE538r6UKQUMmfLK6pYivnCZ1g1Gz02s53+0hAb+Umkch+bwjftaft5eqD9N/yeAB\n\t43yQ==","X-Gm-Message-State":"AOAM531Vq8lk7BzioEEQtQ11PpaX275FeepM0gT9zrwSBMXJx3Fc6mEa\n\tRjMjVvEPOfYbU6x17hUha52NwRVkMnshag==","X-Google-Smtp-Source":"ABdhPJyPcTnirxfZR2ASYJoCaLkNFFD5Fny8sqz5EG3JUELhDhpj+ZuLGqmza/fFU5c0/Wfsyn0aEA==","X-Received":"by 2002:ac2:4a81:: with SMTP id l1mr5589122lfp.118.1627111584962;\n\tSat, 24 Jul 2021 00:26:24 -0700 (PDT)","Date":"Sat, 24 Jul 2021 09:26:24 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Message-ID":"","References":"<20210723040036.32346-1-laurent.pinchart@ideasonboard.com>\n\t<20210723040036.32346-13-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20210723040036.32346-13-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [RFC PATCH 12/17] libcamera: pipeline: vimc:\n\tMigrate to Camera::Private","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]