Fix svace issues

Change-Id: I4d112ad884a405e48d2bfe9a666095aba4d346a4
Signed-off-by: Gilbok Lee <gilbok.lee@samsung.com>

diff --git a/include/media_format_private.h b/include/media_format_private.h
index 065ed96cfcac0452f50837783d0b43444b357d8e..51b3055712b341b2a3582773f5aa83c6fa507542 100755 (executable)
--- a/include/media_format_private.h
+++ b/include/media_format_private.h
@@ -30,12 +30,20 @@ extern "C" {
 #define LOG_TAG "TIZEN_MEDIA_TOOL"
 
 #define MEDIA_FORMAT_CHECK_CONDITION(condition, error, msg)     \
-                if (condition) {} else \
-                { LOGE("[%s] %s(0x%08x)", __FUNCTION__, msg, error); return error; }; \
+        if (condition) {} else \
+        { LOGE("[%s] %s(0x%08x)", __FUNCTION__, msg, error); return error; }; \
+
+#define MEDIA_FORMAT_CHECK_CONDITION_VOID(condition, msg)     \
+        if (condition) {} else \
+        { LOGE("[%s] %s", __FUNCTION__, msg); return; }; \
+
 
 #define MEDIA_FORMAT_INSTANCE_CHECK(media_format)   \
         MEDIA_FORMAT_CHECK_CONDITION(media_format != NULL, MEDIA_FORMAT_ERROR_INVALID_PARAMETER, "MEDIA_FORMAT_ERROR_INVALID_PARAMETER")
 
+#define MEDIA_FORMAT_INSTANCE_CHEC_VOID(media_format)   \
+        MEDIA_FORMAT_CHECK_CONDITION_VOID(media_format != NULL, "MEDIA_FORMAT_ERROR_INVALID_PARAMETER")
+
 #define MEDIA_FORMAT_NULL_ARG_CHECK(arg)      \
         MEDIA_FORMAT_CHECK_CONDITION(arg != NULL, MEDIA_FORMAT_ERROR_INVALID_PARAMETER, "MEDIA_FORMAT_ERROR_INVALID_PARAMETER")
 

diff --git a/src/media_format.c b/src/media_format.c
index 85aa403ea3bf22a4a36f2b9af808c7e98a659fdc..d8cf551a19b158a3981c3a40a14fe265b39fe565 100755 (executable)
--- a/src/media_format.c
+++ b/src/media_format.c
@@ -47,7 +47,7 @@ int media_format_create(media_format_h * fmt)
 
 static void _media_format_destroy(media_format_s * fmt)
 {
-       MEDIA_FORMAT_INSTANCE_CHECK(fmt);
+       MEDIA_FORMAT_INSTANCE_CHEC_VOID (fmt);
 
        free(fmt);
        fmt = NULL;

diff --git a/src/media_packet.c b/src/media_packet.c
index c26b82fd32a6459c12e1348e6c9963cfec1832f9..b0eac7a2e6c2bdde578ecff0f5f243974c632327 100755 (executable)
--- a/src/media_packet.c
+++ b/src/media_packet.c
@@ -375,7 +375,7 @@ static uint64_t _pkt_calculate_video_buffer_size(media_packet_s * pkt)
                stride2 = _ROUND_UP_16(w2);
                h2 = _DIV_ROUND_UP_X(height, y_chroma_shift);
                size2 = stride2 * h2;
-               buffersize = size + 2 * size2;
+               buffersize = (uint64_t)size + 2 * (uint64_t)size2;
                break;
        case MEDIA_FORMAT_YUYV:
        case MEDIA_FORMAT_UYVY:
@@ -384,19 +384,19 @@ static uint64_t _pkt_calculate_video_buffer_size(media_packet_s * pkt)
        case MEDIA_FORMAT_422P:
                stride = _ROUND_UP_16(width * 2);
                size = stride * height;
-               buffersize = size;
+               buffersize = (uint64_t)size;
                break;
        case MEDIA_FORMAT_RGB888:
                stride = _ROUND_UP_16(width * 3);
                size = stride * height;
-               buffersize = size;
+               buffersize = (uint64_t)size;
                break;
        case MEDIA_FORMAT_ARGB:
        case MEDIA_FORMAT_RGBA:
        case MEDIA_FORMAT_BGRA:
                stride = width * 4;
                size = stride * height;
-               buffersize = size;
+               buffersize = (uint64_t)size;
                break;
        case MEDIA_FORMAT_NV12:
        case MEDIA_FORMAT_NV12T:
@@ -423,7 +423,7 @@ static uint64_t _pkt_calculate_video_buffer_size(media_packet_s * pkt)
                stride2 = _ROUND_UP_16(w2);
                h2 = _DIV_ROUND_UP_X(height, y_chroma_shift);
                size2 = stride2 * h2;
-               buffersize = size + size2;
+               buffersize = (uint64_t)size + (uint64_t)size2;
                break;
        default:
                LOGE("Not supported format\n");

diff --git a/test/media_packet_test.c b/test/media_packet_test.c
index e460bffde4a8bf4207ecc8922e08687c60a23914..fadc10b0ac4655ab066d7fcdcd548e5630c4e62d 100755 (executable)
--- a/test/media_packet_test.c
+++ b/test/media_packet_test.c
@@ -493,13 +493,14 @@ static void _media_packet_copy(void)
             g_print("media_packet_copy sucess !!");
             is_only_created_handle = true;
             memset (g_media_packet[0], 0, sizeof(media_packet_s));
-            memcpy (g_media_packet[0], g_media_packet[1], sizeof(media_packet_s));
-            if(g_media_packet[1])
+            if(!g_media_packet[1])
             {
-                free(g_media_packet[1]);
-                g_media_packet[1] = NULL;
+                g_print("g_media_packet[1] is NULL\n");
+                return;
             }
-
+            memcpy (g_media_packet[0], g_media_packet[1], sizeof(media_packet_s));
+            free(g_media_packet[1]);
+            g_media_packet[1] = NULL;
         }
         else
         {
@@ -1408,7 +1409,7 @@ static void interpret (char *cmd)
             break;
         case CURRENT_STATUS_DURATION:
             {
-                uint64_t duration = atoi(cmd);
+                uint64_t duration = (uint64_t)atoi(cmd);
                 _media_packet_set_duration(duration);
                 reset_menu_state();
             }