Browse Source

Merge branch 'CR_3508_update_toolchain' into 'jh7110-devel'

CR_3508: fix wave420l wave511 codaj12 omx-il building issue for gcc 12.2.0

See merge request sdk/soft_3rdpart!42
andy.hu 11 months ago
parent
commit
831a541271

+ 2 - 2
IMG_GPU/out/img-gpu-powervr-bin-1.17.6210866.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:237c44e22453e4be6648a854c4333493d00fe5a2e5bd8775644005758198807c
-size 61785882
+oid sha256:bb94718c965a1c6d6ee68529e4b85989b08f347ccc8b64d12d8872dd668070d1
+size 58405096

+ 2 - 2
ispsdk/DDKSource/libispsdk/libCI_User.a

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6eee4531dd2011c3a593281ee5620869e275a94714798a053487f3d3903fd969
-size 3550926
+oid sha256:d1f55db80f3ede87c63abb6b12c5eb21e5ace1743ca54d80c93f27120502294e
+size 3316630

+ 2 - 2
ispsdk/DDKSource/libispsdk/libISPC.a

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9b6e6377d9a95d1bde023d4cf6467158a263cf5aea3a174fd61a0c1ccabe7bd
-size 28197664
+oid sha256:22da68aafd4f0eac6e038ef2d39e9a8cbbdab82bedf9b1da7c131f1b417a2afb
+size 25723584

+ 2 - 2
ispsdk/DDKSource/libispsdk/libISP_API.a

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc8d4e6d8676aada1c14c5d4ed94f0b8f3943ff12fc318e4abb5b9e272032624
-size 1427696
+oid sha256:a303dd644c72d3d74826c541f9bc1e06ec846091dc15f34ac784b72580516f0a
+size 1312992

+ 2 - 2
ispsdk/DDKSource/libispsdk/libStfCommon.a

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a69f257faafd15c955c58d55bf17916f2c9ac65e98b93e858e9dbff1a5967cc
-size 317858
+oid sha256:781c37b2a7aecfc10eaad89bfe477935583f1b75152230a42acf5587de83a02d
+size 283370

+ 2 - 2
ispsdk/DDKSource/libispsdk/libStfIncludes.a

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52ea68d85a53c83430536a66b3d159f6610bd8cd44f26f4679519e29e576ca85
-size 14854
+oid sha256:f487a9b6f0cd9cffa663da53ea87660054b92eb4e55bd600088f74640cd37e0c
+size 15494

+ 2 - 2
ispsdk/DDKSource/libispsdk/libStfLib_LinkedList.a

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bea06da6e48ed00a69e147f6217a37e130ee5d73e2880c56f4ee35859b79c970
-size 83338
+oid sha256:d209002011269fa57e184d8b466296983b96990746b6dd5ddc3949ee483f84ba
+size 75762

+ 2 - 2
ispsdk/DDKSource/libispsdk/libmedia-ctrl.a

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f81cbe49a0684d9b574056ab5b6c96121353d02ccd231e2c991eeefe0d4f3a8
-size 719800
+oid sha256:856051ad1ea4fe1f081c6ddc9000d41698538d2f462391a12aac2090bab4afda
+size 661600

+ 1 - 1
omx-il/tests/dec_test.c

@@ -333,7 +333,7 @@ int main(int argc, char **argv)
         }
     }
 
-    if (decodeTestContext->sInputFilePath == NULL || decodeTestContext->sOutputFilePath == NULL)
+    if (decodeTestContext == NULL)
     {
         help();
         return -1;

+ 1 - 2
omx-il/tests/enc_test.c

@@ -340,8 +340,7 @@ int main(int argc, char **argv)
     }
 
     encodeTestContext->nFrameBufferSize = width * height * 3 / 2;
-    if (encodeTestContext->sInputFilePath == NULL ||
-        encodeTestContext->sOutputFilePath == NULL ||
+    if (encodeTestContext == NULL ||
         encodeTestContext->nFrameBufferSize == 0 ||
         encodeTestContext->pInputFile == NULL)
     {

+ 1 - 1
omx-il/tests/mjpeg_dec_test.c

@@ -376,7 +376,7 @@ int main(int argc, char **argv)
         }
     }
 
