Merge branch 'upstream' into tizen_base

[platform/upstream/libjpeg-turbo.git] / simd / arm / aarch32 / jsimd.c

diff --git a/simd/arm/aarch32/jsimd.c b/simd/arm/aarch32/jsimd.c
index 04d6452..b06a6c3 100644 (file)
--- a/simd/arm/aarch32/jsimd.c
+++ b/simd/arm/aarch32/jsimd.c
@@ -27,6 +27,11 @@
 
 #include <ctype.h>
 
+#if _USE_PRODUCT_TV
+//Changes for JPEG GAMMA enhancement in thumbnail
+#include <unistd.h>
+#endif
+
 static THREAD_LOCAL unsigned int simd_support = ~0;
 static THREAD_LOCAL unsigned int simd_huffman = 1;
 
@@ -321,7 +326,23 @@ jsimd_ycc_rgb_convert(j_decompress_ptr cinfo, JSAMPIMAGE input_buf,
     break;
   }
 
+#if _USE_PRODUCT_TV
+  if (simd_support & JSIMD_NEON) {
+    neonfct(cinfo->output_width, input_buf, input_row, output_buf, num_rows);
+    PickColor* pickColor = cinfo->pick_color_data;
+    if(pickColor && pickColor->enablePickColor && output_buf) {
+      int w = cinfo->output_width;
+      unsigned char *ptr = *output_buf;
+      if(pickColor->perc <= 0) {
+        w = pickColor->x2 - pickColor->x1 + 1;
+        ptr = (*output_buf) + (pickColor->x1 * 3);
+      }
+      jsimd_pick_color(ptr, pickColor, w);
+    }
+  }
+#else
   neonfct(cinfo->output_width, input_buf, input_row, output_buf, num_rows);
+#endif
 }
 
 GLOBAL(void)