From patchwork Wed Apr 19 19:52:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41266 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp744341pzb; Wed, 19 Apr 2023 12:54:53 -0700 (PDT) X-Google-Smtp-Source: AKy350ZimLMhg48cKeCYTrVtSMy7ua6UJcR+153CsALucRpzVvlDk3dXG3w7UOmNXSXAymot+LDP X-Received: by 2002:a17:907:9805:b0:94f:3cf5:6d7f with SMTP id ji5-20020a170907980500b0094f3cf56d7fmr15699197ejc.46.1681934093743; Wed, 19 Apr 2023 12:54:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681934093; cv=none; d=google.com; s=arc-20160816; b=gTlPQOtpwSyldvgJ9l7vW1eMtES6H3f0lqHjplCXQWbvcGl6UyGTBCfHGL7ek8qPpr rVJr6fDPjDzae4RHcWGA/GnSVfLSqhoVsBAy4sxstibAzp0Y5qvyJ0ARCTRHMJFT9ri4 STbi6QlgGhzHPLOnvpMn7G010PS+p0UHNu9BW3ba/ed5EyZIzF+Hbf83qfpf4dAadnIe TiP3rR0dtADtAXuloqg35scfIUEKqAXqnZG9mRFAPug1SlLndf/mBFYrCI2lvNpy5xN0 BfVNgJejp9bEWaYalIo1ahvE49jraQ/qm0MwPqJLWo3k7f5POI8n+kS2fd2RHlLPUD2L 4Lxw== 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=butZ14GiwzC5Qz6DpJA82hwNRfN9H9Dviq2qd4l7RF4=; b=ZqWV1u7IZnEBmERL2f5yfK6VZm0BwYtxLT6xRoazgsPMAYGN30msRtS+E46Qkebfsf jxLEsPeyR3s8uMPOJla3I5mEpGcdNRWc0AX4c0nuPnaXvaQ4aQDxvFRrnhq96z4b0wg3 3VXP5rcXJFW5M/Xj2oZNSMq+olzXRPSNXl7ul12eKkKoQT0GY3SvfbIvJo0Pr8qugqHN GKuh58A6JlEYPstETD7Vuxo+cnGGbh+9U7qaYCPl2piWwQRbXjtGCEkeNqbQMI7hmGKL inMW6n+dOHYzyu2lCJvmnh/mA7DwT9epV99e/jlmqsKsy6sbttvVjyAggNyuGNZEOVZW i9xg== 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 eq5-20020a170907290500b0094f0647d5d5si11755042ejc.800.2023.04.19.12.54.53; Wed, 19 Apr 2023 12:54:53 -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; 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 334D068BF4F; Wed, 19 Apr 2023 22:53:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0869368BEB5 for ; Wed, 19 Apr 2023 22:53:02 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 3DE722405EC for ; Wed, 19 Apr 2023 21:53:00 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 4M-L5Veiji5b for ; Wed, 19 Apr 2023 21:52:59 +0200 (CEST) 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 mail0.khirnov.net (Postfix) with ESMTPS id 127F42405F9 for ; Wed, 19 Apr 2023 21:52:56 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id BCB963A1049 for ; Wed, 19 Apr 2023 21:52:55 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Apr 2023 21:52:28 +0200 Message-Id: <20230419195243.2974-10-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230419195243.2974-1-anton@khirnov.net> References: <20230419195243.2974-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/25] fftools/ffmpeg_mux_init: consolidate handling -filter for audio/video 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: yJgq0gvaBJUd --- fftools/ffmpeg_mux_init.c | 68 +++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 38 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 89c0ac90ea..7c35d6b582 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -420,33 +420,36 @@ static MuxStream *mux_stream_alloc(Muxer *mux, enum AVMediaType type) return ms; } -static char *get_ost_filters(const OptionsContext *o, AVFormatContext *oc, - OutputStream *ost) +static int ost_get_filters(const OptionsContext *o, AVFormatContext *oc, + OutputStream *ost) { + MATCH_PER_STREAM_OPT(filter_scripts, str, ost->filters_script, oc, ost->st); + MATCH_PER_STREAM_OPT(filters, str, ost->filters, oc, ost->st); + + if (!ost->enc) { + if (ost->filters_script || ost->filters) { + av_log(ost, AV_LOG_ERROR, + "%s '%s' was specified, but codec copy was selected. " + "Filtering and streamcopy cannot be used together.\n", + ost->filters ? "Filtergraph" : "Filtergraph script", + ost->filters ? ost->filters : ost->filters_script); + return AVERROR(ENOSYS); + } + return 0; + } + if (ost->filters_script && ost->filters) { av_log(ost, AV_LOG_ERROR, "Both -filter and -filter_script set\n"); exit_program(1); } if (ost->filters_script) - return file_read(ost->filters_script); + ost->avfilter = file_read(ost->filters_script); else if (ost->filters) - return av_strdup(ost->filters); - - return av_strdup(ost->type == AVMEDIA_TYPE_VIDEO ? "null" : "anull"); -} - -static void check_streamcopy_filters(const OptionsContext *o, AVFormatContext *oc, - OutputStream *ost, enum AVMediaType type) -{ - if (ost->filters_script || ost->filters) { - av_log(ost, AV_LOG_ERROR, - "%s '%s' was defined, but codec copy was selected.\n" - "Filtering and streamcopy cannot be used together.\n", - ost->filters ? "Filtergraph" : "Filtergraph script", - ost->filters ? ost->filters : ost->filters_script); - exit_program(1); - } + ost->avfilter = av_strdup(ost->filters); + else + ost->avfilter = av_strdup(ost->type == AVMEDIA_TYPE_VIDEO ? "null" : "anull"); + return ost->avfilter ? 0 : AVERROR(ENOMEM); } static void parse_matrix_coeffs(void *logctx, uint16_t *dest, const char *str) @@ -504,9 +507,6 @@ static void new_stream_video(Muxer *mux, const OptionsContext *o, ost->frame_aspect_ratio = q; } - MATCH_PER_STREAM_OPT(filter_scripts, str, ost->filters_script, oc, st); - MATCH_PER_STREAM_OPT(filters, str, ost->filters, oc, st); - if (ost->enc_ctx) { AVCodecContext *video_enc = ost->enc_ctx; const char *p = NULL, *fps_mode = NULL; @@ -692,12 +692,7 @@ static void new_stream_video(Muxer *mux, const OptionsContext *o, } } ost->is_cfr = (ost->vsync_method == VSYNC_CFR || ost->vsync_method == VSYNC_VSCFR); - - ost->avfilter = get_ost_filters(o, oc, ost); - if (!ost->avfilter) - exit_program(1); - } else - check_streamcopy_filters(o, oc, ost, AVMEDIA_TYPE_VIDEO); + } } static void new_stream_audio(Muxer *mux, const OptionsContext *o, @@ -708,10 +703,6 @@ static void new_stream_audio(Muxer *mux, const OptionsContext *o, st = ost->st; - - MATCH_PER_STREAM_OPT(filter_scripts, str, ost->filters_script, oc, st); - MATCH_PER_STREAM_OPT(filters, str, ost->filters, oc, st); - if (ost->enc_ctx) { AVCodecContext *audio_enc = ost->enc_ctx; int channels = 0; @@ -757,10 +748,6 @@ static void new_stream_audio(Muxer *mux, const OptionsContext *o, MATCH_PER_STREAM_OPT(apad, str, ost->apad, oc, st); ost->apad = av_strdup(ost->apad); - ost->avfilter = get_ost_filters(o, oc, ost); - if (!ost->avfilter) - exit_program(1); - #if FFMPEG_OPT_MAP_CHANNEL /* check for channel mapping for this audio stream */ for (int n = 0; n < o->nb_audio_channel_maps; n++) { @@ -791,8 +778,7 @@ static void new_stream_audio(Muxer *mux, const OptionsContext *o, } } #endif - } else - check_streamcopy_filters(o, oc, ost, AVMEDIA_TYPE_AUDIO); + } } static void new_stream_data(Muxer *mux, const OptionsContext *o, @@ -1223,6 +1209,12 @@ static OutputStream *ost_add(Muxer *mux, const OptionsContext *o, default: new_stream_unknown (mux, o, ost); break; } + if (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO) { + ret = ost_get_filters(o, oc, ost); + if (ret < 0) + exit_program(1); + } + if (ost->ist) { if (ost->enc && (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO)) {