From patchwork Thu Jul 2 10:53:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 8553 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 940B9BE905 for ; Thu, 2 Jul 2020 10:53:43 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 152AF60C5B; Thu, 2 Jul 2020 12:53:43 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="O4cuPLwe"; dkim-atps=neutral Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1FA8F603B3 for ; Thu, 2 Jul 2020 12:53:42 +0200 (CEST) Received: by mail-wm1-x32d.google.com with SMTP id 17so27370479wmo.1 for ; Thu, 02 Jul 2020 03:53:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sVayGIGwKG3GvXC6jRhNzM2V+z4slLKJl0H3Fq3690s=; b=O4cuPLwezUAhQLyEcdhIQlMvnVz39O4WrYUTDWFAJFzfwTsNtjQq9IZdvE7m/vKjzG LQqMsAqg27rxxdSTTkFVoH/N5f7pBGBPsnpzgszOTr0wG1Il9fICSuUbVKYZaJjzZngE HqP1hnUlRx/kpwGjJEYXRgxIBMXfFIKnCP8yVOIvgO6iTbIDph5/2UO4zqh1gzQDXVvd W2c3ayTIHswX+KiWkZtdTZurt7dbaIoAPv3cQPA7ltC0jipfvIca9hyRJnvvQIV+IbH8 Mg8MBS2hhjT/xVc/Uorv5Z1UzgtV33a8iJFE/jlUYR4j+3wpedM9wBAwBISjT7kW1HHg GwcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sVayGIGwKG3GvXC6jRhNzM2V+z4slLKJl0H3Fq3690s=; b=IdcpeCbYB4nAkPBGVBj1k+tTo7f57jmcxHxjcXuBT7Jhc5scACfxfexYS5JfzKoBPZ eJwK9m7Q2KlOFsrpFa90t6umMaRxH5bT2tisuutj1V9IarZ/7hhyGj09a74y5nB0usHL MsBmYgwfjlVTZ1u26j6f127KXJFoPRPGrueG2oKvNuxFuC98+whWVcICDzmaP1TC9ZGM FXAxo2ElrEZ8bP3ICLumzm/Rz4CcPjp2e9Q0mZEL91PFzeHeJKIVcEKhiSWgbdF0mzFI UVg36aykqWZ4aW6sXocpfiBerCeRdN860Hy4uCsbHT8iz6sszsHJE/S/pMbKHu5N1i7x eohw== X-Gm-Message-State: AOAM530kah4WYLoWrz/1Al8564SkL8fSp6a6Myz5Wf9PDVen4mEyybX4 TuCgbybFGWv8EmkhO5xwxVJl5gWEETE= X-Google-Smtp-Source: ABdhPJyMJJ0fOTfUQw1cpJtt1W5AdoKJ2/8LoqAL1PIh9XIxsX6AJKsgY/lOo4Lpie1mDTkq8Eoqtg== X-Received: by 2002:a1c:f003:: with SMTP id a3mr30549703wmb.119.1593687221529; Thu, 02 Jul 2020 03:53:41 -0700 (PDT) Received: from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72]) by smtp.gmail.com with ESMTPSA id p25sm9768444wmg.39.2020.07.02.03.53.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2020 03:53:41 -0700 (PDT) From: David Plowman To: libcamera-devel@lists.libcamera.org Date: Thu, 2 Jul 2020 11:53:36 +0100 Message-Id: <20200702105337.31161-2-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200702105337.31161-1-david.plowman@raspberrypi.com> References: <20200702105337.31161-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/2] libcamera: Implement digital zoom 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" These changes add a Digital Zoom control, tacking a rectangle as its argument, indicating the region of the sensor output that will be zoomed up to the final output size. Additionally, we need have a method returning the "sensorCrop" which gives the dimensions of the sensor output within which we can pan and zoom. --- include/libcamera/camera.h | 2 ++ include/libcamera/internal/pipeline_handler.h | 4 +++ src/libcamera/camera.cpp | 26 +++++++++++++++++++ src/libcamera/control_ids.yaml | 10 +++++++ 4 files changed, 42 insertions(+) diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h index 9c0e58f..d57b606 100644 --- a/include/libcamera/camera.h +++ b/include/libcamera/camera.h @@ -92,6 +92,8 @@ public: std::unique_ptr generateConfiguration(const StreamRoles &roles); int configure(CameraConfiguration *config); + Size const &getSensorCrop() const; + Request *createRequest(uint64_t cookie = 0); int queueRequest(Request *request); diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h index 22e629a..37e069a 100644 --- a/include/libcamera/internal/pipeline_handler.h +++ b/include/libcamera/internal/pipeline_handler.h @@ -89,6 +89,8 @@ public: const char *name() const { return name_; } + Size const &getSensorCrop() const { return sensorCrop_; } + protected: void registerCamera(std::shared_ptr camera, std::unique_ptr data); @@ -100,6 +102,8 @@ protected: CameraManager *manager_; + Size sensorCrop_; + private: void mediaDeviceDisconnected(MediaDevice *media); virtual void disconnect(); diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 69a1b44..6614c93 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -793,6 +793,32 @@ int Camera::configure(CameraConfiguration *config) return 0; } +/** + * \brief Return the size of the sensor image being used to form the output + * + * This method returns the size, in pixels, of the raw image read from the + * sensor and which is used to form the output image(s). Note that these + * values take account of any cropping performed on the sensor output so + * as to produce the correct aspect ratio. It would normally be necessary + * to retrieve these values in order to calculate correct parameters for + * digital zoom. + * + * Example: a sensor mode may produce a 1920x1440 output image. But if an + * application has requested a 16:9 image, the values returned here would + * be 1920x1080 - the largest portion of the sensor output that provides + * the correct aspect ratio. + * + * \context This function is \threadsafe. It will only return valid + * (non-zero) values when the camera has been configured. + * + * \return The dimensions of the sensor image in use. + */ + +Size const &Camera::getSensorCrop() const +{ + return p_->pipe_->getSensorCrop(); +} + /** * \brief Create a request object for the camera * \param[in] cookie Opaque cookie for application use diff --git a/src/libcamera/control_ids.yaml b/src/libcamera/control_ids.yaml index 8c3e4c7..ac72e2a 100644 --- a/src/libcamera/control_ids.yaml +++ b/src/libcamera/control_ids.yaml @@ -251,4 +251,14 @@ controls: higher than anyone could reasonably want. Negative values are not allowed. Note also that sharpening is not applied to raw streams. + + - DigitalZoom: + type: Rectangle + description: | + Sets the portion of the full sensor image, in pixels, that will be + used for digital zoom. That is, this part of the sensor output will + be scaled up to make the full size output image (and everything else + discarded). To obtain the "full sensor image" that is available, the + method Camera::getOutputCrop() should be called once the camera is + configured. An application may pan and zoom within this rectangle. ...