From 44aba2d93666001033bdc0df3b0f78a92fa9d783 Mon Sep 17 00:00:00 2001
From: yh <yanghao236@huawei.com>
Date: Wed, 13 Sep 2023 15:26:13 +0800
Subject: [PATCH] codec code check repair

Signed-off-by: yh <yanghao236@huawei.com>
---
 .../passthrough/adapter/src/component_common.cpp   |  7 ++-----
 codec/hal/src/codec_config_parser.c                |  7 ++-----
 .../codec_service_stub/codec_config_parser.c       | 14 ++++----------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/codec/hal/passthrough/adapter/src/component_common.cpp b/codec/hal/passthrough/adapter/src/component_common.cpp
index beeeed87a0..a5c884cd3a 100644
--- a/codec/hal/passthrough/adapter/src/component_common.cpp
+++ b/codec/hal/passthrough/adapter/src/component_common.cpp
@@ -720,11 +720,10 @@ static int32_t ParseParamPortDefinitionVideo(Param *paramIn, int8_t *paramOut, i
             case KEY_OUTPUT_BUFFER_COUNT:
                 param->nBufferCountActual = *(reinterpret_cast<OMX_U32 *>(paramIn[i].val));
                 break;
-            case KEY_BUFFERSIZE: {
+            case KEY_BUFFERSIZE:
                 param->nBufferSize = *(reinterpret_cast<OMX_U32 *>(paramIn[i].val));
                 param->bEnabled = OMX_TRUE;
                 break;
-            }
             case KEY_MIMETYPE: {
                 int32_t codingType = ConvertMimeTypeToCodingType(*(reinterpret_cast<AvCodecMime *>(paramIn[i].val)));
                 param->format.video.eCompressionFormat = static_cast<OMX_VIDEO_CODINGTYPE>(codingType);
@@ -749,12 +748,10 @@ static int32_t ParseParamPortDefinitionVideo(Param *paramIn, int8_t *paramOut, i
                 param->format.video.eColorFormat =
                     ConvertPixelFormatToColorFormat(*(reinterpret_cast<PixelFormat *>(paramIn[i].val)));
                 break;
-
-            default: {
+            default:
                 validCount--;
                 HDF_LOGW("%{public}s warn, unsupport key[%{public}d]", __func__, paramIn[i].key);
                 break;
-            }
         }
     }
     return (validCount > 0) ? HDF_SUCCESS : HDF_FAILURE;
diff --git a/codec/hal/src/codec_config_parser.c b/codec/hal/src/codec_config_parser.c
index 6d6c6727af..27fd778779 100644
--- a/codec/hal/src/codec_config_parser.c
+++ b/codec/hal/src/codec_config_parser.c
@@ -329,15 +329,13 @@ int32_t LoadCodecCapabilityFromHcs(const struct DeviceResourceNode *node, CodecC
         CODEC_LOGE("invalid param!");
         return HDF_ERR_INVALID_PARAM;
     }
-
     CodecCapablityGroup *codecCapGroup = NULL;
     int32_t index;
     int32_t codecNum = 0;
 
     char *codecGroupsNodeName[] = {
-        NODE_VIDEO_HARDWARE_ENCODERS, NODE_VIDEO_HARDWARE_DECODERS,
-        NODE_VIDEO_SOFTWARE_ENCODERS, NODE_VIDEO_SOFTWARE_DECODERS,
-        NODE_AUDIO_HARDWARE_ENCODERS, NODE_AUDIO_HARDWARE_DECODERS,
+        NODE_VIDEO_HARDWARE_ENCODERS, NODE_VIDEO_HARDWARE_DECODERS, NODE_VIDEO_SOFTWARE_ENCODERS,
+        NODE_VIDEO_SOFTWARE_DECODERS, NODE_AUDIO_HARDWARE_ENCODERS, NODE_AUDIO_HARDWARE_DECODERS,
         NODE_AUDIO_SOFTWARE_ENCODERS, NODE_AUDIO_SOFTWARE_DECODERS
     };
     CodecCapablityGroup *codecCapGroups[] = {
@@ -373,7 +371,6 @@ int32_t LoadCodecCapabilityFromHcs(const struct DeviceResourceNode *node, CodecC
             return HDF_FAILURE;
         }
     }
-
     caps->inited = true;
     return HDF_SUCCESS;
 }
diff --git a/codec/hdi_service/codec_service_stub/codec_config_parser.c b/codec/hdi_service/codec_service_stub/codec_config_parser.c
index ec67e32256..b9064d31ac 100644
--- a/codec/hdi_service/codec_service_stub/codec_config_parser.c
+++ b/codec/hdi_service/codec_service_stub/codec_config_parser.c
@@ -382,27 +382,22 @@ int32_t LoadCodecCapabilityFromHcs(const struct DeviceResourceNode *node)
     CodecCapablityGroup *codecCapGroup = NULL;
     int32_t index;
     int32_t codecNum = 0;
-
     if (node == NULL) {
         HDF_LOGE("%{public}s, load capability failed, node is null!", __func__);
         return HDF_FAILURE;
     }
     g_resourceNode = node;
-
     char *codecGroupsNodeName[] = {
-        NODE_VIDEO_HARDWARE_ENCODERS, NODE_VIDEO_HARDWARE_DECODERS,
-        NODE_VIDEO_SOFTWARE_ENCODERS, NODE_VIDEO_SOFTWARE_DECODERS,
-        NODE_AUDIO_HARDWARE_ENCODERS, NODE_AUDIO_HARDWARE_DECODERS,
+        NODE_VIDEO_HARDWARE_ENCODERS, NODE_VIDEO_HARDWARE_DECODERS, NODE_VIDEO_SOFTWARE_ENCODERS,
+        NODE_VIDEO_SOFTWARE_DECODERS, NODE_AUDIO_HARDWARE_ENCODERS, NODE_AUDIO_HARDWARE_DECODERS,
         NODE_AUDIO_SOFTWARE_ENCODERS, NODE_AUDIO_SOFTWARE_DECODERS
     };
     for (index = 0; index < CODEC_CAPABLITY_GROUP_NUM; index++) {
-        codecCapGroup = GetCapablityGroup(index);
-        if (codecCapGroup == NULL) {
+        if ((codecCapGroup = GetCapablityGroup(index)) == NULL) {
             continue;
         }
         if (GetGroupCapabilitiesNumber(node, codecGroupsNodeName[index], &codecNum) == HDF_SUCCESS) {
-            codecCapGroup->num = codecNum;
-            if (codecNum <= 0) {
+            if ((codecCapGroup->num = codecNum) <= 0) {
                 codecCapGroup->capablitis = NULL;
                 continue;
             }
@@ -429,7 +424,6 @@ int32_t LoadCodecCapabilityFromHcs(const struct DeviceResourceNode *node)
             return HDF_FAILURE;
         }
     }
-
     g_codecCapabilites.inited = true;
     return HDF_SUCCESS;
 }
-- 
Gitee