[{"id":4709,"web_url":"https://patchwork.libcamera.org/comment/4709/","msgid":"<20200501170523.GC2569889@oden.dyn.berto.se>","date":"2020-05-01T17:05:23","subject":"Re: [libcamera-devel] [PATCH 2/2] libcamera: pipeline: vimc: Store\n\tmedia device pointer in camera data","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 2020-05-01 19:43:32 +0300, Laurent Pinchart wrote:\n> Store the MediaDevice for the VIMC instance in the VimcCameraData class.\n> This will be used to check the media device version at runtime.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/libcamera/pipeline/vimc/vimc.cpp | 30 +++++++++++++++-------------\n> 1 file changed, 16 insertions(+), 14 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\n> index 339d1cf653fb..0b8a0a0c6890 100644\n> --- a/src/libcamera/pipeline/vimc/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc/vimc.cpp\n> @@ -39,9 +39,10 @@ LOG_DEFINE_CATEGORY(VIMC)\n> class VimcCameraData : public CameraData\n> {\n> public:\n> -\tVimcCameraData(PipelineHandler *pipe)\n> -\t\t: CameraData(pipe), sensor_(nullptr), debayer_(nullptr),\n> -\t\t scaler_(nullptr), video_(nullptr), raw_(nullptr)\n> +\tVimcCameraData(PipelineHandler *pipe, MediaDevice *media)\n> +\t\t: CameraData(pipe), media_(media), sensor_(nullptr),\n> +\t\t debayer_(nullptr), scaler_(nullptr), video_(nullptr),\n> +\t\t raw_(nullptr)\n> \t{\n> \t}\n> \n> @@ -54,9 +55,10 @@ public:\n> \t\tdelete raw_;\n> \t}\n> \n> -\tint init(MediaDevice *media);\n> +\tint init();\n> \tvoid bufferReady(FrameBuffer *buffer);\n> \n> +\tMediaDevice *media_;\n> \tCameraSensor *sensor_;\n> \tV4L2Subdevice *debayer_;\n> \tV4L2Subdevice *scaler_;\n> @@ -389,7 +391,7 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n> \tif (!media)\n> \t\treturn false;\n> \n> -\tstd::unique_ptr data = std::make_unique(this);\n> +\tstd::unique_ptr data = std::make_unique(this, media);\n> \n> \tdata->ipa_ = IPAManager::instance()->createIPA(this, 0, 0);\n> \tif (data->ipa_ != nullptr) {\n> @@ -400,7 +402,7 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n> \t}\n> \n> \t/* Locate and open the capture video node. */\n> -\tif (data->init(media))\n> +\tif (data->init())\n> \t\treturn false;\n> \n> \t/* Create and register the camera. */\n> @@ -412,15 +414,15 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n> \treturn true;\n> }\n> \n> -int VimcCameraData::init(MediaDevice *media)\n> +int VimcCameraData::init()\n> {\n> \tint ret;\n> \n> -\tret = media->disableLinks();\n> +\tret = media_->disableLinks();\n> \tif (ret < 0)\n> \t\treturn ret;\n> \n> -\tMediaLink *link = media->link(\"Debayer B\", 1, \"Scaler\", 0);\n> +\tMediaLink *link = media_->link(\"Debayer B\", 1, \"Scaler\", 0);\n> \tif (!link)\n> \t\treturn -ENODEV;\n> \n> @@ -429,26 +431,26 @@ int VimcCameraData::init(MediaDevice *media)\n> \t\treturn ret;\n> \n> \t/* Create and open the camera sensor, debayer, scaler and video device. */\n> -\tsensor_ = new CameraSensor(media->getEntityByName(\"Sensor B\"));\n> +\tsensor_ = new CameraSensor(media_->getEntityByName(\"Sensor B\"));\n> \tret = sensor_->init();\n> \tif (ret)\n> \t\treturn ret;\n> \n> -\tdebayer_ = new V4L2Subdevice(media->getEntityByName(\"Debayer B\"));\n> +\tdebayer_ = new V4L2Subdevice(media_->getEntityByName(\"Debayer B\"));\n> \tif (debayer_->open())\n> \t\treturn -ENODEV;\n> \n> -\tscaler_ = new V4L2Subdevice(media->getEntityByName(\"Scaler\"));\n> +\tscaler_ = new V4L2Subdevice(media_->getEntityByName(\"Scaler\"));\n> \tif (scaler_->open())\n> \t\treturn -ENODEV;\n> \n> -\tvideo_ = new V4L2VideoDevice(media->getEntityByName(\"RGB/YUV Capture\"));\n> +\tvideo_ = new V4L2VideoDevice(media_->getEntityByName(\"RGB/YUV Capture\"));\n> \tif (video_->open())\n> \t\treturn -ENODEV;\n> \n> \tvideo_->bufferReady.connect(this, &VimcCameraData::bufferReady);\n> \n> -\traw_ = new V4L2VideoDevice(media->getEntityByName(\"Raw Capture 1\"));\n> +\traw_ = new V4L2VideoDevice(media_->getEntityByName(\"Raw Capture 1\"));\n> \tif (raw_->open())\n> \t\treturn -ENODEV;\n> \n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from mail-lj1-x241.google.com (mail-lj1-x241.google.com\n\t[IPv6:2a00:1450:4864:20::241])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 90556603F3\n\tfor ;\n\tFri, 1 May 2020 19:05:25 +0200 (CEST)","by mail-lj1-x241.google.com with SMTP id b2so3199872ljp.4\n\tfor ;\n\tFri, 01 May 2020 10:05:25 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\th84sm2580930lfd.88.2020.05.01.10.05.24\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 01 May 2020 10:05:24 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected)\n\theader.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com header.b=\"z1pSEsSI\"; \n\tdkim-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=WGjC8i0kFBwUWrhrSShNRs9vZ17T2KcmMADNXCxW7BA=;\n\tb=z1pSEsSIwKnlAyC1nkaD1/uf26OSe5IeizlGHCTY0owArvU152fLv4uvWGo8uBxJZ1\n\tKK29l0SbGHgi3vPzt45o1ibZRmiL2eqKdBg95EtJXbsUYLfKesV+x4V9rLz4LqiImqOp\n\tsDlAZkYhe/byz2Kdd4BHxHdTzmJpP/xf3rX28SWsHWhxe8OMY5NEZflz5xuqXf85rET9\n\tDQz+xzPRvufALLcdWg0sbE7Z/A20INz49z26DPzUkjxlAPP2DzcIinxDSXKVjQb02U4t\n\t2mV5Q7s0gBvCuiqdqBQyfUQLCrPMXralz1kdd3DwdDKCKGvyyacfkan71ah+PUPy/1vs\n\tRyVg==","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=WGjC8i0kFBwUWrhrSShNRs9vZ17T2KcmMADNXCxW7BA=;\n\tb=L8Z+xVz2QggLynOz/Nes73Xy7Q3feTjC7zZqm05tCLe+n8v5RxcKnhAsu9ipmMHYMn\n\t1tJz+lElACTU0lrpuLghFHdXQmuxPVI0WMYnhgFpMN4aS6BnBUpplAC0C/Y3JGhPYPi1\n\t7aSxJngSJBe3GMh26vcfZwxWFw44CNkPwTP5RuPWr1f3VSUQ6Za/3xWnKVUmzFZje1Wh\n\tRB97XlS9fiwDEfm0kgPlTNPU5S3OoiIomK/xj4rKkdUKzaY5omYSIrhMCbLU4T4hloZv\n\turT4WMXNWEO1sHEEZWmOraHM0TBMpVAgztn+vpvVSHN2NsAJvdRoI4Fk2GbtVVIjMGD6\n\t0Wyg==","X-Gm-Message-State":"AGi0PuYdDc13kxMpEnAh90VlHeQcmqCl8U7nL6H6LXjvuuv9VLOlbVGk\n\ttVeSVG5h5zKLKbw+nx2RZmDwKoEoazg=","X-Google-Smtp-Source":"APiQypK3HgsVrDOHRvT26tq5w4kZZg0296NgCtQ9n4JR+MN26DLX1eWm6Gksjee5sOcjZequPcro+A==","X-Received":"by 2002:a05:651c:97:: with SMTP id\n\t23mr3065751ljq.17.1588352724930; \n\tFri, 01 May 2020 10:05:24 -0700 (PDT)","Date":"Fri, 1 May 2020 19:05:23 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200501170523.GC2569889@oden.dyn.berto.se>","References":"<20200501164332.24517-1-laurent.pinchart@ideasonboard.com>\n\t<20200501164332.24517-2-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":"<20200501164332.24517-2-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 2/2] libcamera: pipeline: vimc: Store\n\tmedia device pointer in camera data","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","X-List-Received-Date":"Fri, 01 May 2020 17:05:25 -0000"}}]