ipa: raspberrypi: Generalise the focus reporting code

Use the generalised focus statistics structure to compute the centre
window focus FoM value. This avoids needed to hard-code a specific
grid size.

Remove the focus reporting algorithm as the functionality is duplicated
by this bit of IPA code. Remove focus_status.h as it is no longer needed.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: David Plowman <david.plowman@raspberrypi.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

11 files changed, 0 insertions, 33 deletions

diff --git a/src/ipa/raspberrypi/data/imx290.json b/src/ipa/raspberrypi/data/imx290.json
index bfb9c609..ace68d0e 100644
--- a/src/ipa/raspberrypi/data/imx290.json
+++ b/src/ipa/raspberrypi/data/imx290.json
@@ -195,9 +195,6 @@
                     }
                 ]
             }
-        },
-        {
-            "rpi.focus": { }
         }
     ]
 }
\ No newline at end of file
diff --git a/src/ipa/raspberrypi/data/imx296.json b/src/ipa/raspberrypi/data/imx296.json
index 346f5b65..ae8722c4 100644
--- a/src/ipa/raspberrypi/data/imx296.json
+++ b/src/ipa/raspberrypi/data/imx296.json
@@ -532,9 +532,6 @@
                 "strength": 1.0,
                 "limit": 0.18
             }
-        },
-        {
-            "rpi.focus": { }
         }
     ]
 }
diff --git a/src/ipa/raspberrypi/data/imx296_mono.json b/src/ipa/raspberrypi/data/imx296_mono.json
index e9fa30c6..30965b4b 100644
--- a/src/ipa/raspberrypi/data/imx296_mono.json
+++ b/src/ipa/raspberrypi/data/imx296_mono.json
@@ -228,9 +228,6 @@
                 "strength": 1.0,
                 "limit": 0.18
             }
-        },
-        {
-            "rpi.focus": { }
         }
     ]
 }
diff --git a/src/ipa/raspberrypi/data/imx477.json b/src/ipa/raspberrypi/data/imx477.json
index bfc0774f..daffc268 100644
--- a/src/ipa/raspberrypi/data/imx477.json
+++ b/src/ipa/raspberrypi/data/imx477.json
@@ -513,9 +513,6 @@
         },
         {
             "rpi.sharpen": { }
-        },
-        {
-            "rpi.focus": { }
         }
     ]
 }
\ No newline at end of file
diff --git a/src/ipa/raspberrypi/data/imx477_noir.json b/src/ipa/raspberrypi/data/imx477_noir.json
index dadd97bc..52d7f072 100644
--- a/src/ipa/raspberrypi/data/imx477_noir.json
+++ b/src/ipa/raspberrypi/data/imx477_noir.json
@@ -424,9 +424,6 @@
         },
         {
             "rpi.sharpen": { }
-        },
-        {
-            "rpi.focus": { }
         }
     ]
 }
\ No newline at end of file
diff --git a/src/ipa/raspberrypi/data/imx477_scientific.json b/src/ipa/raspberrypi/data/imx477_scientific.json
index 17c4ed0a..26c692fd 100644
--- a/src/ipa/raspberrypi/data/imx477_scientific.json
+++ b/src/ipa/raspberrypi/data/imx477_scientific.json
@@ -474,9 +474,6 @@
         },
         {
             "rpi.sharpen": { }
-        },
-        {
-            "rpi.focus": { }
         }
     ]
 }
\ No newline at end of file
diff --git a/src/ipa/raspberrypi/data/imx477_v1.json b/src/ipa/raspberrypi/data/imx477_v1.json
index 5bcaac67..d6402009 100644
--- a/src/ipa/raspberrypi/data/imx477_v1.json
+++ b/src/ipa/raspberrypi/data/imx477_v1.json
@@ -511,9 +511,6 @@
         },
         {
             "rpi.sharpen": { }
-        },
-        {
-            "rpi.focus": { }
         }
     ]
 }
\ No newline at end of file
diff --git a/src/ipa/raspberrypi/data/imx708.json b/src/ipa/raspberrypi/data/imx708.json
index c38b2d4c..b9830a3b 100644
--- a/src/ipa/raspberrypi/data/imx708.json
+++ b/src/ipa/raspberrypi/data/imx708.json
@@ -513,9 +513,6 @@
             "rpi.sharpen": { }
         },
         {
-            "rpi.focus": { }
-        },
-        {
             "rpi.af":
             {
                 "ranges":
diff --git a/src/ipa/raspberrypi/data/imx708_noir.json b/src/ipa/raspberrypi/data/imx708_noir.json
index 082274e3..075f7035 100644
--- a/src/ipa/raspberrypi/data/imx708_noir.json
+++ b/src/ipa/raspberrypi/data/imx708_noir.json
@@ -513,9 +513,6 @@
             "rpi.sharpen": { }
         },
         {
-            "rpi.focus": { }
-        },
-        {
             "rpi.af":
             {
                 "ranges":
diff --git a/src/ipa/raspberrypi/data/imx708_wide.json b/src/ipa/raspberrypi/data/imx708_wide.json
index cdc61436..b772efee 100644
--- a/src/ipa/raspberrypi/data/imx708_wide.json
+++ b/src/ipa/raspberrypi/data/imx708_wide.json
@@ -404,9 +404,6 @@
             "rpi.sharpen": { }
         },
         {
-            "rpi.focus": { }
-        },
-        {
             "rpi.af":
             {
                 "ranges":
diff --git a/src/ipa/raspberrypi/data/imx708_wide_noir.json b/src/ipa/raspberrypi/data/imx708_wide_noir.json
index 8a7f5991..c5f6b53d 100644
--- a/src/ipa/raspberrypi/data/imx708_wide_noir.json
+++ b/src/ipa/raspberrypi/data/imx708_wide_noir.json
@@ -404,9 +404,6 @@
             "rpi.sharpen": { }
         },
         {
-            "rpi.focus": { }
-        },
-        {
             "rpi.af":
             {
                 "ranges":