[libcamera-devel,v2,01/14] libcamera: ipa: Remove IPAInterface::init()

Message ID 20190829232653.13214-2-niklas.soderlund@ragnatech.se
State Superseded
Headers show
Series
  • libcamera: ipa: Add basic IPA support
Related show

Commit Message

Niklas Söderlund Aug. 29, 2019, 11:26 p.m. UTC
The function performs no useful task and will not be needed when we
extend the IPA interface to process parameter and statistic buffers.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 include/libcamera/ipa/ipa_interface.h | 2 --
 src/ipa/ipa_dummy.cpp                 | 8 --------
 src/ipa/ipa_dummy_isolate.cpp         | 8 --------
 src/libcamera/ipa_interface.cpp       | 5 -----
 src/libcamera/pipeline/vimc.cpp       | 2 --
 5 files changed, 25 deletions(-)

Comments

Kieran Bingham Aug. 30, 2019, 9:14 a.m. UTC | #1
Hi Niklas,


On 30/08/2019 00:26, Niklas Söderlund wrote:
> The function performs no useful task and will not be needed when we
> extend the IPA interface to process parameter and statistic buffers.

This is probably a neater way to remove this call :D

I assume we're not relying on these messages as the only way to know the
dummy-IPA tests have loaded ...

So..

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

> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
> ---
>  include/libcamera/ipa/ipa_interface.h | 2 --
>  src/ipa/ipa_dummy.cpp                 | 8 --------
>  src/ipa/ipa_dummy_isolate.cpp         | 8 --------
>  src/libcamera/ipa_interface.cpp       | 5 -----
>  src/libcamera/pipeline/vimc.cpp       | 2 --
>  5 files changed, 25 deletions(-)
> 
> diff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h
> index 2c5eb1fd524311cb..9bbc4cf58ec66420 100644
> --- a/include/libcamera/ipa/ipa_interface.h
> +++ b/include/libcamera/ipa/ipa_interface.h
> @@ -13,8 +13,6 @@ class IPAInterface
>  {
>  public:
>  	virtual ~IPAInterface() {}
> -
> -	virtual int init() = 0;
>  };
>  
>  } /* namespace libcamera */
> diff --git a/src/ipa/ipa_dummy.cpp b/src/ipa/ipa_dummy.cpp
> index 4c8b6657689d0c9f..2fe232295c676941 100644
> --- a/src/ipa/ipa_dummy.cpp
> +++ b/src/ipa/ipa_dummy.cpp
> @@ -14,16 +14,8 @@ namespace libcamera {
>  
>  class IPADummy : public IPAInterface
>  {
> -public:
> -	int init();
>  };
>  
> -int IPADummy::init()
> -{
> -	std::cout << "initializing dummy IPA!" << std::endl;
> -	return 0;
> -}
> -
>  /*
>   * External IPA module interface
>   */
> diff --git a/src/ipa/ipa_dummy_isolate.cpp b/src/ipa/ipa_dummy_isolate.cpp
> index 24434e85d31809e2..fa50be5309eba3c4 100644
> --- a/src/ipa/ipa_dummy_isolate.cpp
> +++ b/src/ipa/ipa_dummy_isolate.cpp
> @@ -15,16 +15,8 @@ namespace libcamera {
>  
>  class IPADummyIsolate : public IPAInterface
>  {
> -public:
> -	int init();
>  };
>  
> -int IPADummyIsolate::init()
> -{
> -	std::cout << "initializing isolated dummy IPA!" << std::endl;
> -	return 0;
> -}
> -
>  /*
>   * External IPA module interface
>   */
> diff --git a/src/libcamera/ipa_interface.cpp b/src/libcamera/ipa_interface.cpp
> index 9d30da29228fabb7..273477a5272677b7 100644
> --- a/src/libcamera/ipa_interface.cpp
> +++ b/src/libcamera/ipa_interface.cpp
> @@ -19,9 +19,4 @@ namespace libcamera {
>   * \brief Interface for IPA implementation
>   */
>  
> -/**
> - * \fn IPAInterface::init()
> - * \brief Initialise the IPAInterface
> - */
> -
>  } /* namespace libcamera */
> diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp
> index f8f91d6219b1aee4..55d5bff287c3366d 100644
> --- a/src/libcamera/pipeline/vimc.cpp
> +++ b/src/libcamera/pipeline/vimc.cpp
> @@ -364,8 +364,6 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)
>  	ipa_ = IPAManager::instance()->createIPA(this, 0, 0);
>  	if (ipa_ == nullptr)
>  		LOG(VIMC, Warning) << "no matching IPA found";
> -	else
> -		ipa_->init();
>  
>  	std::unique_ptr<VimcCameraData> data = utils::make_unique<VimcCameraData>(this);
>  
>
Laurent Pinchart Sept. 4, 2019, 2:11 p.m. UTC | #2
Hi Niklas,

Thank you for the patch.

On Fri, Aug 30, 2019 at 01:26:40AM +0200, Niklas Söderlund wrote:
> The function performs no useful task and will not be needed when we
> extend the IPA interface to process parameter and statistic buffers.
> 
> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

I haven't checked the rest of the series yet, but assuming we indeed
will have no use for an init method,

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

If this question isn't answered by other patches in the series, how will
IPAs perform one-time initialisation ?

> ---
>  include/libcamera/ipa/ipa_interface.h | 2 --
>  src/ipa/ipa_dummy.cpp                 | 8 --------
>  src/ipa/ipa_dummy_isolate.cpp         | 8 --------
>  src/libcamera/ipa_interface.cpp       | 5 -----
>  src/libcamera/pipeline/vimc.cpp       | 2 --
>  5 files changed, 25 deletions(-)
> 
> diff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h
> index 2c5eb1fd524311cb..9bbc4cf58ec66420 100644
> --- a/include/libcamera/ipa/ipa_interface.h
> +++ b/include/libcamera/ipa/ipa_interface.h
> @@ -13,8 +13,6 @@ class IPAInterface
>  {
>  public:
>  	virtual ~IPAInterface() {}
> -
> -	virtual int init() = 0;
>  };
>  
>  } /* namespace libcamera */
> diff --git a/src/ipa/ipa_dummy.cpp b/src/ipa/ipa_dummy.cpp
> index 4c8b6657689d0c9f..2fe232295c676941 100644
> --- a/src/ipa/ipa_dummy.cpp
> +++ b/src/ipa/ipa_dummy.cpp
> @@ -14,16 +14,8 @@ namespace libcamera {
>  
>  class IPADummy : public IPAInterface
>  {
> -public:
> -	int init();
>  };
>  
> -int IPADummy::init()
> -{
> -	std::cout << "initializing dummy IPA!" << std::endl;
> -	return 0;
> -}
> -
>  /*
>   * External IPA module interface
>   */
> diff --git a/src/ipa/ipa_dummy_isolate.cpp b/src/ipa/ipa_dummy_isolate.cpp
> index 24434e85d31809e2..fa50be5309eba3c4 100644
> --- a/src/ipa/ipa_dummy_isolate.cpp
> +++ b/src/ipa/ipa_dummy_isolate.cpp
> @@ -15,16 +15,8 @@ namespace libcamera {
>  
>  class IPADummyIsolate : public IPAInterface
>  {
> -public:
> -	int init();
>  };
>  
> -int IPADummyIsolate::init()
> -{
> -	std::cout << "initializing isolated dummy IPA!" << std::endl;
> -	return 0;
> -}
> -
>  /*
>   * External IPA module interface
>   */
> diff --git a/src/libcamera/ipa_interface.cpp b/src/libcamera/ipa_interface.cpp
> index 9d30da29228fabb7..273477a5272677b7 100644
> --- a/src/libcamera/ipa_interface.cpp
> +++ b/src/libcamera/ipa_interface.cpp
> @@ -19,9 +19,4 @@ namespace libcamera {
>   * \brief Interface for IPA implementation
>   */
>  
> -/**
> - * \fn IPAInterface::init()
> - * \brief Initialise the IPAInterface
> - */
> -
>  } /* namespace libcamera */
> diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp
> index f8f91d6219b1aee4..55d5bff287c3366d 100644
> --- a/src/libcamera/pipeline/vimc.cpp
> +++ b/src/libcamera/pipeline/vimc.cpp
> @@ -364,8 +364,6 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)
>  	ipa_ = IPAManager::instance()->createIPA(this, 0, 0);
>  	if (ipa_ == nullptr)
>  		LOG(VIMC, Warning) << "no matching IPA found";
> -	else
> -		ipa_->init();
>  
>  	std::unique_ptr<VimcCameraData> data = utils::make_unique<VimcCameraData>(this);
>

Patch

diff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h
index 2c5eb1fd524311cb..9bbc4cf58ec66420 100644
--- a/include/libcamera/ipa/ipa_interface.h
+++ b/include/libcamera/ipa/ipa_interface.h
@@ -13,8 +13,6 @@  class IPAInterface
 {
 public:
 	virtual ~IPAInterface() {}
-
-	virtual int init() = 0;
 };
 
 } /* namespace libcamera */
