From patchwork Mon Dec 18 09:57:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 45204 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp7221673pzf; Mon, 18 Dec 2023 01:58:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IG57kfIpFgT6/1z1VT2bW0tw9TgvZ5HT7QiLsuat/LvfxMa5zMhTWLvVTn1aVnARcxY2VVk X-Received: by 2002:a50:d71a:0:b0:553:739e:bfac with SMTP id t26-20020a50d71a000000b00553739ebfacmr152210edi.8.1702893484207; Mon, 18 Dec 2023 01:58:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702893484; cv=none; d=google.com; s=arc-20160816; b=dYML/FW0kUdz0FZQpVogo7xW2Nb8stagk2/EPvqDbpDpZSPcX55rdE2xuuAj+IV0lu 8m1mOb3+/BxEVJu7nBc2Pc8fVKLzhZEK9I4zPBR33s6KkDUMBwoistdhuKH7mc3oyklS Ura9vw7Kv0Usk6ZzQvGqQB0QtP9Lp1Bwfpfyor6ro3E7ttUwgCtO19Ew0LvBhGTpMr8P RAUBfTB20ZRHThIPMxKXkcqtzdkkRz0b26laAAOa4B+nU5Twtl3b/L2Q6LMooQVFfBoH YOpmerQM57+Qt0pGKkgv483Ve7kKOAIH/YuMmE6fq+4W22Cie+ISCB1F3OaLMUbXyvhN 2Wog== 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=/dFqkDwlz0Oa/dfA4Kpl+FqJ6KdqbN5BW1JajKWSqOk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=afj5CiHkKuGC3JvCeZ7hen0mTkn6yrc+QgSbqo0Gr0w7BmyqgwfkHkoBkNLsD04Jxm Ecq6wIp+itzWFWlLaicRdjJ6fAUlKu+3r6sXNUHgUONhpjBPhgieUXt/3lVNGUd6W71m 9yGNWAxBxWOtDmh31ApfMw3bvvxPmsZyzYpxFaXHmCGDe6hYYISx5bYFCTw8WaHATfIs 7PaEfZpPWZLjpDlLbKQuvelWc+V2hbreZjt8ZMdtDDIPIN+j/IOnqaZVGciEGWoj1RAl ZC2ZSuU5W6NeTyiLQiAr20sQ01wrP0mmtHAigvxUWlhs6ZKb3zBH36ejgeyiS7yoUJ2I +Q7g== 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 dz15-20020a0564021d4f00b005534aff42f2si735560edb.594.2023.12.18.01.58.03; Mon, 18 Dec 2023 01:58:04 -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 371C568D1E2; Mon, 18 Dec 2023 11:58:00 +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 4A5CB68D1B6 for ; Mon, 18 Dec 2023 11:57:53 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id AA2FA4672 for ; Mon, 18 Dec 2023 10:57:52 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 7SXzzPCvl-1c for ; Mon, 18 Dec 2023 10:57:51 +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 431D51372 for ; Mon, 18 Dec 2023 10:57:51 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 13DC83A0613 for ; Mon, 18 Dec 2023 10:57:44 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Dec 2023 10:57:06 +0100 Message-ID: <20231218095722.25879-4-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231218095722.25879-1-anton@khirnov.net> References: <20231218095722.25879-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/20] fftools/ffmpeg_opt: move deprecated options to the end of the list 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: 4acFbMw93Ey8 This way they don't clutter this already-cluttered code even further. --- fftools/ffmpeg_opt.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index aed20032a8..b545c42818 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1452,10 +1452,6 @@ const OptionDef options[] = { OPT_OUTPUT, { .func_arg = opt_map }, "set input stream mapping", "[-]input_file_id[:stream_specifier][,sync_file_id[:stream_specifier]]" }, -#if FFMPEG_OPT_MAP_CHANNEL - { "map_channel", HAS_ARG | OPT_EXPERT | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_map_channel }, - "map an audio channel from one stream to another (deprecated)", "file.stream.channel[:syncfile.syncstream]" }, -#endif { "map_metadata", OPT_STRING | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(metadata_map) }, "set metadata information of outfile from infile", @@ -1531,10 +1527,6 @@ const OptionDef options[] = { "set video sync method globally; deprecated, use -fps_mode", "" }, { "frame_drop_threshold", OPT_FLOAT | OPT_EXPERT, { &frame_drop_threshold }, "frame drop threshold", "" }, -#if FFMPEG_OPT_ADRIFT_THRESHOLD - { "adrift_threshold", HAS_ARG | OPT_EXPERT, { .func_arg = opt_adrift_threshold }, - "deprecated, does nothing", "threshold" }, -#endif { "copyts", OPT_BOOL | OPT_EXPERT, { ©_ts }, "copy timestamps" }, { "start_at_zero", OPT_BOOL | OPT_EXPERT, { &start_at_zero }, @@ -1683,10 +1675,6 @@ const OptionDef options[] = { { "passlogfile", OPT_VIDEO | OPT_STRING | OPT_EXPERT | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(passlogfiles) }, "select two pass log file name prefix", "prefix" }, -#if FFMPEG_OPT_PSNR - { "psnr", OPT_VIDEO | OPT_BOOL | OPT_EXPERT, { &do_psnr }, - "calculate PSNR of compressed frames (deprecated, use -flags +psnr)" }, -#endif { "vstats", OPT_VIDEO | OPT_EXPERT , { .func_arg = opt_vstats }, "dump video coding statistics to file" }, { "vstats_file", OPT_VIDEO | HAS_ARG | OPT_EXPERT , { .func_arg = opt_vstats_file }, @@ -1704,18 +1692,9 @@ const OptionDef options[] = { { "chroma_intra_matrix", OPT_VIDEO | OPT_EXPERT | OPT_STRING | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(chroma_intra_matrices) }, "specify intra matrix coeffs", "matrix" }, -#if FFMPEG_OPT_TOP - { "top", OPT_VIDEO | OPT_EXPERT | OPT_INT| OPT_SPEC | - OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(top_field_first) }, - "deprecated, use the setfield video filter", "" }, -#endif { "vtag", OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_PERFILE | OPT_INPUT | OPT_OUTPUT, { .func_arg = opt_old2new }, "force video tag/fourcc", "fourcc/tag" }, -#if FFMPEG_OPT_QPHIST - { "qphist", OPT_VIDEO | OPT_EXPERT , { .func_arg = opt_qphist }, - "deprecated, does nothing" }, -#endif { "fps_mode", OPT_VIDEO | OPT_STRING | OPT_EXPERT | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(fps_mode) }, "set framerate mode for matching video streams; overrides vsync" }, @@ -1856,5 +1835,28 @@ const OptionDef options[] = { { "filter_hw_device", HAS_ARG | OPT_EXPERT, { .func_arg = opt_filter_hw_device }, "set hardware device used when filtering", "device" }, + // deprecated options +#if FFMPEG_OPT_MAP_CHANNEL + { "map_channel", HAS_ARG | OPT_EXPERT | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_map_channel }, + "map an audio channel from one stream to another (deprecated)", "file.stream.channel[:syncfile.syncstream]" }, +#endif +#if FFMPEG_OPT_ADRIFT_THRESHOLD + { "adrift_threshold", HAS_ARG | OPT_EXPERT, { .func_arg = opt_adrift_threshold }, + "deprecated, does nothing", "threshold" }, +#endif +#if FFMPEG_OPT_PSNR + { "psnr", OPT_VIDEO | OPT_BOOL | OPT_EXPERT, { &do_psnr }, + "calculate PSNR of compressed frames (deprecated, use -flags +psnr)" }, +#endif +#if FFMPEG_OPT_TOP + { "top", OPT_VIDEO | OPT_EXPERT | OPT_INT| OPT_SPEC | + OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(top_field_first) }, + "deprecated, use the setfield video filter", "" }, +#endif +#if FFMPEG_OPT_QPHIST + { "qphist", OPT_VIDEO | OPT_EXPERT , { .func_arg = opt_qphist }, + "deprecated, does nothing" }, +#endif + { NULL, }, };