commit af8b72d3a97baa0c86583b03321e8a8d3f4bc2aa
author FinnWilliamsArm <Finn.Williams@arm.com> Wed May 22 14:50:55 2019 +0100
committer Narumol Prangnawarat <narumol.prangnawarat@arm.com> Mon May 27 16:27:36 2019 +0000
tree 3b4d86842399842b852e593c3bcf131d86d3ae20
parent 43aec5886449c1b024b740fd6f4500e827bde221

IVGCVSW-3129 Image pre-processing fix for TFLite

 * Resized images for quantized models are now statically cast to uint8
   instead of quantized

 * Removed optional quantization parameters from ImagePreprocessor
   constructor

 * Changed mean and scale for TFLite models

Signed-off-by: FinnWilliamsArm <Finn.Williams@arm.com>
Change-Id: Id5ffdf77f3614d10c417e769bd8ffc4a4c07308b

tests/InferenceTestImage.cpp

diff --git a/tests/InferenceTestImage.cpp b/tests/InferenceTestImage.cpp
index b011e6a..92c67ae 100644
--- a/tests/InferenceTestImage.cpp
+++ b/tests/InferenceTestImage.cpp
@@ -55,6 +55,7 @@
 std::vector<float> ResizeBilinearAndNormalize(const InferenceTestImage & image,
                                               const unsigned int outputWidth,
                                               const unsigned int outputHeight,
+                                              const float scale,
                                               const std::array<float, 3>& mean,
                                               const std::array<float, 3>& stddev)
 {
@@ -114,7 +115,7 @@
                 const float ly0 = Lerp(float(rgb_x0y0[c]), float(rgb_x1y0[c]), xw);
                 const float ly1 = Lerp(float(rgb_x0y1[c]), float(rgb_x1y1[c]), xw);
                 const float l = Lerp(ly0, ly1, yw);
-                PutData(out, outputWidth, x, y, c, ((l/255.0f) - mean[c])/stddev[c]);
+                PutData(out, outputWidth, x, y, c, ((l / scale) - mean[c]) / stddev[c]);
             }
         }
     }
@@ -210,7 +211,8 @@
                                               const armnn::CheckLocation& location,
                                               const ResizingMethods meth,
                                               const std::array<float, 3>& mean,
-                                              const std::array<float, 3>& stddev)
+                                              const std::array<float, 3>& stddev,
+                                              const float scale)
 {
     std::vector<float> out;
     if (newWidth == 0 || newHeight == 0)
@@ -227,7 +229,7 @@
         }
         case ResizingMethods::BilinearAndNormalized:
         {
-            out = ResizeBilinearAndNormalize(*this, newWidth, newHeight, mean, stddev);
+            out = ResizeBilinearAndNormalize(*this, newWidth, newHeight, scale, mean, stddev);
             break;
         }
         default: