[V1.0] 1,Verify opus version and iamf code validity 2, fix aac specific information parsing 3, vlogging changing(info_type->info_type_bit_masks)

code/src/common/audio_defines.h

@@ -25,20 +25,6 @@
 #define LIMITER_ReleaseSec 0.200f
 #define LIMITER_LookAhead 240
 
-typedef enum {
-  CHANNELUNKNOWN = 0,
-  CHANNELMONO,
-  CHANNELSTEREO,
-  CHANNEL51,
-  CHANNEL512,
-  CHANNEL514,
-  CHANNEL71,
-  CHANNEL712,
-  CHANNEL714,
-  CHANNEL312,
-  CHANNELBINAURAL
-} channelLayout;
-
 #define MAX_CHANNELS 12
 #define MAX_OUTPUT_CHANNELS 24
 #define MAX_DELAYSIZE 4096

code/src/iamf_dec/IAMF_OBU.c

@@ -254,6 +254,10 @@ static int _valid_profile(uint8_t primary, uint8_t addional) {
 IAMF_Version *iamf_version_new(IAMF_OBU *obu) {
   IAMF_Version *ver = 0;
   BitStream b;
+  union {
+    uint32_t _id;
+    uint8_t _4cc[4];
+  } code = {._4cc = {'i', 'a', 'm', 'f'}};
 
   ver = IAMF_MALLOCZ(IAMF_Version, 1);
   if (!ver) {
@@ -273,6 +277,12 @@ IAMF_Version *iamf_version_new(IAMF_OBU *obu) {
       "%u.",
       (char *)&ver->iamf_code, ver->primary_profile, ver->additional_profile);
 
+  if (ver->iamf_code != code._id) {
+    ia_loge("ia sequence header object: Invalid iamf code %.4s.",
+            (char *)&ver->iamf_code);
+    goto version_fail;
+  }
+
   if (!_valid_profile(ver->primary_profile, ver->additional_profile)) {
     ia_loge(
         "ia sequence header object: Invalid primary profile %u or additional "
@@ -296,6 +306,18 @@ static int _valid_codec(uint32_t codec) {
   return iamf_codec_check(iamf_codec_4cc_get_codecID(codec));
 }
 
+#define OPUS_VERSION_MAX 15
+static int _valid_decoder_conifg(uint32_t codec, uint8_t *conf, size_t size) {
+  if (iamf_codec_4cc_get_codecID(codec) == IAMF_CODEC_OPUS) {
+    if (conf[0] > OPUS_VERSION_MAX) {
+      ia_logw("opus config invalid: version %u should less than %u.", conf[0],
+              OPUS_VERSION_MAX);
+      return 0;
+    }
+  }
+  return 1;
+}
+
 IAMF_CodecConf *iamf_codec_conf_new(IAMF_OBU *obu) {
   IAMF_CodecConf *conf = 0;
   BitStream b;
@@ -335,6 +357,10 @@ IAMF_CodecConf *iamf_codec_conf_new(IAMF_OBU *obu) {
     goto codec_conf_fail;
   }
 
+  if (!_valid_decoder_conifg(conf->codec_id, conf->decoder_conf,
+                             conf->decoder_conf_size))
+    goto codec_conf_fail;
+
 #if SUPPORT_VERIFIER
   vlog_obu(IAMF_OBU_CODEC_CONFIG, conf, 0, 0);
 #endif