avformat/iamf_writer: Return proper error codes

Surprisingly the return value of add_param_definition() (a pointer) has only been used to check for success and not to actually access the pointee; nonsuccess was equated with ENOMEM, although there is a non-enomem error path in this function. Change this by returning an int.

Andreas Rheinhardt committed 2 years ago

Commit c5845af1 parent 18af9221 file · +19 −18Browse files

Unified · Split

libavformat/iamf_writer.c+19−18

     return ret;
 }
-static IAMFParamDefinition *add_param_definition(IAMFContext *iamf, AVIAMFParamDefinition *param,
+static int add_param_definition(IAMFContext *iamf, AVIAMFParamDefinition *param,
-                                                 const IAMFAudioElement *audio_element, void *log_ctx)
+                                const IAMFAudioElement *audio_element, void *log_ctx)
 {
     IAMFParamDefinition **tmp, *param_definition;
     IAMFCodecConfig *codec_config = NULL;
     tmp = av_realloc_array(iamf->param_definitions, iamf->nb_param_definitions + 1,
                            sizeof(*iamf->param_definitions));
     if (!tmp)
-        return NULL;
+        return AVERROR(ENOMEM);
     iamf->param_definitions = tmp;
         if (!codec_config) {
             av_log(log_ctx, AV_LOG_ERROR, "parameter_rate needed but not set for parameter_id %u\n",
                    param->parameter_id);
-            return NULL;
+            return AVERROR(EINVAL);
         }
         param->parameter_rate = codec_config->sample_rate;
     }
     param_definition = av_mallocz(sizeof(*param_definition));
     if (!param_definition)
-        return NULL;
+        return AVERROR(ENOMEM);
     param_definition->mode = !!param->duration;
     param_definition->param = param;
     param_definition->audio_element = audio_element;
     iamf->param_definitions[iamf->nb_param_definitions++] = param_definition;
-    return param_definition;
+    return 0;
 }
 int ff_iamf_add_audio_element(IAMFContext *iamf, const AVStreamGroup *stg, void *log_ctx)
         }
         if (!param_definition) {
-            param_definition = add_param_definition(iamf, param, audio_element, log_ctx);
+            ret = add_param_definition(iamf, param, audio_element, log_ctx);
-            if (!param_definition)
+            if (ret < 0)
-                return AVERROR(ENOMEM);
+                return ret;
         }
     }
     if (iamf_audio_element->recon_gain_info) {
         }
         if (!param_definition) {
-            param_definition = add_param_definition(iamf, param, audio_element, log_ctx);
+            ret = add_param_definition(iamf, param, audio_element, log_ctx);
-            if (!param_definition)
+            if (ret < 0)
-                return AVERROR(ENOMEM);
+                return ret;
         }
     }
 int ff_iamf_add_mix_presentation(IAMFContext *iamf, const AVStreamGroup *stg, void *log_ctx)
 {
     IAMFMixPresentation **tmp, *mix_presentation;
+    int ret;
     if (stg->type != AV_STREAM_GROUP_PARAMS_IAMF_MIX_PRESENTATION)
         return AVERROR(EINVAL);
         param_definition = ff_iamf_get_param_definition(iamf, param->parameter_id);
         if (!param_definition) {
-            param_definition = add_param_definition(iamf, param, NULL, log_ctx);
+            ret = add_param_definition(iamf, param, NULL, log_ctx);
-            if (!param_definition)
+            if (ret < 0)
-                return AVERROR(ENOMEM);
+                return ret;
         }
         for (int j = 0; j < submix->nb_elements; j++) {
             }
             param_definition = ff_iamf_get_param_definition(iamf, param->parameter_id);
             if (!param_definition) {
-                param_definition = add_param_definition(iamf, param, NULL, log_ctx);
+                ret = add_param_definition(iamf, param, NULL, log_ctx);
-                if (!param_definition)
+                if (ret < 0)
-                    return AVERROR(ENOMEM);
+                    return ret;
             }
         }
     }

avformat/iamf_writer: Return proper error codes

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code