From patchwork Thu Jun 18 11:12: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: 4077 Return-Path: Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 79C23607DE for ; Thu, 18 Jun 2020 13:12:58 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="a0N/zIlq"; dkim-atps=neutral Received: by mail-wm1-x330.google.com with SMTP id a6so1398857wmm.5 for ; Thu, 18 Jun 2020 04:12:58 -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=vfF7umJN63KhWa9zfa1zff+dqwZNZIkIJp+wbjDa9aQ=; b=a0N/zIlq8SU9F94epC1dSJlaZCO26PxB+SnFuuLvn5sMEzzt5XjxvtVbZbMs6LE1s7 ca7dctV9/Ef3mlIbqnbI15QoWbIYN+JxVNRbB/QQspGXqjiS+aGbKplEYF83CxxyQ3M4 OUspoFyHgVEA4h7Ngi3bwubcmRP9WJOvKfIC8hXMa9EUi6D5WdPXDIe8jCpfx9t4tLKE dAMvJpQKOTBtXMKS/dVr8hVrmLXuE3TnaoGP0G69JiFQUbIcFcptEV5ZkZ7XjtwBC90u VgGB/No6D5BqGwkiUIeQdRUzIzs9E3UWh4ASJN30NcL4r5yd4HScu/NzILTV/VRpEbze 3SOA== 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=vfF7umJN63KhWa9zfa1zff+dqwZNZIkIJp+wbjDa9aQ=; b=DgOibxUNrCOkzAesYnhX5zOscDvilVQjg5m0yxVcuQDQkokyZ6/03jjrToSB+a+wXf B5jpOBX++n05jJ0JoLPuSS5ksZzUHVz4CFtscWXrWSy0UEEhrcruN8+NPS5eTvsmJCIP uEwLcvrM5OTOYCrWdanoqP64m01yx/NePXTQvVEfATy8roBhX56KHHr2Aa7BlsdrE0Hr NGUZFCxE69fizuU2g2UM8d7UtH3DKxFHkNzd6baWnSHLOvyRH6BecVFkDZv1XXBg/wQS yjDRy9opo6NlYVd60ibgEUMXKcmNlpfjnJmiucfvWYBto/z5ne1gcT2J7nGYV6babnnP Ui8g== X-Gm-Message-State: AOAM533qZ73ucZdEu/swQvhIEr99sQNF44BEBJgdecLAjvWSaL9yiT42 JCmvqoOeqsnC7j5gNcJabYUxmHhIHww= X-Google-Smtp-Source: ABdhPJx5infg9dfKJ+Z0qgkgNjcJcDE+/68UupVCwBUeTDgWB5FJ0bp9q3mBlRWtOmjKMMJFWPyJFA== X-Received: by 2002:a1c:9687:: with SMTP id y129mr3495953wmd.30.1592478777423; Thu, 18 Jun 2020 04:12:57 -0700 (PDT) Received: from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72]) by smtp.gmail.com with ESMTPSA id e10sm3103857wrn.11.2020.06.18.04.12.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2020 04:12:56 -0700 (PDT) From: David Plowman To: libcamera-devel@lists.libcamera.org Date: Thu, 18 Jun 2020 12:12:36 +0100 Message-Id: <20200618111236.26897-3-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200618111236.26897-1-david.plowman@raspberrypi.com> References: <20200618111236.26897-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 2/2] libcamera: raspberrypi: recalculate camera exposure/gain when camera mode changes 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: Thu, 18 Jun 2020 11:12:58 -0000 This commit causes the AGC to recalculate its camera exposure/gain values when the camera mode changes. For example it's possible that the exposure profile could be changed by the application so the division between exposure time and analogue gain may be different. The other underlying reason (and which this commit accomplishes too) is that the sensor's line timing may change in a new mode, and because V4L2 drivers store a number of exposure _lines_, the resulting _time_ will "change under our feet". So we have to go through the process of recalculating the correct number of lines and writing this back to the sensor with every mode switch, regardless of anything else. Signed-off-by: David Plowman Reviewed-by: Laurent Pinchart --- src/ipa/raspberrypi/controller/rpi/agc.cpp | 12 +++++++++++ src/ipa/raspberrypi/controller/rpi/agc.hpp | 1 + src/ipa/raspberrypi/raspberrypi.cpp | 25 +++++++++++----------- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp b/src/ipa/raspberrypi/controller/rpi/agc.cpp index a474287..c02b5ec 100644 --- a/src/ipa/raspberrypi/controller/rpi/agc.cpp +++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp @@ -221,6 +221,18 @@ void Agc::SetConstraintMode(std::string const &constraint_mode_name) constraint_mode_name_ = constraint_mode_name; } +void Agc::SwitchMode(CameraMode const &camera_mode, Metadata *metadata) +{ + // On a mode switch, it's possible the exposure profile could change, + // so we run through the dividing up of exposure/gain again and + // write the results into the metadata we've been given. + if (status_.total_exposure_value) { + housekeepConfig(); + divvyupExposure(); + writeAndFinish(metadata, false); + } +} + void Agc::Prepare(Metadata *image_metadata) { AgcStatus status; diff --git a/src/ipa/raspberrypi/controller/rpi/agc.hpp b/src/ipa/raspberrypi/controller/rpi/agc.hpp index dbcefba..9a7e89c 100644 --- a/src/ipa/raspberrypi/controller/rpi/agc.hpp +++ b/src/ipa/raspberrypi/controller/rpi/agc.hpp @@ -75,6 +75,7 @@ public: void SetMeteringMode(std::string const &metering_mode_name) override; void SetExposureMode(std::string const &exposure_mode_name) override; void SetConstraintMode(std::string const &contraint_mode_name) override; + void SwitchMode(CameraMode const &camera_mode, Metadata *metadata) override; void Prepare(Metadata *image_metadata) override; void Process(StatisticsPtr &stats, Metadata *image_metadata) override; diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index d6fd3df..42c84b1 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -247,29 +247,30 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo, mistrust_count_ = helper_->MistrustFramesStartup(); } + struct AgcStatus agcStatus; + /* These zero values mean not program anything (unless overwritten). */ + agcStatus.shutter_time = 0.0; + agcStatus.analogue_gain = 0.0; + if (!controllerInit_) { /* Load the tuning file for this sensor. */ controller_.Read(tuningFile_.c_str()); controller_.Initialise(); controllerInit_ = true; - /* Calculate initial values for gain and exposure. */ - int32_t gain_code = helper_->GainCode(DEFAULT_ANALOGUE_GAIN); - int32_t exposure_lines = helper_->ExposureLines(DEFAULT_EXPOSURE_TIME); - - ControlList ctrls(unicam_ctrls_); - ctrls.set(V4L2_CID_ANALOGUE_GAIN, gain_code); - ctrls.set(V4L2_CID_EXPOSURE, exposure_lines); - - IPAOperationData op; - op.operation = RPI_IPA_ACTION_V4L2_SET_STAGGERED; - op.controls.push_back(ctrls); - queueFrameAction.emit(0, op); + /* Supply initial values for gain and exposure. */ + agcStatus.shutter_time = DEFAULT_EXPOSURE_TIME; + agcStatus.analogue_gain = DEFAULT_ANALOGUE_GAIN; } RPi::Metadata metadata; controller_.SwitchMode(mode_, &metadata); + /* SwitchMode may supply updated exposure/gain values to use. */ + metadata.Get("agc.status", agcStatus); + if (agcStatus.shutter_time != 0.0 && agcStatus.analogue_gain != 0.0) + applyAGC(&agcStatus); + lastMode_ = mode_; }