[v2,2/7] software_isp: Rename simple IPA setIspParams signal to paramsComputed
diff mbox series

Message ID 20260721145958.68489-3-johannes.goede@oss.qualcomm.com
State New
Headers show
Series
  • camss: Add CAMSS pipeline handler
Related show

Commit Message

Hans de Goede July 21, 2026, 2:59 p.m. UTC 
Rename the simple IPA setIspParams signal to paramsComputed and pass
the frame-number as argument to make the simple IPA behavior consistent
with other IPA implementations.

Signed-off-by: Hans de Goede <johannes.goede@oss.qualcomm.com>
---
 include/libcamera/internal/software_isp/software_isp.h | 2 +-
 include/libcamera/ipa/soft.mojom                       | 2 +-
 src/ipa/simple/soft_simple.cpp                         | 2 +-
 src/libcamera/software_isp/software_isp.cpp            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

Comments

Kieran Bingham Aug. 5, 2026, 11:35 a.m. UTC | #1 
Quoting Hans de Goede (2026-07-21 15:59:52)
> Rename the simple IPA setIspParams signal to paramsComputed and pass
> the frame-number as argument to make the simple IPA behavior consistent
> with other IPA implementations.
> 

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> Signed-off-by: Hans de Goede <johannes.goede@oss.qualcomm.com>
> ---
>  include/libcamera/internal/software_isp/software_isp.h | 2 +-
>  include/libcamera/ipa/soft.mojom                       | 2 +-
>  src/ipa/simple/soft_simple.cpp                         | 2 +-
>  src/libcamera/software_isp/software_isp.cpp            | 4 ++--
>  4 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h
> index 4f72dce9b..58353301f 100644
> --- a/include/libcamera/internal/software_isp/software_isp.h
> +++ b/include/libcamera/internal/software_isp/software_isp.h
> @@ -89,7 +89,7 @@ public:
>         Signal<const ControlList &> setSensorControls;
>  
>  private:
> -       void saveIspParams();
> +       void saveIspParams(uint32_t frame);
>         void setSensorCtrls(const ControlList &sensorControls);
>         void statsReady(uint32_t frame, uint32_t bufferId);
>         void inputReady(FrameBuffer *input);
> diff --git a/include/libcamera/ipa/soft.mojom b/include/libcamera/ipa/soft.mojom
> index 77328c5fd..55a00b598 100644
> --- a/include/libcamera/ipa/soft.mojom
> +++ b/include/libcamera/ipa/soft.mojom
> @@ -33,6 +33,6 @@ interface IPASoftInterface {
>  
>  interface IPASoftEventInterface {
>         setSensorControls(libcamera.ControlList sensorControls);
> -       setIspParams();
> +       paramsComputed(uint32 frame);
>         metadataReady(uint32 frame, libcamera.ControlList metadata);
>  };
> diff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp
> index d4ab91e30..3ee7b0d65 100644
> --- a/src/ipa/simple/soft_simple.cpp
> +++ b/src/ipa/simple/soft_simple.cpp
> @@ -292,7 +292,7 @@ void IPASoftSimple::computeParams(const uint32_t frame)
>                 algo->prepare(context_, frame, frameContext, params_);
>         params_->combinedMatrix = context_.activeState.combinedMatrix;
>  
> -       setIspParams.emit();
> +       paramsComputed.emit(frame);
>  }
>  
>  void IPASoftSimple::processStats(const uint32_t frame,
> diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp
> index 137341fe2..7efd5cf4c 100644
> --- a/src/libcamera/software_isp/software_isp.cpp
> +++ b/src/libcamera/software_isp/software_isp.cpp
> @@ -170,7 +170,7 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor,
>                 return;
>         }
>  
> -       ipa_->setIspParams.connect(this, &SoftwareIsp::saveIspParams);
> +       ipa_->paramsComputed.connect(this, &SoftwareIsp::saveIspParams);
>         ipa_->metadataReady.connect(this,
>                                     [this](uint32_t frame, const ControlList &metadata) {
>                                             metadataReady.emit(frame, metadata);
> @@ -431,7 +431,7 @@ void SoftwareIsp::process(uint32_t frame, FrameBuffer *input, FrameBuffer *outpu
>                                ConnectionTypeQueued, frame, input, output, debayerParams_);
>  }
>  
> -void SoftwareIsp::saveIspParams()
> +void SoftwareIsp::saveIspParams([[maybe_unused]] uint32_t frame)
>  {
>         debayerParams_ = *sharedParams_;
>  }
> -- 
> 2.55.0
>
Barnabás Pőcze Aug. 5, 2026, 1:42 p.m. UTC | #2 
2026. 07. 21. 16:59 keltezéssel, Hans de Goede írta:
> Rename the simple IPA setIspParams signal to paramsComputed and pass
> the frame-number as argument to make the simple IPA behavior consistent
> with other IPA implementations.
> 
> Signed-off-by: Hans de Goede <johannes.goede@oss.qualcomm.com>
> ---

Looks ok to me.

Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>


>   include/libcamera/internal/software_isp/software_isp.h | 2 +-
>   include/libcamera/ipa/soft.mojom                       | 2 +-
>   src/ipa/simple/soft_simple.cpp                         | 2 +-
>   src/libcamera/software_isp/software_isp.cpp            | 4 ++--
>   4 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h
> index 4f72dce9b..58353301f 100644
> --- a/include/libcamera/internal/software_isp/software_isp.h
> +++ b/include/libcamera/internal/software_isp/software_isp.h
> @@ -89,7 +89,7 @@ public:
>   	Signal<const ControlList &> setSensorControls;
>   
>   private:
> -	void saveIspParams();
> +	void saveIspParams(uint32_t frame);
>   	void setSensorCtrls(const ControlList &sensorControls);
>   	void statsReady(uint32_t frame, uint32_t bufferId);
>   	void inputReady(FrameBuffer *input);
> diff --git a/include/libcamera/ipa/soft.mojom b/include/libcamera/ipa/soft.mojom
> index 77328c5fd..55a00b598 100644
> --- a/include/libcamera/ipa/soft.mojom
> +++ b/include/libcamera/ipa/soft.mojom
> @@ -33,6 +33,6 @@ interface IPASoftInterface {
>   
>   interface IPASoftEventInterface {
>   	setSensorControls(libcamera.ControlList sensorControls);
> -	setIspParams();
> +	paramsComputed(uint32 frame);
>   	metadataReady(uint32 frame, libcamera.ControlList metadata);
>   };
> diff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp
> index d4ab91e30..3ee7b0d65 100644
> --- a/src/ipa/simple/soft_simple.cpp
> +++ b/src/ipa/simple/soft_simple.cpp
> @@ -292,7 +292,7 @@ void IPASoftSimple::computeParams(const uint32_t frame)
>   		algo->prepare(context_, frame, frameContext, params_);
>   	params_->combinedMatrix = context_.activeState.combinedMatrix;
>   
> -	setIspParams.emit();
> +	paramsComputed.emit(frame);
>   }
>   
>   void IPASoftSimple::processStats(const uint32_t frame,
> diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp
> index 137341fe2..7efd5cf4c 100644
> --- a/src/libcamera/software_isp/software_isp.cpp
> +++ b/src/libcamera/software_isp/software_isp.cpp
> @@ -170,7 +170,7 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor,
>   		return;
>   	}
>   
> -	ipa_->setIspParams.connect(this, &SoftwareIsp::saveIspParams);
> +	ipa_->paramsComputed.connect(this, &SoftwareIsp::saveIspParams);
>   	ipa_->metadataReady.connect(this,
>   				    [this](uint32_t frame, const ControlList &metadata) {
>   					    metadataReady.emit(frame, metadata);
> @@ -431,7 +431,7 @@ void SoftwareIsp::process(uint32_t frame, FrameBuffer *input, FrameBuffer *outpu
>   			       ConnectionTypeQueued, frame, input, output, debayerParams_);
>   }
>   
> -void SoftwareIsp::saveIspParams()
> +void SoftwareIsp::saveIspParams([[maybe_unused]] uint32_t frame)
>   {
>   	debayerParams_ = *sharedParams_;
>   }

Patch
diff mbox series 

diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h
index 4f72dce9b..58353301f 100644
--- a/include/libcamera/internal/software_isp/software_isp.h
+++ b/include/libcamera/internal/software_isp/software_isp.h
@@ -89,7 +89,7 @@  public:
 	Signal<const ControlList &> setSensorControls;
 
 private:
-	void saveIspParams();
+	void saveIspParams(uint32_t frame);
 	void setSensorCtrls(const ControlList &sensorControls);
 	void statsReady(uint32_t frame, uint32_t bufferId);
 	void inputReady(FrameBuffer *input);
diff --git a/include/libcamera/ipa/soft.mojom b/include/libcamera/ipa/soft.mojom
index 77328c5fd..55a00b598 100644
--- a/include/libcamera/ipa/soft.mojom
+++ b/include/libcamera/ipa/soft.mojom
@@ -33,6 +33,6 @@  interface IPASoftInterface {
 
 interface IPASoftEventInterface {
 	setSensorControls(libcamera.ControlList sensorControls);
-	setIspParams();
+	paramsComputed(uint32 frame);
 	metadataReady(uint32 frame, libcamera.ControlList metadata);
 };
diff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp
index d4ab91e30..3ee7b0d65 100644
--- a/src/ipa/simple/soft_simple.cpp
+++ b/src/ipa/simple/soft_simple.cpp
@@ -292,7 +292,7 @@  void IPASoftSimple::computeParams(const uint32_t frame)
 		algo->prepare(context_, frame, frameContext, params_);
 	params_->combinedMatrix = context_.activeState.combinedMatrix;
 
-	setIspParams.emit();
+	paramsComputed.emit(frame);
 }
 
 void IPASoftSimple::processStats(const uint32_t frame,
diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp
index 137341fe2..7efd5cf4c 100644
--- a/src/libcamera/software_isp/software_isp.cpp
+++ b/src/libcamera/software_isp/software_isp.cpp
@@ -170,7 +170,7 @@  SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor,
 		return;
 	}
 
-	ipa_->setIspParams.connect(this, &SoftwareIsp::saveIspParams);
+	ipa_->paramsComputed.connect(this, &SoftwareIsp::saveIspParams);
 	ipa_->metadataReady.connect(this,
 				    [this](uint32_t frame, const ControlList &metadata) {
 					    metadataReady.emit(frame, metadata);
@@ -431,7 +431,7 @@  void SoftwareIsp::process(uint32_t frame, FrameBuffer *input, FrameBuffer *outpu
 			       ConnectionTypeQueued, frame, input, output, debayerParams_);
 }
 
-void SoftwareIsp::saveIspParams()
+void SoftwareIsp::saveIspParams([[maybe_unused]] uint32_t frame)
 {
 	debayerParams_ = *sharedParams_;
 }