IVGCVSW-3142 Refactor DataLayoutIndexed and TensorBufferArrayView

for convenience

 * Added GetIndex method to DataLayoutIndexed
 * Refactored TensorBufferArrayView::Get to use the new method

Change-Id: Iae08b2761bddeda9e935b25e6bc4985f2d386cd3
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/src/armnnUtils/DataLayoutIndexed.hpp b/src/armnnUtils/DataLayoutIndexed.hpp
index 1cf2a09e32..5bb8e0d93f 100644
--- a/src/armnnUtils/DataLayoutIndexed.hpp
+++ b/src/armnnUtils/DataLayoutIndexed.hpp
@@ -2,8 +2,11 @@
 // Copyright © 2017 Arm Ltd. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
+
 #pragma once
+
 #include <armnn/Types.hpp>
+#include <armnn/Tensor.hpp>
 
 namespace armnnUtils
 {
@@ -18,6 +21,9 @@ public:
     unsigned int      GetChannelsIndex() const { return m_ChannelsIndex; }
     unsigned int      GetHeightIndex()   const { return m_HeightIndex; }
     unsigned int      GetWidthIndex()    const { return m_WidthIndex; }
+    unsigned int      GetIndex(const armnn::TensorShape& shape,
+                               unsigned int batchIndex, unsigned int channelIndex,
+                               unsigned int heightIndex, unsigned int widthIndex) const;
 
 private:
     armnn::DataLayout m_DataLayout;