Update the README.md

README.md

@@ -1,22 +1,33 @@
 # ipu6-camera-bins
 
-This repository supports MIPI cameras through the IPU6 on Intel Tiger Lake and
-Alder Lake platforms. There are 4 repositories that provide the complete setup:
+This repository supports MIPI cameras through the IPU6 on Intel Tiger Lake, Alder Lake, Raptor Lake and Meteor Lake platforms.
+There are 4 repositories that provide the complete setup:
 
 - https://github.com/intel/ipu6-drivers - kernel drivers for the IPU and sensors
-- https://github.com/intel/ipu6-camera-hal - HAL for processing of images in userspace
 - https://github.com/intel/ipu6-camera-bins - IPU firmware and proprietary image processing libraries
-- https://github.com/intel/icamerasrc (branch:icamerasrc_slim_api) - Gstreamer src plugin
+- https://github.com/intel/ipu6-camera-hal - HAL for processing of images in userspace
+- https://github.com/intel/icamerasrc/tree/icamerasrc_slim_api (branch:icamerasrc_slim_api) - Gstreamer src plugin
 
 ## Content of this repository:
-- IPU6 firmware
-- IPU6ep firmware
-- Library binary dependencies for IPU6 HAL
-- Header files for those libraries
+- IPU6 firmware binaries
+- Library binary dependencies for ipu6-camera-hal
+- Headerfiles for those libraries
 
 ## Deployment
 ipu6-camera-bins should be copied to build server and target
-```shell
-cp -r ipu6-camera-bins/<IPU_VER>/include/* /usr/include/
-cp -r ipu6-camera-bins/<IPU_VER>/lib/* /usr/lib/
+```
+# Runtime files
+mkdir -p /lib/firmware/intel/ipu
+cp -r ipu6-camera-bins/lib/firmware/intel/ipu/*.bin /lib/firmware/intel/ipu
+# For developers using engineer samples, try use unsigned FW if authenticate fail:
+# cp -r ipu6-camera-bins/lib/firmware/intel/ipu/unsigned/*.bin /lib/firmware/intel/ipu
+for lib in ipu6-camera-bins/lib/lib*.so.*; do \
+  lib=${lib##*/}; \
+  ln -s $lib ipu6-camera-bins/lib/${lib%.*}; \
+done
+cp -P ipu6-camera-bins/lib/lib* /usr/lib/
+# Development files
+mkdir -p /usr/include /usr/lib/pkgconfig
+cp -r ipu6-camera-bins/include/* /usr/include/
+cp -r ipu6-camera-bins/lib/pkgconfig/* /usr/lib/pkgconfig/
 ```

ipu6ep/include/ia_camera/gcss_keys.h → include/ipu6ep/ia_camera/gcss_keys.h

@@ -91,6 +91,7 @@ GCSS_KEY (HW_BITMAPS, hw_bitmaps)
 GCSS_KEY (DEB, deb)
 GCSS_KEY (TEB, teb)
 GCSS_KEY (REB, reb)
+GCSS_KEY (PIPELINE, pipeline)
 /* add new keys to this section above this line */
 GCSS_KEY_SECTION_END (GENERIC_KEYS_END, generic_keys_end, 0x0FFF)
 

ipu6/include/ia_cipf/ia_cipf_types.h → include/ipu6ep/ia_cipf/ia_cipf_types.h

@@ -357,7 +357,8 @@ typedef enum ia_cipf_terminal_type {
     ia_cipf_terminal_type_frame_input,
     ia_cipf_terminal_type_frame_output,
     ia_cipf_terminal_type_param_input,
-    ia_cipf_terminal_type_param_output
+    ia_cipf_terminal_type_param_output,
+    ia_cipf_terminal_type_max
 } ia_cipf_terminal_type_t;
 
 /**

ipu6ep/include/ia_cipf_css/ia_cipf_css.h → include/ipu6ep/ia_cipf_css/ia_cipf_css.h

@@ -846,6 +846,15 @@
 #define veboxtnr_stage_id             101
 #define veboxtnr_stage_uid            ia_cipf_external_stage_uid(veboxtnr_stage_id)
 
+#define dol_stage_id                  104
+#define dol_stage_uid                 ia_cipf_external_stage_uid(dol_stage_id)
+
+#define gtm_stage_id                  105
+#define gtm_stage_uid                 ia_cipf_external_stage_uid(gtm_stage_id)
+
+#define cas_stage_id                  106
+#define cas_stage_uid                 ia_cipf_external_stage_uid(cas_stage_id)
+
 #define psys_interleaved_code_uid     ia_fourcc('I','L','C','S')
 #define psys_interleaved_code_in_uid  psys_interleaved_code_uid + 1
 #define psys_interleaved_code_out_uid psys_interleaved_code_uid + 2

ipu6ep/include/ia_imaging/CCAMacro.h → include/ipu6ep/ia_imaging/CCAMacro.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation.
+ * Copyright (C) 2022-2023 Intel Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,10 +28,10 @@ namespace cca {
  * sensor, IPU, etc.
  */
 const uint32_t MAX_CAM_NUM = 4U;
