From patchwork Fri May 1 16:43:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3655 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5B891603F3 for ; Fri, 1 May 2020 18:43:40 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="GPHj9OSn"; dkim-atps=neutral Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id DAF7372C for ; Fri, 1 May 2020 18:43:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1588351420; bh=xatNycbvXd5cT7Af69MOKb1tyGMonwYtAuxzoIeYYR4=; h=From:To:Subject:Date:From; b=GPHj9OSnPdma3lCUtveNkoHOxFy+U5fONQPhp/pufwMajkewhq+MD7JNiVikDuq7d Gb8WYLuQxr3b1rHsPPtNQzaI0uDMbAk5s6gKjRUUC3zbKTMShsttGCL1diQXzuFuhh 64mLCRGjDwMiokZGAEBHmfEJv8DVIoYQU8SMN8To= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 1 May 2020 19:43:31 +0300 Message-Id: <20200501164332.24517-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.25.3 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/2] libcamera: media_device: Expose media device API version number 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: , X-List-Received-Date: Fri, 01 May 2020 16:43:40 -0000 Add a MediaDevice::version() function to expose the media device API version number. This can be useful to support driver API changes in pipeline handlers. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/libcamera/include/media_device.h | 1 + src/libcamera/media_device.cpp | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/src/libcamera/include/media_device.h b/src/libcamera/include/media_device.h index 44a59e70139e..4d9f76618ec0 100644 --- a/src/libcamera/include/media_device.h +++ b/src/libcamera/include/media_device.h @@ -40,6 +40,7 @@ public: const std::string driver() const { return driver_; } const std::string deviceNode() const { return deviceNode_; } const std::string model() const { return model_; } + unsigned int version() const { return version_; } const std::vector &entities() const { return entities_; } MediaEntity *getEntityByName(const std::string &name) const; diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp index 0d6b5efd9e7a..d4e7e1002224 100644 --- a/src/libcamera/media_device.cpp +++ b/src/libcamera/media_device.cpp @@ -314,6 +314,15 @@ done: * \return The MediaDevice model name */ +/** + * \fn MediaDevice::version() + * \brief Retrieve the media device API version + * + * The version is formatted with the KERNEL_VERSION() macro. + * + * \return The MediaDevice API version + */ + /** * \fn MediaDevice::entities() * \brief Retrieve the list of entities in the media graph From patchwork Fri May 1 16:43:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3656 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D8FBB603F3 for ; Fri, 1 May 2020 18:43:40 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="CRTWNM0s"; dkim-atps=neutral Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 567F8A24 for ; Fri, 1 May 2020 18:43:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1588351420; bh=RlJB0m82kYT+ugasHNu6E6ZBa6WgwuigBLZ72xRysm8=; h=From:To:Subject:Date:In-Reply-To:References:From; b=CRTWNM0s+VihUqmRJfUSLliiV8HlwFGjXT6KvLFKpoPEgT5HbqapOrlcbgOpB/1dr N6HTQ797UfZYLATefHakffzmVqEVSFDRlL3Muh0ngB0rZ3EjDEK4M54ARJlzwSM3IF lzefhbR75ffGK5OmfZvVs0wBs89dghrNQWqJoPeM= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 1 May 2020 19:43:32 +0300 Message-Id: <20200501164332.24517-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200501164332.24517-1-laurent.pinchart@ideasonboard.com> References: <20200501164332.24517-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/2] libcamera: pipeline: vimc: Store media device pointer in camera data 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: , X-List-Received-Date: Fri, 01 May 2020 16:43:41 -0000 Store the MediaDevice for the VIMC instance in the VimcCameraData class. This will be used to check the media device version at runtime. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/libcamera/pipeline/vimc/vimc.cpp | 30 +++++++++++++++------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp index 339d1cf653fb..0b8a0a0c6890 100644 --- a/src/libcamera/pipeline/vimc/vimc.cpp +++ b/src/libcamera/pipeline/vimc/vimc.cpp @@ -39,9 +39,10 @@ LOG_DEFINE_CATEGORY(VIMC) class VimcCameraData : public CameraData { public: - VimcCameraData(PipelineHandler *pipe) - : CameraData(pipe), sensor_(nullptr), debayer_(nullptr), - scaler_(nullptr), video_(nullptr), raw_(nullptr) + VimcCameraData(PipelineHandler *pipe, MediaDevice *media) + : CameraData(pipe), media_(media), sensor_(nullptr), + debayer_(nullptr), scaler_(nullptr), video_(nullptr), + raw_(nullptr) { } @@ -54,9 +55,10 @@ public: delete raw_; } - int init(MediaDevice *media); + int init(); void bufferReady(FrameBuffer *buffer); + MediaDevice *media_; CameraSensor *sensor_; V4L2Subdevice *debayer_; V4L2Subdevice *scaler_; @@ -389,7 +391,7 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator) if (!media) return false; - std::unique_ptr data = std::make_unique(this); + std::unique_ptr data = std::make_unique(this, media); data->ipa_ = IPAManager::instance()->createIPA(this, 0, 0); if (data->ipa_ != nullptr) { @@ -400,7 +402,7 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator) } /* Locate and open the capture video node. */ - if (data->init(media)) + if (data->init()) return false; /* Create and register the camera. */ @@ -412,15 +414,15 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator) return true; } -int VimcCameraData::init(MediaDevice *media) +int VimcCameraData::init() { int ret; - ret = media->disableLinks(); + ret = media_->disableLinks(); if (ret < 0) return ret; - MediaLink *link = media->link("Debayer B", 1, "Scaler", 0); + MediaLink *link = media_->link("Debayer B", 1, "Scaler", 0); if (!link) return -ENODEV; @@ -429,26 +431,26 @@ int VimcCameraData::init(MediaDevice *media) return ret; /* Create and open the camera sensor, debayer, scaler and video device. */ - sensor_ = new CameraSensor(media->getEntityByName("Sensor B")); + sensor_ = new CameraSensor(media_->getEntityByName("Sensor B")); ret = sensor_->init(); if (ret) return ret; - debayer_ = new V4L2Subdevice(media->getEntityByName("Debayer B")); + debayer_ = new V4L2Subdevice(media_->getEntityByName("Debayer B")); if (debayer_->open()) return -ENODEV; - scaler_ = new V4L2Subdevice(media->getEntityByName("Scaler")); + scaler_ = new V4L2Subdevice(media_->getEntityByName("Scaler")); if (scaler_->open()) return -ENODEV; - video_ = new V4L2VideoDevice(media->getEntityByName("RGB/YUV Capture")); + video_ = new V4L2VideoDevice(media_->getEntityByName("RGB/YUV Capture")); if (video_->open()) return -ENODEV; video_->bufferReady.connect(this, &VimcCameraData::bufferReady); - raw_ = new V4L2VideoDevice(media->getEntityByName("Raw Capture 1")); + raw_ = new V4L2VideoDevice(media_->getEntityByName("Raw Capture 1")); if (raw_->open()) return -ENODEV;