From patchwork Fri Aug 30 10:15:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 51245 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:4027:b0:48e:c0f8:d0de with SMTP id ky39csp326944vqb; Fri, 30 Aug 2024 04:20:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXXB9eNV5SXoK+cVB5ovMgCMLglkMgSqWJVWjvsiJj/tsugZHFfDy+T2U+2b8EwtuzJF5HRT+wzBX5uqO9GE5p6@gmail.com X-Google-Smtp-Source: AGHT+IEEpoSDrNLCvvT2aRg4l5XpAH1KHkhmomOfKZq0NlB2I5ByrlvNRMrC8OCXbxpfQwjyLesU X-Received: by 2002:a05:6512:68c:b0:530:c1fb:51a1 with SMTP id 2adb3069b0e04-53546aff14dmr1291837e87.17.1725016818691; Fri, 30 Aug 2024 04:20:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725016818; cv=none; d=google.com; s=arc-20240605; b=EdgMjzYUEm4M4+6ls4zBd72sQmYqQkSifu0ZiFHWF4FgHHLj9c7hc6CbU68qqnra2P IyHgz5FpOEqvRwZQP6Oh7u68Wbf2XiBTzPkoQWx53+WQGpEzqqA20OEIF4XCeivIPeDW 5rY93xb+hH+9yGM/IGt98O/4jFsph0QjKaJZntDM1nu2Cd7IrrV3YZjf+XKP+WV0aOEt hVvVG/XpQJKZ8L6dvZogNWm2c5VMRpFTdtQ8LSVQ2LrOP8vEtmwE/e8ZGixNvpnyZAH9 i7yyc58Iy9lXmFoTbrofEg/dv8IYLlEcDffXYI3ShsVVsMW0TminCRM6HWpH9cc5BQDb 5RQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=8fZD7oMuNl8NKaX6wN9SdaUnuEojWBEhIlt78+KbOZM=; fh=tuUXnhgwUopqrbuJY3BExN6aocuFs1Cf//owLTlTyNI=; b=LSi1sWChUWpmNcG04gFiVEXPEpYFmYxMbAZQXc7JSklCgOCUQwHPFHen8aJcQW7F7y 4QMcLT1K/ogLx+UxgCvu3sBiD7h3l+gK5ZNNxh0CKh4NzA+X8sfjJyB7bq5t7xMTQ0vM 2rJmEXGM5LCwLIhzATFyiShCslWhHBre/zUv1ssvrK2KxvkGNDoQi57mZSIAtpIPu2/H YDVJwnfeYdYvwDhCw8lRBlhMvReIqqT4HySLf5PVjn7JDQnLb+LOxgoxC+AMM7P+ospy zTM2IWRFs6K3a1JsuN0Q/6xuiFNx2cICfSeozRjr4V/na6/KHvz/HO8wZpAlxH1Cy54f MEHA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=ls+SBS1c; 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 2adb3069b0e04-5354084efdbsi1168488e87.628.2024.08.30.04.20.17; Fri, 30 Aug 2024 04:20:18 -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=@haasn.xyz header.s=mail header.b=ls+SBS1c; 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 C696768DBCA; Fri, 30 Aug 2024 13:24:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3EA3368DB71 for ; Fri, 30 Aug 2024 13:24:14 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1725013450; bh=JTRvErYpiBBPZFQBJ2T+wDzVCjqrlMgDbt6DsXd3gkI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ls+SBS1coOHzlI5XOTvLsCXTXhDYJJvcNiMFpvzFBkJ65Z1j8qXSKoCGcuzPYmJ5g KBZZ9LVkrgdAk7AQPv7Z2CgZ/JnNREs0Lt1b6I66L8m3IJOd+bgkJeG3FcTSyZgzpN mFd46FKvlPurPBDFVNtqr5GaoAAw5FGoFOzdFDs4= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id E66B0473C2; Fri, 30 Aug 2024 12:24:10 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Aug 2024 12:15:36 +0200 Message-ID: <20240830102402.18149-14-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240830102402.18149-1-ffmpeg@haasn.xyz> References: <20240830102402.18149-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 13/17] fftools/ffmpeg_filter: simplify choose_pix_fmts 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 Cc: Anton Khirnov , Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1SFfEZvLLLRh From: Niklas Haas The only meaningful difference between choose_pix_fmts and the default code was the inclusion of an extra branch for `keep_pix_fmt` being true. However, in this case, we either: 1. Force the specific `ofp->format` that we inherited from ofilter_bind_ost, or if no format was set: 2. Print an empty format list Both of these goals can be accomplished by simply moving the decision logic to ofilter_bind_ost, to avoid setting any format list when keep_pix_fmt is enabled. This is arguably cleaner as it moves format selection logic to a single function. In the case of branch 1, nothing else needs to be done as we already force the format provided in ofp->format, if any is set. Add an assertion to verify this assumption just in case. (Side note: The "choose_*" family of functions are arguably misnomers, as they should really be called "print_*" - their current behavior is to print the relevant format lists to the `vf/af_format` filter arguments) Signed-off-by: Anton Khirnov Signed-off-by: Niklas Haas --- fftools/ffmpeg_filter.c | 49 +++++++++-------------------------------- 1 file changed, 11 insertions(+), 38 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index d54beb26b7..4411985548 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -364,35 +364,6 @@ static void sub2video_update(InputFilterPriv *ifp, int64_t heartbeat_pts, ifp->sub2video.initialize = 0; } -/* *dst may return be set to NULL (no pixel format found), a static string or a - * string backed by the bprint. Nothing has been written to the AVBPrint in case - * NULL is returned. The AVBPrint provided should be clean. */ -static int choose_pix_fmts(OutputFilter *ofilter, AVBPrint *bprint, - const char **dst) -{ - OutputFilterPriv *ofp = ofp_from_ofilter(ofilter); - - *dst = NULL; - - if (ofp->flags & OFILTER_FLAG_DISABLE_CONVERT || ofp->format != AV_PIX_FMT_NONE) { - *dst = ofp->format == AV_PIX_FMT_NONE ? NULL : - av_get_pix_fmt_name(ofp->format); - } else if (ofp->formats) { - const enum AVPixelFormat *p = ofp->formats; - - for (; *p != AV_PIX_FMT_NONE; p++) { - const char *name = av_get_pix_fmt_name(*p); - av_bprintf(bprint, "%s%c", name, p[1] == AV_PIX_FMT_NONE ? '\0' : '|'); - } - if (!av_bprint_is_complete(bprint)) - return AVERROR(ENOMEM); - - *dst = bprint->str; - } - - return 0; -} - /* Define a function for appending a list of allowed formats * to an AVBPrint. If nonempty, the list will have a header. */ #define DEF_CHOOSE_FORMAT(name, type, var, supported_list, none, printf_format, get_name) \ @@ -415,8 +386,8 @@ static void choose_ ## name (OutputFilterPriv *ofp, AVBPrint *bprint) \ av_bprint_chars(bprint, ':', 1); \ } -//DEF_CHOOSE_FORMAT(pix_fmts, enum AVPixelFormat, format, formats, AV_PIX_FMT_NONE, -// av_get_pix_fmt_name) +DEF_CHOOSE_FORMAT(pix_fmts, enum AVPixelFormat, format, formats, + AV_PIX_FMT_NONE, "%s", av_get_pix_fmt_name) DEF_CHOOSE_FORMAT(sample_fmts, enum AVSampleFormat, format, formats, AV_SAMPLE_FMT_NONE, "%s", av_get_sample_fmt_name) @@ -850,7 +821,8 @@ int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost, ofp->format = opts->format; } else if (opts->pix_fmts) ofp->formats = opts->pix_fmts; - else if (opts->enc) + else if (opts->enc && + !(ofp->flags & OFILTER_FLAG_DISABLE_CONVERT)) ofp->formats = opts->enc->pix_fmts; fgp->disable_conversions |= !!(ofp->flags & OFILTER_FLAG_DISABLE_CONVERT); @@ -1481,7 +1453,6 @@ static int configure_output_video_filter(FilterGraph *fg, AVFilterGraph *graph, AVBPrint bprint; int pad_idx = out->pad_idx; int ret; - const char *pix_fmts; char name[255]; snprintf(name, sizeof(name), "out_%s", ofp->name); @@ -1515,17 +1486,19 @@ static int configure_output_video_filter(FilterGraph *fg, AVFilterGraph *graph, pad_idx = 0; } + av_assert0(!(ofp->flags & OFILTER_FLAG_DISABLE_CONVERT) || + ofp->format != AV_PIX_FMT_NONE || !ofp->formats); av_bprint_init(&bprint, 0, AV_BPRINT_SIZE_UNLIMITED); - ret = choose_pix_fmts(ofilter, &bprint, &pix_fmts); - if (ret < 0) - return ret; + choose_pix_fmts(ofp, &bprint); + if (!av_bprint_is_complete(&bprint)) + return AVERROR(ENOMEM); - if (pix_fmts) { + if (bprint.len) { AVFilterContext *filter; ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("format"), - "format", pix_fmts, NULL, graph); + "format", bprint.str, NULL, graph); av_bprint_finalize(&bprint, NULL); if (ret < 0) return ret;