From patchwork Sat Sep 28 09:53:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51903 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d8ca:0:b0:48e:c0f8:d0de with SMTP id dy10csp895785vqb; Sat, 28 Sep 2024 02:55:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXYvnXpKDHXR0eOt6EDo0TD6D08KGOPHG2QBrayncIqZ5djzMrh3uciJ6/kyH4VhGw0TUXz2C/eTaKfzG9qsjPm@gmail.com X-Google-Smtp-Source: AGHT+IGyDl1NDWaMGe0+oc9FvMVjrQTNvgG13TdAn8auy1IfglH84SZSTtxAA6DgMVUwSzkQImUJ X-Received: by 2002:a17:907:1c9f:b0:a8d:2623:dd17 with SMTP id a640c23a62f3a-a93d8b8384bmr96376066b.12.1727517309654; Sat, 28 Sep 2024 02:55:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727517309; cv=none; d=google.com; s=arc-20240605; b=MOVPMTy7gXoaQn1IlLc2Rdk8F76Vb47djGao7bRwN07xKeOMiiM7w7dZc8lTA6Qi8t NBw4fbDN0eKZedmvYKwVu/OmT9753ohiHq6xsDt593bjo7vFBe7YXMvr43BenAuaAVY6 j4JKQE8RC0pU8keBiDOGrLLArj5u2dn/msYvCkfrSctnfctONsHfU9GRL9QIwqImKEY1 /BjkAscGhV9xLG/M3vz3tzJm6Lfut2HvRIE0h8AZFmo8z7NwCmqKBc/9iEQodUfROkk7 DTyOaYpbNrSQJNZ0vRzRL8sVbETq0L6ZF+0CSicVBH9w83oIpCykl+AKZg98GbfKMR8H ZY6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:dkim-signature:delivered-to; bh=pZ5aHTYw7JbLYMa427UxsdAGtZdZOq7V0uBZYhdDSC0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=BETO3CvqM7uJo3yOVwSB9Wlq/OlPfsecO5npaAokflnXqCanbJROPFWl8nlHFyOEBX q9LXwLD+eAlAn9eYQHYyK9Zh694DWe3P05RBipNEDGutC99P5k2LosY2p4n6NkB1sWRD BeWEnYiXN5maBgNe7X75gws3Kcuxx1l1gROaKCgKoGvbCwJvNO+OY2RwFUGDRbkywsON QkXQHqMzkqRHilMjzLALw1nNHEmHlvjUTc7hAnk32v3OUzE9in6Lo5LdNtZBSzqA4vOv nNdf62x/5i6R6FkQb715wYUAcUwKdFO+Ka5zEoMfV3Sf5+viaoW55EPPYHqDl2JdnnQG HHLg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=GQlODzeN; 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 a640c23a62f3a-a93c29ee94dsi276856866b.667.2024.09.28.02.55.09; Sat, 28 Sep 2024 02:55:09 -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=@khirnov.net header.s=mail header.b=GQlODzeN; 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 DFD1B68DC89; Sat, 28 Sep 2024 12:54:08 +0300 (EEST) 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 5B24968DB33 for ; Sat, 28 Sep 2024 12:54:02 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=GQlODzeN; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id E336D4DE6 for ; Sat, 28 Sep 2024 11:53:56 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 3_BOZwIyFWfW for ; Sat, 28 Sep 2024 11:53:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1727517234; bh=/xhyq7f7gOn3vmRqZlYdyVi0yK4gfIg2jXSHmVO87Yk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=GQlODzeNwWHvY6nspbyRz//t1e0zM+EEeXviGrjoArG7IEsxyuRKOE+6/8X5mvMfu J66ks+aSECFpVvF48dvuBeXED8syjZuhMQLCqghOBCVX38hWlCKcMFD1QT496e9oFC 1oFV5iGvphNghZk7xrNDdDr0aFbspWpWVwLQGRrqSkbU8EHCkxdQHbeBV7Dalvt6cb Mx5wsI39kaKaQPlq32YgGpTImNc/by1zIoggaVAUqnk/XSiICCIgoUNQLtdXaTd6Ja K6nQFfMnPL84niEaOcIpxCofsAo4yIHac5dDAaAdfnw91/vvs+hNu1TA+PzUWUoCcJ uUJ1WLMkUsYKA== 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 C8C7A4E05 for ; Sat, 28 Sep 2024 11:53:54 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id A45983A17BA for ; Sat, 28 Sep 2024 11:53:48 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Sep 2024 11:53:40 +0200 Message-ID: <20240928095341.15552-8-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240928095341.15552-1-anton@khirnov.net> References: <20240928095341.15552-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/9] fftools/ffmpeg_mux_init: move the ost_get_filters() call to ost_bind_filter() 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: yXHHKgJeOiee That is a more appropriate place for it. --- fftools/ffmpeg_mux_init.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 1ddd1d7492..50ce45ef1b 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -896,7 +896,7 @@ static int new_stream_subtitle(Muxer *mux, const OptionsContext *o, static int ost_bind_filter(const Muxer *mux, MuxStream *ms, OutputFilter *ofilter, - const OptionsContext *o, char *filters, + const OptionsContext *o, AVRational enc_tb, enum VideoSyncMethod vsync_method, int keep_pix_fmt, int autoscale, int threads_manual, const ViewSpecifier *vs) @@ -904,6 +904,7 @@ ost_bind_filter(const Muxer *mux, MuxStream *ms, OutputFilter *ofilter, OutputStream *ost = &ms->ost; AVCodecContext *enc_ctx = ost->enc->enc_ctx; char name[16]; + char *filters = NULL; int ret; OutputFilterOptions opts = { @@ -985,7 +986,12 @@ ost_bind_filter(const Muxer *mux, MuxStream *ms, OutputFilter *ofilter, return ret; } + ret = ost_get_filters(o, mux->fc, ost, &filters); + if (ret < 0) + return ret; + if (ofilter) { + av_assert0(!filters); ost->filter = ofilter; ret = ofilter_bind_enc(ofilter, ms->sch_idx_enc, &opts); } else { @@ -1188,7 +1194,7 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type, AVRational enc_tb = { 0, 0 }; enum VideoSyncMethod vsync_method = VSYNC_AUTO; const char *bsfs = NULL, *time_base = NULL, *codec_tag = NULL; - char *filters = NULL, *next; + char *next; double qscale = -1; st = avformat_new_stream(oc, NULL); @@ -1526,15 +1532,9 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type, if (ret < 0) goto fail; - if (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO) { - ret = ost_get_filters(o, oc, ost, &filters); - if (ret < 0) - goto fail; - } - if (ost->enc && (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO)) { - ret = ost_bind_filter(mux, ms, ofilter, o, filters, enc_tb, vsync_method, + ret = ost_bind_filter(mux, ms, ofilter, o, enc_tb, vsync_method, keep_pix_fmt, autoscale, threads_manual, vs); if (ret < 0) goto fail;