-const uint32_t MAX_CPF_LEN = 1024 * 1024 * 4;
+const uint32_t MAX_CPF_LEN = 1024 * 1024 * 5;
 const uint32_t MAX_NVM_LEN = 1024 * 16;
 const uint32_t MAX_AIQD_LEN = 1024 * 1024;
-const uint32_t MAX_MKN_LEN = 64 * 1024;
+const uint32_t MAX_MKN_LEN = 80 * 1024;
 const uint32_t MAX_MKN_SECTION_SIZE = 100000;
 const uint32_t MAX_CMC_LEN = 1024 * 1024;
 const uint32_t MAX_TAG_LIST_LEN = 8;
@@ -76,10 +76,13 @@ const uint32_t MAX_KERNEL_NUM_IN_PG = 128;
 const uint32_t MAX_PG_NUM = 5;
 const uint32_t MAX_PG_TERMINAL_NUM = 16;
 
+const float MIN_MANUAL_GAMMA = 0.4f;
+const float MAX_MANUAL_GAMMA = 2.6f;
+
 const uint32_t PDAF_STATS_GRID_WIDTH = 16;
 const uint32_t PDAF_STATS_GRID_HEIGHT = 12;
 const uint32_t PDAF_STATS_NUM_NONSVE = 1;
-const uint32_t MAX_STREAM_NUM = 5;
+const uint32_t MAX_STREAM_NUM = 15;
 const uint32_t MAX_RGBIR_MODELS = 3;
 
 const uint64_t INVALID_FRAME_ID = static_cast<uint64_t>(-1);

ipu6ep/include/ia_imaging/CCAStorage.h → include/ipu6ep/ia_imaging/CCAStorage.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation.
+ * Copyright (C) 2020-2024 Intel Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ipu6/include/ia_imaging/IIPUAic.h → include/ipu6ep/ia_imaging/IIPUAic.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation.
+ * Copyright (C) 2020-2023 Intel Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,12 @@
 #endif
 
 namespace cca {
-
+enum cfa_type_t
+{
+    type_1x1 = 0,
+    type_2x2 = 1,
+    type_4x4 = 2,
+};
 /*!
  * \brief decode stats input parameters
  */
@@ -174,19 +179,20 @@ class IIPUAic {
                         uint32_t max_stats_height, uint32_t max_num_stats_in, const ia_mkn *mkn,
                         const cca_stream_ids& aic_stream_ids) = 0;
 
+
     /*!
      * \brief update tuning file aiqb.
      *
      * \param[in] aiqb                       Mandatory.\n
      *                                       Tuning file.
      * \param[in] cmc                        Mandatory.\n
      *                                       Parsed cmc data.
-     * \param[in] streamId                   Optional.\n
+     * \param[in] aicId                      Optional.\n
      *                                       The stream id for aic handle.
      * \return                               Error code.
      */
     virtual ia_err updateTuning(const ia_binary_data *aiqb, const ia_cmc_t *cmc,
-                                int32_t streamId = -1) = 0;
+                                int32_t aicId = -1) = 0;
 
     /*!
      * \brief pass parameters for statistic analysis.
@@ -200,6 +206,31 @@ class IIPUAic {
     virtual ia_err setStatsParams(ia_aiq* aiqHandle, const cca_stats_params &params,
                                   const cca_aiq_results_storage &aiqResults) = 0;
 
+    /*!
+    * \brief get the max bin index of non-zero element.
+    *
+    * \param[out] stats                 Mandatory.\n
+    *                                   output the max bin index.
+    * \return                           Error code.
+    */
+    virtual ia_err getBrightestIndex(uint32_t *outMaxBin) = 0;
+
+    /*!
+     * \brief calc the total pixel number in range [luminance_low, luminance_high]
+     *
+     * \param[in] luminance_low          Mandatory.\n
+     *                                   the low pixel value
+     *
+     * \param[in] luminance_high         Mandatory.\n
+     *                                   the high pixel value
+     *
+     * \param[out] outTotalPixels        Mandatory.\n
+     *                                   the total pixel number in range [luminance_low, luminance_high]
+     *
+     * \return                           Error code.
+     */
+    virtual ia_err getPixelCount(uint32_t luminance_low, uint32_t luminance_high, uint32_t *outTotalPixels) = 0;
+
 #ifdef PAC_ENABLE
     /*!
      * \brief configure cb including kernels group and kernels offset.
@@ -210,35 +241,44 @@ class IIPUAic {
      *                                          buffer offsets for all kernels.
      * \param[out] termConfig                   Mandatory.\n
      *                                          the memory needed by terminals of cb.
+     * \param[in] aicId                         Optional.\n
+     *                                          id for aic handle.
      * \return                                  Error code.
      */
