[{"id":31335,"web_url":"https://patchwork.libcamera.org/comment/31335/","msgid":"<172718215904.3726802.12236842152084562541@ping.linuxembedded.co.uk>","date":"2024-09-24T12:49:19","subject":"Re: [PATCH v2 2/2] libcamera: Add gc08a3 camera sensor proprietary\n\tfor ciri","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Harvey Yang (2024-09-24 09:26:11)\n> gc08a3 is the second sensor used by ciri.\n\nPlease keep this related to the sensor hardware.\n\nSame comments for $SUBJECT as preceeding patch.\n\n> \n> Signed-off-by: Han-Lin Chen \n> Co-developed-by: Xing Gu \n> Co-developed-by: Yudhistira Erlandinata \n> Co-developed-by: Harvey Yang \n> ---\n> src/ipa/libipa/camera_sensor_helper.cpp | 17 +++++++++++++++++\n> .../sensor/camera_sensor_properties.cpp | 7 +++++++\n> 2 files changed, 24 insertions(+)\n> \n> diff --git a/src/ipa/libipa/camera_sensor_helper.cpp b/src/ipa/libipa/camera_sensor_helper.cpp\n> index cd7d12d6..afa177fe 100644\n> --- a/src/ipa/libipa/camera_sensor_helper.cpp\n> +++ b/src/ipa/libipa/camera_sensor_helper.cpp\n> @@ -536,6 +536,23 @@ private:\n> };\n> REGISTER_CAMERA_SENSOR_HELPER(\"gc05a2\", CameraSensorHelperGc05a2)\n> \n> +class CameraSensorHelperGc08a3 : public CameraSensorHelper\n> +{\n> +public:\n> + uint32_t gainCode(double gain) const override\n> + {\n> + uint32_t aeGain = std::clamp((uint32_t)gain, kAeBaseGain_, kStep_ * kAeBaseGain_);\n> + return aeGain * 0x400 / kAeBaseGain_;\n> + }\n> +\n> + // `double gain(uint32_t gainCode)` will not be used.\n\nSame issue here too.\n\nAlso - applying these patches fails:\n\nkbingham@Monstersaurus:~/iob/libcamera/ci/libcamera-gitlab-ci$ ./send-for-testing.sh 4617\ngit -C libcamera fetch --prune libcamera.org\ngit -C libcamera fetch --prune gl.fdo\ngit -C libcamera am --quit\nfatal: Resolve operation not in progress, we are not resuming.\ngit -C libcamera reset --hard\nHEAD is now at 64e347679b51 libcamera: rkisp1: Eliminate hard-coded resizer limits\ngit -C libcamera switch --detach\nHEAD is now at 64e347679b51 libcamera: rkisp1: Eliminate hard-coded resizer limits\ngit -C libcamera checkout libcamera.org/master\nPrevious HEAD position was 64e347679b51 libcamera: rkisp1: Eliminate hard-coded resizer limits\nHEAD is now at 642dbafe64d5 libcamera: libipa: camera_sensor: Add Sony IMX214 sensor properties\nPreparing patchwork/4617\ngit -C libcamera show-ref --verify --quiet refs/heads/patchwork/4617\ngit -C libcamera checkout -b patchwork/4617\nSwitched to a new branch 'patchwork/4617'\ngit -C libcamera pw series apply 4617 -s\nApplying: libcamera: Add gc05a2 camera sensor proprietary for ciri\nUsing index info to reconstruct a base tree...\nM\tsrc/ipa/libipa/camera_sensor_helper.cpp\nM\tsrc/libcamera/sensor/camera_sensor_properties.cpp\nFalling back to patching base and 3-way merge...\nAuto-merging src/libcamera/sensor/camera_sensor_properties.cpp\nAuto-merging src/ipa/libipa/camera_sensor_helper.cpp\nCONFLICT (content): Merge conflict in src/ipa/libipa/camera_sensor_helper.cpp\nRecorded preimage for 'src/ipa/libipa/camera_sensor_helper.cpp'\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch=diff' to see the failed patch\nPatch failed at 0001 libcamera: Add gc05a2 camera sensor proprietary for ciri\nWhen you have resolved this problem, run \"git am --continue\".\nIf you prefer to skip this patch, run \"git am --skip\" instead.\nTo restore the original branch and stop patching, run \"git am --abort\".\n\n\n--\nKieran\n\n\n> +\n> +private:\n> + static constexpr uint32_t kStep_ = 16;\n> + static constexpr uint32_t kAeBaseGain_ = 1024;\n> +};\n> +REGISTER_CAMERA_SENSOR_HELPER(\"gc08a3\", CameraSensorHelperGc08a3)\n> +\n> class CameraSensorHelperImx219 : public CameraSensorHelper\n> {\n> public:\n> diff --git a/src/libcamera/sensor/camera_sensor_properties.cpp b/src/libcamera/sensor/camera_sensor_properties.cpp\n> index 3e1bd85e..c76c8088 100644\n> --- a/src/libcamera/sensor/camera_sensor_properties.cpp\n> +++ b/src/libcamera/sensor/camera_sensor_properties.cpp\n> @@ -77,6 +77,13 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen\n> { controls::draft::TestPatternModeColorBars, 1 },\n> },\n> } },\n> + { \"gc08a3\", {\n> + .unitCellSize = { 1120, 1120 },\n> + .testPatternModes = {\n> + { controls::draft::TestPatternModeOff, 0 },\n> + { controls::draft::TestPatternModeColorBars, 2 },\n> + },\n> + } },\n> { \"hi846\", {\n> .unitCellSize = { 1120, 1120 },\n> .testPatternModes = {\n> -- \n> 2.46.0.792.g87dc391469-goog\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 1B7A8C3257\n\tfor ;\n\tTue, 24 Sep 2024 12:49:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BDEA163510;\n\tTue, 24 Sep 2024 14:49:22 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1F21263500\n\tfor ;\n\tTue, 24 Sep 2024 14:49:21 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 69994594;\n\tTue, 24 Sep 2024 14:47:54 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"wI8Etbvf\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1727182074;\n\tbh=qL8kX92hSXWR4IwYXWtOxJL5wo2tJM4aOUtmRLRBcX8=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=wI8Etbvf0wa9joF+UmQgDAQyCC63q5kdwToVTTChGU+fuqWdsp9XhWKBzYrxJqVl1\n\ty9UXPz3t4glKlNKbgmjWTpaVGm3LQ8Guo6TlNX6ExJAs0s90ho1knrGq1lt0pLXGYv\n\tO5/ZfR5jhrx0ArHKeSMlaGeQirkZFFrnCud+oI/Q=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20240924090051.1617040-3-chenghaoyang@google.com>","References":"<20240924090051.1617040-1-chenghaoyang@google.com>\n\t<20240924090051.1617040-3-chenghaoyang@google.com>","Subject":"Re: [PATCH v2 2/2] libcamera: Add gc08a3 camera sensor proprietary\n\tfor ciri","From":"Kieran Bingham ","Cc":"Harvey Yang ,\n\tHan-Lin Chen , Xing Gu ,\n\tYudhistira Erlandinata ,\n\tHarvey Yang ","To":"Harvey Yang ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Tue, 24 Sep 2024 13:49:19 +0100","Message-ID":"<172718215904.3726802.12236842152084562541@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":32250,"web_url":"https://patchwork.libcamera.org/comment/32250/","msgid":"","date":"2024-11-19T07:42:03","subject":"Re: [PATCH v2 2/2] libcamera: Add gc08a3 camera sensor proprietary\n\tfor ciri","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/people/117/","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"content":"Hi Kieran,\n\nOn Tue, Sep 24, 2024 at 8:49 PM Kieran Bingham\n wrote:\n>\n> Quoting Harvey Yang (2024-09-24 09:26:11)\n> > gc08a3 is the second sensor used by ciri.\n>\n> Please keep this related to the sensor hardware.\n>\n> Same comments for $SUBJECT as preceeding patch.\n\nUpdated. Please check again.\n\n>\n> >\n> > Signed-off-by: Han-Lin Chen \n> > Co-developed-by: Xing Gu \n> > Co-developed-by: Yudhistira Erlandinata \n> > Co-developed-by: Harvey Yang \n> > ---\n> > src/ipa/libipa/camera_sensor_helper.cpp | 17 +++++++++++++++++\n> > .../sensor/camera_sensor_properties.cpp | 7 +++++++\n> > 2 files changed, 24 insertions(+)\n> >\n> > diff --git a/src/ipa/libipa/camera_sensor_helper.cpp b/src/ipa/libipa/camera_sensor_helper.cpp\n> > index cd7d12d6..afa177fe 100644\n> > --- a/src/ipa/libipa/camera_sensor_helper.cpp\n> > +++ b/src/ipa/libipa/camera_sensor_helper.cpp\n> > @@ -536,6 +536,23 @@ private:\n> > };\n> > REGISTER_CAMERA_SENSOR_HELPER(\"gc05a2\", CameraSensorHelperGc05a2)\n> >\n> > +class CameraSensorHelperGc08a3 : public CameraSensorHelper\n> > +{\n> > +public:\n> > + uint32_t gainCode(double gain) const override\n> > + {\n> > + uint32_t aeGain = std::clamp((uint32_t)gain, kAeBaseGain_, kStep_ * kAeBaseGain_);\n> > + return aeGain * 0x400 / kAeBaseGain_;\n> > + }\n> > +\n> > + // `double gain(uint32_t gainCode)` will not be used.\n>\n> Same issue here too.\n>\n> Also - applying these patches fails:\n>\n> kbingham@Monstersaurus:~/iob/libcamera/ci/libcamera-gitlab-ci$ ./send-for-testing.sh 4617\n> git -C libcamera fetch --prune libcamera.org\n> git -C libcamera fetch --prune gl.fdo\n> git -C libcamera am --quit\n> fatal: Resolve operation not in progress, we are not resuming.\n> git -C libcamera reset --hard\n> HEAD is now at 64e347679b51 libcamera: rkisp1: Eliminate hard-coded resizer limits\n> git -C libcamera switch --detach\n> HEAD is now at 64e347679b51 libcamera: rkisp1: Eliminate hard-coded resizer limits\n> git -C libcamera checkout libcamera.org/master\n> Previous HEAD position was 64e347679b51 libcamera: rkisp1: Eliminate hard-coded resizer limits\n> HEAD is now at 642dbafe64d5 libcamera: libipa: camera_sensor: Add Sony IMX214 sensor properties\n> Preparing patchwork/4617\n> git -C libcamera show-ref --verify --quiet refs/heads/patchwork/4617\n> git -C libcamera checkout -b patchwork/4617\n> Switched to a new branch 'patchwork/4617'\n> git -C libcamera pw series apply 4617 -s\n> Applying: libcamera: Add gc05a2 camera sensor proprietary for ciri\n> Using index info to reconstruct a base tree...\n> M src/ipa/libipa/camera_sensor_helper.cpp\n> M src/libcamera/sensor/camera_sensor_properties.cpp\n> Falling back to patching base and 3-way merge...\n> Auto-merging src/libcamera/sensor/camera_sensor_properties.cpp\n> Auto-merging src/ipa/libipa/camera_sensor_helper.cpp\n> CONFLICT (content): Merge conflict in src/ipa/libipa/camera_sensor_helper.cpp\n> Recorded preimage for 'src/ipa/libipa/camera_sensor_helper.cpp'\n> error: Failed to merge in the changes.\n> hint: Use 'git am --show-current-patch=diff' to see the failed patch\n> Patch failed at 0001 libcamera: Add gc05a2 camera sensor proprietary for ciri\n> When you have resolved this problem, run \"git am --continue\".\n> If you prefer to skip this patch, run \"git am --skip\" instead.\n> To restore the original branch and stop patching, run \"git am --abort\".\n\nRebased onto the current origin/master.\n\nBR,\nHarvey\n\n>\n>\n> --\n> Kieran\n>\n>\n> > +\n> > +private:\n> > + static constexpr uint32_t kStep_ = 16;\n> > + static constexpr uint32_t kAeBaseGain_ = 1024;\n> > +};\n> > +REGISTER_CAMERA_SENSOR_HELPER(\"gc08a3\", CameraSensorHelperGc08a3)\n> > +\n> > class CameraSensorHelperImx219 : public CameraSensorHelper\n> > {\n> > public:\n> > diff --git a/src/libcamera/sensor/camera_sensor_properties.cpp b/src/libcamera/sensor/camera_sensor_properties.cpp\n> > index 3e1bd85e..c76c8088 100644\n> > --- a/src/libcamera/sensor/camera_sensor_properties.cpp\n> > +++ b/src/libcamera/sensor/camera_sensor_properties.cpp\n> > @@ -77,6 +77,13 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen\n> > { controls::draft::TestPatternModeColorBars, 1 },\n> > },\n> > } },\n> > + { \"gc08a3\", {\n> > + .unitCellSize = { 1120, 1120 },\n> > + .testPatternModes = {\n> > + { controls::draft::TestPatternModeOff, 0 },\n> > + { controls::draft::TestPatternModeColorBars, 2 },\n> > + },\n> > + } },\n> > { \"hi846\", {\n> > .unitCellSize = { 1120, 1120 },\n> > .testPatternModes = {\n> > --\n> > 2.46.0.792.g87dc391469-goog\n> >","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 90B40C32F1\n\tfor ;\n\tTue, 19 Nov 2024 07:42:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4641065ED8;\n\tTue, 19 Nov 2024 08:42:17 +0100 (CET)","from mail-lj1-x229.google.com (mail-lj1-x229.google.com\n\t[IPv6:2a00:1450:4864:20::229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 324A0658FD\n\tfor ;\n\tTue, 19 Nov 2024 08:42:15 +0100 (CET)","by mail-lj1-x229.google.com with SMTP id\n\t38308e7fff4ca-2fb5be4381dso6166241fa.2\n\tfor ;\n\tMon, 18 Nov 2024 23:42:15 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"LUF/plhS\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1732002134; x=1732606934;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:cc:to:subject:message-id:date:from\n\t:in-reply-to:references:mime-version:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=eC+B39WNzeJgngkIOjJ4w3GEuDzAdAzYSXPrNjm9jtI=;\n\tb=LUF/plhSGI7Zj4AgxWIUwmMJ0zlnKPJvkiaDkBuD/JQnSkmAVwusTKkSYLwTFDqoOm\n\tSHrStoT/SfBievd/Ad3irYiAOtlX3TdvitWjWvseka74lBpU+CwBF0TM1nqxqaz3vFUC\n\tx5VTCokAmoEG8roDrsbW+rjSIGR7fJK6aGJeo=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1732002134; x=1732606934;\n\th=content-transfer-encoding:cc:to:subject:message-id:date:from\n\t:in-reply-to:references:mime-version:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=eC+B39WNzeJgngkIOjJ4w3GEuDzAdAzYSXPrNjm9jtI=;\n\tb=iLdpRs0DxROJRLRyL4mRtc04mcPisxj91Q6uRnHZY26dchlikdf2nZwaKSpIbrt9IQ\n\twR3NLQZrR4Qq+CYnOqeHcCUk4Bo4bw5xY5AmhGAipYpPgXZAZDq8vEHnl9dA9Xqpg8pR\n\tWudFYYOp+BBRq6O4Q2y9hBNDbfZsWYPJ5Fx8z7wbBsgtFZAKDmc+a/kY32bkjTLQQfPM\n\tyxEaH87VZulHpTaGt1K85I58NT6BOAr5lk2THwpgCvPwk454yCTk9+jhowSkRDIv2BJn\n\tJD0hBltfI0eaFbSxEHke2W+g3z3hcsanxTlYRtb9k0K42h6RViuqEZNn7QS3dN1b0CH0\n\tf6gw==","X-Gm-Message-State":"AOJu0Yw16yyDTX9aSasXcYqlcWerIYBZQlSBzdb11tZ7ftOJDjl60fpo\n\t/rAEAxETzhRNOZwFeAbsFg7mah+YMAzIZmqIKulqLx/X0qEK4HxgF5Ic3/LRn8MIdc+hqRp52lh\n\tddxXee9lkT3gjZTBwaq9uLOUsF1cIwf7cIIbO","X-Google-Smtp-Source":"AGHT+IEmHRjjdKvOJ8kn4NlIYNbvtWKwp26FjDeddm/RfcZ07rvrMoP9q8aUFKjRQ9RKYfiXy0qsMlORPc84qCJgnXg=","X-Received":"by 2002:a2e:a591:0:b0:2fa:e658:27b4 with SMTP id\n\t38308e7fff4ca-2ff6092077emr58808011fa.4.1732002134409;\n\tMon, 18 Nov 2024 23:42:14 -0800 (PST)","MIME-Version":"1.0","References":"<20240924090051.1617040-1-chenghaoyang@google.com>\n\t<20240924090051.1617040-3-chenghaoyang@google.com>\n\t<172718215904.3726802.12236842152084562541@ping.linuxembedded.co.uk>","In-Reply-To":"<172718215904.3726802.12236842152084562541@ping.linuxembedded.co.uk>","From":"Cheng-Hao Yang ","Date":"Tue, 19 Nov 2024 15:42:03 +0800","Message-ID":"","Subject":"Re: [PATCH v2 2/2] libcamera: Add gc08a3 camera sensor proprietary\n\tfor ciri","To":"Kieran Bingham ","Cc":"libcamera-devel@lists.libcamera.org,\n\tHarvey Yang , \n\tHan-Lin Chen , Xing Gu ,\n\tYudhistira Erlandinata ","Content-Type":"text/plain; charset=\"UTF-8\"","Content-Transfer-Encoding":"quoted-printable","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]