[{"id":24537,"web_url":"https://patchwork.libcamera.org/comment/24537/","msgid":"<61c75638-381b-bd78-bb96-26d33a89f122@ideasonboard.com>","date":"2022-08-11T07:00:36","subject":"Re: [libcamera-devel] [PATCH v2 08/10] ipa: libipa: algorithm:\n\tprepare(): Pass frame and frame Context","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/people/86/","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"content":"Hi Jacopo\n\nThank you for the patch.\n\nOn 8/5/22 19:23, Jacopo Mondi via libcamera-devel wrote:\n> From: Kieran Bingham via libcamera-devel <libcamera-devel@lists.libcamera.org>\n>\n> Pass the current frame number, and the current FrameContext for calls to\n> prepare.\n>\n> Until there is a Frame Context Queue in the RKISP1 the FrameContext will\n\n\nI think there is FCQueue in RkISP1 now, so should this commit message be \nupdated accordingly?\n\n> be a nullptr, and must not be dereferenced until the queue is\n> implemented.\n>\n> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n>\n>   - Obtain and use the RKISP1FrameContext Queue entry for IPARkISP1::fillParamsBuffer\n>\n> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> ---\n>   src/ipa/ipu3/algorithms/af.cpp           | 5 ++++-\n>   src/ipa/ipu3/algorithms/af.h             | 4 +++-\n>   src/ipa/ipu3/algorithms/awb.cpp          | 5 ++++-\n>   src/ipa/ipu3/algorithms/awb.h            | 5 ++++-\n>   src/ipa/ipu3/algorithms/blc.cpp          | 6 +++++-\n>   src/ipa/ipu3/algorithms/blc.h            | 4 +++-\n>   src/ipa/ipu3/algorithms/tone_mapping.cpp | 4 ++++\n>   src/ipa/ipu3/algorithms/tone_mapping.h   | 3 ++-\n>   src/ipa/ipu3/ipu3.cpp                    | 4 +++-\n>   src/ipa/libipa/algorithm.cpp             | 2 ++\n>   src/ipa/libipa/algorithm.h               | 2 ++\n>   src/ipa/rkisp1/algorithms/agc.cpp        | 5 ++++-\n>   src/ipa/rkisp1/algorithms/agc.h          | 4 +++-\n>   src/ipa/rkisp1/algorithms/awb.cpp        | 5 ++++-\n>   src/ipa/rkisp1/algorithms/awb.h          | 4 +++-\n>   src/ipa/rkisp1/algorithms/blc.cpp        | 2 ++\n>   src/ipa/rkisp1/algorithms/blc.h          | 4 +++-\n>   src/ipa/rkisp1/algorithms/cproc.cpp      | 2 ++\n>   src/ipa/rkisp1/algorithms/cproc.h        | 4 +++-\n>   src/ipa/rkisp1/algorithms/dpcc.cpp       | 2 ++\n>   src/ipa/rkisp1/algorithms/dpcc.h         | 4 +++-\n>   src/ipa/rkisp1/algorithms/filter.cpp     | 5 ++++-\n>   src/ipa/rkisp1/algorithms/filter.h       | 4 +++-\n>   src/ipa/rkisp1/algorithms/gsl.cpp        | 2 ++\n>   src/ipa/rkisp1/algorithms/gsl.h          | 4 +++-\n>   src/ipa/rkisp1/algorithms/lsc.cpp        | 2 ++\n>   src/ipa/rkisp1/algorithms/lsc.h          | 4 +++-\n>   src/ipa/rkisp1/rkisp1.cpp                | 4 +++-\n>   28 files changed, 85 insertions(+), 20 deletions(-)\n>\n> diff --git a/src/ipa/ipu3/algorithms/af.cpp b/src/ipa/ipu3/algorithms/af.cpp\n> index fcbf8e557b10..1faf92969ee5 100644\n> --- a/src/ipa/ipu3/algorithms/af.cpp\n> +++ b/src/ipa/ipu3/algorithms/af.cpp\n> @@ -116,7 +116,10 @@ Af::Af()\n>   /**\n>    * \\copydoc libcamera::ipa::Algorithm::prepare\n>    */\n> -void Af::prepare(IPAContext &context, ipu3_uapi_params *params)\n> +void Af::prepare(IPAContext &context,\n> +\t\t [[maybe_unused]] unsigned int frame,\n> +\t\t [[maybe_unused]] IPU3FrameContext &frameContext,\n> +\t\t ipu3_uapi_params *params)\n>   {\n>   \tconst struct ipu3_uapi_grid_config &grid = context.configuration.af.afGrid;\n>   \tparams->acc_param.af.grid_cfg = grid;\n> diff --git a/src/ipa/ipu3/algorithms/af.h b/src/ipa/ipu3/algorithms/af.h\n> index 7a5aeb1b6bf4..4e2bbd08c3bf 100644\n> --- a/src/ipa/ipu3/algorithms/af.h\n> +++ b/src/ipa/ipu3/algorithms/af.h\n> @@ -30,8 +30,10 @@ public:\n>   \tAf();\n>   \t~Af() = default;\n>   \n> -\tvoid prepare(IPAContext &context, ipu3_uapi_params *params) override;\n>   \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n> +\tvoid prepare(IPAContext &context, unsigned int frame,\n> +\t\t     IPU3FrameContext &frameContext,\n> +\t\t     ipu3_uapi_params *params) override;\n>   \tvoid process(IPAContext &context, IPU3FrameContext &frameContext,\n>   \t\t     const ipu3_uapi_stats_3a *stats) override;\n>   \n> diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\n> index 45f8e5f29119..b110ad404fd1 100644\n> --- a/src/ipa/ipu3/algorithms/awb.cpp\n> +++ b/src/ipa/ipu3/algorithms/awb.cpp\n> @@ -430,7 +430,10 @@ constexpr uint16_t Awb::gainValue(double gain)\n>   /**\n>    * \\copydoc libcamera::ipa::Algorithm::prepare\n>    */\n> -void Awb::prepare(IPAContext &context, ipu3_uapi_params *params)\n> +void Awb::prepare(IPAContext &context,\n> +\t\t  [[maybe_unused]] unsigned int frame,\n> +\t\t  [[maybe_unused]] IPU3FrameContext &frameContext,\n> +\t\t  ipu3_uapi_params *params)\n>   {\n>   \t/*\n>   \t * Green saturation thresholds are reduced because we are using the\n> diff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\n> index 28e39620fd59..731e5bae17de 100644\n> --- a/src/ipa/ipu3/algorithms/awb.h\n> +++ b/src/ipa/ipu3/algorithms/awb.h\n> @@ -39,7 +39,10 @@ public:\n>   \t~Awb();\n>   \n>   \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n> -\tvoid prepare(IPAContext &context, ipu3_uapi_params *params) override;\n> +\n> +\tvoid prepare(IPAContext &context, unsigned int frame,\n> +\t\t     IPU3FrameContext &frameContext,\n> +\t\t     ipu3_uapi_params *params) override;\n>   \tvoid process(IPAContext &context, IPU3FrameContext &frameContext,\n>   \t\t     const ipu3_uapi_stats_3a *stats) override;\n>   \n> diff --git a/src/ipa/ipu3/algorithms/blc.cpp b/src/ipa/ipu3/algorithms/blc.cpp\n> index 78ab7bff549f..7b0d720a5970 100644\n> --- a/src/ipa/ipu3/algorithms/blc.cpp\n> +++ b/src/ipa/ipu3/algorithms/blc.cpp\n> @@ -39,13 +39,17 @@ BlackLevelCorrection::BlackLevelCorrection()\n>   /**\n>    * \\brief Fill in the parameter structure, and enable black level correction\n>    * \\param context The shared IPA context\n> + * \\param[in] frame The frame context sequence number\n> + * \\param[in] frameContext The FrameContext for this frame\n>    * \\param params The IPU3 parameters\n>    *\n>    * Populate the IPU3 parameter structure with the correction values for each\n>    * channel and enable the corresponding ImgU block processing.\n>    */\n>   void BlackLevelCorrection::prepare([[maybe_unused]] IPAContext &context,\n> -\t\t\t      ipu3_uapi_params *params)\n> +\t\t\t\t   [[maybe_unused]] unsigned int frame,\n> +\t\t\t\t   [[maybe_unused]] IPU3FrameContext &frameContext,\n> +\t\t\t\t   ipu3_uapi_params *params)\n>   {\n>   \t/*\n>   \t * The Optical Black Level correction values\n> diff --git a/src/ipa/ipu3/algorithms/blc.h b/src/ipa/ipu3/algorithms/blc.h\n> index d8da1748baba..36388b267eea 100644\n> --- a/src/ipa/ipu3/algorithms/blc.h\n> +++ b/src/ipa/ipu3/algorithms/blc.h\n> @@ -18,7 +18,9 @@ class BlackLevelCorrection : public Algorithm\n>   public:\n>   \tBlackLevelCorrection();\n>   \n> -\tvoid prepare(IPAContext &context, ipu3_uapi_params *params) override;\n> +\tvoid prepare(IPAContext &context, unsigned int frame,\n> +\t\t     IPU3FrameContext &frameContext,\n> +\t\t     ipu3_uapi_params *params) override;\n>   };\n>   \n>   } /* namespace ipa::ipu3::algorithms */\n> diff --git a/src/ipa/ipu3/algorithms/tone_mapping.cpp b/src/ipa/ipu3/algorithms/tone_mapping.cpp\n> index 977741c5a4d4..0951db43f53f 100644\n> --- a/src/ipa/ipu3/algorithms/tone_mapping.cpp\n> +++ b/src/ipa/ipu3/algorithms/tone_mapping.cpp\n> @@ -50,12 +50,16 @@ int ToneMapping::configure(IPAContext &context,\n>   /**\n>    * \\brief Fill in the parameter structure, and enable gamma control\n>    * \\param context The shared IPA context\n> + * \\param[in] frame The frame context sequence number\n> + * \\param[in] frameContext The FrameContext for this frame\n>    * \\param params The IPU3 parameters\n>    *\n>    * Populate the IPU3 parameter structure with our tone mapping look up table and\n>    * enable the gamma control module in the processing blocks.\n>    */\n>   void ToneMapping::prepare([[maybe_unused]] IPAContext &context,\n> +\t\t\t  [[maybe_unused]] unsigned int frame,\n> +\t\t\t  [[maybe_unused]] IPU3FrameContext &frameContext,\n>   \t\t\t  ipu3_uapi_params *params)\n>   {\n>   \t/* Copy the calculated LUT into the parameters buffer. */\n> diff --git a/src/ipa/ipu3/algorithms/tone_mapping.h b/src/ipa/ipu3/algorithms/tone_mapping.h\n> index 8cce38c742a6..cfb3de01b7f3 100644\n> --- a/src/ipa/ipu3/algorithms/tone_mapping.h\n> +++ b/src/ipa/ipu3/algorithms/tone_mapping.h\n> @@ -19,7 +19,8 @@ public:\n>   \tToneMapping();\n>   \n>   \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n> -\tvoid prepare(IPAContext &context, ipu3_uapi_params *params) override;\n> +\tvoid prepare(IPAContext &context, unsigned int frame,\n> +\t\t     IPU3FrameContext &frameContext, ipu3_uapi_params *params) override;\n>   \tvoid process(IPAContext &context, IPU3FrameContext &frameContext,\n>   \t\t     const ipu3_uapi_stats_3a *stats) override;\n>   \n> diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\n> index 24839fd1edee..ffb9ea8c5971 100644\n> --- a/src/ipa/ipu3/ipu3.cpp\n> +++ b/src/ipa/ipu3/ipu3.cpp\n> @@ -538,8 +538,10 @@ void IPAIPU3::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)\n>   \t */\n>   \tparams->use = {};\n>   \n> +\tIPU3FrameContext frameContext = context_.frameContexts.get(frame);\n\nWon't this copy IPU3FrameContext ? I think here we need\n\n     IPU3FrameContext &frameContext = context_.frameContexts.get(frame);\n\n> +\n>   \tfor (auto const &algo : algorithms_)\n> -\t\talgo->prepare(context_, params);\n> +\t\talgo->prepare(context_, frame, frameContext, params);\n>   \n>   \tparamsBufferReady.emit(frame);\n>   }\n> diff --git a/src/ipa/libipa/algorithm.cpp b/src/ipa/libipa/algorithm.cpp\n> index 38200e57b780..0992e5de8dd5 100644\n> --- a/src/ipa/libipa/algorithm.cpp\n> +++ b/src/ipa/libipa/algorithm.cpp\n> @@ -70,6 +70,8 @@ namespace ipa {\n>    * \\fn Algorithm::prepare()\n>    * \\brief Fill the \\a params buffer with ISP processing parameters for a frame\n>    * \\param[in] context The shared IPA context\n> + * \\param[in] frame The frame context sequence number\n> + * \\param[in] frameContext The FrameContext for this frame\n>    * \\param[out] params The ISP specific parameters.\n>    *\n>    * This function is called for every frame when the camera is running before it\n> diff --git a/src/ipa/libipa/algorithm.h b/src/ipa/libipa/algorithm.h\n> index 0fe3d772963a..379207f1657e 100644\n> --- a/src/ipa/libipa/algorithm.h\n> +++ b/src/ipa/libipa/algorithm.h\n> @@ -38,6 +38,8 @@ public:\n>   \t}\n>   \n>   \tvirtual void prepare([[maybe_unused]] typename Module::Context &context,\n> +\t\t\t     [[maybe_unused]] unsigned int frame,\n> +\t\t\t     [[maybe_unused]] typename Module::FrameContext &frameContext,\n>   \t\t\t     [[maybe_unused]] typename Module::Params *params)\n>   \t{\n>   \t}\n> diff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp\n> index 40d27963ef68..2d436511caf7 100644\n> --- a/src/ipa/rkisp1/algorithms/agc.cpp\n> +++ b/src/ipa/rkisp1/algorithms/agc.cpp\n> @@ -322,7 +322,10 @@ void Agc::process(IPAContext &context,\n>   /**\n>    * \\copydoc libcamera::ipa::Algorithm::prepare\n>    */\n> -void Agc::prepare(IPAContext &context, rkisp1_params_cfg *params)\n> +void Agc::prepare(IPAContext &context,\n> +\t\t  [[maybe_unused]] unsigned int frame,\n> +\t\t  [[maybe_unused]] RKISP1FrameContext &frameContext,\n> +\t\t  rkisp1_params_cfg *params)\n>   {\n>   \tif (context.activeState.frameCount > 0)\n>   \t\treturn;\n> diff --git a/src/ipa/rkisp1/algorithms/agc.h b/src/ipa/rkisp1/algorithms/agc.h\n> index af7fe2740908..97ca0e31558c 100644\n> --- a/src/ipa/rkisp1/algorithms/agc.h\n> +++ b/src/ipa/rkisp1/algorithms/agc.h\n> @@ -26,7 +26,9 @@ public:\n>   \t~Agc() = default;\n>   \n>   \tint configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override;\n> -\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n> +\tvoid prepare(IPAContext &context, unsigned int frame,\n> +\t\t     RKISP1FrameContext &frameContext,\n> +\t\t     rkisp1_params_cfg *params) override;\n>   \tvoid process(IPAContext &context, RKISP1FrameContext &frameContext,\n>   \t\t     const rkisp1_stat_buffer *stats) override;\n>   \n> diff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp\n> index 3beafb73ca33..1af6d98c5252 100644\n> --- a/src/ipa/rkisp1/algorithms/awb.cpp\n> +++ b/src/ipa/rkisp1/algorithms/awb.cpp\n> @@ -70,7 +70,10 @@ uint32_t Awb::estimateCCT(double red, double green, double blue)\n>   /**\n>    * \\copydoc libcamera::ipa::Algorithm::prepare\n>    */\n> -void Awb::prepare(IPAContext &context, rkisp1_params_cfg *params)\n> +void Awb::prepare(IPAContext &context,\n> +\t\t  [[maybe_unused]] unsigned int frame,\n> +\t\t  [[maybe_unused]] RKISP1FrameContext &frameContext,\n> +\t\t  rkisp1_params_cfg *params)\n>   {\n>   \tparams->others.awb_gain_config.gain_green_b = 256 * context.activeState.awb.gains.green;\n>   \tparams->others.awb_gain_config.gain_blue = 256 * context.activeState.awb.gains.blue;\n> diff --git a/src/ipa/rkisp1/algorithms/awb.h b/src/ipa/rkisp1/algorithms/awb.h\n> index 5954034b8142..82d5ce1b1818 100644\n> --- a/src/ipa/rkisp1/algorithms/awb.h\n> +++ b/src/ipa/rkisp1/algorithms/awb.h\n> @@ -20,7 +20,9 @@ public:\n>   \t~Awb() = default;\n>   \n>   \tint configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override;\n> -\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n> +\tvoid prepare(IPAContext &context, unsigned int frame,\n> +\t\t     RKISP1FrameContext &frameContext,\n> +\t\t     rkisp1_params_cfg *params) override;\n>   \tvoid process(IPAContext &context, RKISP1FrameContext &frameCtx,\n>   \t\t     const rkisp1_stat_buffer *stats) override;\n>   \n> diff --git a/src/ipa/rkisp1/algorithms/blc.cpp b/src/ipa/rkisp1/algorithms/blc.cpp\n> index 4d55a2d529cb..93c7e3145fa2 100644\n> --- a/src/ipa/rkisp1/algorithms/blc.cpp\n> +++ b/src/ipa/rkisp1/algorithms/blc.cpp\n> @@ -66,6 +66,8 @@ int BlackLevelCorrection::init([[maybe_unused]] IPAContext &context,\n>    * \\copydoc libcamera::ipa::Algorithm::prepare\n>    */\n>   void BlackLevelCorrection::prepare(IPAContext &context,\n> +\t\t\t\t   [[maybe_unused]] unsigned int frame,\n> +\t\t\t\t   [[maybe_unused]] RKISP1FrameContext &frameContext,\n>   \t\t\t\t   rkisp1_params_cfg *params)\n>   {\n>   \tif (context.activeState.frameCount > 0)\n> diff --git a/src/ipa/rkisp1/algorithms/blc.h b/src/ipa/rkisp1/algorithms/blc.h\n> index 5fc3a80fb638..1afa12f6b46e 100644\n> --- a/src/ipa/rkisp1/algorithms/blc.h\n> +++ b/src/ipa/rkisp1/algorithms/blc.h\n> @@ -20,7 +20,9 @@ public:\n>   \t~BlackLevelCorrection() = default;\n>   \n>   \tint init(IPAContext &context, const YamlObject &tuningData) override;\n> -\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n> +\tvoid prepare(IPAContext &context, unsigned int frame,\n> +\t\t     RKISP1FrameContext &frameContext,\n> +\t\t     rkisp1_params_cfg *params) override;\n>   \n>   private:\n>   \tbool tuningParameters_;\n> diff --git a/src/ipa/rkisp1/algorithms/cproc.cpp b/src/ipa/rkisp1/algorithms/cproc.cpp\n> index a3b778d1c908..edaf2d10e850 100644\n> --- a/src/ipa/rkisp1/algorithms/cproc.cpp\n> +++ b/src/ipa/rkisp1/algorithms/cproc.cpp\n> @@ -71,6 +71,8 @@ void ColorProcessing::queueRequest(IPAContext &context,\n>    * \\copydoc libcamera::ipa::Algorithm::prepare\n>    */\n>   void ColorProcessing::prepare(IPAContext &context,\n> +\t\t\t      [[maybe_unused]] unsigned int frame,\n> +\t\t\t      [[maybe_unused]] RKISP1FrameContext &frameContext,\n>   \t\t\t      rkisp1_params_cfg *params)\n>   {\n>   \tauto &cproc = context.activeState.cproc;\n> diff --git a/src/ipa/rkisp1/algorithms/cproc.h b/src/ipa/rkisp1/algorithms/cproc.h\n> index 4b7e4064d7e8..fde83f3c965c 100644\n> --- a/src/ipa/rkisp1/algorithms/cproc.h\n> +++ b/src/ipa/rkisp1/algorithms/cproc.h\n> @@ -23,7 +23,9 @@ public:\n>   \n>   \tvoid queueRequest(IPAContext &context, const uint32_t frame,\n>   \t\t\t  const ControlList &controls) override;\n> -\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n> +\tvoid prepare(IPAContext &context, unsigned int frame,\n> +\t\t     RKISP1FrameContext &frameContext,\n> +\t\t     rkisp1_params_cfg *params) override;\n>   };\n>   \n>   } /* namespace ipa::rkisp1::algorithms */\n> diff --git a/src/ipa/rkisp1/algorithms/dpcc.cpp b/src/ipa/rkisp1/algorithms/dpcc.cpp\n> index 93d37b1dae44..9ba03653afdc 100644\n> --- a/src/ipa/rkisp1/algorithms/dpcc.cpp\n> +++ b/src/ipa/rkisp1/algorithms/dpcc.cpp\n> @@ -232,6 +232,8 @@ int DefectPixelClusterCorrection::init([[maybe_unused]] IPAContext &context,\n>    * \\copydoc libcamera::ipa::Algorithm::prepare\n>    */\n>   void DefectPixelClusterCorrection::prepare(IPAContext &context,\n> +\t\t\t\t\t   [[maybe_unused]] unsigned int frame,\n> +\t\t\t\t\t   [[maybe_unused]] RKISP1FrameContext &frameContext,\n>   \t\t\t\t\t   rkisp1_params_cfg *params)\n>   {\n>   \tif (context.activeState.frameCount > 0)\n> diff --git a/src/ipa/rkisp1/algorithms/dpcc.h b/src/ipa/rkisp1/algorithms/dpcc.h\n> index a363f7bee0a7..ca9df9fc38dc 100644\n> --- a/src/ipa/rkisp1/algorithms/dpcc.h\n> +++ b/src/ipa/rkisp1/algorithms/dpcc.h\n> @@ -20,7 +20,9 @@ public:\n>   \t~DefectPixelClusterCorrection() = default;\n>   \n>   \tint init(IPAContext &context, const YamlObject &tuningData) override;\n> -\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n> +\tvoid prepare(IPAContext &context, unsigned int frame,\n> +\t\t     RKISP1FrameContext &frameContext,\n> +\t\t     rkisp1_params_cfg *params) override;\n>   \n>   private:\n>   \tbool initialized_;\n> diff --git a/src/ipa/rkisp1/algorithms/filter.cpp b/src/ipa/rkisp1/algorithms/filter.cpp\n> index bc7fc1f32f34..f6577046442a 100644\n> --- a/src/ipa/rkisp1/algorithms/filter.cpp\n> +++ b/src/ipa/rkisp1/algorithms/filter.cpp\n> @@ -85,7 +85,10 @@ void Filter::queueRequest(IPAContext &context,\n>   /**\n>    * \\copydoc libcamera::ipa::Algorithm::prepare\n>    */\n> -void Filter::prepare(IPAContext &context, rkisp1_params_cfg *params)\n> +void Filter::prepare(IPAContext &context,\n> +\t\t     [[maybe_unused]] unsigned int frame,\n> +\t\t     [[maybe_unused]] RKISP1FrameContext &frameContext,\n> +\t\t     rkisp1_params_cfg *params)\n>   {\n>   \tauto &filter = context.activeState.filter;\n>   \n> diff --git a/src/ipa/rkisp1/algorithms/filter.h b/src/ipa/rkisp1/algorithms/filter.h\n> index 9eb170eb7da1..1fbe785a3cab 100644\n> --- a/src/ipa/rkisp1/algorithms/filter.h\n> +++ b/src/ipa/rkisp1/algorithms/filter.h\n> @@ -23,7 +23,9 @@ public:\n>   \n>   \tvoid queueRequest(IPAContext &context, const uint32_t frame,\n>   \t\t\t  const ControlList &controls) override;\n> -\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n> +\tvoid prepare(IPAContext &context, unsigned int frame,\n> +\t\t     RKISP1FrameContext &frameContext,\n> +\t\t     rkisp1_params_cfg *params) override;\n>   };\n>   \n>   } /* namespace ipa::rkisp1::algorithms */\n> diff --git a/src/ipa/rkisp1/algorithms/gsl.cpp b/src/ipa/rkisp1/algorithms/gsl.cpp\n> index dd9974627cd2..77d841cfbf82 100644\n> --- a/src/ipa/rkisp1/algorithms/gsl.cpp\n> +++ b/src/ipa/rkisp1/algorithms/gsl.cpp\n> @@ -119,6 +119,8 @@ int GammaSensorLinearization::init([[maybe_unused]] IPAContext &context,\n>    * \\copydoc libcamera::ipa::Algorithm::prepare\n>    */\n>   void GammaSensorLinearization::prepare(IPAContext &context,\n> +\t\t\t\t       [[maybe_unused]] unsigned int frame,\n> +\t\t\t\t       [[maybe_unused]] RKISP1FrameContext &frameContext,\n>   \t\t\t\t       rkisp1_params_cfg *params)\n>   {\n>   \tif (context.activeState.frameCount > 0)\n> diff --git a/src/ipa/rkisp1/algorithms/gsl.h b/src/ipa/rkisp1/algorithms/gsl.h\n> index db287dc280dc..fe74ae10e099 100644\n> --- a/src/ipa/rkisp1/algorithms/gsl.h\n> +++ b/src/ipa/rkisp1/algorithms/gsl.h\n> @@ -20,7 +20,9 @@ public:\n>   \t~GammaSensorLinearization() = default;\n>   \n>   \tint init(IPAContext &context, const YamlObject &tuningData) override;\n> -\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n> +\tvoid prepare(IPAContext &context, unsigned int frame,\n> +\t\t     RKISP1FrameContext &frameContext,\n> +\t\t     rkisp1_params_cfg *params) override;\n>   \n>   private:\n>   \tbool initialized_;\n> diff --git a/src/ipa/rkisp1/algorithms/lsc.cpp b/src/ipa/rkisp1/algorithms/lsc.cpp\n> index 4ed467086199..cd8fcbe66b9b 100644\n> --- a/src/ipa/rkisp1/algorithms/lsc.cpp\n> +++ b/src/ipa/rkisp1/algorithms/lsc.cpp\n> @@ -123,6 +123,8 @@ int LensShadingCorrection::init([[maybe_unused]] IPAContext &context,\n>    * \\copydoc libcamera::ipa::Algorithm::prepare\n>    */\n>   void LensShadingCorrection::prepare(IPAContext &context,\n> +\t\t\t\t    [[maybe_unused]] unsigned int frame,\n> +\t\t\t\t    [[maybe_unused]] RKISP1FrameContext &frameContext,\n>   \t\t\t\t    rkisp1_params_cfg *params)\n>   {\n>   \tif (context.activeState.frameCount > 0)\n> diff --git a/src/ipa/rkisp1/algorithms/lsc.h b/src/ipa/rkisp1/algorithms/lsc.h\n> index fdb2ec1dd27d..fafb80b329ee 100644\n> --- a/src/ipa/rkisp1/algorithms/lsc.h\n> +++ b/src/ipa/rkisp1/algorithms/lsc.h\n> @@ -20,7 +20,9 @@ public:\n>   \t~LensShadingCorrection() = default;\n>   \n>   \tint init(IPAContext &context, const YamlObject &tuningData) override;\n> -\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n> +\tvoid prepare(IPAContext &context, unsigned int frame,\n> +\t\t     RKISP1FrameContext &frameContext,\n> +\t\t     rkisp1_params_cfg *params) override;\n>   \n>   private:\n>   \tbool initialized_;\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 2c7fdde55f49..f3512647a833 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -302,6 +302,8 @@ void IPARkISP1::queueRequest(const uint32_t frame, const ControlList &controls)\n>   \n>   void IPARkISP1::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)\n>   {\n> +\tRKISP1FrameContext &frameContext = context_.frameContexts.get(frame);\n\n\nThis seems correct :-)\n\nWith the IPU3FrameContext .get() fixed,\n\nReviewed-by: Umang Jain <umang.jain@ideasonboard.com>\n\n> +\n>   \trkisp1_params_cfg *params =\n>   \t\treinterpret_cast<rkisp1_params_cfg *>(\n>   \t\t\tmappedBuffers_.at(bufferId).planes()[0].data());\n> @@ -310,7 +312,7 @@ void IPARkISP1::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)\n>   \tmemset(params, 0, sizeof(*params));\n>   \n>   \tfor (auto const &algo : algorithms())\n> -\t\talgo->prepare(context_, params);\n> +\t\talgo->prepare(context_, frame, frameContext, params);\n>   \n>   \tparamsBufferReady.emit(frame);\n>   \tcontext_.activeState.frameCount++;","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 77F1DBE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 11 Aug 2022 07:00:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 02E2A6332B;\n\tThu, 11 Aug 2022 09:00:43 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9C13863327\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 11 Aug 2022 09:00:41 +0200 (CEST)","from [IPV6:2401:4900:1f3f:c7a1:27b3:9637:38a7:6084] (unknown\n\t[IPv6:2401:4900:1f3f:c7a1:27b3:9637:38a7:6084])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4699A3F1;\n\tThu, 11 Aug 2022 09:00:40 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660201243;\n\tbh=RtmE0eMfPzDLZAsyaET5xdo86B0qP2rf9fUfTKg2ZZg=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=kdyJ7hTqhuuaGZCCwEI/qvO7OpfEA6Gooa8jJMdfyL+ovnYF9vCqlPSLS/HoPMno9\n\tdGGwueesCDs7+FzwF69Wxjo336HRRsTj+HWEtpejXvahhZ9AmEZWONU2A5Jglss0J7\n\t19dFhKLkHyBkF7TPTZ/i/S4Lt9I+J5snsilvqNH5r9brbGFnj+KCjLChk6zw6Anxmk\n\tbNF9ZHl3TM4+Y2taeVbRBwPui+b+ch+3NyFKkSX26AqQ5dn+DThWLK9sletXSmGBZ9\n\tGx9XiYmkvX4d8iKIK5I9Q5pBzx7Bv8xPBa68pVwYYV42yP7m1wFef7oJSQ1ubSXFst\n\tcAxkwXS+63c6w==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1660201241;\n\tbh=RtmE0eMfPzDLZAsyaET5xdo86B0qP2rf9fUfTKg2ZZg=;\n\th=Date:Subject:To:References:From:In-Reply-To:From;\n\tb=bqvxtNe2uERwj+eZzw57jkUJD7/sFsZTwQSq9C8/bGjQtfsbALK5JjAwGu4cSbAeS\n\txJFwrIzVguP5ULe1CFXud4PXRYQ5S6RQS/Y7YjIbsKKfzDA/5HVujKKsVk4HyEU2dA\n\t83A85LBtWX30SyK4dsDhPgivEKsftXffaoDdtphU="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"bqvxtNe2\"; dkim-atps=neutral","Message-ID":"<61c75638-381b-bd78-bb96-26d33a89f122@ideasonboard.com>","Date":"Thu, 11 Aug 2022 12:30:36 +0530","MIME-Version":"1.0","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101\n\tThunderbird/91.4.1","Content-Language":"en-US","To":"Jacopo Mondi <jacopo@jmondi.org>, libcamera-devel@lists.libcamera.org","References":"<20220805135312.47497-1-jacopo@jmondi.org>\n\t<20220805135312.47497-9-jacopo@jmondi.org>","In-Reply-To":"<20220805135312.47497-9-jacopo@jmondi.org>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH v2 08/10] ipa: libipa: algorithm:\n\tprepare(): Pass frame and frame Context","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","From":"Umang Jain via libcamera-devel <libcamera-devel@lists.libcamera.org>","Reply-To":"Umang Jain <umang.jain@ideasonboard.com>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":24542,"web_url":"https://patchwork.libcamera.org/comment/24542/","msgid":"<20220811080511.regvxmfd4fu32ag6@uno.localdomain>","date":"2022-08-11T08:05:11","subject":"Re: [libcamera-devel] [PATCH v2 08/10] ipa: libipa: algorithm:\n\tprepare(): Pass frame and frame Context","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Umang\n\nOn Thu, Aug 11, 2022 at 12:30:36PM +0530, Umang Jain wrote:\n> Hi Jacopo\n>\n> Thank you for the patch.\n>\n> On 8/5/22 19:23, Jacopo Mondi via libcamera-devel wrote:\n> > From: Kieran Bingham via libcamera-devel <libcamera-devel@lists.libcamera.org>\n> >\n> > Pass the current frame number, and the current FrameContext for calls to\n> > prepare.\n> >\n> > Until there is a Frame Context Queue in the RKISP1 the FrameContext will\n>\n>\n> I think there is FCQueue in RkISP1 now, so should this commit message be\n> updated accordingly?\n>\n\nAh, ups. Thanks for spotting, I missed it in the review of the first\nRFC version!\n\nThanks\n  j\n\n> > be a nullptr, and must not be dereferenced until the queue is\n> > implemented.\n> >\n> > Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> >\n> >   - Obtain and use the RKISP1FrameContext Queue entry for IPARkISP1::fillParamsBuffer\n> >\n> > Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> > ---\n> >   src/ipa/ipu3/algorithms/af.cpp           | 5 ++++-\n> >   src/ipa/ipu3/algorithms/af.h             | 4 +++-\n> >   src/ipa/ipu3/algorithms/awb.cpp          | 5 ++++-\n> >   src/ipa/ipu3/algorithms/awb.h            | 5 ++++-\n> >   src/ipa/ipu3/algorithms/blc.cpp          | 6 +++++-\n> >   src/ipa/ipu3/algorithms/blc.h            | 4 +++-\n> >   src/ipa/ipu3/algorithms/tone_mapping.cpp | 4 ++++\n> >   src/ipa/ipu3/algorithms/tone_mapping.h   | 3 ++-\n> >   src/ipa/ipu3/ipu3.cpp                    | 4 +++-\n> >   src/ipa/libipa/algorithm.cpp             | 2 ++\n> >   src/ipa/libipa/algorithm.h               | 2 ++\n> >   src/ipa/rkisp1/algorithms/agc.cpp        | 5 ++++-\n> >   src/ipa/rkisp1/algorithms/agc.h          | 4 +++-\n> >   src/ipa/rkisp1/algorithms/awb.cpp        | 5 ++++-\n> >   src/ipa/rkisp1/algorithms/awb.h          | 4 +++-\n> >   src/ipa/rkisp1/algorithms/blc.cpp        | 2 ++\n> >   src/ipa/rkisp1/algorithms/blc.h          | 4 +++-\n> >   src/ipa/rkisp1/algorithms/cproc.cpp      | 2 ++\n> >   src/ipa/rkisp1/algorithms/cproc.h        | 4 +++-\n> >   src/ipa/rkisp1/algorithms/dpcc.cpp       | 2 ++\n> >   src/ipa/rkisp1/algorithms/dpcc.h         | 4 +++-\n> >   src/ipa/rkisp1/algorithms/filter.cpp     | 5 ++++-\n> >   src/ipa/rkisp1/algorithms/filter.h       | 4 +++-\n> >   src/ipa/rkisp1/algorithms/gsl.cpp        | 2 ++\n> >   src/ipa/rkisp1/algorithms/gsl.h          | 4 +++-\n> >   src/ipa/rkisp1/algorithms/lsc.cpp        | 2 ++\n> >   src/ipa/rkisp1/algorithms/lsc.h          | 4 +++-\n> >   src/ipa/rkisp1/rkisp1.cpp                | 4 +++-\n> >   28 files changed, 85 insertions(+), 20 deletions(-)\n> >\n> > diff --git a/src/ipa/ipu3/algorithms/af.cpp b/src/ipa/ipu3/algorithms/af.cpp\n> > index fcbf8e557b10..1faf92969ee5 100644\n> > --- a/src/ipa/ipu3/algorithms/af.cpp\n> > +++ b/src/ipa/ipu3/algorithms/af.cpp\n> > @@ -116,7 +116,10 @@ Af::Af()\n> >   /**\n> >    * \\copydoc libcamera::ipa::Algorithm::prepare\n> >    */\n> > -void Af::prepare(IPAContext &context, ipu3_uapi_params *params)\n> > +void Af::prepare(IPAContext &context,\n> > +\t\t [[maybe_unused]] unsigned int frame,\n> > +\t\t [[maybe_unused]] IPU3FrameContext &frameContext,\n> > +\t\t ipu3_uapi_params *params)\n> >   {\n> >   \tconst struct ipu3_uapi_grid_config &grid = context.configuration.af.afGrid;\n> >   \tparams->acc_param.af.grid_cfg = grid;\n> > diff --git a/src/ipa/ipu3/algorithms/af.h b/src/ipa/ipu3/algorithms/af.h\n> > index 7a5aeb1b6bf4..4e2bbd08c3bf 100644\n> > --- a/src/ipa/ipu3/algorithms/af.h\n> > +++ b/src/ipa/ipu3/algorithms/af.h\n> > @@ -30,8 +30,10 @@ public:\n> >   \tAf();\n> >   \t~Af() = default;\n> > -\tvoid prepare(IPAContext &context, ipu3_uapi_params *params) override;\n> >   \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n> > +\tvoid prepare(IPAContext &context, unsigned int frame,\n> > +\t\t     IPU3FrameContext &frameContext,\n> > +\t\t     ipu3_uapi_params *params) override;\n> >   \tvoid process(IPAContext &context, IPU3FrameContext &frameContext,\n> >   \t\t     const ipu3_uapi_stats_3a *stats) override;\n> > diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\n> > index 45f8e5f29119..b110ad404fd1 100644\n> > --- a/src/ipa/ipu3/algorithms/awb.cpp\n> > +++ b/src/ipa/ipu3/algorithms/awb.cpp\n> > @@ -430,7 +430,10 @@ constexpr uint16_t Awb::gainValue(double gain)\n> >   /**\n> >    * \\copydoc libcamera::ipa::Algorithm::prepare\n> >    */\n> > -void Awb::prepare(IPAContext &context, ipu3_uapi_params *params)\n> > +void Awb::prepare(IPAContext &context,\n> > +\t\t  [[maybe_unused]] unsigned int frame,\n> > +\t\t  [[maybe_unused]] IPU3FrameContext &frameContext,\n> > +\t\t  ipu3_uapi_params *params)\n> >   {\n> >   \t/*\n> >   \t * Green saturation thresholds are reduced because we are using the\n> > diff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\n> > index 28e39620fd59..731e5bae17de 100644\n> > --- a/src/ipa/ipu3/algorithms/awb.h\n> > +++ b/src/ipa/ipu3/algorithms/awb.h\n> > @@ -39,7 +39,10 @@ public:\n> >   \t~Awb();\n> >   \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n> > -\tvoid prepare(IPAContext &context, ipu3_uapi_params *params) override;\n> > +\n> > +\tvoid prepare(IPAContext &context, unsigned int frame,\n> > +\t\t     IPU3FrameContext &frameContext,\n> > +\t\t     ipu3_uapi_params *params) override;\n> >   \tvoid process(IPAContext &context, IPU3FrameContext &frameContext,\n> >   \t\t     const ipu3_uapi_stats_3a *stats) override;\n> > diff --git a/src/ipa/ipu3/algorithms/blc.cpp b/src/ipa/ipu3/algorithms/blc.cpp\n> > index 78ab7bff549f..7b0d720a5970 100644\n> > --- a/src/ipa/ipu3/algorithms/blc.cpp\n> > +++ b/src/ipa/ipu3/algorithms/blc.cpp\n> > @@ -39,13 +39,17 @@ BlackLevelCorrection::BlackLevelCorrection()\n> >   /**\n> >    * \\brief Fill in the parameter structure, and enable black level correction\n> >    * \\param context The shared IPA context\n> > + * \\param[in] frame The frame context sequence number\n> > + * \\param[in] frameContext The FrameContext for this frame\n> >    * \\param params The IPU3 parameters\n> >    *\n> >    * Populate the IPU3 parameter structure with the correction values for each\n> >    * channel and enable the corresponding ImgU block processing.\n> >    */\n> >   void BlackLevelCorrection::prepare([[maybe_unused]] IPAContext &context,\n> > -\t\t\t      ipu3_uapi_params *params)\n> > +\t\t\t\t   [[maybe_unused]] unsigned int frame,\n> > +\t\t\t\t   [[maybe_unused]] IPU3FrameContext &frameContext,\n> > +\t\t\t\t   ipu3_uapi_params *params)\n> >   {\n> >   \t/*\n> >   \t * The Optical Black Level correction values\n> > diff --git a/src/ipa/ipu3/algorithms/blc.h b/src/ipa/ipu3/algorithms/blc.h\n> > index d8da1748baba..36388b267eea 100644\n> > --- a/src/ipa/ipu3/algorithms/blc.h\n> > +++ b/src/ipa/ipu3/algorithms/blc.h\n> > @@ -18,7 +18,9 @@ class BlackLevelCorrection : public Algorithm\n> >   public:\n> >   \tBlackLevelCorrection();\n> > -\tvoid prepare(IPAContext &context, ipu3_uapi_params *params) override;\n> > +\tvoid prepare(IPAContext &context, unsigned int frame,\n> > +\t\t     IPU3FrameContext &frameContext,\n> > +\t\t     ipu3_uapi_params *params) override;\n> >   };\n> >   } /* namespace ipa::ipu3::algorithms */\n> > diff --git a/src/ipa/ipu3/algorithms/tone_mapping.cpp b/src/ipa/ipu3/algorithms/tone_mapping.cpp\n> > index 977741c5a4d4..0951db43f53f 100644\n> > --- a/src/ipa/ipu3/algorithms/tone_mapping.cpp\n> > +++ b/src/ipa/ipu3/algorithms/tone_mapping.cpp\n> > @@ -50,12 +50,16 @@ int ToneMapping::configure(IPAContext &context,\n> >   /**\n> >    * \\brief Fill in the parameter structure, and enable gamma control\n> >    * \\param context The shared IPA context\n> > + * \\param[in] frame The frame context sequence number\n> > + * \\param[in] frameContext The FrameContext for this frame\n> >    * \\param params The IPU3 parameters\n> >    *\n> >    * Populate the IPU3 parameter structure with our tone mapping look up table and\n> >    * enable the gamma control module in the processing blocks.\n> >    */\n> >   void ToneMapping::prepare([[maybe_unused]] IPAContext &context,\n> > +\t\t\t  [[maybe_unused]] unsigned int frame,\n> > +\t\t\t  [[maybe_unused]] IPU3FrameContext &frameContext,\n> >   \t\t\t  ipu3_uapi_params *params)\n> >   {\n> >   \t/* Copy the calculated LUT into the parameters buffer. */\n> > diff --git a/src/ipa/ipu3/algorithms/tone_mapping.h b/src/ipa/ipu3/algorithms/tone_mapping.h\n> > index 8cce38c742a6..cfb3de01b7f3 100644\n> > --- a/src/ipa/ipu3/algorithms/tone_mapping.h\n> > +++ b/src/ipa/ipu3/algorithms/tone_mapping.h\n> > @@ -19,7 +19,8 @@ public:\n> >   \tToneMapping();\n> >   \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n> > -\tvoid prepare(IPAContext &context, ipu3_uapi_params *params) override;\n> > +\tvoid prepare(IPAContext &context, unsigned int frame,\n> > +\t\t     IPU3FrameContext &frameContext, ipu3_uapi_params *params) override;\n> >   \tvoid process(IPAContext &context, IPU3FrameContext &frameContext,\n> >   \t\t     const ipu3_uapi_stats_3a *stats) override;\n> > diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\n> > index 24839fd1edee..ffb9ea8c5971 100644\n> > --- a/src/ipa/ipu3/ipu3.cpp\n> > +++ b/src/ipa/ipu3/ipu3.cpp\n> > @@ -538,8 +538,10 @@ void IPAIPU3::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)\n> >   \t */\n> >   \tparams->use = {};\n> > +\tIPU3FrameContext frameContext = context_.frameContexts.get(frame);\n>\n> Won't this copy IPU3FrameContext ? I think here we need\n>\n>     IPU3FrameContext &frameContext = context_.frameContexts.get(frame);\n>\n\nAh good catch!\n\n> > +\n> >   \tfor (auto const &algo : algorithms_)\n> > -\t\talgo->prepare(context_, params);\n> > +\t\talgo->prepare(context_, frame, frameContext, params);\n> >   \tparamsBufferReady.emit(frame);\n> >   }\n> > diff --git a/src/ipa/libipa/algorithm.cpp b/src/ipa/libipa/algorithm.cpp\n> > index 38200e57b780..0992e5de8dd5 100644\n> > --- a/src/ipa/libipa/algorithm.cpp\n> > +++ b/src/ipa/libipa/algorithm.cpp\n> > @@ -70,6 +70,8 @@ namespace ipa {\n> >    * \\fn Algorithm::prepare()\n> >    * \\brief Fill the \\a params buffer with ISP processing parameters for a frame\n> >    * \\param[in] context The shared IPA context\n> > + * \\param[in] frame The frame context sequence number\n> > + * \\param[in] frameContext The FrameContext for this frame\n> >    * \\param[out] params The ISP specific parameters.\n> >    *\n> >    * This function is called for every frame when the camera is running before it\n> > diff --git a/src/ipa/libipa/algorithm.h b/src/ipa/libipa/algorithm.h\n> > index 0fe3d772963a..379207f1657e 100644\n> > --- a/src/ipa/libipa/algorithm.h\n> > +++ b/src/ipa/libipa/algorithm.h\n> > @@ -38,6 +38,8 @@ public:\n> >   \t}\n> >   \tvirtual void prepare([[maybe_unused]] typename Module::Context &context,\n> > +\t\t\t     [[maybe_unused]] unsigned int frame,\n> > +\t\t\t     [[maybe_unused]] typename Module::FrameContext &frameContext,\n> >   \t\t\t     [[maybe_unused]] typename Module::Params *params)\n> >   \t{\n> >   \t}\n> > diff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp\n> > index 40d27963ef68..2d436511caf7 100644\n> > --- a/src/ipa/rkisp1/algorithms/agc.cpp\n> > +++ b/src/ipa/rkisp1/algorithms/agc.cpp\n> > @@ -322,7 +322,10 @@ void Agc::process(IPAContext &context,\n> >   /**\n> >    * \\copydoc libcamera::ipa::Algorithm::prepare\n> >    */\n> > -void Agc::prepare(IPAContext &context, rkisp1_params_cfg *params)\n> > +void Agc::prepare(IPAContext &context,\n> > +\t\t  [[maybe_unused]] unsigned int frame,\n> > +\t\t  [[maybe_unused]] RKISP1FrameContext &frameContext,\n> > +\t\t  rkisp1_params_cfg *params)\n> >   {\n> >   \tif (context.activeState.frameCount > 0)\n> >   \t\treturn;\n> > diff --git a/src/ipa/rkisp1/algorithms/agc.h b/src/ipa/rkisp1/algorithms/agc.h\n> > index af7fe2740908..97ca0e31558c 100644\n> > --- a/src/ipa/rkisp1/algorithms/agc.h\n> > +++ b/src/ipa/rkisp1/algorithms/agc.h\n> > @@ -26,7 +26,9 @@ public:\n> >   \t~Agc() = default;\n> >   \tint configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override;\n> > -\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n> > +\tvoid prepare(IPAContext &context, unsigned int frame,\n> > +\t\t     RKISP1FrameContext &frameContext,\n> > +\t\t     rkisp1_params_cfg *params) override;\n> >   \tvoid process(IPAContext &context, RKISP1FrameContext &frameContext,\n> >   \t\t     const rkisp1_stat_buffer *stats) override;\n> > diff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp\n> > index 3beafb73ca33..1af6d98c5252 100644\n> > --- a/src/ipa/rkisp1/algorithms/awb.cpp\n> > +++ b/src/ipa/rkisp1/algorithms/awb.cpp\n> > @@ -70,7 +70,10 @@ uint32_t Awb::estimateCCT(double red, double green, double blue)\n> >   /**\n> >    * \\copydoc libcamera::ipa::Algorithm::prepare\n> >    */\n> > -void Awb::prepare(IPAContext &context, rkisp1_params_cfg *params)\n> > +void Awb::prepare(IPAContext &context,\n> > +\t\t  [[maybe_unused]] unsigned int frame,\n> > +\t\t  [[maybe_unused]] RKISP1FrameContext &frameContext,\n> > +\t\t  rkisp1_params_cfg *params)\n> >   {\n> >   \tparams->others.awb_gain_config.gain_green_b = 256 * context.activeState.awb.gains.green;\n> >   \tparams->others.awb_gain_config.gain_blue = 256 * context.activeState.awb.gains.blue;\n> > diff --git a/src/ipa/rkisp1/algorithms/awb.h b/src/ipa/rkisp1/algorithms/awb.h\n> > index 5954034b8142..82d5ce1b1818 100644\n> > --- a/src/ipa/rkisp1/algorithms/awb.h\n> > +++ b/src/ipa/rkisp1/algorithms/awb.h\n> > @@ -20,7 +20,9 @@ public:\n> >   \t~Awb() = default;\n> >   \tint configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override;\n> > -\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n> > +\tvoid prepare(IPAContext &context, unsigned int frame,\n> > +\t\t     RKISP1FrameContext &frameContext,\n> > +\t\t     rkisp1_params_cfg *params) override;\n> >   \tvoid process(IPAContext &context, RKISP1FrameContext &frameCtx,\n> >   \t\t     const rkisp1_stat_buffer *stats) override;\n> > diff --git a/src/ipa/rkisp1/algorithms/blc.cpp b/src/ipa/rkisp1/algorithms/blc.cpp\n> > index 4d55a2d529cb..93c7e3145fa2 100644\n> > --- a/src/ipa/rkisp1/algorithms/blc.cpp\n> > +++ b/src/ipa/rkisp1/algorithms/blc.cpp\n> > @@ -66,6 +66,8 @@ int BlackLevelCorrection::init([[maybe_unused]] IPAContext &context,\n> >    * \\copydoc libcamera::ipa::Algorithm::prepare\n> >    */\n> >   void BlackLevelCorrection::prepare(IPAContext &context,\n> > +\t\t\t\t   [[maybe_unused]] unsigned int frame,\n> > +\t\t\t\t   [[maybe_unused]] RKISP1FrameContext &frameContext,\n> >   \t\t\t\t   rkisp1_params_cfg *params)\n> >   {\n> >   \tif (context.activeState.frameCount > 0)\n> > diff --git a/src/ipa/rkisp1/algorithms/blc.h b/src/ipa/rkisp1/algorithms/blc.h\n> > index 5fc3a80fb638..1afa12f6b46e 100644\n> > --- a/src/ipa/rkisp1/algorithms/blc.h\n> > +++ b/src/ipa/rkisp1/algorithms/blc.h\n> > @@ -20,7 +20,9 @@ public:\n> >   \t~BlackLevelCorrection() = default;\n> >   \tint init(IPAContext &context, const YamlObject &tuningData) override;\n> > -\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n> > +\tvoid prepare(IPAContext &context, unsigned int frame,\n> > +\t\t     RKISP1FrameContext &frameContext,\n> > +\t\t     rkisp1_params_cfg *params) override;\n> >   private:\n> >   \tbool tuningParameters_;\n> > diff --git a/src/ipa/rkisp1/algorithms/cproc.cpp b/src/ipa/rkisp1/algorithms/cproc.cpp\n> > index a3b778d1c908..edaf2d10e850 100644\n> > --- a/src/ipa/rkisp1/algorithms/cproc.cpp\n> > +++ b/src/ipa/rkisp1/algorithms/cproc.cpp\n> > @@ -71,6 +71,8 @@ void ColorProcessing::queueRequest(IPAContext &context,\n> >    * \\copydoc libcamera::ipa::Algorithm::prepare\n> >    */\n> >   void ColorProcessing::prepare(IPAContext &context,\n> > +\t\t\t      [[maybe_unused]] unsigned int frame,\n> > +\t\t\t      [[maybe_unused]] RKISP1FrameContext &frameContext,\n> >   \t\t\t      rkisp1_params_cfg *params)\n> >   {\n> >   \tauto &cproc = context.activeState.cproc;\n> > diff --git a/src/ipa/rkisp1/algorithms/cproc.h b/src/ipa/rkisp1/algorithms/cproc.h\n> > index 4b7e4064d7e8..fde83f3c965c 100644\n> > --- a/src/ipa/rkisp1/algorithms/cproc.h\n> > +++ b/src/ipa/rkisp1/algorithms/cproc.h\n> > @@ -23,7 +23,9 @@ public:\n> >   \tvoid queueRequest(IPAContext &context, const uint32_t frame,\n> >   \t\t\t  const ControlList &controls) override;\n> > -\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n> > +\tvoid prepare(IPAContext &context, unsigned int frame,\n> > +\t\t     RKISP1FrameContext &frameContext,\n> > +\t\t     rkisp1_params_cfg *params) override;\n> >   };\n> >   } /* namespace ipa::rkisp1::algorithms */\n> > diff --git a/src/ipa/rkisp1/algorithms/dpcc.cpp b/src/ipa/rkisp1/algorithms/dpcc.cpp\n> > index 93d37b1dae44..9ba03653afdc 100644\n> > --- a/src/ipa/rkisp1/algorithms/dpcc.cpp\n> > +++ b/src/ipa/rkisp1/algorithms/dpcc.cpp\n> > @@ -232,6 +232,8 @@ int DefectPixelClusterCorrection::init([[maybe_unused]] IPAContext &context,\n> >    * \\copydoc libcamera::ipa::Algorithm::prepare\n> >    */\n> >   void DefectPixelClusterCorrection::prepare(IPAContext &context,\n> > +\t\t\t\t\t   [[maybe_unused]] unsigned int frame,\n> > +\t\t\t\t\t   [[maybe_unused]] RKISP1FrameContext &frameContext,\n> >   \t\t\t\t\t   rkisp1_params_cfg *params)\n> >   {\n> >   \tif (context.activeState.frameCount > 0)\n> > diff --git a/src/ipa/rkisp1/algorithms/dpcc.h b/src/ipa/rkisp1/algorithms/dpcc.h\n> > index a363f7bee0a7..ca9df9fc38dc 100644\n> > --- a/src/ipa/rkisp1/algorithms/dpcc.h\n> > +++ b/src/ipa/rkisp1/algorithms/dpcc.h\n> > @@ -20,7 +20,9 @@ public:\n> >   \t~DefectPixelClusterCorrection() = default;\n> >   \tint init(IPAContext &context, const YamlObject &tuningData) override;\n> > -\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n> > +\tvoid prepare(IPAContext &context, unsigned int frame,\n> > +\t\t     RKISP1FrameContext &frameContext,\n> > +\t\t     rkisp1_params_cfg *params) override;\n> >   private:\n> >   \tbool initialized_;\n> > diff --git a/src/ipa/rkisp1/algorithms/filter.cpp b/src/ipa/rkisp1/algorithms/filter.cpp\n> > index bc7fc1f32f34..f6577046442a 100644\n> > --- a/src/ipa/rkisp1/algorithms/filter.cpp\n> > +++ b/src/ipa/rkisp1/algorithms/filter.cpp\n> > @@ -85,7 +85,10 @@ void Filter::queueRequest(IPAContext &context,\n> >   /**\n> >    * \\copydoc libcamera::ipa::Algorithm::prepare\n> >    */\n> > -void Filter::prepare(IPAContext &context, rkisp1_params_cfg *params)\n> > +void Filter::prepare(IPAContext &context,\n> > +\t\t     [[maybe_unused]] unsigned int frame,\n> > +\t\t     [[maybe_unused]] RKISP1FrameContext &frameContext,\n> > +\t\t     rkisp1_params_cfg *params)\n> >   {\n> >   \tauto &filter = context.activeState.filter;\n> > diff --git a/src/ipa/rkisp1/algorithms/filter.h b/src/ipa/rkisp1/algorithms/filter.h\n> > index 9eb170eb7da1..1fbe785a3cab 100644\n> > --- a/src/ipa/rkisp1/algorithms/filter.h\n> > +++ b/src/ipa/rkisp1/algorithms/filter.h\n> > @@ -23,7 +23,9 @@ public:\n> >   \tvoid queueRequest(IPAContext &context, const uint32_t frame,\n> >   \t\t\t  const ControlList &controls) override;\n> > -\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n> > +\tvoid prepare(IPAContext &context, unsigned int frame,\n> > +\t\t     RKISP1FrameContext &frameContext,\n> > +\t\t     rkisp1_params_cfg *params) override;\n> >   };\n> >   } /* namespace ipa::rkisp1::algorithms */\n> > diff --git a/src/ipa/rkisp1/algorithms/gsl.cpp b/src/ipa/rkisp1/algorithms/gsl.cpp\n> > index dd9974627cd2..77d841cfbf82 100644\n> > --- a/src/ipa/rkisp1/algorithms/gsl.cpp\n> > +++ b/src/ipa/rkisp1/algorithms/gsl.cpp\n> > @@ -119,6 +119,8 @@ int GammaSensorLinearization::init([[maybe_unused]] IPAContext &context,\n> >    * \\copydoc libcamera::ipa::Algorithm::prepare\n> >    */\n> >   void GammaSensorLinearization::prepare(IPAContext &context,\n> > +\t\t\t\t       [[maybe_unused]] unsigned int frame,\n> > +\t\t\t\t       [[maybe_unused]] RKISP1FrameContext &frameContext,\n> >   \t\t\t\t       rkisp1_params_cfg *params)\n> >   {\n> >   \tif (context.activeState.frameCount > 0)\n> > diff --git a/src/ipa/rkisp1/algorithms/gsl.h b/src/ipa/rkisp1/algorithms/gsl.h\n> > index db287dc280dc..fe74ae10e099 100644\n> > --- a/src/ipa/rkisp1/algorithms/gsl.h\n> > +++ b/src/ipa/rkisp1/algorithms/gsl.h\n> > @@ -20,7 +20,9 @@ public:\n> >   \t~GammaSensorLinearization() = default;\n> >   \tint init(IPAContext &context, const YamlObject &tuningData) override;\n> > -\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n> > +\tvoid prepare(IPAContext &context, unsigned int frame,\n> > +\t\t     RKISP1FrameContext &frameContext,\n> > +\t\t     rkisp1_params_cfg *params) override;\n> >   private:\n> >   \tbool initialized_;\n> > diff --git a/src/ipa/rkisp1/algorithms/lsc.cpp b/src/ipa/rkisp1/algorithms/lsc.cpp\n> > index 4ed467086199..cd8fcbe66b9b 100644\n> > --- a/src/ipa/rkisp1/algorithms/lsc.cpp\n> > +++ b/src/ipa/rkisp1/algorithms/lsc.cpp\n> > @@ -123,6 +123,8 @@ int LensShadingCorrection::init([[maybe_unused]] IPAContext &context,\n> >    * \\copydoc libcamera::ipa::Algorithm::prepare\n> >    */\n> >   void LensShadingCorrection::prepare(IPAContext &context,\n> > +\t\t\t\t    [[maybe_unused]] unsigned int frame,\n> > +\t\t\t\t    [[maybe_unused]] RKISP1FrameContext &frameContext,\n> >   \t\t\t\t    rkisp1_params_cfg *params)\n> >   {\n> >   \tif (context.activeState.frameCount > 0)\n> > diff --git a/src/ipa/rkisp1/algorithms/lsc.h b/src/ipa/rkisp1/algorithms/lsc.h\n> > index fdb2ec1dd27d..fafb80b329ee 100644\n> > --- a/src/ipa/rkisp1/algorithms/lsc.h\n> > +++ b/src/ipa/rkisp1/algorithms/lsc.h\n> > @@ -20,7 +20,9 @@ public:\n> >   \t~LensShadingCorrection() = default;\n> >   \tint init(IPAContext &context, const YamlObject &tuningData) override;\n> > -\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n> > +\tvoid prepare(IPAContext &context, unsigned int frame,\n> > +\t\t     RKISP1FrameContext &frameContext,\n> > +\t\t     rkisp1_params_cfg *params) override;\n> >   private:\n> >   \tbool initialized_;\n> > diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> > index 2c7fdde55f49..f3512647a833 100644\n> > --- a/src/ipa/rkisp1/rkisp1.cpp\n> > +++ b/src/ipa/rkisp1/rkisp1.cpp\n> > @@ -302,6 +302,8 @@ void IPARkISP1::queueRequest(const uint32_t frame, const ControlList &controls)\n> >   void IPARkISP1::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)\n> >   {\n> > +\tRKISP1FrameContext &frameContext = context_.frameContexts.get(frame);\n>\n>\n> This seems correct :-)\n>\n> With the IPU3FrameContext .get() fixed,\n>\n> Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>\n>\n> > +\n> >   \trkisp1_params_cfg *params =\n> >   \t\treinterpret_cast<rkisp1_params_cfg *>(\n> >   \t\t\tmappedBuffers_.at(bufferId).planes()[0].data());\n> > @@ -310,7 +312,7 @@ void IPARkISP1::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)\n> >   \tmemset(params, 0, sizeof(*params));\n> >   \tfor (auto const &algo : algorithms())\n> > -\t\talgo->prepare(context_, params);\n> > +\t\talgo->prepare(context_, frame, frameContext, params);\n> >   \tparamsBufferReady.emit(frame);\n> >   \tcontext_.activeState.frameCount++;","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 3597DC3272\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 11 Aug 2022 08:05:16 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 936FF6332B;\n\tThu, 11 Aug 2022 10:05:15 +0200 (CEST)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CD99363327\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 11 Aug 2022 10:05:13 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby mail.gandi.net (Postfix) with ESMTPSA id 0A29C1C0013;\n\tThu, 11 Aug 2022 08:05:12 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660205115;\n\tbh=YdJuLUHA+IfxnoN3X1mByQIrAGf7u7/E5Qd/2uMAPUM=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=jLP+N3BbnmytEeg6l1hpzZiIq4Jnx6vNwrcpTqvvOpyaa8K9mhdDpymweF+uBEwZa\n\t6nxekm1E3xjdLUgmqPzKKDEp3mm0BwGeFlyiriO99ReudNtF/GPdiNuH3F9meZRHri\n\tOwBtFp9EUAaYC3gRGy81DWDXv9W5+GgbVecMgrhkwH2SZ2Q0yJnZbc8o2dpg4SwhKV\n\ts84moIGnItzvkLPwHRi6zGIGXLE7XvJzGvb4BhBEMi0y5t+/4WoJyQnx3kcUUX0SRq\n\tOaBimyn3zPQtcur1ASkqTFFV6eLW3u4QXw5b8gEAtKbQCE2DExlRvVUwDtFGHQkjNG\n\tXrFCev6RVGL5g==","Date":"Thu, 11 Aug 2022 10:05:11 +0200","To":"Umang Jain <umang.jain@ideasonboard.com>","Message-ID":"<20220811080511.regvxmfd4fu32ag6@uno.localdomain>","References":"<20220805135312.47497-1-jacopo@jmondi.org>\n\t<20220805135312.47497-9-jacopo@jmondi.org>\n\t<61c75638-381b-bd78-bb96-26d33a89f122@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<61c75638-381b-bd78-bb96-26d33a89f122@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 08/10] ipa: libipa: algorithm:\n\tprepare(): Pass frame and frame Context","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","From":"Jacopo Mondi via libcamera-devel <libcamera-devel@lists.libcamera.org>","Reply-To":"Jacopo Mondi <jacopo@jmondi.org>","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]