From patchwork Tue Oct 13 09:10:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22914 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:3414:0:0:0:0:0 with SMTP id b20csp1645392yba; Tue, 13 Oct 2020 02:12:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx23v6AuLfBJ4USzZ3wWUocSD/SgqO28Qspk42uimVB1J0bcBG5qWcuLweIcaHXBy0n7MA0 X-Received: by 2002:adf:e741:: with SMTP id c1mr23460769wrn.16.1602580323524; Tue, 13 Oct 2020 02:12:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602580323; cv=none; d=google.com; s=arc-20160816; b=IQwftLSi7xtQGLLO/sGU+KDyrObnb6r0XbND2XBCF4LJv2U+LhSvZv80e58/dPEIUu PqVmy+X4DlV1fCHBYFH4pUYm5IfdpYAeqSqBJUfNV89DHvcIjRmDuU9uHoUh9To9n2im Fx/d9mPULlQ8gp//kIIDWbh5WLofDvormsUijk4kW7G1d8k4APlPk2o1ATLvarussVfI hnNDbhItnmtZdwhQ8gvUHbdqka/uoglJcU3y9HoEG593wdKXfvwYS/pF2wcSN5I2gzuW u5rqZM9jubtfBRY34WZhVy2QaYMBwF3Iot6Eevo95ziShWewBgz85nGbcRso+BXlSq3X rTLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=Oyjx+WsdRLrPVGGW7/e3m7bzT2xaUic4mYKpHqiylsU=; b=xzyUZLe91yO134CuJENuEPEM0cze9Qa7nWI7AGrGJpJhh7RlWZHBPADYZxOScEsGtw f8eXLUs/VQoIn6duiz/HbCZG31NqVqTrZ2VioiRubvkaf6L+IJoDJLknX3Htd4zZ7ol3 3y4T8XqJ76Ico67Ful47GofD2wQqHO7Y48GXP5884x7bShkVdNJHOQ+aIMIhTB+CWuS5 bIYmuwbnuT8Umc2js75kJLAmcKu1RM3tBPs4PPOg3wrl0ixf50Glk4OWEbcfuO+jKNRb lZW1UGpit/SMTZ4sy+QkOJKMiSDOaB9L2pdPTTTGmSqHWytm2xcdg/jiyCKBF0LfLGAf T6Uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=sKXdpvUn; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a131si18175804wmf.197.2020.10.13.02.12.03; Tue, 13 Oct 2020 02:12:03 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=sKXdpvUn; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 429CF68BBDD; Tue, 13 Oct 2020 12:11:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 112FE68BB9E for ; Tue, 13 Oct 2020 12:10:58 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id h5so12995109wrv.7 for ; Tue, 13 Oct 2020 02:10:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yAaP9JoTbUZup9cU1j4IVv0QBEC6HItgEblGWCgs8hg=; b=sKXdpvUnpRWWfUef19nbqWRgMwsdH77KlCSMleawUoCpAXFf8lIG4SzRCafAEAi28/ tcE+GbCUVYTQyhtsAQiFEhtNG3zYfreujLaruZ+cgvwwUpSlIb7GSuiED0wKVRMjGgTS ztbR2Nc1aYCjTd5tyu27qxfXHy2HrSXJbWXvFEw58NY7bY+67KthI0NU9UAJ/4VaWPiP x6yjZ2FhYLwoSQKBkOrBZFfnTbzTSFIa/7Lryj9jA4V5777a8RbPJE3+plyV1MKM5+ko /fpYXsD+BiIcv1+WOS7PDKHSm9DnU2o/dfufZ2h+6ZZcmqoA4V+fCtzVghdDz9KDPkQi WlDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yAaP9JoTbUZup9cU1j4IVv0QBEC6HItgEblGWCgs8hg=; b=otv171MYPMTwrOIyth2Yi661KcumNq93oFQDXsfvTOirVdTeQwpbvoMFr2iYkPDW11 Bndm14sgX3NAfoIxlUZWlqcv17MVdOczG0r6CisSbUBkCaXX98SjjkICYpdV+K76MLsm K6XiybSfDABJ0IYAQfZ9k0mCDvcVt9MM+IKEeqHs1ysZNueX5qPWV3wl/wx7dk+ru5EH 6QLg3lERcxk3DUW5WQPI/YqJVQJqZVfmBh8Kh0ABMBYZJg7tbYpyATMVVQg3Uz73qmWo jxIhWU1zy0XWRjyxHHLKTQBKd65JnYhsH/xbhvaKMH5TwNApTHNtmtTOTE0nJ5ist3MV zogg== X-Gm-Message-State: AOAM532Cb4rlrGN6nYJl3JoB5GZk/bS35elbUjOJHB6CP4LMSPlEcO5d owjGNpMl8E097RC+1s4bxZiuDvNd0Vw= X-Received: by 2002:adf:dcc7:: with SMTP id x7mr35350058wrm.203.1602580257188; Tue, 13 Oct 2020 02:10:57 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g83sm25913159wmf.15.2020.10.13.02.10.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 02:10:56 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Oct 2020 11:10:15 +0200 Message-Id: <20201013091017.1899676-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201013091017.1899676-1-andreas.rheinhardt@gmail.com> References: <20201013091017.1899676-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/9] avfilter/af_mcompand: Remove redundant calls to AVFilter.uninit X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gbTIo5CispcZ Content-Length: 5390 uninit is already called automatically (even when configuring the filter failed). Signed-off-by: Andreas Rheinhardt --- libavfilter/af_mcompand.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/libavfilter/af_mcompand.c b/libavfilter/af_mcompand.c index f142573bea..ce4f366ad7 100644 --- a/libavfilter/af_mcompand.c +++ b/libavfilter/af_mcompand.c @@ -361,10 +361,8 @@ static int config_output(AVFilterLink *outlink) char *p2, *p3, *saveptr2 = NULL, *saveptr3 = NULL; double radius; - if (!tstr) { - uninit(ctx); + if (!tstr) return AVERROR(EINVAL); - } p = NULL; p2 = tstr; @@ -372,7 +370,6 @@ static int config_output(AVFilterLink *outlink) tstr2 = av_strtok(p2, " ", &saveptr2); if (!tstr2) { av_log(ctx, AV_LOG_ERROR, "at least one attacks/decays rate is mandatory\n"); - uninit(ctx); return AVERROR(EINVAL); } p2 = NULL; @@ -381,7 +378,6 @@ static int config_output(AVFilterLink *outlink) count_items(tstr2, &nb_attacks, ','); if (!nb_attacks || nb_attacks & 1) { av_log(ctx, AV_LOG_ERROR, "number of attacks rate plus decays rate must be even\n"); - uninit(ctx); return AVERROR(EINVAL); } @@ -417,7 +413,6 @@ static int config_output(AVFilterLink *outlink) tstr2 = av_strtok(p2, " ", &saveptr2); if (!tstr2) { av_log(ctx, AV_LOG_ERROR, "transfer function curve in dB must be set\n"); - uninit(ctx); return AVERROR(EINVAL); } sscanf(tstr2, "%lf", &s->bands[i].transfer_fn.curve_dB); @@ -427,7 +422,6 @@ static int config_output(AVFilterLink *outlink) tstr2 = av_strtok(p2, " ", &saveptr2); if (!tstr2) { av_log(ctx, AV_LOG_ERROR, "transfer points missing\n"); - uninit(ctx); return AVERROR(EINVAL); } @@ -435,38 +429,31 @@ static int config_output(AVFilterLink *outlink) s->bands[i].transfer_fn.nb_segments = (nb_points + 4) * 2; s->bands[i].transfer_fn.segments = av_calloc(s->bands[i].transfer_fn.nb_segments, sizeof(CompandSegment)); - if (!s->bands[i].transfer_fn.segments) { - uninit(ctx); + if (!s->bands[i].transfer_fn.segments) return AVERROR(ENOMEM); - } ret = parse_points(tstr2, nb_points, radius, &s->bands[i].transfer_fn, ctx); if (ret < 0) { av_log(ctx, AV_LOG_ERROR, "transfer points parsing failed\n"); - uninit(ctx); return ret; } tstr2 = av_strtok(p2, " ", &saveptr2); if (!tstr2) { av_log(ctx, AV_LOG_ERROR, "crossover_frequency is missing\n"); - uninit(ctx); return AVERROR(EINVAL); } new_nb_items += sscanf(tstr2, "%lf", &s->bands[i].topfreq) == 1; if (s->bands[i].topfreq < 0 || s->bands[i].topfreq >= outlink->sample_rate / 2) { av_log(ctx, AV_LOG_ERROR, "crossover_frequency: %f, should be >=0 and lower than half of sample rate: %d.\n", s->bands[i].topfreq, outlink->sample_rate / 2); - uninit(ctx); return AVERROR(EINVAL); } if (s->bands[i].topfreq != 0) { ret = crossover_setup(outlink, &s->bands[i].filter, s->bands[i].topfreq); - if (ret < 0) { - uninit(ctx); + if (ret < 0) return ret; - } } tstr2 = av_strtok(p2, " ", &saveptr2);