From patchwork Thu Apr 21 05:54:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunke Cao X-Patchwork-Id: 15690 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id D5E2EC3256 for ; Thu, 21 Apr 2022 05:54:14 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0522065643; Thu, 21 Apr 2022 07:54:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1650520454; bh=M1mPH6hNY5cTwNjOZiyJI995gigfYhUS7QU52X4QKRE=; h=Date:To:List-Id:List-Post:From:Cc:List-Subscribe:List-Unsubscribe: List-Archive:Reply-To:List-Help:Subject:From; b=UjI238acxaVS2+f/lWeIfSajlPPWl2uQVyiQpbgNFtIMDE++sglnN3Atc0fZ42s65 t5eBNhBZjgtm5fXJPiZn6l+hDt0YI/u0b7PK06Kj8yy+6Nokb0u5/bdzN/2txcTJxJ kLLbh8/BEbbpUWZek6dW8AcTmBbwpqwZ60zitXzkNWnsvW2NfqNunl4uKzdz+oCmbf n19dAOOkA3eiw0hUajf/CE7Fl3XaKeM15zvRjvNnsabKVnY7Iv2O4jtUaaF/cAmau+ mzrD49cotcrW0muxfhNFGNyi8BR+J1qgVk50Auf/oDq5Brej3HnqcMA5OxUrImDPJ7 q53LRzWjXqUBQ== Date: Thu, 21 Apr 2022 14:54:05 +0900 To: Han-lin Chen , Kieran Bingham MIME-Version: 1.0 Message-ID: List-Id: List-Post: X-Patchwork-Original-From: Yunke Cao via libcamera-devel From: Yunke Cao Precedence: list Cc: Tomasz Figa , libcamera-devel@lists.libcamera.org, Yunke Cao X-Mailman-Version: 2.1.29 X-BeenThere: libcamera-devel@lists.libcamera.org List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: Yunke Cao List-Help: Subject: [libcamera-devel] [PATCH] libcamera: Test sensor's ability to discover ancillary devices Content-Disposition: inline Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Use vimc lens to test sensor's ability to discover ancillary lens. Tested with the recent kernel patch for vimc lens: https://lore.kernel.org/linux-media/20220415023855.2568366-1-yunkec@google.com/ Signed-off-by: Yunke Cao --- src/libcamera/camera_sensor.cpp | 5 +++++ src/libcamera/pipeline/vimc/vimc.cpp | 2 ++ test/camera-sensor.cpp | 13 +++++++++++++ 3 files changed, 20 insertions(+) diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp index eaa2da6b..fe366267 100644 --- a/src/libcamera/camera_sensor.cpp +++ b/src/libcamera/camera_sensor.cpp @@ -152,6 +152,11 @@ int CameraSensor::init() */ if (entity_->device()->driver() == "vimc") { initVimcDefaultProperties(); + + ret = discoverAncillaryDevices(); + if (ret) + return ret; + return initProperties(); } diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp index c3e33ecf..1d8b9f4d 100644 --- a/src/libcamera/pipeline/vimc/vimc.cpp +++ b/src/libcamera/pipeline/vimc/vimc.cpp @@ -449,6 +449,8 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator) dm.add("Sensor B"); dm.add("Debayer A"); dm.add("Debayer B"); + dm.add("Lens A"); + dm.add("Lens B"); dm.add("RGB/YUV Input"); dm.add("Scaler"); diff --git a/test/camera-sensor.cpp b/test/camera-sensor.cpp index 372ee4af..55a5b68d 100644 --- a/test/camera-sensor.cpp +++ b/test/camera-sensor.cpp @@ -12,6 +12,7 @@ #include +#include "libcamera/internal/camera_lens.h" #include "libcamera/internal/camera_sensor.h" #include "libcamera/internal/device_enumerator.h" #include "libcamera/internal/media_device.h" @@ -57,6 +58,12 @@ protected: return TestFail; } + lens_ = sensor_->focusLens(); + if (!lens_) { + cerr << "Failed to get ancillary lens" << endl; + return TestFail; + } + return TestPass; } @@ -104,6 +111,11 @@ protected: return TestFail; } + if (lens_->setFocusPosition(10)) { + cerr << "Failed to set lens focus position" << endl; + return TestFail; + } + return TestPass; } @@ -116,6 +128,7 @@ private: std::unique_ptr enumerator_; std::shared_ptr media_; CameraSensor *sensor_; + CameraLens *lens_; }; TEST_REGISTER(CameraSensorTest)