[v1,4/8] ipa: rkisp1: Add constructor to the ipa context

21475 diff mbox series

Initialization using the initializer list is cumbersome and requires
modifications to the list whenever the context is modified. Fix that by
adding a proper constructor to the context.

Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
---
 src/ipa/rkisp1/ipa_context.h | 5 +++++
 src/ipa/rkisp1/rkisp1.cpp    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

Hi Stefan,

Thank you for the patch.

On Wed, Oct 02, 2024 at 06:19:22PM +0200, Stefan Klug wrote:
> Initialization using the initializer list is cumbersome and requires
> modifications to the list whenever the context is modified. Fix that by
> adding a proper constructor to the context.
> 
> Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
> ---
>  src/ipa/rkisp1/ipa_context.h | 5 +++++
>  src/ipa/rkisp1/rkisp1.cpp    | 2 +-
>  2 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h
> index e274d9b01e1c..d52e73ad2503 100644
> --- a/src/ipa/rkisp1/ipa_context.h
> +++ b/src/ipa/rkisp1/ipa_context.h
> @@ -180,6 +180,11 @@ struct IPAFrameContext : public FrameContext {
>  };
>  
>  struct IPAContext {
> +	IPAContext(unsigned int frameContextSize)
> +		: hw(nullptr), frameContexts(frameContextSize)
> +	{
> +	}
> +
>  	const IPAHwSettings *hw;
>  	IPACameraSensorInfo sensorInfo;
>  	IPASessionConfiguration configuration;
> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp
> index 9e161cabdea4..a579f21de56f 100644
> --- a/src/ipa/rkisp1/rkisp1.cpp
> +++ b/src/ipa/rkisp1/rkisp1.cpp
> @@ -124,7 +124,7 @@ const ControlInfoMap::Map rkisp1Controls{
>  } /* namespace */
>  
>  IPARkISP1::IPARkISP1()
> -	: context_({ {}, {}, {}, {}, { kMaxFrameContexts }, {}, {} })
> +	: context_(kMaxFrameContexts)

This looks nicer indeed.

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

>  {
>  }
>

Quoting Laurent Pinchart (2024-10-03 17:37:46)
> Hi Stefan,
> 
> Thank you for the patch.
> 
> On Wed, Oct 02, 2024 at 06:19:22PM +0200, Stefan Klug wrote:
> > Initialization using the initializer list is cumbersome and requires
> > modifications to the list whenever the context is modified. Fix that by
> > adding a proper constructor to the context.
> > 
> > Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
> > ---
> >  src/ipa/rkisp1/ipa_context.h | 5 +++++
> >  src/ipa/rkisp1/rkisp1.cpp    | 2 +-
> >  2 files changed, 6 insertions(+), 1 deletion(-)
> > 
> > diff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h
> > index e274d9b01e1c..d52e73ad2503 100644
> > --- a/src/ipa/rkisp1/ipa_context.h
> > +++ b/src/ipa/rkisp1/ipa_context.h
> > @@ -180,6 +180,11 @@ struct IPAFrameContext : public FrameContext {
> >  };
> >  
> >  struct IPAContext {
> > +     IPAContext(unsigned int frameContextSize)
> > +             : hw(nullptr), frameContexts(frameContextSize)
> > +     {
> > +     }
> > +
> >       const IPAHwSettings *hw;
> >       IPACameraSensorInfo sensorInfo;
> >       IPASessionConfiguration configuration;
> > diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp
> > index 9e161cabdea4..a579f21de56f 100644
> > --- a/src/ipa/rkisp1/rkisp1.cpp
> > +++ b/src/ipa/rkisp1/rkisp1.cpp
> > @@ -124,7 +124,7 @@ const ControlInfoMap::Map rkisp1Controls{
> >  } /* namespace */
> >  
> >  IPARkISP1::IPARkISP1()
> > -     : context_({ {}, {}, {}, {}, { kMaxFrameContexts }, {}, {} })
> > +     : context_(kMaxFrameContexts)
> 
> This looks nicer indeed.

Very much indeed.

Would it be a lot to ask if we could get a drive by update to do the
same fix for the IPU3, and Simple pipeline handlers ?

It could always still be done separately though.

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

> 
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
> >  {
> >  }
> >  
> 
> -- 
> Regards,
> 
> Laurent Pinchart