From patchwork Thu Nov 9 12:19:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 44595 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4fa4:b0:181:818d:5e7f with SMTP id gh36csp444904pzb; Thu, 9 Nov 2023 04:27:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IFLrCNECeZ8F0vuTWBoSGhWluwM2fOuW9kHpTpdIcTcANwcLY2SoVwPWu4KJGLTOsyxRsZG X-Received: by 2002:a17:906:4a53:b0:9e5:1db7:31b1 with SMTP id a19-20020a1709064a5300b009e51db731b1mr862370ejv.2.1699532871289; Thu, 09 Nov 2023 04:27:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699532871; cv=none; d=google.com; s=arc-20160816; b=rHxrPZhpOiz5Y+ypyE3UKlODo1r5dHIGbafqNm0uZNxLLHEe9BK7WbtkPiIcAj5RM3 4xOwH69Es3clU6mx0vkQ3CtHfisNrzHhJZgB4n1QIJS94UhIuFANqN3DEwHm6lZErkYz bl6PaYcmIeRFoHlAl3GOQOf06kpPWA6sBy5411VeaES5CGhLeslSDKMItlUwwU+b67uL j+w/Vf97yyDdKLIGsjguWRsdrWaTosZCFpWCvvCuSGWFPkmgECt/hA0lWoiBwmMRK7o4 Sw+wtINE1ct8IADh/YMlSnrgpERL0RwuRxrQfILLWm9ilvlJdr/AccoQQfUfOe3RneWj FHAQ== 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=IbcmFZttkurAS91wUd3VKGpt24xBNWTlIyPxnGa03Lk=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=oSQMT2RndH1Izgt5a4bHss3HLEQcSdbuTopz8NNGAkHxKxhYH+gAxrejPGIL+4TVk9 TpOzN/cq1W/PE1ovrleRxU7dsgkyzFY7ynkNAsKeGKFqPhBTd3LBH/ZgRp45H8qjz/QU PkFtjYFiFJ/BJvynn8W79mTG2+ne7T39e0sefjbii+iT4bNnA981cH+iMZKTJ95P706V ZZ4155jcpo1Ksz6yXqSdcCH31QjgIKxBCYKFPQ4UEAEDAzMPK0ZDIeVDgldqivns1EY2 3Ry5CWrlfxA9GsZuYtV5ggz5LDtA5j8B/m1qPzx3TrNuxyJSYinfLk865b29ZMM+FKXR HGSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=TGr4A+kQ; 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 f11-20020a170906738b00b009d38bf5a215si3330331ejl.612.2023.11.09.04.27.50; Thu, 09 Nov 2023 04:27:51 -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; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=TGr4A+kQ; 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 4D7DB68CC92; Thu, 9 Nov 2023 14:25:57 +0200 (EET) 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 48A5068CBED for ; Thu, 9 Nov 2023 14:25:42 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id E97AE4BD2C; Thu, 9 Nov 2023 13:25:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1699532741; bh=B1xQF4rSPco1D2cqzX0mix2WghfnFi7FeYIO/qOKkU4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TGr4A+kQnOFjuy1OzLGrnDdnftkM8FV/s+psxwBViu6ewjHPuubEpDSh+RbK2WG4I 1TnVwEgIbuDcLfVZyagRZWdgl9CFjdGPy00Y4xX19VMWbw1IWgImWe7zRFPRCgwade JhE+krWlY8C2MZZnpow1evdN2PXsVnmTAJx6KT1s= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Nov 2023 13:19:52 +0100 Message-ID: <20231109122534.124157-21-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231109122534.124157-1-ffmpeg@haasn.xyz> References: <20231109122534.124157-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 20/25] 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3mL92Vp/xnIE 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) --- fftools/ffmpeg_filter.c | 49 ++++++++--------------------------------- 1 file changed, 9 insertions(+), 40 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index dd5cfe4481..5b99c4ba40 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -313,36 +313,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); - OutputStream *ost = ofilter->ost; - - *dst = NULL; - - if (ost->keep_pix_fmt || 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) \ @@ -365,8 +335,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, -// 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) @@ -690,7 +660,7 @@ int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost) ofp->height = ost->enc_ctx->height; if (ost->enc_ctx->pix_fmt != AV_PIX_FMT_NONE) { ofp->format = ost->enc_ctx->pix_fmt; - } else { + } else if (!ost->keep_pix_fmt) { ofp->formats = c->pix_fmts; // MJPEG encoder exports a full list of supported pixel formats, @@ -1169,7 +1139,6 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, AVBPrint bprint; int pad_idx = out->pad_idx; int ret; - const char *pix_fmts; char name[255]; snprintf(name, sizeof(name), "out_%d_%d", ost->file_index, ost->index); @@ -1204,17 +1173,17 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, pad_idx = 0; } + av_assert0(!ost->keep_pix_fmt || (!ofp->format && !ofp->formats)); av_bprint_init(&bprint, 0, AV_BPRINT_SIZE_UNLIMITED); - ret = choose_pix_fmts(ofilter, &bprint, &pix_fmts); - if (ret < 0) - return ret; - - if (pix_fmts) { + choose_pix_fmts(ofp, &bprint); + if (!av_bprint_is_complete(&bprint)) + return AVERROR(ENOMEM); + if (bprint.len) { AVFilterContext *filter; ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("format"), - "format", pix_fmts, NULL, fg->graph); + "format", bprint.str, NULL, fg->graph); av_bprint_finalize(&bprint, NULL); if (ret < 0) return ret;