From patchwork Fri Apr 24 10:47:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 3517 Return-Path: Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id AFABA62E67 for ; Fri, 24 Apr 2020 12:47:16 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="o3LDMs+r"; dkim-atps=neutral Received: by mail-wm1-x343.google.com with SMTP id k12so1353996wmj.3 for ; Fri, 24 Apr 2020 03:47:16 -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; bh=Rv0SdWrJ8b0yq+PQqecM3X8wUhY/bKbD8mhMLxv9GV0=; b=o3LDMs+rQwaHGBZ4Us38sytMkf7s8EHH5RhtsEMohWXJ4wHy+1gRMLQ3MNLkp6rBuS Tod1DLT0o70CxKdqWsVgWMsm5QZ53N5/kYMr3WTFqRY1+6NXg1voQyumkRsdMYinyiqR UJ3DKUxUly1/3makWPOLWQqRTIMZEUhhmhKfb2Dt7HB2ajOMT8GjmEEf6rUB5KfnOjV8 Wa8hBWJpo/PPutbqlMaYMxPBEWUwsBuspys0n3RKAwr+cZPv6fYCAIwZ3Gl07blNByiZ dhSAStjr4/eJDmbl5aLlTzgxiVA7/Bq2eUJU7CNCIc7bhDNB1D7gXbWeyh9Lql/NAoOt P9Rg== 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; bh=Rv0SdWrJ8b0yq+PQqecM3X8wUhY/bKbD8mhMLxv9GV0=; b=WZwW1rKxmEO+lZzKy3Od9GI51xhjYCrUHjjD0hJsoFxja0xjB5p+03bChRAEGPIC1n LT4GcpX2biLmyZczvUdFOobxDyvoxFxJ+OyDqicIcgPUefvskQHh7xaNJ7F/Ev2NtQgu 86r6vVxRvGBntv3EKjIRwcdltB8UNROUnx7HFPmSFZNkCEEccfZyGrsUINhZ7rMklklc 20lujocP3uZbie8a9jFHGDJjjuyDl76g5xpTQsk9NR2k8+kc94ZgM6PV3iCTv+fsnDzM FTsGTFL1h4TAP8d1at6HCnKU3sCwR0DWCSJNdE8YppFFxM0zvyJUa4nMlPqKc0V5qoPz IHWw== X-Gm-Message-State: AGi0PubOn5+3ISgdkTlZR4vDkgzLTyOxYVt3ERvN16Nvn0HFcays124U WqXr1wLccj1sxwvQCiznu7GYwC3ESK5JxQ== X-Google-Smtp-Source: APiQypLT5AXrWwS9czPLLdjE3NcT+BHkKCee4/HmxMdz0NZ8J5mI446g2nYl0rnLNAKUaLgpKHVV6g== X-Received: by 2002:a7b:c14b:: with SMTP id z11mr9169431wmi.44.1587725236082; Fri, 24 Apr 2020 03:47:16 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id j68sm7884997wrj.32.2020.04.24.03.47.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2020 03:47:15 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Fri, 24 Apr 2020 11:47:00 +0100 Message-Id: <20200424104700.26819-6-naush@raspberrypi.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200424104700.26819-1-naush@raspberrypi.com> References: <20200424104700.26819-1-naush@raspberrypi.com> Subject: [libcamera-devel] [PATCH v4 5/5] libcamera: controls: Add AWB related controls 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, 24 Apr 2020 10:47:17 -0000 AwbMode is a new enum type to specify operating mode of the AWB algorithm. All modes may not be supported by all platforms. ColourGains is a new float array type used to specify manual red and blue (in that order) colour channel gains when AWB is disabled. ColourTemperature is a new control to return the current estimate of the colour temperature. Signed-off-by: Naushir Patuck Reviewed-by: Laurent Pinchart --- src/libcamera/control_ids.yaml | 55 ++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/src/libcamera/control_ids.yaml b/src/libcamera/control_ids.yaml index f66b851b..d922b039 100644 --- a/src/libcamera/control_ids.yaml +++ b/src/libcamera/control_ids.yaml @@ -169,6 +169,61 @@ controls: description: | Enable or disable the AWB. + \sa ColourGains + + # AwbMode needs further attention: + # - Auto-generate max enum value. + # - Better handling of custom types. + - AwbMode: + type: int32_t + description: | + Specify the range of illuminants to use for the AWB algorithm. The modes + supported are platform specific, and not all modes may be supported. + enum: + - name: AwbAuto + value: 0 + description: Search over the whole colour temperature range. + - name: AwbIncandescent + value: 1 + description: Incandescent AWB lamp mode. + - name: AwbTungsten + value: 2 + description: Tungsten AWB lamp mode. + - name: AwbFluorescent + value: 3 + description: Fluorescent AWB lamp mode. + - name: AwbIndoor + value: 4 + description: Indoor AWB lighting mode. + - name: AwbDaylight + value: 5 + description: Daylight AWB lighting mode. + - name: AwbCloudy + value: 6 + description: Cloudy AWB lighting mode. + - name: AwbCustom + value: 7 + description: Custom AWB mode. + - name: AwbModeMax + value: 7 + description: Maximum allowed value (place any new values above here). + + - ColourGains: + type: float + description: | + Pair of gain values for the Red and Blue colour channels, in that + order. ColourGains can only be applied in a Request when the AWB is + disabled. + + \sa AwbEnable + size: [2] + + - ColourTemperature: + type: float + description: Report the current estimate of the colour temperature, in + kelvin, for this frame. The ColourTemperature control can only be + returned in metadata. + - Saturation: type: float description: |