Merge branch 'bugfix/fix_video_compiling_error' into 'master'

Update IPA, JSON configuration and fix compiling error Closes AEG-2102 See merge request espressif/esp-video-components!223
espressif · Jan 3, 2025 · ef4f3c4 · ef4f3c4
2 parents d6253ec + 92b6569
commit ef4f3c4
Show file tree

Hide file tree

Showing 14 changed files with 1,500 additions and 261 deletions.
diff --git a/esp_cam_sensor/sensors/ov2710/cfg/ov2710_default.json b/esp_cam_sensor/sensors/ov2710/cfg/ov2710_default.json
diff --git a/esp_cam_sensor/sensors/ov5647/cfg/ov5647_default.json b/esp_cam_sensor/sensors/ov5647/cfg/ov5647_default.json
@@ -22,8 +22,17 @@
         "aen": {
             "gamma":
             {
-                "param": 0.72
-            },
+                "use_gamma_param": true,
+                "luma_env": "ae.luma.avg",
+                "luma_min_step": 16.0,
+                "table":
+                [
+                    {
+                        "luma": 71.1,
+                        "gamma_param": 0.72
+                    }
+                ]
+            },    
             "sharpen":
             [
                 {
@@ -50,6 +59,23 @@
                 }  
             ]
         },
+        "ian":
+        {
+            "luma":
+            {
+                "ae":
+                {
+                    "weight":
+                    [
+                        1, 1, 1, 1, 1,
+                        1, 1, 1, 1, 1,
+                        1, 1, 1, 1, 1,
+                        1, 1, 1, 1, 1,
+                        1, 1, 1, 1, 1
+                    ]
+                }
+            }
+        },
         "acc": {
             "saturation":
             [
@@ -59,17 +85,31 @@
                 }
             ],
             "ccm":
-            [
+            {
+                "low_luma":
                 {
-                    "color_temp": 0,
+                    "luma_env": "ae.luma.avg",
+                    "threshold": 28,
                     "matrix":
                     [
-                         2.0000,  -0.5459, -0.4541,
-                        -0.4751,   1.7696, -0.2945,
-                        -0.2002,  -0.7998,  2.0000
+                        1.00,  0.00, 0.00,
+                        0.00,    1.00,  0.00,
+                        0.00,  0.00,  1.00
                     ]
-                }     
-            ]
+                },
+                "table":
+                [
+                    {
+                        "color_temp": 0,
+                        "matrix":
+                        [
+                             2.0000,  -0.5459, -0.4541,
+                            -0.4751,   1.7696, -0.2945,
+                            -0.2002,  -0.7998,  2.0000
+                        ]
+                    }   
+                ]
+            }
         }
     }
 }