diff mbox series

[FFmpeg-devel,05/19] avfilter/vf_fieldmatch: Don't allocate inpad names

Message ID 20200825140927.16433-5-andreas.rheinhardt@gmail.com
State Accepted
Commit 2d349631b11b66da2ba23e3e3df18b362ccf759f
Headers show
Series [FFmpeg-devel,01/19] avfilter/avfilter: Fix indentation
Related show

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Andreas Rheinhardt Aug. 25, 2020, 2:09 p.m. UTC
These names are always the same, so not using duplicates saves
allocations, checks for the allocations as well as frees.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavfilter/vf_fieldmatch.c | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

Comments

Paul B Mahol Aug. 26, 2020, 8:19 p.m. UTC | #1
On 8/25/20, Andreas Rheinhardt <andreas.rheinhardt@gmail.com> wrote:
> These names are always the same, so not using duplicates saves
> allocations, checks for the allocations as well as frees.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
>  libavfilter/vf_fieldmatch.c | 19 ++++---------------
>  1 file changed, 4 insertions(+), 15 deletions(-)
>

LGTM

> diff --git a/libavfilter/vf_fieldmatch.c b/libavfilter/vf_fieldmatch.c
> index fa4aa8239c..7fcad18caf 100644
> --- a/libavfilter/vf_fieldmatch.c
> +++ b/libavfilter/vf_fieldmatch.c
> @@ -964,28 +964,20 @@ static av_cold int fieldmatch_init(AVFilterContext
> *ctx)
>  {
>      const FieldMatchContext *fm = ctx->priv;
>      AVFilterPad pad = {
> -        .name         = av_strdup("main"),
> +        .name         = "main",
>          .type         = AVMEDIA_TYPE_VIDEO,
>          .config_props = config_input,
>      };
>      int ret;
>
> -    if (!pad.name)
> -        return AVERROR(ENOMEM);
> -    if ((ret = ff_insert_inpad(ctx, INPUT_MAIN, &pad)) < 0) {
> -        av_freep(&pad.name);
> +    if ((ret = ff_insert_inpad(ctx, INPUT_MAIN, &pad)) < 0)
>          return ret;
> -    }
>
>      if (fm->ppsrc) {
> -        pad.name = av_strdup("clean_src");
> +        pad.name = "clean_src";
>          pad.config_props = NULL;
> -        if (!pad.name)
> -            return AVERROR(ENOMEM);
> -        if ((ret = ff_insert_inpad(ctx, INPUT_CLEANSRC, &pad)) < 0) {
> -            av_freep(&pad.name);
> +        if ((ret = ff_insert_inpad(ctx, INPUT_CLEANSRC, &pad)) < 0)
>              return ret;
> -        }
>      }
>
>      if ((fm->blockx & (fm->blockx - 1)) ||
> @@ -1004,7 +996,6 @@ static av_cold int fieldmatch_init(AVFilterContext
> *ctx)
>
>  static av_cold void fieldmatch_uninit(AVFilterContext *ctx)
>  {
> -    int i;
>      FieldMatchContext *fm = ctx->priv;
>
>      if (fm->prv != fm->src)
> @@ -1021,8 +1012,6 @@ static av_cold void fieldmatch_uninit(AVFilterContext
> *ctx)
>      av_freep(&fm->cmask_data[0]);
>      av_freep(&fm->tbuffer);
>      av_freep(&fm->c_array);
> -    for (i = 0; i < ctx->nb_inputs; i++)
> -        av_freep(&ctx->input_pads[i].name);
>  }
>
>  static int config_output(AVFilterLink *outlink)
> --
> 2.20.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff mbox series

Patch

diff --git a/libavfilter/vf_fieldmatch.c b/libavfilter/vf_fieldmatch.c
index fa4aa8239c..7fcad18caf 100644
--- a/libavfilter/vf_fieldmatch.c
+++ b/libavfilter/vf_fieldmatch.c
@@ -964,28 +964,20 @@  static av_cold int fieldmatch_init(AVFilterContext *ctx)
 {
     const FieldMatchContext *fm = ctx->priv;
     AVFilterPad pad = {
-        .name         = av_strdup("main"),
+        .name         = "main",
         .type         = AVMEDIA_TYPE_VIDEO,
         .config_props = config_input,
     };
     int ret;
 
-    if (!pad.name)
-        return AVERROR(ENOMEM);
-    if ((ret = ff_insert_inpad(ctx, INPUT_MAIN, &pad)) < 0) {
-        av_freep(&pad.name);
+    if ((ret = ff_insert_inpad(ctx, INPUT_MAIN, &pad)) < 0)
         return ret;
-    }
 
     if (fm->ppsrc) {
-        pad.name = av_strdup("clean_src");
+        pad.name = "clean_src";
         pad.config_props = NULL;
-        if (!pad.name)
-            return AVERROR(ENOMEM);
-        if ((ret = ff_insert_inpad(ctx, INPUT_CLEANSRC, &pad)) < 0) {
-            av_freep(&pad.name);
+        if ((ret = ff_insert_inpad(ctx, INPUT_CLEANSRC, &pad)) < 0)
             return ret;
-        }
     }
 
     if ((fm->blockx & (fm->blockx - 1)) ||
@@ -1004,7 +996,6 @@  static av_cold int fieldmatch_init(AVFilterContext *ctx)
 
 static av_cold void fieldmatch_uninit(AVFilterContext *ctx)
 {
-    int i;
     FieldMatchContext *fm = ctx->priv;
 
     if (fm->prv != fm->src)
@@ -1021,8 +1012,6 @@  static av_cold void fieldmatch_uninit(AVFilterContext *ctx)
     av_freep(&fm->cmask_data[0]);
     av_freep(&fm->tbuffer);
     av_freep(&fm->c_array);
-    for (i = 0; i < ctx->nb_inputs; i++)
-        av_freep(&ctx->input_pads[i].name);
 }
 
 static int config_output(AVFilterLink *outlink)