-    virtual ia_err config(const cca_aic_config &conf, const cca_aic_kernel_offset &offset, cca_aic_terminal_config &termConfig) = 0;
+    virtual ia_err config(const cca_aic_config &conf, const cca_aic_kernel_offset &offset,
+                          cca_aic_terminal_config &termConfig, int32_t aicId = -1) = 0;
     /*!
      * \brief register terminal buffers.
      *
      * \param[in] termConfig                    Mandatory.\n
      *                                          the memory needed by terminals of cb.
+     * \param[in] aicId                         Optional.\n
+     *                                          id for aic handle.
      * \return                                  Error code.
      */
-    virtual ia_err registerBuf(const cca_aic_terminal_config &termConfig) = 0;
+    virtual ia_err registerBuf(const cca_aic_terminal_config &termConfig, int32_t aicId = -1) = 0;
     /*!
      * \brief get AIC buffers for FW input after runing PAL.
      *
      * \param[out] termConfig                   Mandatory.\n
      *                                          terminal memory of cb filled with IPU params.
+     * \param[in] aicId                         Optional.\n
+     *                                          id for aic handle.
      * \return                                  Error code.
      */
-    virtual ia_err getBuf(cca_aic_terminal_config &termConfig) = 0;
+    virtual ia_err getBuf(cca_aic_terminal_config &termConfig, int32_t aicId = -1) = 0;
     /*!
      * \brief decode statistics for a specific type(AIQ, LTM, DVS stats).
      *
      * \param[in] groupId                Mandatory.\n
      *                                   group id of CB.
      * \param[in] seqId                  Mandatory.\n
      *                                   sequence id for streaming.
+     * \param[in] aicId                  Optional.\n
+     *                                   id for aic handle.
      * \return                           Error code.
      */
-    virtual ia_err decodeStats(int32_t groupId, int64_t seqId) = 0;
+    virtual ia_err decodeStats(int32_t groupId, int64_t seqId, int32_t aicId = -1) = 0;
 
     /*!
      * \brief run AIC parameters with graph config & Intel3A results.
@@ -247,11 +287,16 @@ class IIPUAic {
      *                                   AIQ plus parameters and manual settings.
      * \param[in] aaaResults             Mandatory.\n
      *                                   AIQ plus results.
+     *  \param[in] bitmap                Mandatory.\n
+     *                                   Bitmap to decide which CB will be run.
      * \param[out] pal                   Mandatory.\n
      *                                   AIC results for each CB.
      * \return                           Error code.
      */
-    virtual ia_err run(const cca_pal_input_params& params, cca_3a_plus_results& aaaResults, cca_multi_pal_output& output) = 0;
+    virtual ia_err run(const cca_pal_input_params& params, cca_3a_plus_results& aaaResults,
+                       cca_multi_pal_output& output, uint8_t bitmap) = 0;
+
+    virtual ia_err UpdateConfigurationResolutions(const cca_aic_config& conf, bool isKeyResolutionChanged, int32_t aicId) = 0;
 
 #else
     /*!
@@ -262,6 +307,7 @@ class IIPUAic {
      * \return                           Error code.
      */
     virtual ia_err getDvsStats(ia_dvs_statistics* stats) = 0;
+
     /*!
      * \brief decode statistics for a specific type(AIQ, LTM, DVS stats) <=IPU6.
      *
@@ -276,16 +322,7 @@ class IIPUAic {
     virtual ia_err decodeStats(const cca_dec_stats_input &decParams, ia_isp_bxt_statistics_query_results_t *results,
                                cca_out_stats *outStats = nullptr) = 0;
 
-    /*! Get PAL binary size
-    *
-    * Calculate the PAL size according to program group
-    *
-    * \param [in]  programGroup kernel info for special stream id
-    *
-    *
-    * return Pal size in success. zero on failure
-    */
-    virtual uint32_t getPalSize(const cca_program_group &programGroup) = 0;
+
     /*!
      * \brief run AIC parameters with graph config & Intel3A results.
      *
@@ -295,9 +332,11 @@ class IIPUAic {
      *                                   AIQ plus results.
      * \param[out] pal                   Mandatory.\n
      *                                   AIC results.
+     * \param[in] aicId                  Optional.\n
+     *                                   id for aic handle.
      * \return                           Error code.
      */
-    virtual ia_err run(const cca_pal_input_params& params, cca_3a_plus_results& aaaResults, ia_binary_data* pal) = 0;
+    virtual ia_err run(const cca_pal_input_params& params, cca_3a_plus_results& aaaResults, ia_binary_data* pal, int32_t aicId = -1) = 0;
 
 #endif
      /*!
@@ -312,15 +351,6 @@ class IIPUAic {
      */
     virtual const char* getVersion() const = 0;
 
-    /*!
-     * \brief get the aic Handle.
-     *
-     * \param[in] streamId           Optional.\n
-     *                               the stream id for aic handle.
-     * \return                       AIC handle.
-     */
-    virtual void* getIspHandle(int32_t streamId = -1) = 0;
-
 };
 }//cca
 #endif //IIPUAIC_H_