From 22100022d7b0f00f38bb927e6dbafadb096ad136 Mon Sep 17 00:00:00 2001
From: "xueman.ruan" <xueman.ruan@rock-chips.com>
Date: Thu, 28 Sep 2023 18:02:33 +0800
Subject: [PATCH] fix[utils]: adjust format range constraint

Change-Id: I12d57955d6ad84e063784e46893b1deec90785b6
Signed-off-by: xueman.ruan <xueman.ruan@rock-chips.com>
---
 inc/mpp_frame.h       | 1 +
 utils/mpi_dec_utils.c | 3 ++-
 utils/mpi_enc_utils.c | 3 ++-
 utils/utils.c         | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/inc/mpp_frame.h b/inc/mpp_frame.h
index a065baf0..42687693 100644
--- a/inc/mpp_frame.h
+++ b/inc/mpp_frame.h
@@ -164,6 +164,7 @@ typedef enum {
 } MppFrameChromaLocation;
 
 #define MPP_FRAME_FMT_MASK          (0x000fffff)
+#define MPP_FRAME_FMT_PROP_MASK     (0x0ff00000)
 
 #define MPP_FRAME_FMT_COLOR_MASK    (0x000f0000)
 #define MPP_FRAME_FMT_YUV           (0x00000000)
diff --git a/utils/mpi_dec_utils.c b/utils/mpi_dec_utils.c
index ce8da77b..6a408f88 100644
--- a/utils/mpi_dec_utils.c
+++ b/utils/mpi_dec_utils.c
@@ -524,10 +524,11 @@ RK_S32 mpi_dec_opt_f(void *ctx, const char *next)
                 cmd->format = format;
                 return 1;
             }
+
+            mpp_err("invalid input format 0x%x\n", format);
         }
     }
 
-    mpp_err("invalid output format\n");
     cmd->format = MPP_FMT_YUV420SP;
     return 0;
 }
diff --git a/utils/mpi_enc_utils.c b/utils/mpi_enc_utils.c
index 548b677e..4c3a5821 100644
--- a/utils/mpi_enc_utils.c
+++ b/utils/mpi_enc_utils.c
@@ -208,10 +208,11 @@ RK_S32 mpi_enc_opt_f(void *ctx, const char *next)
                 cmd->format = format;
                 return 1;
             }
+
+            mpp_err("invalid input format 0x%x\n", format);
         }
     }
 
-    mpp_err("invalid input format\n");
     cmd->format = MPP_FMT_YUV420SP;
     return 0;
 }
diff --git a/utils/utils.c b/utils/utils.c
index 91399e2d..8999f09f 100644
--- a/utils/utils.c
+++ b/utils/utils.c
@@ -1561,7 +1561,7 @@ MPP_RET str_to_frm_fmt(const char *nptr, long *number)
         else if (errno == 0 && nptr && *endptr != 0)
             mpp_err("format: 0x%lx  invalid  (additional characters remain)", tmp);
         else if (errno == 0 && nptr && !*endptr) {
-            if (tmp < UINT_MAX && tmp >= 0) {
+            if ((tmp < (MPP_FMT_BUTT | MPP_FRAME_FMT_PROP_MASK)) && tmp >= 0) {
                 *number = tmp;
                 ret = MPP_OK;
             } else {