Browse Source

sf-omx-il-test:fixed warning

Signed-off-by: sw.multimedia <sw.multimedia@starfivetech.com>
sw.multimedia 2 years ago
parent
commit
8878cd9ef1

+ 14 - 14
soft_3rdpart/omx-il/tests/dec_test.c

@@ -106,7 +106,7 @@ static OMX_ERRORTYPE fill_output_buffer_done_handler(
 
     Message data;
     data.msg_type = 1;
-    if (pBuffer->nFlags & OMX_BUFFERFLAG_EOS == OMX_BUFFERFLAG_EOS)
+    if ((pBuffer->nFlags) & (OMX_BUFFERFLAG_EOS == OMX_BUFFERFLAG_EOS))
     {
         data.msg_flag = -1;
     }
@@ -179,7 +179,7 @@ static OMX_S32 FillInputBuffer(DecodeTestContext *decodeTestContext, OMX_BUFFERH
     return avpacket.size;
 }
 
-int main(int argc, char *argv)
+int main(int argc, char **argv)
 {
     printf("=============================\r\n");
     OMX_S32 error;
@@ -191,7 +191,7 @@ int main(int argc, char *argv)
     if (msgid < 0)
     {
         perror("get ipc_id error");
-        return;
+        return -1;
     }
     decodeTestContext->msgid = msgid;
     struct option longOpt[] = {
@@ -200,17 +200,17 @@ int main(int argc, char *argv)
         {"format", required_argument, NULL, 'f'},
         {NULL, no_argument, NULL, 0},
     };
-    OMX_S8 *shortOpt = "i:o:f:";
+    char *shortOpt = "i:o:f:";
     OMX_U32 c;
     OMX_S32 l;
 
     if (argc == 0)
     {
         help();
-        return;
+        return -1;
     }
 
-    while ((c = getopt_long(argc, argv, shortOpt, longOpt, &l)) != -1)
+    while ((c = getopt_long(argc, argv, shortOpt, longOpt, (int *)&l)) != -1)
     {
         switch (c)
         {
@@ -223,7 +223,7 @@ int main(int argc, char *argv)
             else
             {
                 printf("input file not exist!\r\n");
-                return;
+                return -1;
             }
             break;
         case 'o':
@@ -237,14 +237,14 @@ int main(int argc, char *argv)
         case 'h':
         default:
             help();
-            return;
+            return -1;
         }
     }
 
     if (decodeTestContext->sInputFilePath == NULL || decodeTestContext->sOutputFilePath == NULL)
     {
         help();
-        return;
+        return -1;
     }
     /*ffmpeg init*/
     printf("init ffmpeg\r\n");
@@ -255,7 +255,7 @@ int main(int argc, char *argv)
     if ((avContext = avformat_alloc_context()) == NULL)
     {
         printf("avformat_alloc_context fail\r\n");
-        return;
+        return -1;
     }
     avContext->flags |= AV_CODEC_FLAG_TRUNCATED;
 
@@ -264,7 +264,7 @@ int main(int argc, char *argv)
     {
         printf("%s:%d failed to av_open_input_file error(%d), %s\n",
                __FILE__, __LINE__, error, decodeTestContext->sInputFilePath);
-        return;
+        return -1;
     }
 
     printf("avformat_find_stream_info\r\n");
@@ -272,7 +272,7 @@ int main(int argc, char *argv)
     {
         printf("%s:%d failed to avformat_find_stream_info. error(%d)\n",
                __FUNCTION__, __LINE__, error);
-        return;
+        return -1;
     }
 
     printf("av_find_best_stream\r\n");
@@ -280,7 +280,7 @@ int main(int argc, char *argv)
     if (videoIndex < 0)
     {
         printf("%s:%d failed to av_find_best_stream.\n", __FUNCTION__, __LINE__);
-        return;
+        return -1;
     }
     printf("video index = %d\r\n", videoIndex);
     decodeTestContext->avContext = avContext;
@@ -397,7 +397,7 @@ int main(int argc, char *argv)
             FILE *fb = fopen(sFilePath, "ab+");
             fwrite(pBuffer->pBuffer, 1, pBuffer->nFilledLen, fb);
             fclose(fb);
-            if (pBuffer->nFlags & OMX_BUFFERFLAG_EOS == OMX_BUFFERFLAG_EOS)
+            if ((pBuffer->nFlags) & (OMX_BUFFERFLAG_EOS == OMX_BUFFERFLAG_EOS))
             {
                 goto end;
             }

+ 12 - 11
soft_3rdpart/omx-il/tests/enc_test.c

@@ -15,6 +15,8 @@
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <errno.h>
+#include <string.h>
+#include <stdlib.h>
 
 #define OMX_INIT_STRUCTURE(a)         \
     memset(&(a), 0, sizeof(a));       \
@@ -110,7 +112,7 @@ static OMX_ERRORTYPE fill_output_buffer_done_handler(
 
     Message data;
     data.msg_type = 1;
-    if (pBuffer->nFlags & OMX_BUFFERFLAG_EOS == OMX_BUFFERFLAG_EOS)
+    if ((pBuffer->nFlags) & (OMX_BUFFERFLAG_EOS == OMX_BUFFERFLAG_EOS))
     {
         data.msg_flag = -1;
     }
@@ -182,10 +184,9 @@ static OMX_S32 FillInputBuffer(EncodeTestContext *encodeTestContext, OMX_BUFFERH
     return count;
 }
 
-int main(int argc, char *argv)
+int main(int argc, char **argv)
 {
     printf("=============================\r\n");
-    OMX_S32 error;
     encodeTestContext = malloc(sizeof(EncodeTestContext));
     memset(encodeTestContext, 0, sizeof(EncodeTestContext));
 
@@ -194,7 +195,7 @@ int main(int argc, char *argv)
     if (msgid < 0)
     {
         perror("get ipc_id error");
-        return;
+        return -1;
     }
     encodeTestContext->msgid = msgid;
     struct option longOpt[] = {
@@ -207,18 +208,18 @@ int main(int argc, char *argv)
         {"height", required_argument, NULL, 'h'},
         {NULL, no_argument, NULL, 0},
     };
-    OMX_S8 *shortOpt = "i:o:f:s:w:h:b:c:";
+    char *shortOpt = "i:o:f:s:w:h:b:c:";
     OMX_U32 c;
     OMX_S32 l;
 
     if (argc == 0)
     {
         help();
-        return;
+        return 0;
     }
     OMX_U32 width = 0;
     OMX_U32 height = 0;
-    while ((c = getopt_long(argc, argv, shortOpt, longOpt, &l)) != -1)
+    while ((c = getopt_long(argc, argv, shortOpt, longOpt, (int *)&l)) != -1)
     {
         switch (c)
         {
@@ -232,7 +233,7 @@ int main(int argc, char *argv)
             else
             {
                 printf("input file not exist!\r\n");
-                return;
+                return -1;
             }
             break;
         case 'o':
@@ -261,7 +262,7 @@ int main(int argc, char *argv)
             break;
         default:
             help();
-            return;
+            return 0;
         }
     }
 
@@ -272,7 +273,7 @@ int main(int argc, char *argv)
         encodeTestContext->pInputFile == NULL)
     {
         help();
-        return;
+        return -1;
     }
 
     /*omx init*/
@@ -385,7 +386,7 @@ int main(int argc, char *argv)
             FILE *fb = fopen(sFilePath, "ab+");
             fwrite(pBuffer->pBuffer, 1, pBuffer->nFilledLen, fb);
             fclose(fb);
-            if (pBuffer->nFlags & OMX_BUFFERFLAG_EOS == OMX_BUFFERFLAG_EOS)
+            if ((pBuffer->nFlags) & (OMX_BUFFERFLAG_EOS == OMX_BUFFERFLAG_EOS))
             {
                 goto end;
             }

+ 13 - 13
soft_3rdpart/omx-il/tests/mjpeg_dec_test.c

@@ -108,7 +108,7 @@ static OMX_ERRORTYPE fill_output_buffer_done_handler(
 
     Message data;
     data.msg_type = 1;
-    if (pBuffer->nFlags & OMX_BUFFERFLAG_EOS == OMX_BUFFERFLAG_EOS)
+    if ((pBuffer->nFlags) & (OMX_BUFFERFLAG_EOS == OMX_BUFFERFLAG_EOS))
     {
         data.msg_flag = -1;
     }
@@ -183,7 +183,7 @@ static OMX_S32 FillInputBuffer(DecodeTestContext *decodeTestContext, OMX_BUFFERH
     return avpacket.size;
 }
 
-int main(int argc, char *argv)
+int main(int argc, char **argv)
 {
     printf("=============================\r\n");
     OMX_S32 error;
@@ -195,7 +195,7 @@ int main(int argc, char *argv)
     if (msgid < 0)
     {
         perror("get ipc_id error");
-        return;
+        return -1;
     }
     decodeTestContext->msgid = msgid;
     struct option longOpt[] = {
@@ -204,7 +204,7 @@ int main(int argc, char *argv)
         {"format", required_argument, NULL, 'f'},
         {NULL, no_argument, NULL, 0},
     };
-    OMX_S8 *shortOpt = "i:o:f:";
+    char *shortOpt = "i:o:f:";
     OMX_U32 c;
     OMX_S32 l;
 
@@ -214,7 +214,7 @@ int main(int argc, char *argv)
     //     return;
     // }
 
-    while ((c = getopt_long(argc, argv, shortOpt, longOpt, &l)) != -1)
+    while ((c = getopt_long(argc, argv, shortOpt, longOpt, (int *)&l)) != -1)
     {
         switch (c)
         {
@@ -227,7 +227,7 @@ int main(int argc, char *argv)
             else
             {
                 printf("input file not exist!\r\n");
-                return;
+                return -1;
             }
             break;
         case 'o':
@@ -241,14 +241,14 @@ int main(int argc, char *argv)
         case 'h':
         default:
             help();
-            return;
+            return -1;
         }
     }
 
     if (decodeTestContext->sInputFilePath == NULL || decodeTestContext->sOutputFilePath == NULL)
     {
         help();
-        return;
+        return -1;
     }
     /*ffmpeg init*/
     printf("init ffmpeg\r\n");
@@ -259,7 +259,7 @@ int main(int argc, char *argv)
     if ((avContext = avformat_alloc_context()) == NULL)
     {
         printf("avformat_alloc_context fail\r\n");
-        return;
+        return -1;
     }
     avContext->flags |= AV_CODEC_FLAG_TRUNCATED;
 
@@ -268,7 +268,7 @@ int main(int argc, char *argv)
     {
         printf("%s:%d failed to av_open_input_file error(%d), %s\n",
                __FILE__, __LINE__, error, decodeTestContext->sInputFilePath);
-        return;
+        return -1;
     }
 
     printf("avformat_find_stream_info\r\n");
@@ -276,7 +276,7 @@ int main(int argc, char *argv)
     {
         printf("%s:%d failed to avformat_find_stream_info. error(%d)\n",
                __FUNCTION__, __LINE__, error);
-        return;
+        return -1;
     }
 
     printf("av_find_best_stream\r\n");
@@ -284,7 +284,7 @@ int main(int argc, char *argv)
     if (imageIndex < 0)
     {
         printf("%s:%d failed to av_find_best_stream.\n", __FUNCTION__, __LINE__);
-        return;
+        return -1;
     }
     printf("image index = %d\r\n", imageIndex);
     decodeTestContext->avContext = avContext;
@@ -402,7 +402,7 @@ int main(int argc, char *argv)
             printf("write error = %d\r\n", error);
             fclose(fb);
             printf("write %d buffers finish\r\n", size);
-            if (pBuffer->nFlags & OMX_BUFFERFLAG_EOS == OMX_BUFFERFLAG_EOS)
+            if ((pBuffer->nFlags) & (OMX_BUFFERFLAG_EOS == OMX_BUFFERFLAG_EOS))
             {
                 goto end;
             }