diff --git a/config/linux/ipu6ep/gcss/graph_descriptor.xml b/config/linux/ipu6ep/gcss/graph_descriptor.xml index c0c2656a..d7e9617f 100644 --- a/config/linux/ipu6ep/gcss/graph_descriptor.xml +++ b/config/linux/ipu6ep/gcss/graph_descriptor.xml @@ -12354,7 +12354,6 @@ - @@ -12379,7 +12378,6 @@ - @@ -12410,7 +12408,6 @@ - @@ -12431,7 +12428,6 @@ - @@ -12454,7 +12450,6 @@ - @@ -12492,7 +12487,6 @@ - @@ -12515,7 +12509,6 @@ - @@ -12549,7 +12542,6 @@ - @@ -12573,7 +12565,6 @@ - @@ -12594,7 +12585,6 @@ - @@ -12620,7 +12610,6 @@ - @@ -12642,7 +12631,6 @@ - @@ -12668,7 +12656,6 @@ - @@ -12688,7 +12675,6 @@ - @@ -12714,7 +12700,6 @@ - @@ -12737,7 +12722,6 @@ - @@ -12787,7 +12771,6 @@ - @@ -12809,7 +12792,6 @@ - @@ -12863,7 +12845,6 @@ - @@ -12885,7 +12866,6 @@ - @@ -12932,7 +12912,6 @@ - @@ -13563,7 +13542,6 @@ - @@ -14129,7 +14107,6 @@ - @@ -14159,7 +14136,6 @@ - @@ -14307,7 +14283,6 @@ - @@ -14330,7 +14305,6 @@ - @@ -14384,7 +14358,6 @@ - @@ -14407,7 +14380,6 @@ - @@ -14451,7 +14423,6 @@ - @@ -14473,7 +14444,6 @@ - @@ -14511,7 +14481,6 @@ - @@ -14532,7 +14501,6 @@ - @@ -14589,7 +14557,6 @@ - @@ -14610,7 +14577,6 @@ - @@ -14641,7 +14607,6 @@ - @@ -14665,7 +14630,6 @@ - @@ -14686,7 +14650,6 @@ - @@ -14709,7 +14672,6 @@ - @@ -14731,7 +14693,6 @@ - @@ -14757,7 +14718,6 @@ - @@ -14779,7 +14739,6 @@ - @@ -14822,7 +14781,6 @@ - @@ -15283,7 +15241,6 @@ - @@ -15305,7 +15262,6 @@ - @@ -15348,7 +15304,6 @@ - @@ -15428,7 +15383,6 @@ - @@ -15453,7 +15407,6 @@ - @@ -15630,7 +15583,6 @@ - @@ -15651,7 +15603,6 @@ - @@ -15673,7 +15624,6 @@ - @@ -15695,7 +15645,6 @@ - @@ -15717,7 +15666,6 @@ - @@ -15737,7 +15685,6 @@ - @@ -15759,7 +15706,6 @@ - @@ -15782,7 +15728,6 @@ - @@ -15825,7 +15770,6 @@ - @@ -15847,7 +15791,6 @@ - @@ -15893,7 +15836,6 @@ - @@ -15915,7 +15857,6 @@ - @@ -15962,7 +15903,6 @@ - diff --git a/config/linux/ipu6ep/psys_policy_profiles.xml b/config/linux/ipu6ep/psys_policy_profiles.xml index a75ecf88..eb6fb30f 100644 --- a/config/linux/ipu6ep/psys_policy_profiles.xml +++ b/config/linux/ipu6ep/psys_policy_profiles.xml @@ -26,7 +26,11 @@ limitations under the License. - + + + + + diff --git a/config/linux/ipu6epmtl/0315_imx274_wfov.IPU6.aiqb b/config/linux/ipu6epmtl/0315_imx274_wfov.IPU6.aiqb deleted file mode 100644 index 59a0bee9..00000000 Binary files a/config/linux/ipu6epmtl/0315_imx274_wfov.IPU6.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/0524_A_IMX477_WFOV_PSS.IPU6.ipdev.IPU6.aiqb b/config/linux/ipu6epmtl/0524_A_IMX477_WFOV_PSS.IPU6.ipdev.IPU6.aiqb deleted file mode 100644 index 1befd020..00000000 Binary files a/config/linux/ipu6epmtl/0524_A_IMX477_WFOV_PSS.IPU6.ipdev.IPU6.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/AR0234_BARCODE_TGL.aiqb b/config/linux/ipu6epmtl/AR0234_BARCODE_TGL.aiqb deleted file mode 100644 index 0eab4246..00000000 Binary files a/config/linux/ipu6epmtl/AR0234_BARCODE_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/IMX135_13P2BAD33_TGL.aiqb b/config/linux/ipu6epmtl/IMX135_13P2BAD33_TGL.aiqb deleted file mode 100644 index a977662b..00000000 Binary files a/config/linux/ipu6epmtl/IMX135_13P2BAD33_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/IMX362_A12N08B_MDSVE_TGL.aiqb b/config/linux/ipu6epmtl/IMX362_A12N08B_MDSVE_TGL.aiqb deleted file mode 100644 index c0bc88f4..00000000 Binary files a/config/linux/ipu6epmtl/IMX362_A12N08B_MDSVE_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/IMX362_A12N08B_MD_TGL.aiqb b/config/linux/ipu6epmtl/IMX362_A12N08B_MD_TGL.aiqb deleted file mode 100644 index 86ab8e67..00000000 Binary files a/config/linux/ipu6epmtl/IMX362_A12N08B_MD_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/IMX362_A12N08B_SVE_TGL.aiqb b/config/linux/ipu6epmtl/IMX362_A12N08B_SVE_TGL.aiqb deleted file mode 100644 index 5985f3ce..00000000 Binary files a/config/linux/ipu6epmtl/IMX362_A12N08B_SVE_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/IMX362_A12N08B_TGL.aiqb b/config/linux/ipu6epmtl/IMX362_A12N08B_TGL.aiqb deleted file mode 100644 index 4cf7eb56..00000000 Binary files a/config/linux/ipu6epmtl/IMX362_A12N08B_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/IMX390_HDR_TGL_2.aiqb b/config/linux/ipu6epmtl/IMX390_HDR_TGL_2.aiqb deleted file mode 100644 index 2df11318..00000000 Binary files a/config/linux/ipu6epmtl/IMX390_HDR_TGL_2.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/IMX477_MOD255I_DOL_TGL.aiqb b/config/linux/ipu6epmtl/IMX477_MOD255I_DOL_TGL.aiqb deleted file mode 100644 index 77409882..00000000 Binary files a/config/linux/ipu6epmtl/IMX477_MOD255I_DOL_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/IMX477_MOD26552_BAYER_TGL.aiqb b/config/linux/ipu6epmtl/IMX477_MOD26552_BAYER_TGL.aiqb deleted file mode 100644 index 0ea2cd75..00000000 Binary files a/config/linux/ipu6epmtl/IMX477_MOD26552_BAYER_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/IMX477_MOD26552_WFOV_TGL.aiqb b/config/linux/ipu6epmtl/IMX477_MOD26552_WFOV_TGL.aiqb deleted file mode 100644 index f3e5b3a3..00000000 Binary files a/config/linux/ipu6epmtl/IMX477_MOD26552_WFOV_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/IMX488_56B6_TGL.aiqb b/config/linux/ipu6epmtl/IMX488_56B6_TGL.aiqb deleted file mode 100644 index 4ade69fd..00000000 Binary files a/config/linux/ipu6epmtl/IMX488_56B6_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/OV01A1S_YHRN180_TGL.aiqb b/config/linux/ipu6epmtl/OV01A1S_YHRN180_TGL.aiqb deleted file mode 100644 index c372a85a..00000000 Binary files a/config/linux/ipu6epmtl/OV01A1S_YHRN180_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/OV01A1S_YHRN_TGL.aiqb b/config/linux/ipu6epmtl/OV01A1S_YHRN_TGL.aiqb deleted file mode 100644 index ae2ae7c9..00000000 Binary files a/config/linux/ipu6epmtl/OV01A1S_YHRN_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/OV13858_MSHW0261_TGL.aiqb b/config/linux/ipu6epmtl/OV13858_MSHW0261_TGL.aiqb deleted file mode 100644 index 62922cdb..00000000 Binary files a/config/linux/ipu6epmtl/OV13858_MSHW0261_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/OV5693_13P2BA540_BIN_TGL.aiqb b/config/linux/ipu6epmtl/OV5693_13P2BA540_BIN_TGL.aiqb deleted file mode 100644 index 5340be8e..00000000 Binary files a/config/linux/ipu6epmtl/OV5693_13P2BA540_BIN_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/OV5693_MSHW0220_TGL.aiqb b/config/linux/ipu6epmtl/OV5693_MSHW0220_TGL.aiqb deleted file mode 100644 index e6963d6a..00000000 Binary files a/config/linux/ipu6epmtl/OV5693_MSHW0220_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/OV5693_MSHW0260_TGL.aiqb b/config/linux/ipu6epmtl/OV5693_MSHW0260_TGL.aiqb deleted file mode 100644 index 95ca220e..00000000 Binary files a/config/linux/ipu6epmtl/OV5693_MSHW0260_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/OV7251_MSHW0222_TGL.aiqb b/config/linux/ipu6epmtl/OV7251_MSHW0222_TGL.aiqb deleted file mode 100644 index bc5fd22c..00000000 Binary files a/config/linux/ipu6epmtl/OV7251_MSHW0222_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/OV8865_MSHW0221_TGL.aiqb b/config/linux/ipu6epmtl/OV8865_MSHW0221_TGL.aiqb deleted file mode 100644 index 23e90e1f..00000000 Binary files a/config/linux/ipu6epmtl/OV8865_MSHW0221_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/VD55G0_MSHW0262_TGL.aiqb b/config/linux/ipu6epmtl/VD55G0_MSHW0262_TGL.aiqb deleted file mode 100644 index 361c548f..00000000 Binary files a/config/linux/ipu6epmtl/VD55G0_MSHW0262_TGL.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/gcss/graph_settings_ov13b10.xml b/config/linux/ipu6epmtl/gcss/graph_settings_ov13b10.xml deleted file mode 100644 index 499fd21a..00000000 --- a/config/linux/ipu6epmtl/gcss/graph_settings_ov13b10.xml +++ /dev/null @@ -1,7585 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/config/linux/ipu6epmtl/lt6911uxe.xml b/config/linux/ipu6epmtl/lt6911uxe.xml deleted file mode 100644 index f9d5dd06..00000000 --- a/config/linux/ipu6epmtl/lt6911uxe.xml +++ /dev/null @@ -1,195 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/config/linux/ipu6epmtl/ov13b10.aiqb b/config/linux/ipu6epmtl/ov13b10.aiqb deleted file mode 100644 index 308046ea..00000000 Binary files a/config/linux/ipu6epmtl/ov13b10.aiqb and /dev/null differ diff --git a/config/linux/ipu6epmtl/ov9738_chicony_TGL.aiqb b/config/linux/ipu6epmtl/ov9738_chicony_TGL.aiqb deleted file mode 100644 index e8e919b5..00000000 Binary files a/config/linux/ipu6epmtl/ov9738_chicony_TGL.aiqb and /dev/null differ diff --git a/include/api/IspControl.h b/include/api/IspControl.h deleted file mode 100644 index 1a22a2de..00000000 --- a/include/api/IspControl.h +++ /dev/null @@ -1,548 +0,0 @@ -/* - * Copyright (C) 2017-2018 Intel Corporation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Warning this header is automatically generated. - * Any manual change here will be lost. - */ - -#pragma once - -#include - -namespace icamera { - -typedef enum { - camera_control_isp_ctrl_id_wb_gains = 34710, - camera_control_isp_ctrl_id_color_correction_matrix = 30009, - camera_control_isp_ctrl_id_advanced_color_correction_matrix = 51448, - camera_control_isp_ctrl_id_bxt_csc = 5291, - camera_control_isp_ctrl_id_bxt_demosaic = 55032, - camera_control_isp_ctrl_id_sc_iefd = 5151, - camera_control_isp_ctrl_id_see = 10947, - camera_control_isp_ctrl_id_bnlm = 40283, - camera_control_isp_ctrl_id_tnr5_21 = 20429, - camera_control_isp_ctrl_id_xnr_dss = 22233, - camera_control_isp_ctrl_id_gamma_tone_map = 5809, - camera_control_isp_ctrl_id_tnr5_22 = 15132, - camera_control_isp_ctrl_id_tnr5_25 = 41091, -} camera_control_isp_ctrl_id; - -/** - * \struct camera_control_isp_wb_gains_t - */ -struct camera_control_isp_wb_gains_t { - /*!< gr Gr gain.*/ - float gr; - /*!< r R gain.*/ - float r; - /*!< b B gain.*/ - float b; - /*!< gb Gb gain.*/ - float gb; -}; - -/** - * \struct camera_control_isp_color_correction_matrix_t - */ -struct camera_control_isp_color_correction_matrix_t { - /*!< ccm_gains[9] Color correction matrix from sensor RGB to sRGB/target color space. Row-major - * order.*/ - float ccm_gains[9]; - /*!< ccm_gains_media_format colorspace the ccm matrix was calibrated to*/ - int32_t ccm_gains_media_format; -}; - -/** - * \struct camera_control_isp_advanced_color_correction_matrix_t - */ -struct camera_control_isp_advanced_color_correction_matrix_t { - /*!< bypass bypass*/ - int32_t bypass; - /*!< number_of_sectors number of sectors (CCM matrices)*/ - int32_t number_of_sectors; - /*!< ccm_matrices[216] ccm matrices*/ - float ccm_matrices[216]; - /*!< hue_of_sectors[24] hue of input calibration vectors*/ - float hue_of_sectors[24]; - /*!< ccm_matrices_media_format colorspace the ccm matrices where calibrated to*/ - int32_t ccm_matrices_media_format; -}; - -/** - * \struct camera_control_isp_bxt_csc_t - */ -struct camera_control_isp_bxt_csc_t { - /*!< rgb2yuv_coef[9] Matrix for RGB to YUV conversion*/ - int32_t rgb2yuv_coef[9]; -}; - -/** - * \struct camera_control_isp_bxt_demosaic_t - */ -struct camera_control_isp_bxt_demosaic_t { - /*!< high_frequency_denoise_enable High frequency denoise enbale flag*/ - int32_t high_frequency_denoise_enable; - /*!< false_color_correction_enable False color correction enable flag*/ - int32_t false_color_correction_enable; - /*!< chroma_artifact_removal_enable Chroma artifact removal enable flag*/ - int32_t chroma_artifact_removal_enable; - /*!< sharpening_strength Sharpening strength*/ - int32_t sharpening_strength; - /*!< false_color_correction_gain False color correction gain*/ - int32_t false_color_correction_gain; - /*!< high_frequency_denoise_power High frequency denoise power*/ - int32_t high_frequency_denoise_power; - /*!< checkers_removal_w Checkers removal homogeneity weight*/ - int32_t checkers_removal_w; -}; - -/** - * \struct camera_control_isp_sc_iefd_t - */ -struct camera_control_isp_sc_iefd_t { - /*!< sharpening_power[2] base power of sharpening*/ - int32_t sharpening_power[2]; - /*!< sharp_power_edge shapening power for direct edge*/ - int32_t sharp_power_edge; - /*!< sharp_power_detail shapening power for non-direct edge*/ - int32_t sharp_power_detail; - /*!< unsharp_weight_edge unsharp weight for direct edge*/ - int32_t unsharp_weight_edge; - /*!< unsharp_weight_detail unsharp weight for non-direct edge*/ - int32_t unsharp_weight_detail; - /*!< denoise_power base power of denoise*/ - int32_t denoise_power; - /*!< radial_denoise_power base power of radial denoise*/ - int32_t radial_denoise_power; - /*!< shrpn_nega_lmt_txt Undershoot limit for texture*/ - int32_t shrpn_nega_lmt_txt; - /*!< shrpn_posi_lmt_txt Overshoot limit for texture*/ - int32_t shrpn_posi_lmt_txt; - /*!< shrpn_nega_lmt_dir Undershoot limit for edge*/ - int32_t shrpn_nega_lmt_dir; - /*!< shrpn_posi_lmt_dir Overshoot limit for edge*/ - int32_t shrpn_posi_lmt_dir; - /*!< cu_var_metric_th[4] */ - int32_t cu_var_metric_th[4]; - /*!< cu_ed2_metric_th[2] */ - int32_t cu_ed2_metric_th[2]; - /*!< cu_dir_metric_th[2] */ - int32_t cu_dir_metric_th[2]; - /*!< rad_enable Enable radial dependency flag*/ - int32_t rad_enable; - /*!< cu_nr_power[2] */ - int32_t cu_nr_power[2]; - /*!< unsharp_filter[15] Unsharp-mask filter coefficients*/ - int32_t unsharp_filter[15]; - /*!< dir_far_sharp_weight[2] Weight of wide kernel direct sharpening*/ - int32_t dir_far_sharp_weight[2]; - /*!< configunited_x[6] CU_ED x points*/ - int32_t configunited_x[6]; - /*!< configunited_y[6] CU_ED y points*/ - int32_t configunited_y[6]; - /*!< configunitradial_x[6] CU_RAD x points*/ - int32_t configunitradial_x[6]; - /*!< configunitradial_y[6] CU_RAD y points*/ - int32_t configunitradial_y[6]; - /*!< denoise_filter[6] Denoising filter coefficients*/ - int32_t denoise_filter[6]; - /*!< vssnlm_x0 Edge denoising LUT x0*/ - int32_t vssnlm_x0; - /*!< vssnlm_x1 Edge denoising LUT x1*/ - int32_t vssnlm_x1; - /*!< vssnlm_x2 Edge denoising LUT x2*/ - int32_t vssnlm_x2; - /*!< vssnlm_y1 Edge denoising LUT y0*/ - int32_t vssnlm_y1; - /*!< vssnlm_y2 Edge denoising LUT y1*/ - int32_t vssnlm_y2; - /*!< vssnlm_y3 Edge denoising LUT y2*/ - int32_t vssnlm_y3; -}; - -/** - * \struct camera_control_isp_see_t - */ -struct camera_control_isp_see_t { - /*!< bypass bypass*/ - int32_t bypass; - /*!< edge_max max edge value for clamping*/ - int32_t edge_max; - /*!< edge_thres threshold for coring*/ - int32_t edge_thres; - /*!< alpha overall edge enhance strength*/ - int32_t alpha; - /*!< alpha_shift */ - int32_t alpha_shift; - /*!< alpha_width */ - int32_t alpha_width; - /*!< alpha_bias */ - int32_t alpha_bias; -}; - -/** - * \struct camera_control_isp_bnlm_t - */ -struct camera_control_isp_bnlm_t { - /*!< nm_offset NR level for noise model adaptation*/ - int32_t nm_offset; - /*!< nm_th Threshold for noise model adaptation*/ - int32_t nm_th; - /*!< bypass bypass for the filter*/ - int32_t bypass; - /*!< detailix_x_range[2] detailIx noise model - noise input range - tunned automatically from - * data - set QNN fit range - [Q14.0] [0..16383]*/ - int32_t detailix_x_range[2]; - /*!< detailix_radgain detailIx Lens shading radial compensation power - [Q8.16], [0..256%]*/ - int32_t detailix_radgain; - /*!< detailix_coeffs[3] detailIx SAD noise model - NoiseModel=SQRT(C1*mu^2+C2*mu+C3)*/ - int32_t detailix_coeffs[3]; - /*!< sad_spatialrad[4] Neighbors spatial (radial) weight - filter radial bias - allowing - * reduction of effective filter size [Q3.5] [1:0.25:4]*/ - int32_t sad_spatialrad[4]; - /*!< sad_mu_x_range[2] detailIx noise model - noise input range - tunned automatically from data - * - set QNN fit range [Q14.0] [0..16383]*/ - int32_t sad_mu_x_range[2]; - /*!< sad_radgain SAD Lens shading radial compensation power - [Q8.16], [0..256%]*/ - int32_t sad_radgain; - /*!< sad_mu_coeffs[3] SAD noise model - NoiseModel=SQRT(C1*mu^2+C2*mu+C3)*/ - int32_t sad_mu_coeffs[3]; - /*!< detailth[3] detailTH - 3 THs classifying content(detail) type to {flat/weak - * texture/texture/edge} based on detailIx - [14.0] [0..16383]*/ - int32_t detailth[3]; - /*!< sad_detailixlutx[4] Continuos LUT aligning SAD from different detailIx levels to a common - * scale before appling exponent scaling - texture to flat & edge discrimination, X axis is - * currently fixed 0:8:1023 - [14.0] [0..16383]*/ - int32_t sad_detailixlutx[4]; - /*!< sad_detailixluty[4] Continuos LUT aligning SAD from different detailIx levels to a common - * scale before appling exponent scaling - texture to flat & edge discrimination - Yaxis is - * continuos description of (2^10-1)/QNN_o - [14.0] [0..16383]*/ - int32_t sad_detailixluty[4]; - /*!< numcandforavg[4] max num neighbors to average for smoothing per detail type - [4.0] - * [1..16]*/ - int32_t numcandforavg[4]; - /*!< blend_power[4] blend alpha(alpha0) - Increase central pixel effect to enhance detail - * preservation vs smoothing - [8.24], [0..256%]*/ - int32_t blend_power[4]; - /*!< blend_th[4] blend alpha(alpha0) - preserve details based on texture classification of the - * form alpha0>TH - [0:2^10-1]*/ - int32_t blend_th[4]; - /*!< blend_texturegain[4] blend alpha(alpha0) - define steepness of blent_th effect for - * preserve details - alphaRes=2^10-1; gainScale=255; outScale=0.01; curSlope = - * outScale*tan(pi/2*((fixGain/(gainScale-1))^2))*alphaRes/(alphaRes-curTH) - [0..256]*/ - int32_t blend_texturegain[4]; - /*!< blend_radgain blend radial weigh - [8.16], [0..256%]*/ - int32_t blend_radgain; - /*!< matchqualitycands[4] set max rank limit for alpha0 selected weights - [8.8] [0..14]*/ - int32_t matchqualitycands[4]; - /*!< wsumminth final regret factor on Sum(weight)getSequence() >= mLastEffectSeq && - mPendingRequests.empty()) { + mPendingRequests.empty() && (mRequestsInProcessing == 0)) { LOGW("No request, insert fake req after req %ld to keep 3A stats update", mLastRequestId); CameraRequest fakeRequest; diff --git a/src/isp_control/Android.mk b/src/isp_control/Android.mk deleted file mode 100644 index 2d444ecf..00000000 --- a/src/isp_control/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2017 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -LOCAL_SRC_FILES += \ - src/isp_control/IspControlUtils.cpp - diff --git a/src/isp_control/CMakeLists.txt b/src/isp_control/CMakeLists.txt deleted file mode 100644 index 21a9788f..00000000 --- a/src/isp_control/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (C) 2017 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -set(IPS_CTRL_SRCS - ${ISP_CTRL_DIR}/IspControlUtils.cpp - CACHE INTERNAL "isp_ctrl sources" - ) - diff --git a/src/isp_control/IspControl.mako b/src/isp_control/IspControl.mako deleted file mode 100644 index 97218660..00000000 --- a/src/isp_control/IspControl.mako +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2017-2018 Intel Corporation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Warning this header is automatically generated. - * Any manual change here will be lost. - */ - -#pragma once - -#include - -namespace icamera { - -typedef enum -{ -% for item in uuid_list: -${item} -% endfor -} camera_control_isp_ctrl_id; - -% for item in struct_list: -/** - * \struct ${item[0]} - */ -${item[1]} -% endfor -} // end of icamera diff --git a/src/isp_control/IspControlInfoMap.cpp b/src/isp_control/IspControlInfoMap.cpp deleted file mode 100644 index 1c3aa52a..00000000 --- a/src/isp_control/IspControlInfoMap.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2017-2018 Intel Corporation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Warning this file is automatically generated. - * Any manual change here will be lost. - */ - -struct IspControlInfo { - const char* name; - uint32_t ctrlId; - uint32_t size; - uint32_t tag; -}; - -static const IspControlInfo gIspControlInfoMap[] = { - {"wb_gains", camera_control_isp_ctrl_id_wb_gains, sizeof(camera_control_isp_wb_gains_t), - INTEL_CONTROL_ISP_WB_GAINS}, - {"color_correction_matrix", camera_control_isp_ctrl_id_color_correction_matrix, - sizeof(camera_control_isp_color_correction_matrix_t), - INTEL_CONTROL_ISP_COLOR_CORRECTION_MATRIX}, - {"advanced_color_correction_matrix", - camera_control_isp_ctrl_id_advanced_color_correction_matrix, - sizeof(camera_control_isp_advanced_color_correction_matrix_t), - INTEL_CONTROL_ISP_ADVANCED_COLOR_CORRECTION_MATRIX}, - {"bxt_csc", camera_control_isp_ctrl_id_bxt_csc, sizeof(camera_control_isp_bxt_csc_t), - INTEL_CONTROL_ISP_BXT_CSC}, - {"bxt_demosaic", camera_control_isp_ctrl_id_bxt_demosaic, - sizeof(camera_control_isp_bxt_demosaic_t), INTEL_CONTROL_ISP_BXT_DEMOSAIC}, - {"sc_iefd", camera_control_isp_ctrl_id_sc_iefd, sizeof(camera_control_isp_sc_iefd_t), - INTEL_CONTROL_ISP_SC_IEFD}, - {"see", camera_control_isp_ctrl_id_see, sizeof(camera_control_isp_see_t), - INTEL_CONTROL_ISP_SEE}, - {"bnlm", camera_control_isp_ctrl_id_bnlm, sizeof(camera_control_isp_bnlm_t), - INTEL_CONTROL_ISP_BNLM}, - {"tnr5_21", camera_control_isp_ctrl_id_tnr5_21, sizeof(camera_control_isp_tnr5_21_t), - INTEL_CONTROL_ISP_TNR5_21}, - {"xnr_dss", camera_control_isp_ctrl_id_xnr_dss, sizeof(camera_control_isp_xnr_dss_t), - INTEL_CONTROL_ISP_XNR_DSS}, - {"gamma_tone_map", camera_control_isp_ctrl_id_gamma_tone_map, - sizeof(camera_control_isp_gamma_tone_map_t), INTEL_CONTROL_ISP_GAMMA_TONE_MAP}, - {"tnr5_22", camera_control_isp_ctrl_id_tnr5_22, sizeof(camera_control_isp_tnr5_22_t), - INTEL_CONTROL_ISP_TNR5_22}, - {"tnr5_25", camera_control_isp_ctrl_id_tnr5_25, sizeof(camera_control_isp_tnr5_25_t), - INTEL_CONTROL_ISP_TNR5_25}, -}; diff --git a/src/isp_control/IspControlInfoMap.mako b/src/isp_control/IspControlInfoMap.mako deleted file mode 100644 index f170870e..00000000 --- a/src/isp_control/IspControlInfoMap.mako +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2017-2018 Intel Corporation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Warning this file is automatically generated. - * Any manual change here will be lost. - */ - -struct IspControlInfo { - const char* name; - uint32_t ctrlId; - uint32_t size; - uint32_t tag; -}; - -static const IspControlInfo gIspControlInfoMap[] = { - % for item in control_list: - { "${item.base_name}", ${item.hal_uuid}, sizeof(${item.hal_struct}), ${item.tag_name} }, - % endfor -}; - diff --git a/src/isp_control/IspControlUtils.cpp b/src/isp_control/IspControlUtils.cpp deleted file mode 100644 index 691cf13f..00000000 --- a/src/isp_control/IspControlUtils.cpp +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (C) 2017-2021 Intel Corporation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG IspControlUtils - -#include "CameraMetadata.h" - -#include "IspControl.h" -#include "IspControlUtils.h" - -#include "iutils/CameraLog.h" -#include "iutils/Utils.h" - -namespace icamera { - -#include "IspControlInfoMap.cpp" - -const char* IspControlUtils::getNameById(uint32_t ctrlId) { - int size = ARRAY_SIZE(gIspControlInfoMap); - for (int i = 0; i < size; i++) { - if (gIspControlInfoMap[i].ctrlId == ctrlId) { - return gIspControlInfoMap[i].name; - } - } - - return nullptr; -} - -uint32_t IspControlUtils::getIdByName(const char* name) { - int size = ARRAY_SIZE(gIspControlInfoMap); - for (int i = 0; i < size; i++) { - if (strcmp(gIspControlInfoMap[i].name, name) == 0) { - return gIspControlInfoMap[i].ctrlId; - } - } - - return 0; -} - -uint32_t IspControlUtils::getSizeById(uint32_t ctrlId) { - int size = ARRAY_SIZE(gIspControlInfoMap); - for (int i = 0; i < size; i++) { - if (gIspControlInfoMap[i].ctrlId == ctrlId) { - return gIspControlInfoMap[i].size; - } - } - - return 0; -} - -uint32_t IspControlUtils::getTagById(uint32_t ctrlId) { - int size = ARRAY_SIZE(gIspControlInfoMap); - for (int i = 0; i < size; i++) { - if (gIspControlInfoMap[i].ctrlId == ctrlId) { - return gIspControlInfoMap[i].tag; - } - } - - return 0; -} - -// This struct must be same with ia_record_header in ia_types.h -typedef struct { - unsigned int uuid; - unsigned int size; -} ia_header; - -void* IspControlUtils::findDataById(uint32_t ctrlId, void* fullData, uint32_t size) { - CheckAndLogError(fullData == nullptr || size == 0, nullptr, "Invalid input parameters"); - - char* pData = (char*)fullData; - uint32_t offset = 0; - - // Find the corresponding data from ISP output data. - while (offset < size) { - ia_header* headerPtr = (ia_header*)(pData + offset); - LOG2("ISP output UUID:%d, size:%d", headerPtr->uuid, headerPtr->size); - if (headerPtr->uuid == 0 || headerPtr->size == 0) break; - if (ctrlId == headerPtr->uuid) { - char* offsetPtr = pData + (offset + sizeof(ia_header)); - return offsetPtr; - } - offset += headerPtr->size; - } - - return nullptr; -} - -} // namespace icamera diff --git a/src/isp_control/IspControlUtils.h b/src/isp_control/IspControlUtils.h deleted file mode 100644 index 70308f7c..00000000 --- a/src/isp_control/IspControlUtils.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2017-2018 Intel Corporation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include - -namespace icamera { - -namespace IspControlUtils { -const char* getNameById(uint32_t ctrlId); - -uint32_t getIdByName(const char* name); - -uint32_t getSizeById(uint32_t ctrlId); - -uint32_t getTagById(uint32_t ctrlId); - -/** - * Find the data pointer which belongs to ctrlId in fullData - * - * Return NULL if cannot find ctrlId in fullData, otherwise will return the data pointer. - */ -void* findDataById(uint32_t ctrlId, void* fullData, uint32_t size); -} // namespace IspControlUtils - -} // namespace icamera diff --git a/src/isp_control/README b/src/isp_control/README deleted file mode 100644 index 2740ae11..00000000 --- a/src/isp_control/README +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (C) 2017 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -isp_control_autogen is used to generate IspControl APIs and ISP control related utility code. - -Prerequisites: -python and mako, install them by: sudo apt-get install python3 python3-mako - -Step to run: -1. Go to the metadata folder: src/metadata/docs -2. Add or update the isp_control section of metadata_properties.xml -3. Execute: ./metadata-generate -4. Go to the isp_control folder in src/isp_control -5. Copy ia_pal_types_algo_parameters_autogen.h to the folder src/isp_control. - ia_pal_types_algo_parameters_autogen.h which is located in ia_pal/srcs/broxton_ia_pal/ is generated when building PAL. -6. Execute: ./isp_control_autogen.py - diff --git a/src/isp_control/isp_control_autogen.py b/src/isp_control/isp_control_autogen.py deleted file mode 100755 index 2e5cea41..00000000 --- a/src/isp_control/isp_control_autogen.py +++ /dev/null @@ -1,149 +0,0 @@ -#!/usr/bin/env python3 - -# -# Copyright (C) 2017 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -import sys -import os.path -import xml.etree.ElementTree as Tree -from mako.template import Template - - -class ControlData: - def __init__(self, base_name): - self.base_name = base_name - self.pal_uuid = self._get_pal_uuid() - self.pal_struct = self._get_pal_data_struct() - self.hal_uuid = self._get_hal_uuid() - self.hal_struct = self._get_hal_data_struct() - self.tag_name = self._get_metadata_tag() - - def _get_hal_uuid(self): - _hal_prefix = 'camera_control_isp_ctrl_id_' - return _hal_prefix + self.base_name - - def _get_hal_data_struct(self): - _hal_prefix = 'camera_control_isp_' - _hal_suffix = '_t' - return _hal_prefix + self.base_name + _hal_suffix - - def _get_pal_uuid(self): - _pal_prefix = 'ia_pal_uuid_algo_' - return _pal_prefix + self.base_name - - def _get_pal_data_struct(self): - _pal_prefix = 'ia_pal_algo_' - _pal_suffix = '_t' - return _pal_prefix + self.base_name + _pal_suffix - - def _get_metadata_tag(self): - _pal_prefix = 'INTEL_CONTROL_ISP_' - return _pal_prefix + self.base_name.upper() - - -def get_isp_control_list(xml_file): - def append_namespace(tag): - namespace = '{http://schemas.android.com/service/camera/metadata/}' - return namespace + tag - - root = Tree.parse(xml_file).getroot() - _controls = [] - - for ns in root.findall(append_namespace('namespace')): - if ns.get('name') != 'intel': - continue - - for section in ns.iter(append_namespace('section')): - if section.get('name') != 'control_isp': - continue - - controls = section.find(append_namespace('controls')) - entries = controls.findall(append_namespace('entry')) - for entry in entries: - if entry.get('name') == 'enabledCtrlIds': - continue - _controls.append(ControlData(entry.get('name'))) - - return _controls - - -def get_api_definitions(pal_header, controls): - end_str = '};\n' - with open(pal_header, 'rt', encoding='utf-8') as f: - uuid_list = list() - struct_list = list() - - for item in controls: - f.seek(0) - struct_name = 'struct ' + item.hal_struct + ' IS INVALID' - struct_definition = 'struct ' + item.hal_struct + ' IS INVALID\n' - uuid_name = ' ' + item.hal_uuid + ' = INVALID UUID,' - is_found = False - - for line in f: - if (item.pal_uuid + ' = ') in line: - uuid_name = line.replace(item.pal_uuid, item.hal_uuid).replace('\n', '') - - if ('struct ' + item.pal_struct) in line: - is_found = True - struct_definition = line.replace(item.pal_struct, item.hal_struct) - struct_name = item.hal_struct - elif is_found: - struct_definition += line - - if line == end_str: - is_found = False - - uuid_list.append(uuid_name) - struct_list.append((struct_name, struct_definition)) - - return uuid_list, struct_list - - -def generate_isp_control_header_file(): - control_list = get_isp_control_list(metadata_file) - hal_uuid, hal_struct = get_api_definitions(pal_header_file, control_list) - header = Template(filename='IspControl.mako') - output_header = open('../../include/api/IspControl.h', 'w') - output_header.write(header.render(uuid_list=hal_uuid, struct_list=hal_struct)) - output_header.close() - - -def generate_isp_control_utils_file(): - control_list = get_isp_control_list(metadata_file) - - cpp = Template(filename='IspControlInfoMap.mako') - cpp_output = open('IspControlInfoMap.cpp', 'w') - cpp_output.write(cpp.render(control_list=control_list)) - cpp_output.close() - - -pal_header_file = 'ia_pal_types_algo_parameters_autogen.h' -metadata_file = '../metadata/autogen/metadata_properties.xml' - -if not os.path.exists(pal_header_file): - print('Cannot find PAL header file: ' + pal_header_file) - sys.exit(1) - -if not os.path.exists(metadata_file): - print('Cannot find metadata file: ' + metadata_file) - sys.exit(1) - -generate_isp_control_header_file() -generate_isp_control_utils_file() - -os.system('../metadata/autogen/metadata-generate') - diff --git a/src/iutils/ModuleTags.cpp b/src/iutils/ModuleTags.cpp index bba451f5..03d8e528 100644 --- a/src/iutils/ModuleTags.cpp +++ b/src/iutils/ModuleTags.cpp @@ -79,6 +79,7 @@ const char* tagNames[] = { "Customized3A", "CustomizedAic", "CvfPrivacyChecker", + "DLCClient", "DeviceBase", "Dvs", "EXIFMaker", diff --git a/src/iutils/ModuleTags.h b/src/iutils/ModuleTags.h index e7aca700..d783e80d 100644 --- a/src/iutils/ModuleTags.h +++ b/src/iutils/ModuleTags.h @@ -87,143 +87,144 @@ enum ModuleTags { GENERATED_TAGS_Customized3A = 57, GENERATED_TAGS_CustomizedAic = 58, GENERATED_TAGS_CvfPrivacyChecker = 59, - GENERATED_TAGS_DeviceBase = 60, - GENERATED_TAGS_Dvs = 61, - GENERATED_TAGS_EXIFMaker = 62, - GENERATED_TAGS_EXIFMetaData = 63, - GENERATED_TAGS_ExifCreater = 64, - GENERATED_TAGS_FaceDetection = 65, - GENERATED_TAGS_FaceDetectionPVL = 66, - GENERATED_TAGS_FaceDetectionResultCallbackManager = 67, - GENERATED_TAGS_FaceSSD = 68, - GENERATED_TAGS_FileSource = 69, - GENERATED_TAGS_GPUExecutor = 70, - GENERATED_TAGS_GenGfx = 71, - GENERATED_TAGS_GfxGen = 72, - GENERATED_TAGS_GraphConfig = 73, - GENERATED_TAGS_GraphConfigImpl = 74, - GENERATED_TAGS_GraphConfigImplClient = 75, - GENERATED_TAGS_GraphConfigManager = 76, - GENERATED_TAGS_GraphConfigPipe = 77, - GENERATED_TAGS_GraphConfigServer = 78, - GENERATED_TAGS_GraphUtils = 79, - GENERATED_TAGS_HAL_FACE_DETECTION_TEST = 80, - GENERATED_TAGS_HAL_basic = 81, - GENERATED_TAGS_HAL_jpeg = 82, - GENERATED_TAGS_HAL_multi_streams_test = 83, - GENERATED_TAGS_HAL_rotation_test = 84, - GENERATED_TAGS_HAL_yuv = 85, - GENERATED_TAGS_HalAdaptor = 86, - GENERATED_TAGS_HalV3Utils = 87, - GENERATED_TAGS_I3AControlFactory = 88, - GENERATED_TAGS_IA_CIPR_UTILS = 89, - GENERATED_TAGS_ICBMThread = 90, - GENERATED_TAGS_ICamera = 91, - GENERATED_TAGS_IFaceDetection = 92, - GENERATED_TAGS_IPCIntelPGParam = 93, - GENERATED_TAGS_IPC_FACE_DETECTION = 94, - GENERATED_TAGS_IPC_GRAPH_CONFIG = 95, - GENERATED_TAGS_ImageProcessorCore = 96, - GENERATED_TAGS_ImageScalerCore = 97, - GENERATED_TAGS_Intel3AParameter = 98, - GENERATED_TAGS_IntelAEStateMachine = 99, - GENERATED_TAGS_IntelAFStateMachine = 100, - GENERATED_TAGS_IntelAWBStateMachine = 101, - GENERATED_TAGS_IntelAlgoClient = 102, - GENERATED_TAGS_IntelAlgoCommonClient = 103, - GENERATED_TAGS_IntelAlgoServer = 104, - GENERATED_TAGS_IntelCPUAlgoServer = 105, - GENERATED_TAGS_IntelCca = 106, - GENERATED_TAGS_IntelCcaClient = 107, - GENERATED_TAGS_IntelCcaServer = 108, - GENERATED_TAGS_IntelFDServer = 109, - GENERATED_TAGS_IntelFaceDetection = 110, - GENERATED_TAGS_IntelFaceDetectionClient = 111, - GENERATED_TAGS_IntelGPUAlgoServer = 112, - GENERATED_TAGS_IntelICBM = 113, - GENERATED_TAGS_IntelICBMClient = 114, - GENERATED_TAGS_IntelICBMServer = 115, - GENERATED_TAGS_IntelPGParam = 116, - GENERATED_TAGS_IntelPGParamClient = 117, - GENERATED_TAGS_IntelPGParamS = 118, - GENERATED_TAGS_IntelTNR7US = 119, - GENERATED_TAGS_IntelTNR7USClient = 120, - GENERATED_TAGS_IntelTNRServer = 121, - GENERATED_TAGS_IspControlUtils = 122, - GENERATED_TAGS_IspParamAdaptor = 123, - GENERATED_TAGS_JpegEncoderCore = 124, - GENERATED_TAGS_JpegMaker = 125, - GENERATED_TAGS_LensHw = 126, - GENERATED_TAGS_LensManager = 127, - GENERATED_TAGS_LiveTuning = 128, - GENERATED_TAGS_Ltm = 129, - GENERATED_TAGS_MANUAL_POST_PROCESSING = 130, - GENERATED_TAGS_MakerNote = 131, - GENERATED_TAGS_MediaControl = 132, - GENERATED_TAGS_MetadataConvert = 133, - GENERATED_TAGS_MockCamera3HAL = 134, - GENERATED_TAGS_MockCameraHal = 135, - GENERATED_TAGS_MockSysCall = 136, - GENERATED_TAGS_MsgHandler = 137, - GENERATED_TAGS_OnePunchIC2 = 138, - GENERATED_TAGS_OpenSourceGFX = 139, - GENERATED_TAGS_PGCommon = 140, - GENERATED_TAGS_PGUtils = 141, - GENERATED_TAGS_PSysDAG = 142, - GENERATED_TAGS_PSysPipe = 143, - GENERATED_TAGS_PSysProcessor = 144, - GENERATED_TAGS_ParameterGenerator = 145, - GENERATED_TAGS_ParameterHelper = 146, - GENERATED_TAGS_ParameterResult = 147, - GENERATED_TAGS_Parameters = 148, - GENERATED_TAGS_ParserBase = 149, - GENERATED_TAGS_PipeExecutor = 150, - GENERATED_TAGS_PipeLiteExecutor = 151, - GENERATED_TAGS_PlatformData = 152, - GENERATED_TAGS_PnpDebugControl = 153, - GENERATED_TAGS_PolicyParser = 154, - GENERATED_TAGS_PostProcessor = 155, - GENERATED_TAGS_PostProcessorBase = 156, - GENERATED_TAGS_PostProcessorCore = 157, - GENERATED_TAGS_PrivacyControl = 158, - GENERATED_TAGS_PrivateStream = 159, - GENERATED_TAGS_ProcessorManager = 160, - GENERATED_TAGS_RequestManager = 161, - GENERATED_TAGS_RequestThread = 162, - GENERATED_TAGS_ResultProcessor = 163, - GENERATED_TAGS_SWJpegEncoder = 164, - GENERATED_TAGS_SWPostProcessor = 165, - GENERATED_TAGS_SchedPolicy = 166, - GENERATED_TAGS_Scheduler = 167, - GENERATED_TAGS_SensorHwCtrl = 168, - GENERATED_TAGS_SensorManager = 169, - GENERATED_TAGS_SensorOB = 170, - GENERATED_TAGS_ShareRefer = 171, - GENERATED_TAGS_SofSource = 172, - GENERATED_TAGS_StreamBuffer = 173, - GENERATED_TAGS_SwImageConverter = 174, - GENERATED_TAGS_SwImageProcessor = 175, - GENERATED_TAGS_SyncManager = 176, - GENERATED_TAGS_SysCall = 177, - GENERATED_TAGS_TCPServer = 178, - GENERATED_TAGS_Thread = 179, - GENERATED_TAGS_Trace = 180, - GENERATED_TAGS_TunningParser = 181, - GENERATED_TAGS_Utils = 182, - GENERATED_TAGS_V4l2DeviceFactory = 183, - GENERATED_TAGS_V4l2_device_cc = 184, - GENERATED_TAGS_V4l2_subdevice_cc = 185, - GENERATED_TAGS_V4l2_video_node_cc = 186, - GENERATED_TAGS_VendorTags = 187, - GENERATED_TAGS_camera_metadata_tests = 188, - GENERATED_TAGS_icamera_metadata_base = 189, - GENERATED_TAGS_metadata_test = 190, - ST_FPS = 191, - ST_GPU_TNR = 192, - ST_STATS = 193, + GENERATED_TAGS_DLCClient = 60, + GENERATED_TAGS_DeviceBase = 61, + GENERATED_TAGS_Dvs = 62, + GENERATED_TAGS_EXIFMaker = 63, + GENERATED_TAGS_EXIFMetaData = 64, + GENERATED_TAGS_ExifCreater = 65, + GENERATED_TAGS_FaceDetection = 66, + GENERATED_TAGS_FaceDetectionPVL = 67, + GENERATED_TAGS_FaceDetectionResultCallbackManager = 68, + GENERATED_TAGS_FaceSSD = 69, + GENERATED_TAGS_FileSource = 70, + GENERATED_TAGS_GPUExecutor = 71, + GENERATED_TAGS_GenGfx = 72, + GENERATED_TAGS_GfxGen = 73, + GENERATED_TAGS_GraphConfig = 74, + GENERATED_TAGS_GraphConfigImpl = 75, + GENERATED_TAGS_GraphConfigImplClient = 76, + GENERATED_TAGS_GraphConfigManager = 77, + GENERATED_TAGS_GraphConfigPipe = 78, + GENERATED_TAGS_GraphConfigServer = 79, + GENERATED_TAGS_GraphUtils = 80, + GENERATED_TAGS_HAL_FACE_DETECTION_TEST = 81, + GENERATED_TAGS_HAL_basic = 82, + GENERATED_TAGS_HAL_jpeg = 83, + GENERATED_TAGS_HAL_multi_streams_test = 84, + GENERATED_TAGS_HAL_rotation_test = 85, + GENERATED_TAGS_HAL_yuv = 86, + GENERATED_TAGS_HalAdaptor = 87, + GENERATED_TAGS_HalV3Utils = 88, + GENERATED_TAGS_I3AControlFactory = 89, + GENERATED_TAGS_IA_CIPR_UTILS = 90, + GENERATED_TAGS_ICBMThread = 91, + GENERATED_TAGS_ICamera = 92, + GENERATED_TAGS_IFaceDetection = 93, + GENERATED_TAGS_IPCIntelPGParam = 94, + GENERATED_TAGS_IPC_FACE_DETECTION = 95, + GENERATED_TAGS_IPC_GRAPH_CONFIG = 96, + GENERATED_TAGS_ImageProcessorCore = 97, + GENERATED_TAGS_ImageScalerCore = 98, + GENERATED_TAGS_Intel3AParameter = 99, + GENERATED_TAGS_IntelAEStateMachine = 100, + GENERATED_TAGS_IntelAFStateMachine = 101, + GENERATED_TAGS_IntelAWBStateMachine = 102, + GENERATED_TAGS_IntelAlgoClient = 103, + GENERATED_TAGS_IntelAlgoCommonClient = 104, + GENERATED_TAGS_IntelAlgoServer = 105, + GENERATED_TAGS_IntelCPUAlgoServer = 106, + GENERATED_TAGS_IntelCca = 107, + GENERATED_TAGS_IntelCcaClient = 108, + GENERATED_TAGS_IntelCcaServer = 109, + GENERATED_TAGS_IntelFDServer = 110, + GENERATED_TAGS_IntelFaceDetection = 111, + GENERATED_TAGS_IntelFaceDetectionClient = 112, + GENERATED_TAGS_IntelGPUAlgoServer = 113, + GENERATED_TAGS_IntelICBM = 114, + GENERATED_TAGS_IntelICBMClient = 115, + GENERATED_TAGS_IntelICBMServer = 116, + GENERATED_TAGS_IntelPGParam = 117, + GENERATED_TAGS_IntelPGParamClient = 118, + GENERATED_TAGS_IntelPGParamS = 119, + GENERATED_TAGS_IntelTNR7US = 120, + GENERATED_TAGS_IntelTNR7USClient = 121, + GENERATED_TAGS_IntelTNRServer = 122, + GENERATED_TAGS_IspControlUtils = 123, + GENERATED_TAGS_IspParamAdaptor = 124, + GENERATED_TAGS_JpegEncoderCore = 125, + GENERATED_TAGS_JpegMaker = 126, + GENERATED_TAGS_LensHw = 127, + GENERATED_TAGS_LensManager = 128, + GENERATED_TAGS_LiveTuning = 129, + GENERATED_TAGS_Ltm = 130, + GENERATED_TAGS_MANUAL_POST_PROCESSING = 131, + GENERATED_TAGS_MakerNote = 132, + GENERATED_TAGS_MediaControl = 133, + GENERATED_TAGS_MetadataConvert = 134, + GENERATED_TAGS_MockCamera3HAL = 135, + GENERATED_TAGS_MockCameraHal = 136, + GENERATED_TAGS_MockSysCall = 137, + GENERATED_TAGS_MsgHandler = 138, + GENERATED_TAGS_OnePunchIC2 = 139, + GENERATED_TAGS_OpenSourceGFX = 140, + GENERATED_TAGS_PGCommon = 141, + GENERATED_TAGS_PGUtils = 142, + GENERATED_TAGS_PSysDAG = 143, + GENERATED_TAGS_PSysPipe = 144, + GENERATED_TAGS_PSysProcessor = 145, + GENERATED_TAGS_ParameterGenerator = 146, + GENERATED_TAGS_ParameterHelper = 147, + GENERATED_TAGS_ParameterResult = 148, + GENERATED_TAGS_Parameters = 149, + GENERATED_TAGS_ParserBase = 150, + GENERATED_TAGS_PipeExecutor = 151, + GENERATED_TAGS_PipeLiteExecutor = 152, + GENERATED_TAGS_PlatformData = 153, + GENERATED_TAGS_PnpDebugControl = 154, + GENERATED_TAGS_PolicyParser = 155, + GENERATED_TAGS_PostProcessor = 156, + GENERATED_TAGS_PostProcessorBase = 157, + GENERATED_TAGS_PostProcessorCore = 158, + GENERATED_TAGS_PrivacyControl = 159, + GENERATED_TAGS_PrivateStream = 160, + GENERATED_TAGS_ProcessorManager = 161, + GENERATED_TAGS_RequestManager = 162, + GENERATED_TAGS_RequestThread = 163, + GENERATED_TAGS_ResultProcessor = 164, + GENERATED_TAGS_SWJpegEncoder = 165, + GENERATED_TAGS_SWPostProcessor = 166, + GENERATED_TAGS_SchedPolicy = 167, + GENERATED_TAGS_Scheduler = 168, + GENERATED_TAGS_SensorHwCtrl = 169, + GENERATED_TAGS_SensorManager = 170, + GENERATED_TAGS_SensorOB = 171, + GENERATED_TAGS_ShareRefer = 172, + GENERATED_TAGS_SofSource = 173, + GENERATED_TAGS_StreamBuffer = 174, + GENERATED_TAGS_SwImageConverter = 175, + GENERATED_TAGS_SwImageProcessor = 176, + GENERATED_TAGS_SyncManager = 177, + GENERATED_TAGS_SysCall = 178, + GENERATED_TAGS_TCPServer = 179, + GENERATED_TAGS_Thread = 180, + GENERATED_TAGS_Trace = 181, + GENERATED_TAGS_TunningParser = 182, + GENERATED_TAGS_Utils = 183, + GENERATED_TAGS_V4l2DeviceFactory = 184, + GENERATED_TAGS_V4l2_device_cc = 185, + GENERATED_TAGS_V4l2_subdevice_cc = 186, + GENERATED_TAGS_V4l2_video_node_cc = 187, + GENERATED_TAGS_VendorTags = 188, + GENERATED_TAGS_camera_metadata_tests = 189, + GENERATED_TAGS_icamera_metadata_base = 190, + GENERATED_TAGS_metadata_test = 191, + ST_FPS = 192, + ST_GPU_TNR = 193, + ST_STATS = 194, }; -#define TAGS_MAX_NUM 194 +#define TAGS_MAX_NUM 195 #endif // !!! DO NOT EDIT THIS FILE !!! diff --git a/src/metadata/ParameterGenerator.cpp b/src/metadata/ParameterGenerator.cpp index 696af3b5..715c7e67 100644 --- a/src/metadata/ParameterGenerator.cpp +++ b/src/metadata/ParameterGenerator.cpp @@ -68,6 +68,8 @@ ParameterGenerator::ParameterGenerator(int cameraId) mTonemapCurveGreen[i * 2 + 1] = index / (mTonemapMaxCurvePoints - 1); } } + CLEAR(mSensitivityRange); + info.capability->getSupportedSensorSensitivityRange(mSensitivityRange); } ParameterGenerator::~ParameterGenerator() {} @@ -325,7 +327,19 @@ int ParameterGenerator::updateWithAiqResultsL(int64_t sequence, Parameters* para } else { params->setExposureTime(aiqResult->mAeResults.exposures[0].exposure[0].exposure_time_us); } - params->setSensitivityIso(aiqResult->mAeResults.exposures[0].exposure[0].iso); + + int iso = aiqResult->mAeResults.exposures[0].exposure[0].iso; + SensitivityRange range; + if (PlatformData::getSensitivityRangeByTuningMode(mCameraId, aiqResult->mTuningMode, + range) == OK) { + float ratio = static_cast(iso - range.min) / (range.max - range.min); + iso = mSensitivityRange.min + ratio * (mSensitivityRange.max - mSensitivityRange.min); + iso = CLIP(iso, mSensitivityRange.max, mSensitivityRange.min); + LOG2("%s, exposure[0].iso %d, iso %d", __func__, + aiqResult->mAeResults.exposures[0].exposure[0].iso, iso); + } + params->setSensitivityIso(iso); + float fps = 1000000.0 / aiqResult->mFrameDuration; params->setFrameRate(fps); diff --git a/src/metadata/ParameterGenerator.h b/src/metadata/ParameterGenerator.h index 47bcb6bf..41e41a39 100644 --- a/src/metadata/ParameterGenerator.h +++ b/src/metadata/ParameterGenerator.h @@ -108,6 +108,7 @@ class ParameterGenerator { int32_t mTonemapMaxCurvePoints; camera_color_transform_t mPaCcm; + camera_range_t mSensitivityRange; }; } /* namespace icamera */ diff --git a/src/platformdata/CameraParser.cpp b/src/platformdata/CameraParser.cpp index 258eead5..0cf56a77 100644 --- a/src/platformdata/CameraParser.cpp +++ b/src/platformdata/CameraParser.cpp @@ -426,6 +426,27 @@ void CameraParser::handleSensor(CameraParser* profiles, const char* name, const LOGE("unknown Lens HW type %s, set to LENS_NONE_HW", atts[1]); pCurrentCam->mLensHwType = LENS_NONE_HW; } + } else if (strcmp(name, "tuningModeToSensitivityMap") == 0) { + int size = strlen(atts[1]); + char src[size + 1]; + MEMCPY_S(src, size, atts[1], size); + src[size] = '\0'; + + char* savePtr = nullptr; + char* tuningMode = strtok_r(src, ",", &savePtr); + while (tuningMode) { + SensitivityRange range; + char* min = strtok_r(nullptr, ",", &savePtr); + char* max = strtok_r(nullptr, ",", &savePtr); + CheckAndLogError(!tuningMode || !min || !max, VOID_VALUE, "Wrong sensitivity map"); + + TuningMode mode = CameraUtils::string2TuningMode(tuningMode); + range.min = atoi(min); + range.max = atoi(max); + pCurrentCam->mTuningModeToSensitivityMap[mode] = range; + + tuningMode = strtok_r(nullptr, ",", &savePtr); + } } else if (strcmp(name, "enablePdaf") == 0) { pCurrentCam->mEnablePdaf = strcmp(atts[1], "true") == 0; } else if (strcmp(name, "sensorAwb") == 0) { diff --git a/src/platformdata/CameraTypes.h b/src/platformdata/CameraTypes.h index b239d7df..319c5e78 100644 --- a/src/platformdata/CameraTypes.h +++ b/src/platformdata/CameraTypes.h @@ -240,6 +240,11 @@ struct MultiExpRange { ExpRange SHS3; }; +struct SensitivityRange { + int32_t min; + int32_t max; +}; + struct UserToPslOutputMap { camera_resolution_t User; camera_resolution_t Psl; diff --git a/src/platformdata/PlatformData.cpp b/src/platformdata/PlatformData.cpp index f4374e10..9bfa206a 100644 --- a/src/platformdata/PlatformData.cpp +++ b/src/platformdata/PlatformData.cpp @@ -264,6 +264,17 @@ int PlatformData::getLensHwType(int cameraId) { return getInstance()->mStaticCfg.mCameras[cameraId].mLensHwType; } +int PlatformData::getSensitivityRangeByTuningMode(int cameraId, TuningMode mode, + SensitivityRange& range) { + auto& map = getInstance()->mStaticCfg.mCameras[cameraId].mTuningModeToSensitivityMap; + if (map.find(mode) != map.end()) { + range = map[mode]; + return OK; + } + + return NAME_NOT_FOUND; +} + bool PlatformData::isPdafEnabled(int cameraId) { return getInstance()->mStaticCfg.mCameras[cameraId].mEnablePdaf; } diff --git a/src/platformdata/PlatformData.h b/src/platformdata/PlatformData.h index 1f2f1ac0..d95b3c36 100644 --- a/src/platformdata/PlatformData.h +++ b/src/platformdata/PlatformData.h @@ -227,6 +227,7 @@ class PlatformData { VcAggregator mVcAggregator; // VIRTUAL_CHANNEL_E int mLensHwType; + std::unordered_map mTuningModeToSensitivityMap; bool mEnablePdaf; bool mSensorAwb; bool mSensorAe; @@ -475,6 +476,16 @@ class PlatformData { */ static int getLensHwType(int cameraId); + /** + * get sensitivity range by TuningMode + * + * \param[in] cameraId: [0, MAX_CAMERA_NUMBER - 1] + * \param[out] range: SensitivityRange + * \return OK if found, otherwise return NAME_NOT_FOUND. + */ + static int getSensitivityRangeByTuningMode(int cameraId, TuningMode mode, + SensitivityRange& range); + /** * check if PDAF is supported or not * diff --git a/src/platformdata/TunningParser.cpp b/src/platformdata/TunningParser.cpp deleted file mode 100644 index f212dc9b..00000000 --- a/src/platformdata/TunningParser.cpp +++ /dev/null @@ -1,273 +0,0 @@ -/* - * Copyright (C) 2016-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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#define LOG_TAG TunningParser - -#include "TunningParser.h" - -#include -#include - -#include "iutils/CameraLog.h" -#include "iutils/Utils.h" - -namespace icamera { -#define TUNNING_PROFILE_NAME "tunning_profiles.xml" -TunningParser::TunningParser(PlatformData::StaticCfg* cfg) - : mStaticCfg(cfg), - mCurrentDataField(FIELD_INVALID), - mCurrentCam(nullptr) { - LOG2("@%s", __func__); - CheckAndLogError(!mStaticCfg, VOID_VALUE, "@%s, cfg parameter is wrong", __func__); - - int ret = getDataFromXmlFile(TUNNING_PROFILE_NAME); - if (ret != OK) LOGI("No tunning data from %s", TUNNING_PROFILE_NAME); -} - -// According sensorName to find the CameraInfo in mStaticCfg -void TunningParser::getCameraInfoByName(TunningParser* profiles, const char* name) { - size_t i = 0; - - for (i = 0; i < profiles->mStaticCfg->mCameras.size(); i++) { - if (strcmp(profiles->mStaticCfg->mCameras[i].sensorName.c_str(), name) == 0) { - profiles->mCurrentCam = &profiles->mStaticCfg->mCameras[i]; - break; - } - } - if (i == profiles->mStaticCfg->mCameras.size()) { - LOGE("Couldn't find the CameraInfo, please check the sensor name in xml"); - return; - } - LOG2("find the CameraInfo for sensor: %s", profiles->mCurrentCam->sensorName.c_str()); -} - -/** - * This function will check which field that the parser parses to. - * - * The field is set to 3 types. - * FIELD_INVALID FIELD_SENSOR and FIELD_COMMON - * - * \param profiles: the pointer of the TunningParser. - * \param name: the element's name. - * \param atts: the element's attribute. - */ -void TunningParser::checkField(TunningParser* profiles, const char* name, const char** atts) { - if (strcmp(name, "TunningSettings") == 0) { - profiles->mCurrentDataField = FIELD_INVALID; - return; - } else if (strcmp(name, "Sensor") == 0) { - int idx = 0; - while (atts[idx]) { - const char* key = atts[idx]; - const char* val = atts[idx + 1]; - LOG2("@%s, name:%s, atts[%d]:%s, atts[%d]:%s", __func__, name, idx, key, idx + 1, val); - if (strcmp(key, "name") == 0) { - profiles->getCameraInfoByName(profiles, val); - } - idx += 2; - } - profiles->mCurrentDataField = FIELD_SENSOR; - return; - } else if (strcmp(name, "Modules") == 0) { - profiles->mCurrentDataField = FIELD_MODULE; - return; - } else if (strcmp(name, "Common") == 0) { - profiles->mCurrentDataField = FIELD_COMMON; - return; - } - - LOGE("@%s, name:%s, atts[0]:%s, xml format wrong", __func__, name, atts[0]); - return; -} - -/** - * This function will handle all the common related elements. - * - * It will be called in the function startElement - * - * \param profiles: the pointer of the CameraParser. - * \param name: the element's name. - * \param atts: the element's attribute. - */ -void TunningParser::handleCommon(TunningParser* /*profiles*/, const char* name, const char** atts) { - LOG2("@%s, name:%s, atts[0]:%s", __func__, name, atts[0]); - - if (strcmp(atts[0], "value") != 0) { - LOGE("@%s, name:%s, atts[0]:%s, xml format wrong", __func__, name, atts[0]); - return; - } -} - -// CUSTOM_WEIGHT_GRID_S -void TunningParser::handleWeightGrid(TunningParser* profiles, const char* name, const char** atts) { - WeightGridTable wg; - int idx = 0; - - CLEAR(wg); - while (atts[idx]) { - const char* key = atts[idx]; - LOG2("%s: name: %s, value: %s", __func__, atts[idx], atts[idx + 1]); - if (strcmp(key, "width") == 0) { - wg.width = (unsigned short)strtoul(atts[idx + 1], nullptr, 10); - } else if (strcmp(key, "height") == 0) { - wg.height = (unsigned short)strtoul(atts[idx + 1], nullptr, 10); - } else if (strcmp(key, "table") == 0) { - if (wg.table) { - delete[] wg.table; - wg.table = nullptr; - } - if (0 < wg.width && wg.width < MAX_WEIGHT_GRID_SIDE_LEN && 0 < wg.height && - wg.height < MAX_WEIGHT_GRID_SIDE_LEN) { - wg.table = new unsigned char[wg.width * wg.height]; - } - - if (wg.table) parseXmlParameterToChar(atts[idx + 1], wg.table); - } - idx += 2; - } - - LOG2("@%s, name:%s, atts[0]:%s", __func__, name, atts[0]); - profiles->mCurrentCam->mWGTable.push_back(wg); -} -// CUSTOM_WEIGHT_GRID_E - -#define CAMERA_MODULE_STR "CameraModuleInfo_" -void TunningParser::handleModule(TunningParser* profiles, const char* name, const char** atts) { - if (strncmp(name, CAMERA_MODULE_STR, strlen(CAMERA_MODULE_STR)) == 0) { - // tag name like this: CameraModuleInfo_xxx - std::string tagName(name); - std::string moduleName = tagName.substr(strlen(CAMERA_MODULE_STR)); - for (size_t i = 0; i < profiles->mStaticCfg->mCameras.size(); i++) { - if (!profiles->mStaticCfg->mCameras[i].mCamModuleName.empty() && - (strcmp(profiles->mStaticCfg->mCameras[i].mCamModuleName.c_str(), - moduleName.c_str()) == 0)) { - profiles->mCurrentCam = &profiles->mStaticCfg->mCameras[i]; - break; - } - } - } - if (!profiles->mCurrentCam) return; - - LOG2("@%s, name:%s, atts[0]:%s, sensor:%s", __func__, name, atts[0], - profiles->mCurrentCam->sensorName.c_str()); - - if (strcmp(name, "edgeNrTable") == 0) { - EdgeNrSetting setting; - - int size = strlen(atts[1]); - char src[size+1]; - MEMCPY_S(src, size, atts[1], size); - src[size] = '\0'; - char* savePtr; - char* totalGain = strtok_r(src, ",", &savePtr); - - while (totalGain) { - float tg = atof(totalGain); - char* hdrRatio = strtok_r(nullptr, ",", &savePtr); - char* edge = strtok_r(nullptr, ",", &savePtr); - char* nr = strtok_r(nullptr, ",", &savePtr); - CheckWarning(!hdrRatio || !edge || !nr, VOID_VALUE, "wrong str %s", atts[1]); - - float hr = atof(hdrRatio); - setting.edgeStrength = atoi(edge); - setting.nrStrength = atoi(nr); - LOG3("Edge and Nr table: totalGain %f, hdrRatio %f, edge %d, nr %d", tg, hr, - setting.edgeStrength, setting.nrStrength); - auto& tmpMap = profiles->mCurrentCam->mTotalGainHdrRatioToEdgeNrMap[tg]; - tmpMap[hr] = setting; - - totalGain = strtok_r(nullptr, ",", &savePtr); - } - } -} - -/** - * This function will handle all the sensor related elements. - * - * It will be called in the function startElement - * - * \param profiles: the pointer of the CameraParser. - * \param name: the element's name. - * \param atts: the element's attribute. - */ -void TunningParser::handleSensor(TunningParser* profiles, const char* name, const char** atts) { - if (profiles->mCurrentCam == nullptr) { - LOGW("@%s, can't get the sensor name, will not process sensor weightgrid", __func__); - return; - } - - LOG2("@%s, name:%s, atts[0]:%s, sensor:%s", __func__, name, atts[0], - profiles->mCurrentCam->sensorName.c_str()); -// CUSTOM_WEIGHT_GRID_S - if (strcmp(name, "WeightGrid") == 0) { - handleWeightGrid(profiles, name, atts); - } -// CUSTOM_WEIGHT_GRID_E -} - -/** - * the callback function of the libexpat for handling of one element start - * - * When it comes to the start of one element. This function will be called. - * - * \param userData: the pointer we set by the function XML_SetUserData. - * \param name: the element's name. - */ -void TunningParser::startParseElement(void* userData, const char* name, const char** atts) { - TunningParser* profiles = reinterpret_cast(userData); - - if (profiles->mCurrentDataField == FIELD_INVALID) { - profiles->checkField(profiles, name, atts); - return; - } - - switch (profiles->mCurrentDataField) { - case FIELD_SENSOR: - profiles->handleSensor(profiles, name, atts); - break; - case FIELD_MODULE: - profiles->handleModule(profiles, name, atts); - break; - case FIELD_COMMON: - profiles->handleCommon(profiles, name, atts); - break; - default: - LOGE("@%s, line:%d, go to default handling", __func__, __LINE__); - break; - } -} - -/** - * the callback function of the libexpat for handling of one element end - * - * When it comes to the end of one element. This function will be called. - * - * \param userData: the pointer we set by the function XML_SetUserData. - * \param name: the element's name. - */ -void TunningParser::endParseElement(void* userData, const char* name) { - LOG2("@%s %s", __func__, name); - - TunningParser* profiles = reinterpret_cast(userData); - - if (strcmp(name, "Sensor") == 0 || strcmp(name, "Common") == 0 || - strcmp(name, "Modules") == 0) { - profiles->mCurrentDataField = FIELD_INVALID; - } else if (strncmp(name, CAMERA_MODULE_STR, strlen(CAMERA_MODULE_STR)) == 0) { - profiles->mCurrentCam = nullptr; - } -} - -} // namespace icamera diff --git a/src/platformdata/TunningParser.h b/src/platformdata/TunningParser.h deleted file mode 100644 index 2d96c45e..00000000 --- a/src/platformdata/TunningParser.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (C) 2016-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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - *\file TunningParser.h - * - * parser for the camera xml configuration file - * - * This file calls the libexpat ditectly. The libexpat is one xml parser. - * It will parse the camera configuration out firstly. - * Then other module can call the methods of it to get the real configuration. - * - */ - -#pragma once - -#include "ParserBase.h" -#include "PlatformData.h" - -namespace icamera { - -/** - * \class TunningParser - * - * This class is used to parse the camera configuration file. - * The configuration file is xml format. - * This class will use the expat lib to do the xml parser. - */ -class TunningParser : public ParserBase { - public: - explicit TunningParser(PlatformData::StaticCfg* cfg); - ~TunningParser() {} - - void startParseElement(void* userData, const char* name, const char** atts); - void endParseElement(void* userData, const char* name); - - private: - PlatformData::StaticCfg* mStaticCfg; - - enum DataField { - FIELD_INVALID = 0, - FIELD_SENSOR, - FIELD_MODULE, - FIELD_COMMON - } mCurrentDataField; - PlatformData::StaticCfg::CameraInfo* mCurrentCam; - - void getCameraInfoByName(TunningParser* profiles, const char* name); - void checkField(TunningParser* profiles, const char* name, const char** atts); - - void handleSensor(TunningParser* profiles, const char* name, const char** atts); - void handleModule(TunningParser* profiles, const char* name, const char** atts); - void handleCommon(TunningParser* profiles, const char* name, const char** atts); -// CUSTOM_WEIGHT_GRID_S - void handleWeightGrid(TunningParser* profiles, const char* name, const char** atts); -// CUSTOM_WEIGHT_GRID_E - - private: - // prevent copy constructor and assignment operator - DISALLOW_COPY_AND_ASSIGN(TunningParser); -}; - -} // namespace icamera