From patchwork Thu Dec 28 18:42:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 45368 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp4354169pzh; Thu, 28 Dec 2023 10:42:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IH3p7Uu+NiBwm6+2PQjbUm49+UbBJ66tcapVdvmIR5kRihT1eqVFpGU6R1sT+yy+ETXhZQX X-Received: by 2002:a05:651c:2128:b0:2cc:eca0:9897 with SMTP id a40-20020a05651c212800b002cceca09897mr145493ljq.3.1703788969995; Thu, 28 Dec 2023 10:42:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703788969; cv=none; d=google.com; s=arc-20160816; b=Ik9w7LyEIrXUXWg1N7CejIkXUQnprwqAdShrs6UNKxHamnASrSDFxuANdUdTmgHZSt pUZqEfoAQIO4gAOPY4YWk/JubVJIRcWvhwGQHuAu8YYbjDfr01tFwDk1J2ICTgAEdFBT eePpJdiDnhFZ7D6sWhGZvGBdnG9JhwaEzmZLZ80XnCYXW8At6Ui8cI29cr3e67P64aMe gw1G5T1mP5ebvwCNEHYDvEwV4w/xJU0qWOMZhGumzx0XctuSvrQYtFMOepSF77tjLb9U nTFxeZ4m7Wr9KLpgzJytH7m4LmfaJWZxKeA7/cSk90pKxIRZicXJTI99gxMjscbfSL9e lTEg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=b62S6u7XqmZEWvwwl3Hc73abI1AuRP9+MYu0oyWtgGo=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=mwdyMtHHDXvyPaR/0CyGufl7vEex80mqfcaurIdboPc4ZZR9n91R2G8u9nVM1wseGq XcmQx9fKI4TYtpZNh7e5H6DYhvA1NL6Dj7gmB5fzQP2RSAcqvEsVUpw/Pi3xgGmCn5iP MW4ctB0N6U+OyV1sFlW3q6483yWqoG+JAqt+ONWiA9SYlVqgJJYvmiV/fN3eZ/JktVj8 ChX82f0XboU1kzcMErCg6hyEE1S7D0b4eVEv7+G9b5H7u4zp2WxG16c5sACu0GaP8c8x ZgI/CpwX0v9VZpnHhrbyFaTi0PA3tcGlYNHlgElOQVpHSSLFvML1nCVHhVh7ZdtTRCBt iFXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=VEIvjw7x; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ch1-20020a0564021bc100b0055482b6364bsi5114581edb.179.2023.12.28.10.42.49; Thu, 28 Dec 2023 10:42:49 -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=@gmail.com header.s=20230601 header.b=VEIvjw7x; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B1F1268CC5A; Thu, 28 Dec 2023 20:42:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B00668BAC9 for ; Thu, 28 Dec 2023 20:42:39 +0200 (EET) Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-28bd85bda06so2921616a91.3 for ; Thu, 28 Dec 2023 10:42:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703788956; x=1704393756; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=KRczEy2IoPBBVDo8PtPju7IqgYjdQv5GhHqH7abMYsQ=; b=VEIvjw7xX7VBQnW5oFNtETweZkNIWyJ26Kw1jgDxaX/uFpnuAkPDIVbcxvCEq5ln8l eEKatHycW+/1Vo44OKN7mmrLtp5CUxu8c+fvKVs5Db/3bP6RzFQooAXnDhoaSJL+Ttim fJU2H67qnO7QTZPaDom7IaIrmesLxFTeja1sl5WoyZSVDRFiP9iwAzjZP2ER0xC8cqqI lBXR37fYux8QtfDyeo+S+4PiNPmwtlV2gTvbCYmrlc5ksJ2THJUA/zhsB+pzVUEXgTLv ge+EkenA769lCwXJ3RPtXNrt+qr9GNhCaDPdSxDPDiVrVjrX3kd5hh3vQ0YtGSsGjjzZ V96w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703788956; x=1704393756; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KRczEy2IoPBBVDo8PtPju7IqgYjdQv5GhHqH7abMYsQ=; b=teIiiHsitpQOti/BXLhBTqPaJ+1dpSuMow33FPIpmcWFPmjtsWgIunsCmrYCB8a+fs 73L3yZNmUrA7V0aQUsr2lkY1v8TiXx0dXM9DtrBrPa04NaaUaPHnCLp02JersLfeQrl7 /G7hmF0J6Jabi08ZmebQFi5paWZUGG/rPn8pgE6rcOk5vXba3RMBIVY8ITiiyyGjV9wr zbXFa30tv4bRqyg5baOj/Z4l6BoUYyb8DBl845bBhyZUBzD1kYESkqYA9J7Bx5CiE0HE 219oV+8X/HImSEE7wAMfwaNKfqM8kisOsm3XcORZk2dqfQQWkTjKytUEnXreEDp/YxEX posQ== X-Gm-Message-State: AOJu0YwDBifu6lbI3DE3/tig/BV+19lp2uJKKEeCdg1ROguZPVqY7fb5 ivIGi/C1n22/lsjpmhYYJ44Z0bw+wu8= X-Received: by 2002:a17:90a:7108:b0:28a:3110:93a9 with SMTP id h8-20020a17090a710800b0028a311093a9mr3826048pjk.86.1703788956581; Thu, 28 Dec 2023 10:42:36 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id u6-20020a17090aa20600b0028bad9b220fsm5978387pjp.37.2023.12.28.10.42.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Dec 2023 10:42:36 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Dec 2023 15:42:22 -0300 Message-ID: <20231228184222.4083-1-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/options_table: add missing deprecated flag to relevant options 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: 446RjkDD/lNV Signed-off-by: James Almer --- libavcodec/options_table.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index ee243d9894..c3d8cd5fef 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -40,6 +40,7 @@ #define S AV_OPT_FLAG_SUBTITLE_PARAM #define E AV_OPT_FLAG_ENCODING_PARAM #define D AV_OPT_FLAG_DECODING_PARAM +#define R AV_OPT_FLAG_DEPRECATED #define CC AV_OPT_FLAG_CHILD_CONSTS #define AV_CODEC_DEFAULT_BITRATE 200*1000 @@ -73,7 +74,7 @@ static const AVOption avcodec_options[] = { {"cgop", "closed GOP", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_CLOSED_GOP }, INT_MIN, INT_MAX, V|E, "flags"}, {"output_corrupt", "Output even potentially corrupted frames", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_OUTPUT_CORRUPT }, INT_MIN, INT_MAX, V|D, "flags"}, #if FF_API_DROPCHANGED -{"drop_changed", "Drop frames whose parameters differ from first decoded frame", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_DROPCHANGED }, INT_MIN, INT_MAX, A|V|D | AV_OPT_FLAG_DEPRECATED, "flags"}, +{"drop_changed", "Drop frames whose parameters differ from first decoded frame", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_DROPCHANGED }, INT_MIN, INT_MAX, A|V|D|R, "flags"}, #endif {"flags2", NULL, OFFSET(flags2), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT}, 0, UINT_MAX, V|A|E|D|S, "flags2"}, {"fast", "allow non-spec-compliant speedup tricks", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_FAST }, INT_MIN, INT_MAX, V|E, "flags2"}, @@ -95,7 +96,7 @@ static const AVOption avcodec_options[] = { {"g", "set the group of picture (GOP) size", OFFSET(gop_size), AV_OPT_TYPE_INT, {.i64 = 12 }, INT_MIN, INT_MAX, V|E}, {"ar", "set audio sampling rate (in Hz)", OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|D|E}, #if FF_API_OLD_CHANNEL_LAYOUT -{"ac", "set number of audio channels", OFFSET(channels), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|D|E}, +{"ac", "use ch_layout", OFFSET(channels), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|D|E|R}, #endif {"cutoff", "set cutoff bandwidth", OFFSET(cutoff), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|E}, {"frame_size", NULL, OFFSET(frame_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|E}, @@ -180,7 +181,7 @@ static const AVOption avcodec_options[] = { {"faani", "floating point AAN IDCT", 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_FAAN }, INT_MIN, INT_MAX, V|D|E, "idct"}, {"simpleauto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEAUTO }, INT_MIN, INT_MAX, V|E|D, "idct"}, #if FF_API_SLICE_OFFSET -{"slice_count", NULL, OFFSET(slice_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +{"slice_count", NULL, OFFSET(slice_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, R}, #endif {"ec", "set error concealment strategy", OFFSET(error_concealment), AV_OPT_TYPE_FLAGS, {.i64 = 3 }, INT_MIN, INT_MAX, V|D, "ec"}, {"guess_mvs", "iterative motion vector (MV) search (slow)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_EC_GUESS_MVS }, INT_MIN, INT_MAX, V|D, "ec"}, @@ -273,13 +274,13 @@ static const AVOption avcodec_options[] = { {"bits_per_raw_sample", NULL, OFFSET(bits_per_raw_sample), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX}, {"ch_layout", NULL, OFFSET(ch_layout), AV_OPT_TYPE_CHLAYOUT, {.str = NULL }, 0, 0, A|E|D, "ch_layout"}, #if FF_API_OLD_CHANNEL_LAYOUT -{"channel_layout", NULL, OFFSET(channel_layout), AV_OPT_TYPE_CHANNEL_LAYOUT, {.i64 = DEFAULT }, 0, UINT64_MAX, A|E|D, "channel_layout"}, -{"request_channel_layout", NULL, OFFSET(request_channel_layout), AV_OPT_TYPE_CHANNEL_LAYOUT, {.i64 = DEFAULT }, 0, UINT64_MAX, A|D, "request_channel_layout"}, +{"channel_layout", "use ch_layout", OFFSET(channel_layout), AV_OPT_TYPE_CHANNEL_LAYOUT, {.i64 = DEFAULT }, 0, UINT64_MAX, A|E|D|R, "channel_layout"}, +{"request_channel_layout", "see decoder specific options", OFFSET(request_channel_layout), AV_OPT_TYPE_CHANNEL_LAYOUT, {.i64 = DEFAULT }, 0, UINT64_MAX, A|D|R, "request_channel_layout"}, #endif {"rc_max_vbv_use", NULL, OFFSET(rc_max_available_vbv_use), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, 0.0, FLT_MAX, V|E}, {"rc_min_vbv_use", NULL, OFFSET(rc_min_vbv_overflow_use), AV_OPT_TYPE_FLOAT, {.dbl = 3 }, 0.0, FLT_MAX, V|E}, #if FF_API_TICKS_PER_FRAME -{"ticks_per_frame", NULL, OFFSET(ticks_per_frame), AV_OPT_TYPE_INT, {.i64 = 1 }, 1, INT_MAX, A|V|E|D}, +{"ticks_per_frame", NULL, OFFSET(ticks_per_frame), AV_OPT_TYPE_INT, {.i64 = 1 }, 1, INT_MAX, A|V|E|D|R}, #endif {"color_primaries", "color primaries", OFFSET(color_primaries), AV_OPT_TYPE_INT, {.i64 = AVCOL_PRI_UNSPECIFIED }, 1, INT_MAX, V|E|D, "color_primaries_type"}, {"bt709", "BT.709", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_BT709 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"}, @@ -413,6 +414,7 @@ static const AVOption avcodec_options[] = { #undef S #undef E #undef D +#undef R #undef CC #undef DEFAULT #undef OFFSET