Code clean up of TTRACE and modify converting colorspace not working

 - On the case of converting colorspace, can missed dst_width and dst_height.
   As the result dst_width and dst_height is zero, src_width and src_height
   should be assigned to dst_width and dst_height.

Change-Id: I04c218ae4ac90d6e7aaa829846ff4f3d629784f4
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>

diff --git a/common/include/mm_util_private.h b/common/include/mm_util_private.h
index d47a6a6..3fe2fd2 100755 (executable)
--- a/common/include/mm_util_private.h
+++ b/common/include/mm_util_private.h
@@ -26,11 +26,24 @@
 #include <stdlib.h>
 #include "mm_util_debug.h"
 #include "mm_util_type.h"
+#ifdef ENABLE_TTRACE
+#include <ttrace.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/* For_TTRACE performance checker */
+#ifdef ENABLE_TTRACE
+#define TTRACE_BEGIN(NAME) traceBegin(TTRACE_TAG_IMAGE, NAME)
+#define TTRACE_END() traceEnd(TTRACE_TAG_IMAGE)
+#else /* ENABLE_TTRACE */
+#define TTRACE_BEGIN(NAME)
+#define TTRACE_END()
+#endif /* ENABLE_TTRACE */
+
+/* For memory management */
 #define MMUTIL_SAFE_FREE(x)                            { if (x) { free(x); x = NULL; } }
 #define MMUTIL_SAFE_G_FREE(x)                  { if (x) { g_free(x); x = NULL; } }
 #define MMUTIL_SAFE_STRCPY(dst, src, n)        g_strlcpy(dst, src, n)

diff --git a/imgcv/mm_util_imgcv.c b/imgcv/mm_util_imgcv.c
index 21a15ff..d736c30 100755 (executable)
--- a/imgcv/mm_util_imgcv.c
+++ b/imgcv/mm_util_imgcv.c
@@ -24,15 +24,6 @@
 #include "mm_util_imgcv.h"
 #include "mm_util_imgcv_internal.h"
 
-#ifdef ENABLE_TTRACE
-#include <ttrace.h>
-#define TTRACE_BEGIN(NAME) traceBegin(TTRACE_TAG_IMAGE, NAME)
-#define TTRACE_END() traceEnd(TTRACE_TAG_IMAGE)
-#else /* ENABLE_TTRACE */
-#define TTRACE_BEGIN(NAME)
-#define TTRACE_END()
-#endif /* ENABLE_TTRACE */
-
 #define RGB_COLOR_CHANNELS 3
 #define HSV_COLOR_CHANNELS 3
 

diff --git a/imgp/mm_util_imgp.c b/imgp/mm_util_imgp.c
index bfb51ca..0a8652f 100755 (executable)
--- a/imgp/mm_util_imgp.c
+++ b/imgp/mm_util_imgp.c
@@ -25,15 +25,6 @@
 #include "mm_util_imgp.h"
 #include "mm_util_imgp_internal.h"
 
-#ifdef ENABLE_TTRACE
-#include <ttrace.h>
-#define TTRACE_BEGIN(NAME) traceBegin(TTRACE_TAG_IMAGE, NAME)
-#define TTRACE_END() traceEnd(TTRACE_TAG_IMAGE)
-#else /* ENABLE_TTRACE */
-#define TTRACE_BEGIN(NAME)
-#define TTRACE_END()
-#endif /* ENABLE_TTRACE */
-
 #define MM_UTIL_ROUND_UP_2(num) (((num)+1)&~1)
 #define MM_UTIL_ROUND_UP_4(num) (((num)+3)&~3)
 #define MM_UTIL_ROUND_UP_8(num) (((num)+7)&~7)
@@ -1114,6 +1105,8 @@ static int __mm_util_processing(mm_util_s *handle)
                }
                src_index = dst_index;
                src_format = handle->dst_format;
+               handle->dst_width = src_width;
+               handle->dst_height = src_height;
        }
 
        if (handle->set_rotate) {

diff --git a/jpeg/mm_util_jpeg.c b/jpeg/mm_util_jpeg.c
index 647df2e..4e1f674 100755 (executable)
--- a/jpeg/mm_util_jpeg.c
+++ b/jpeg/mm_util_jpeg.c
@@ -34,14 +34,6 @@
 #include "mm_util_jpeg.h"
 #include "mm_util_imgp.h"
 #include "mm_util_private.h"
-#ifdef ENABLE_TTRACE
-#include <ttrace.h>
-#define TTRACE_BEGIN(NAME) traceBegin(TTRACE_TAG_IMAGE, NAME)
-#define TTRACE_END() traceEnd(TTRACE_TAG_IMAGE)
-#else /* ENABLE_TTRACE */
-#define TTRACE_BEGIN(NAME)
-#define TTRACE_END()
-#endif /* ENABLE_TTRACE */
 
 #ifndef YUV420_SIZE
 #define YUV420_SIZE(width, height)     (width*height*3>>1)