diff mbox series

[FFmpeg-devel,03/19] avfilter/af_anequalizer: Don't allocate outpad names

Message ID 20200825140927.16433-3-andreas.rheinhardt@gmail.com
State Accepted
Commit 080d2c67f540908e48d1e0f482c057e52a7fad7a
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/af_anequalizer.c | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

Comments

Paul B Mahol Aug. 26, 2020, 8:23 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/af_anequalizer.c | 20 ++++----------------
>  1 file changed, 4 insertions(+), 16 deletions(-)
>

LGTM

> diff --git a/libavfilter/af_anequalizer.c b/libavfilter/af_anequalizer.c
> index 26cf835727..8cb607b2b4 100644
> --- a/libavfilter/af_anequalizer.c
> +++ b/libavfilter/af_anequalizer.c
> @@ -192,33 +192,23 @@ static av_cold int init(AVFilterContext *ctx)
>      int ret;
>
>      pad = (AVFilterPad){
> -        .name         = av_strdup("out0"),
> +        .name         = "out0",
>          .type         = AVMEDIA_TYPE_AUDIO,
>      };
>
> -    if (!pad.name)
> -        return AVERROR(ENOMEM);
> -
>      ret = ff_insert_outpad(ctx, 0, &pad);
> -    if (ret < 0) {
> -        av_freep(&pad.name);
> +    if (ret < 0)
>          return ret;
> -    }
>
>      if (s->draw_curves) {
>          vpad = (AVFilterPad){
> -            .name         = av_strdup("out1"),
> +            .name         = "out1",
>              .type         = AVMEDIA_TYPE_VIDEO,
>              .config_props = config_video,
>          };
> -        if (!vpad.name) {
> -            return AVERROR(ENOMEM);
> -        }
>          ret = ff_insert_outpad(ctx, 1, &vpad);
> -        if (ret < 0) {
> -            av_freep(&vpad.name);
> +        if (ret < 0)
>              return ret;
> -        }
>      }
>
>      return 0;
> @@ -267,8 +257,6 @@ static av_cold void uninit(AVFilterContext *ctx)
>  {
>      AudioNEqualizerContext *s = ctx->priv;
>
> -    for (int i = 0; i < ctx->nb_outputs; i++)
> -        av_freep(&ctx->output_pads[i].name);
>      av_frame_free(&s->video);
>      av_freep(&s->filters);
>      s->nb_filters = 0;
> --
> 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/af_anequalizer.c b/libavfilter/af_anequalizer.c
index 26cf835727..8cb607b2b4 100644
--- a/libavfilter/af_anequalizer.c
+++ b/libavfilter/af_anequalizer.c
@@ -192,33 +192,23 @@  static av_cold int init(AVFilterContext *ctx)
     int ret;
 
     pad = (AVFilterPad){
-        .name         = av_strdup("out0"),
+        .name         = "out0",
         .type         = AVMEDIA_TYPE_AUDIO,
     };
 
-    if (!pad.name)
-        return AVERROR(ENOMEM);
-
     ret = ff_insert_outpad(ctx, 0, &pad);
-    if (ret < 0) {
-        av_freep(&pad.name);
+    if (ret < 0)
         return ret;
-    }
 
     if (s->draw_curves) {
         vpad = (AVFilterPad){
-            .name         = av_strdup("out1"),
+            .name         = "out1",
             .type         = AVMEDIA_TYPE_VIDEO,
             .config_props = config_video,
         };
-        if (!vpad.name) {
-            return AVERROR(ENOMEM);
-        }
         ret = ff_insert_outpad(ctx, 1, &vpad);
-        if (ret < 0) {
-            av_freep(&vpad.name);
+        if (ret < 0)
             return ret;
-        }
     }
 
     return 0;
@@ -267,8 +257,6 @@  static av_cold void uninit(AVFilterContext *ctx)
 {
     AudioNEqualizerContext *s = ctx->priv;
 
-    for (int i = 0; i < ctx->nb_outputs; i++)
-        av_freep(&ctx->output_pads[i].name);
     av_frame_free(&s->video);
     av_freep(&s->filters);
     s->nb_filters = 0;