diff --git a/src/ipa/ipa_dummy.cpp b/src/ipa/ipa_dummy.cpp
index 4c8b6657689d0c9f..2fe232295c676941 100644
--- a/src/ipa/ipa_dummy.cpp
+++ b/src/ipa/ipa_dummy.cpp
@@ -14,16 +14,8 @@  namespace libcamera {
 
 class IPADummy : public IPAInterface
 {
-public:
-	int init();
 };
 
-int IPADummy::init()
-{
-	std::cout << "initializing dummy IPA!" << std::endl;
-	return 0;
-}
-
 /*
  * External IPA module interface
  */
diff --git a/src/ipa/ipa_dummy_isolate.cpp b/src/ipa/ipa_dummy_isolate.cpp
index 24434e85d31809e2..fa50be5309eba3c4 100644
--- a/src/ipa/ipa_dummy_isolate.cpp
+++ b/src/ipa/ipa_dummy_isolate.cpp
@@ -15,16 +15,8 @@  namespace libcamera {
 
 class IPADummyIsolate : public IPAInterface
 {
-public:
-	int init();
 };
 
-int IPADummyIsolate::init()
-{
-	std::cout << "initializing isolated dummy IPA!" << std::endl;
-	return 0;
-}
-
 /*
  * External IPA module interface
  */
diff --git a/src/libcamera/ipa_interface.cpp b/src/libcamera/ipa_interface.cpp
index 9d30da29228fabb7..273477a5272677b7 100644
--- a/src/libcamera/ipa_interface.cpp
+++ b/src/libcamera/ipa_interface.cpp
@@ -19,9 +19,4 @@  namespace libcamera {
  * \brief Interface for IPA implementation
  */
 
-/**
- * \fn IPAInterface::init()
- * \brief Initialise the IPAInterface
- */
-
 } /* namespace libcamera */
diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp
index f8f91d6219b1aee4..55d5bff287c3366d 100644
--- a/src/libcamera/pipeline/vimc.cpp
+++ b/src/libcamera/pipeline/vimc.cpp
@@ -364,8 +364,6 @@  bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)
 	ipa_ = IPAManager::instance()->createIPA(this, 0, 0);
 	if (ipa_ == nullptr)
 		LOG(VIMC, Warning) << "no matching IPA found";
-	else
-		ipa_->init();
 
 	std::unique_ptr<VimcCameraData> data = utils::make_unique<VimcCameraData>(this);