From patchwork Thu Dec 14 19:31:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 45143 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp5186103pzf; Thu, 14 Dec 2023 11:33:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IG0MYM6mVCIJjur4ePVpuCETkyXEa4rxEJBiM0W5C9Mlp6pKkSbtDdzt083YTusQqBlcJcq X-Received: by 2002:a17:907:7246:b0:a1e:91ab:ba2d with SMTP id ds6-20020a170907724600b00a1e91abba2dmr6490392ejc.110.1702582433729; Thu, 14 Dec 2023 11:33:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702582433; cv=none; d=google.com; s=arc-20160816; b=oKagBnNOYTh9Tq/s5eGc1KixiUdullUdY8q+T+PuKtXUwGbbegEIX27LpkX231gsAG PPkGHhpfsT1XrMXjrgpY2IxDQb2gmJZhX4YxbluW7N3+ei9LLJCQ/AAnOCLHOCXoq+6L lqYCj69FojyP8+eQQ96oMfH4DXW1wIarA6r9UMsBz7ZQyYwTeUHKXXm724Yp9HzpFmCn kvJepu8pJ5wgUNKQpquog0fhuhPAMKpO7jGvn47ONXJLK0UNxPI2/P/2Bq53BPlCSAGE uFpIdezdMyyfzP5PwnthgGHuVC7rxfog3i63nZFSIt+Mf+XGywHk9GoCiTwh6XSjZO4y 9YPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:delivered-to; bh=g2aQXv/RXoUtvUFJtnsaMdEyGJVAoXFAGXv4AC+dehk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=FulGtys8qVS6sQJWfbixqUarHol99Ye2hmilhEwOHK225Vo4Y1Wv7GXr8UIBp5Cv5f py+9cgnd5A2FlP8vc8fty0hk4ZsupcUZFdaywgmpco9Y6WZezB7Da5oVvNMGl8psI6I6 01/8Mky1cjQ82/0ila/O/68Z5uhe6G7N9DyLEDgVbdiy5m0KCG8699GbZGj1gXbgYbGi dQNUR8t54SrvNspf/AOPbmMR8cLlNkQ5e4YMydvsr1LvU2Nb2VdjDBqaKTwRN4SNqpDk eGFAdx4220OJdjcGhdIk3ecUN942jeFX3zXL+mifWdhBodZKp7y9tvdzKU1xDVOBL1mz cwfg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p23-20020a170906229700b00a1d1f6bb285si6364943eja.443.2023.12.14.11.33.53; Thu, 14 Dec 2023 11:33:53 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 707CA68D2B2; Thu, 14 Dec 2023 21:32:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E0A468D29C for ; Thu, 14 Dec 2023 21:32:45 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id F24D51CAF for ; Thu, 14 Dec 2023 20:32:44 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id Jf6PBk6WcJvT for ; Thu, 14 Dec 2023 20:32:44 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 945C41C9B for ; Thu, 14 Dec 2023 20:32:38 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 99C993A0706 for ; Thu, 14 Dec 2023 20:32:31 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Dec 2023 20:31:37 +0100 Message-ID: <20231214193138.2503-8-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231214193138.2503-1-anton@khirnov.net> References: <20231214193138.2503-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/9] fftools/ffmpeg_mux: deduplicate uniniting EncStats X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CRIRFqPTE8rq --- fftools/ffmpeg_mux.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 88ce3cd60c..357f34172f 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -773,6 +773,13 @@ int of_write_trailer(OutputFile *of) return mux_result; } +static void enc_stats_uninit(EncStats *es) +{ + for (int i = 0; i < es->nb_components; i++) + av_freep(&es->components[i].str); + av_freep(&es->components); +} + static void ost_free(OutputStream **post) { OutputStream *ost = *post; @@ -818,17 +825,9 @@ static void ost_free(OutputStream **post) av_freep(&ost->enc_ctx->stats_in); avcodec_free_context(&ost->enc_ctx); - for (int i = 0; i < ost->enc_stats_pre.nb_components; i++) - av_freep(&ost->enc_stats_pre.components[i].str); - av_freep(&ost->enc_stats_pre.components); - - for (int i = 0; i < ost->enc_stats_post.nb_components; i++) - av_freep(&ost->enc_stats_post.components[i].str); - av_freep(&ost->enc_stats_post.components); - - for (int i = 0; i < ms->stats.nb_components; i++) - av_freep(&ms->stats.components[i].str); - av_freep(&ms->stats.components); + enc_stats_uninit(&ost->enc_stats_pre); + enc_stats_uninit(&ost->enc_stats_post); + enc_stats_uninit(&ms->stats); av_freep(post); }