[3/4] libcamera: vimc: Drop ipa_interface.h header
diff mbox series

Message ID 20240701075720.46076-4-umang.jain@ideasonboard.com
State Not Applicable
Headers show
Series
  • Frop base IPA headers
Related show

Commit Message

Umang Jain July 1, 2024, 7:57 a.m. UTC
The ipa_interface.h header is already included in vimc_ipa_interface.h
generated from module_ipa_interface.h.tmpl. Drop it from the vimc IPA
and pipeline handler as deemed redundant.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
---
 src/ipa/vimc/vimc.cpp                | 1 -
 src/libcamera/pipeline/vimc/vimc.cpp | 1 -
 2 files changed, 2 deletions(-)

Comments

Milan Zamazal July 1, 2024, 9:04 a.m. UTC | #1
Umang Jain <umang.jain@ideasonboard.com> writes:

> The ipa_interface.h header is already included in vimc_ipa_interface.h
> generated from module_ipa_interface.h.tmpl. Drop it from the vimc IPA
> and pipeline handler as deemed redundant.
>
> Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>

Reviewed-by: Milan Zamazal <mzamazal@redhat.com>

> ---
>  src/ipa/vimc/vimc.cpp                | 1 -
>  src/libcamera/pipeline/vimc/vimc.cpp | 1 -
>  2 files changed, 2 deletions(-)
>
> diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp
> index ebd63fa6..766e9c9c 100644
> --- a/src/ipa/vimc/vimc.cpp
> +++ b/src/ipa/vimc/vimc.cpp
> @@ -16,7 +16,6 @@
>  #include <libcamera/base/file.h>
>  #include <libcamera/base/log.h>
>  
> -#include <libcamera/ipa/ipa_interface.h>
>  #include <libcamera/ipa/ipa_module_info.h>
>  
>  #include "libcamera/internal/mapped_framebuffer.h"
> diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp
> index 0ec9928e..838a9355 100644
> --- a/src/libcamera/pipeline/vimc/vimc.cpp
> +++ b/src/libcamera/pipeline/vimc/vimc.cpp
> @@ -24,7 +24,6 @@
>  #include <libcamera/request.h>
>  #include <libcamera/stream.h>
>  
> -#include <libcamera/ipa/ipa_interface.h>
>  #include <libcamera/ipa/ipa_module_info.h>
>  #include <libcamera/ipa/vimc_ipa_interface.h>
>  #include <libcamera/ipa/vimc_ipa_proxy.h>
Kieran Bingham July 1, 2024, 9:48 a.m. UTC | #2
Quoting Umang Jain (2024-07-01 08:57:19)
> The ipa_interface.h header is already included in vimc_ipa_interface.h
> generated from module_ipa_interface.h.tmpl. Drop it from the vimc IPA
> and pipeline handler as deemed redundant.
> 
> Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
> ---
>  src/ipa/vimc/vimc.cpp                | 1 -
>  src/libcamera/pipeline/vimc/vimc.cpp | 1 -
>  2 files changed, 2 deletions(-)
> 
> diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp
> index ebd63fa6..766e9c9c 100644
> --- a/src/ipa/vimc/vimc.cpp
> +++ b/src/ipa/vimc/vimc.cpp
> @@ -16,7 +16,6 @@
>  #include <libcamera/base/file.h>
>  #include <libcamera/base/log.h>
>  
> -#include <libcamera/ipa/ipa_interface.h>
>  #include <libcamera/ipa/ipa_module_info.h>

Where's #include <libcamera/ipa/vimc_ipa_interface.h>, and why isn't it
here?

>  
>  #include "libcamera/internal/mapped_framebuffer.h"
> diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp
> index 0ec9928e..838a9355 100644
> --- a/src/libcamera/pipeline/vimc/vimc.cpp
> +++ b/src/libcamera/pipeline/vimc/vimc.cpp
> @@ -24,7 +24,6 @@
>  #include <libcamera/request.h>
>  #include <libcamera/stream.h>
>  
> -#include <libcamera/ipa/ipa_interface.h>
>  #include <libcamera/ipa/ipa_module_info.h>
>  #include <libcamera/ipa/vimc_ipa_interface.h>


Otherwise,

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


>  #include <libcamera/ipa/vimc_ipa_proxy.h>
> -- 
> 2.44.0
>
Umang Jain July 1, 2024, 1:08 p.m. UTC | #3
Hi Kieran,

On 01/07/24 3:18 pm, Kieran Bingham wrote:
> Quoting Umang Jain (2024-07-01 08:57:19)
>> The ipa_interface.h header is already included in vimc_ipa_interface.h
>> generated from module_ipa_interface.h.tmpl. Drop it from the vimc IPA
>> and pipeline handler as deemed redundant.
>>
>> Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
>> ---
>>   src/ipa/vimc/vimc.cpp                | 1 -
>>   src/libcamera/pipeline/vimc/vimc.cpp | 1 -
>>   2 files changed, 2 deletions(-)
>>
>> diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp
>> index ebd63fa6..766e9c9c 100644
>> --- a/src/ipa/vimc/vimc.cpp
>> +++ b/src/ipa/vimc/vimc.cpp
>> @@ -16,7 +16,6 @@
>>   #include <libcamera/base/file.h>
>>   #include <libcamera/base/log.h>
>>   
>> -#include <libcamera/ipa/ipa_interface.h>
>>   #include <libcamera/ipa/ipa_module_info.h>
> Where's #include <libcamera/ipa/vimc_ipa_interface.h>, and why isn't it
> here?

It is at the top of the file.
https://git.libcamera.org/libcamera/libcamera.git/tree/src/ipa/vimc/vimc.cpp#n7

Should be a candidate for indentation fix

>>   
>>   #include "libcamera/internal/mapped_framebuffer.h"
>> diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp
>> index 0ec9928e..838a9355 100644
>> --- a/src/libcamera/pipeline/vimc/vimc.cpp
>> +++ b/src/libcamera/pipeline/vimc/vimc.cpp
>> @@ -24,7 +24,6 @@
>>   #include <libcamera/request.h>
>>   #include <libcamera/stream.h>
>>   
>> -#include <libcamera/ipa/ipa_interface.h>
>>   #include <libcamera/ipa/ipa_module_info.h>
>>   #include <libcamera/ipa/vimc_ipa_interface.h>
>
> Otherwise,
>
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
>
>
>>   #include <libcamera/ipa/vimc_ipa_proxy.h>
>> -- 
>> 2.44.0
>>

Patch
diff mbox series

diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp
index ebd63fa6..766e9c9c 100644
--- a/src/ipa/vimc/vimc.cpp
+++ b/src/ipa/vimc/vimc.cpp
@@ -16,7 +16,6 @@ 
 #include <libcamera/base/file.h>
 #include <libcamera/base/log.h>
 
-#include <libcamera/ipa/ipa_interface.h>
 #include <libcamera/ipa/ipa_module_info.h>
 
 #include "libcamera/internal/mapped_framebuffer.h"
diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp
index 0ec9928e..838a9355 100644
--- a/src/libcamera/pipeline/vimc/vimc.cpp
+++ b/src/libcamera/pipeline/vimc/vimc.cpp
@@ -24,7 +24,6 @@ 
 #include <libcamera/request.h>
 #include <libcamera/stream.h>
 
-#include <libcamera/ipa/ipa_interface.h>
 #include <libcamera/ipa/ipa_module_info.h>
 #include <libcamera/ipa/vimc_ipa_interface.h>
 #include <libcamera/ipa/vimc_ipa_proxy.h>