commit 9414f64c231a013664102e2c284b10266c6b4d4e
author Ioan-Cristian Szabo <ioan-cristian.szabo@arm.com> Fri Oct 27 17:35:40 2017 +0100
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:47:18 2018 +0000
tree 5a5ad6a525004634fe6b78cdfc8da71aae762d33
parent 6acc6add8412c6d3841a49684610fc5a6526312e

COMPMID-582: Add validation to channel_extract kernels.

Change-Id: I5022d02f06f9d849dad76e3d9b8e48632c236429
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/121191
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>

src/runtime/CL/CLMultiImage.cpp

diff --git a/src/runtime/CL/CLMultiImage.cpp b/src/runtime/CL/CLMultiImage.cpp
index aa09c7a..92254f3 100644
--- a/src/runtime/CL/CLMultiImage.cpp
+++ b/src/runtime/CL/CLMultiImage.cpp
@@ -25,6 +25,7 @@
 
 #include "arm_compute/core/Error.h"
 #include "arm_compute/core/TensorInfo.h"
+#include "arm_compute/core/Utils.h"
 #include "arm_compute/runtime/ITensorAllocator.h"
 
 using namespace arm_compute;
@@ -51,7 +52,8 @@
 
 void CLMultiImage::internal_init(unsigned int width, unsigned int height, Format format, bool auto_padding)
 {
-    TensorInfo info(width, height, Format::U8);
+    TensorShape shape = adjust_odd_shape(TensorShape{ width, height }, format);
+    TensorInfo  info(shape, Format::U8);
 
     if(auto_padding)
     {
@@ -72,7 +74,7 @@
         case Format::YUYV422:
         case Format::UYVY422:
         {
-            TensorInfo info_full(width, height, format);
+            TensorInfo info_full(shape, format);
 
             if(auto_padding)
             {
@@ -85,7 +87,8 @@
         case Format::NV12:
         case Format::NV21:
         {
-            TensorInfo info_uv88(width / 2, height / 2, Format::UV88);
+            const TensorShape shape_uv88 = calculate_subsampled_shape(shape, Format::UV88);
+            TensorInfo        info_uv88(shape_uv88, Format::UV88);
 
             if(auto_padding)
             {
@@ -98,7 +101,8 @@
         }
         case Format::IYUV:
         {
-            TensorInfo info_sub2(width / 2, height / 2, Format::U8);
+            const TensorShape shape_sub2 = calculate_subsampled_shape(shape, Format::IYUV);
+            TensorInfo        info_sub2(shape_sub2, Format::U8);
 
             if(auto_padding)
             {
@@ -120,7 +124,7 @@
             break;
     }
 
-    _info.init(width, height, format);
+    _info.init(shape.x(), shape.y(), format);
 }
 
 void CLMultiImage::allocate()