-    if (decodeTestContext->sInputFilePath == NULL || decodeTestContext->sOutputFilePath == NULL)
+    if (decodeTestContext == NULL)
     {
         help();
         return -1;

+ 5 - 5
wave420l/code/sample/helper/main_helper.c

@@ -1229,7 +1229,7 @@ Int32 writeVuiRbsp(int coreIdx, TestEncConfig *encConfig, EncOpenParam *encOP, v
         }
         encOP->vuiRbspDataAddr = vbVuiRbsp->phys_addr;
 
-        if (encConfig->vui_rbsp_file_name) {
+        if (encConfig) {
             Uint8   *pVuiRbspBuf;
             Int32   rbspSizeInByte = (encOP->vuiRbspDataSize+7)>>3;
             ChangePathStyle(encConfig->vui_rbsp_file_name);
@@ -1263,7 +1263,7 @@ Int32 writeHrdRbsp(int coreIdx, TestEncConfig *encConfig, EncOpenParam *encOP, v
 
         encOP->hrdRbspDataAddr = vbHrdRbsp->phys_addr;
 
-        if (encConfig->hrd_rbsp_file_name) {
+        if (encConfig) {
             Uint8   *pHrdRbspBuf;
             Int32   rbspSizeInByte = (encOP->hrdRbspDataSize+7)>>3;
             ChangePathStyle(encConfig->hrd_rbsp_file_name);
@@ -1505,7 +1505,7 @@ int setRoiMap(int coreIdx, TestEncConfig *encConfig, EncOpenParam encOP, Physica
         // sample code to convert ROI coordinate to ROI map.
         osal_memset(&encConfig->region[0], 0, sizeof(VpuRect)*MAX_ROI_NUMBER);
         osal_memset(&encConfig->roiLevel[0], 0, sizeof(int)*MAX_ROI_NUMBER);
-        if (encConfig->roi_file_name) {
+        if (encConfig) {
             char lineStr[256] = {0, };
             int  val;
             fgets(lineStr, 256, encConfig->roi_file);
@@ -1580,7 +1580,7 @@ int checkParamRestriction(Uint32 productId, TestEncConfig *encConfig)
 int openRoiMapFile(TestEncConfig *encConfig) 
 {
     if (encConfig->roi_enable) {
-        if (encConfig->roi_file_name) {
+        if (encConfig) {
             ChangePathStyle(encConfig->roi_file_name);
             if ((encConfig->roi_file = osal_fopen(encConfig->roi_file_name, "r")) == NULL) {
                 VLOG(ERR, "fail to open ROI file, %s\n", encConfig->roi_file_name);
@@ -1617,7 +1617,7 @@ int setCtuQpMap(int coreIdx, TestEncConfig *encConfig, EncOpenParam encOP, Physi
         // sample code to convert CTU coordinate to CTU MODE map.
         osal_memset(&encConfig->region[0], 0, sizeof(VpuRect)*MAX_ROI_NUMBER);
         osal_memset(&encConfig->ctuQp[0], 0, sizeof(int)*MAX_ROI_NUMBER);
-        if (encConfig->ctuqp_file_name) {
+        if (encConfig) {
             char lineStr[256] = {0, };
             int  val;
             fgets(lineStr, 256, encConfig->ctuqp_file);

+ 2 - 1
wave420l/code/sample/helper/main_helper.h

@@ -55,6 +55,7 @@ struct OptionExt
 };
 
 #define MAX_FILE_PATH               256
+#define MAX_SRC_FILE_PATH           128
 #define MAX_PIC_SKIP_NUM            5
 #ifdef SUPPORT_SRC_BUF_CONTROL
 #define ENC_SRC_BUF_NUM             2000
@@ -231,7 +232,7 @@ typedef struct {
 } HEVC_ENC_CFG;
 
 typedef struct {
-    char SrcFileName[MAX_FILE_PATH];
+    char SrcFileName[MAX_SRC_FILE_PATH];
     char BitStreamFileName[MAX_FILE_PATH];
     BOOL srcCbCrInterleave;
     int NumFrame;

+ 1 - 1
wave420l/code/sample/helper/vpuhelper.c

@@ -1657,7 +1657,7 @@ Int32 GetEncOpenParam(EncOpenParam *pEncOP, TestEncConfig *pEncConfig, ENC_CFG *
     int bitFormat;
     ENC_CFG encCfgInst;
     ENC_CFG *pCfg;
-    char yuvDir[256] = "yuv/";
+    char yuvDir[128] = "yuv/";
 
     // Source YUV Image File to load
     if (pEncCfg) {

+ 2 - 2
wave420l/code/sample/main_w4_enc_test.c

@@ -509,7 +509,7 @@ int TestEncoder(TestEncConfig *param)
         }
         
         if ( (encConfig.seiDataEnc.prefixSeiNalEnable || encConfig.seiDataEnc.suffixSeiNalEnable) && encParam.srcEndFlag != 1) {
-            if (encConfig.prefix_sei_nal_file_name) {
+            {
                 Uint8   *pUserBuf;
                 pUserBuf = (Uint8*)osal_malloc(SEI_NAL_DATA_BUF_SIZE);
                 osal_memset(pUserBuf, 0, SEI_NAL_DATA_BUF_SIZE);
@@ -518,7 +518,7 @@ int TestEncoder(TestEncConfig *param)
                 osal_free(pUserBuf);
             }
             
-            if (encConfig.suffix_sei_nal_file_name) {
+            {
                 Uint8   *pUserBuf;
                 pUserBuf = (Uint8*)osal_malloc(SEI_NAL_DATA_BUF_SIZE);
                 osal_memset(pUserBuf, 0, SEI_NAL_DATA_BUF_SIZE);

+ 18 - 26
wave511/code/sample_v2/component_encoder/component_enc_encoder.c

@@ -1013,7 +1013,7 @@ static BOOL PrepareEncoder(ComponentImpl* com, BOOL* done)
 
     /* Open Data File*/
     if (ctx->encOpenParam.EncStdParam.waveParam.scalingListEnable) {
-        if (testEncConfig->scaling_list_fileName) {
+        if (testEncConfig) {
             ChangePathStyle(testEncConfig->scaling_list_fileName);
             if ((testEncConfig->scaling_list_file = osal_fopen(testEncConfig->scaling_list_fileName, "r")) == NULL) {
                 VLOG(ERR, "fail to open scaling list file, %s\n", testEncConfig->scaling_list_fileName);
@@ -1023,7 +1023,7 @@ static BOOL PrepareEncoder(ComponentImpl* com, BOOL* done)
     }
 
     if (ctx->encOpenParam.EncStdParam.waveParam.customLambdaEnable) {
-        if (testEncConfig->custom_lambda_fileName) {
+        if (testEncConfig) {
             ChangePathStyle(testEncConfig->custom_lambda_fileName);
             if ((testEncConfig->custom_lambda_file = osal_fopen(testEncConfig->custom_lambda_fileName, "r")) == NULL) {
                 VLOG(ERR, "fail to open custom lambda file, %s\n", testEncConfig->custom_lambda_fileName);
@@ -1033,42 +1033,34 @@ static BOOL PrepareEncoder(ComponentImpl* com, BOOL* done)
     }
 
     if (testEncConfig->roi_enable) {
-        if (testEncConfig->roi_file_name) {
-            ChangePathStyle(testEncConfig->roi_file_name);
-            if ((testEncConfig->roi_file = osal_fopen(testEncConfig->roi_file_name, "r")) == NULL) {
-                VLOG(ERR, "fail to open ROI file, %s\n", testEncConfig->roi_file_name);
-                return FALSE;
-            }
+        ChangePathStyle(testEncConfig->roi_file_name);
+        if ((testEncConfig->roi_file = osal_fopen(testEncConfig->roi_file_name, "r")) == NULL) {
+            VLOG(ERR, "fail to open ROI file, %s\n", testEncConfig->roi_file_name);
+            return FALSE;
         }
     }
 
     if (testEncConfig->lambda_map_enable) {
-        if (testEncConfig->lambda_map_fileName) {
-            ChangePathStyle(testEncConfig->lambda_map_fileName);
-            if ((testEncConfig->lambda_map_file = osal_fopen(testEncConfig->lambda_map_fileName, "r")) == NULL) {
-                VLOG(ERR, "fail to open lambda map file, %s\n", testEncConfig->lambda_map_fileName);
-                return FALSE;
-            }
+        ChangePathStyle(testEncConfig->lambda_map_fileName);
+        if ((testEncConfig->lambda_map_file = osal_fopen(testEncConfig->lambda_map_fileName, "r")) == NULL) {
+            VLOG(ERR, "fail to open lambda map file, %s\n", testEncConfig->lambda_map_fileName);
+            return FALSE;
         }
     }
 
     if (testEncConfig->mode_map_flag) {
-        if (testEncConfig->mode_map_fileName) {
-            ChangePathStyle(testEncConfig->mode_map_fileName);
-            if ((testEncConfig->mode_map_file = osal_fopen(testEncConfig->mode_map_fileName, "r")) == NULL) {
-                VLOG(ERR, "fail to open custom mode map file, %s\n", testEncConfig->mode_map_fileName);
-                return FALSE;
-            }
+        ChangePathStyle(testEncConfig->mode_map_fileName);
+        if ((testEncConfig->mode_map_file = osal_fopen(testEncConfig->mode_map_fileName, "r")) == NULL) {
+            VLOG(ERR, "fail to open custom mode map file, %s\n", testEncConfig->mode_map_fileName);
+            return FALSE;
         }
     }
 
     if (testEncConfig->wp_param_flag & 0x1) {
-        if (testEncConfig->wp_param_fileName) {
-            ChangePathStyle(testEncConfig->wp_param_fileName);
-            if ((testEncConfig->wp_param_file = osal_fopen(testEncConfig->wp_param_fileName, "r")) == NULL) {
-                VLOG(ERR, "fail to open Weight Param file, %s\n", testEncConfig->wp_param_fileName);
-                return FALSE;
-            }
+        ChangePathStyle(testEncConfig->wp_param_fileName);
+        if ((testEncConfig->wp_param_file = osal_fopen(testEncConfig->wp_param_fileName, "r")) == NULL) {
+            VLOG(ERR, "fail to open Weight Param file, %s\n", testEncConfig->wp_param_fileName);
+            return FALSE;
         }
     }
 

+ 1 - 1
wave511/code/sample_v2/helper/main_helper.c

@@ -2158,7 +2158,7 @@ void GenRegionToQpMap(
 int openRoiMapFile(TestEncConfig *encConfig)
 {
     if (encConfig->roi_enable) {
-        if (encConfig->roi_file_name) {
+        if (encConfig) {
             ChangePathStyle(encConfig->roi_file_name);
             if ((encConfig->roi_file = osal_fopen(encConfig->roi_file_name, "r")) == NULL) {
                 VLOG(ERR, "fail to open ROI file, %s\n", encConfig->roi_file_name);

+ 2 - 1
wave511/code/sample_v2/helper/main_helper.h

@@ -79,6 +79,7 @@ struct OptionExt
 };
 
 #define MAX_FILE_PATH               256
+#define MAX_SRC_FILE_PATH           128
 #define MAX_PIC_SKIP_NUM            5
 
 
@@ -313,7 +314,7 @@ typedef struct {
 } W5ChangeParam;
 
 typedef struct {
-    char SrcFileName[MAX_FILE_PATH];
+    char SrcFileName[MAX_SRC_FILE_PATH];
     char BitStreamFileName[MAX_FILE_PATH];
     BOOL srcCbCrInterleave;
     int NumFrame;

+ 1 - 1
wave511/code/sample_v2/helper/vpuhelper.c

@@ -1394,7 +1394,7 @@ Int32 GetEncOpenParam(EncOpenParam *pEncOP, TestEncConfig *pEncConfig, ENC_CFG *
     ENC_CFG encCfgInst;
     ENC_CFG *pCfg;
     Int32   productId;
-    char yuvDir[256] = "yuv/";
+    char yuvDir[128] = "yuv/";
 
     productId   = VPU_GetProductId(pEncOP->coreIdx);