Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 02/24] avcodec: remove deprecated FF_API_SVTAV1_OPTS
Date: Thu, 25 Jan 2024 10:43:25 -0300
Message-ID: <20240125134425.374-3-jamrial@gmail.com> (raw)
In-Reply-To: <20240125134425.374-1-jamrial@gmail.com>

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/libsvtav1.c     | 48 --------------------------------------
 libavcodec/version_major.h |  1 -
 2 files changed, 49 deletions(-)

diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
index 862192945b..9343322496 100644
--- a/libavcodec/libsvtav1.c
+++ b/libavcodec/libsvtav1.c
@@ -62,16 +62,6 @@ typedef struct SvtContext {
 
     // User options.
     AVDictionary *svtav1_opts;
-#if FF_API_SVTAV1_OPTS
-    int hierarchical_level;
-    int la_depth;
-    int scd;
-
-    int tier;
-
-    int tile_columns;
-    int tile_rows;
-#endif
     int enc_mode;
     int crf;
     int qp;
@@ -154,22 +144,6 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
     AVDictionaryEntry *en = NULL;
 
     // Update param from options
-#if FF_API_SVTAV1_OPTS
-    if (svt_enc->hierarchical_level >= 0)
-        param->hierarchical_levels    = svt_enc->hierarchical_level;
-    if (svt_enc->tier >= 0)
-        param->tier                   = svt_enc->tier;
-    if (svt_enc->scd >= 0)
-        param->scene_change_detection = svt_enc->scd;
-    if (svt_enc->tile_columns >= 0)
-        param->tile_columns           = svt_enc->tile_columns;
-    if (svt_enc->tile_rows >= 0)
-        param->tile_rows              = svt_enc->tile_rows;
-
-    if (svt_enc->la_depth >= 0)
-        param->look_ahead_distance    = svt_enc->la_depth;
-#endif
-
     if (svt_enc->enc_mode >= -1)
         param->enc_mode             = svt_enc->enc_mode;
 
@@ -605,20 +579,6 @@ static av_cold int eb_enc_close(AVCodecContext *avctx)
 #define OFFSET(x) offsetof(SvtContext, x)
 #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption options[] = {
-#if FF_API_SVTAV1_OPTS
-    { "hielevel", "Hierarchical prediction levels setting (Deprecated, use svtav1-params)", OFFSET(hierarchical_level),
-      AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 4, VE | AV_OPT_FLAG_DEPRECATED , "hielevel"},
-        { "3level", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 3 },  INT_MIN, INT_MAX, VE, "hielevel" },
-        { "4level", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 4 },  INT_MIN, INT_MAX, VE, "hielevel" },
-
-    { "la_depth", "Look ahead distance [0, 120] (Deprecated, use svtav1-params)", OFFSET(la_depth),
-      AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 120, VE | AV_OPT_FLAG_DEPRECATED },
-
-    { "tier", "Set operating point tier (Deprecated, use svtav1-params)", OFFSET(tier),
-      AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE | AV_OPT_FLAG_DEPRECATED, "tier" },
-        { "main", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, VE, "tier" },
-        { "high", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, VE, "tier" },
-#endif
     { "preset", "Encoding preset",
       OFFSET(enc_mode), AV_OPT_TYPE_INT, { .i64 = -2 }, -2, MAX_ENC_PRESET, VE },
 
@@ -656,14 +616,6 @@ static const AVOption options[] = {
       AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 63, VE },
     { "qp", "Initial Quantizer level value", OFFSET(qp),
       AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 63, VE },
-#if FF_API_SVTAV1_OPTS
-    { "sc_detection", "Scene change detection (Deprecated, use svtav1-params)", OFFSET(scd),
-      AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VE | AV_OPT_FLAG_DEPRECATED },
-
-    { "tile_columns", "Log2 of number of tile columns to use (Deprecated, use svtav1-params)", OFFSET(tile_columns), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 4, VE | AV_OPT_FLAG_DEPRECATED },
-    { "tile_rows", "Log2 of number of tile rows to use (Deprecated, use svtav1-params)", OFFSET(tile_rows), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 6, VE | AV_OPT_FLAG_DEPRECATED },
-#endif
-
     { "svtav1-params", "Set the SVT-AV1 configuration using a :-separated list of key=value parameters", OFFSET(svtav1_opts), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE },
 
     {NULL},
diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h
index dc1938888c..03fe1e2a83 100644
--- a/libavcodec/version_major.h
+++ b/libavcodec/version_major.h
@@ -38,7 +38,6 @@
  */
 
 #define FF_API_INIT_PACKET         (LIBAVCODEC_VERSION_MAJOR < 61)
-#define FF_API_SVTAV1_OPTS         (LIBAVCODEC_VERSION_MAJOR < 61)
 #define FF_API_AYUV_CODECID        (LIBAVCODEC_VERSION_MAJOR < 61)
 #define FF_API_VT_OUTPUT_CALLBACK  (LIBAVCODEC_VERSION_MAJOR < 61)
 #define FF_API_AVCODEC_CHROMA_POS  (LIBAVCODEC_VERSION_MAJOR < 61)
-- 
2.43.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

  parent reply	other threads:[~2024-01-25 13:45 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-25 13:43 [FFmpeg-devel] [PATCH 00/24] Major library version bump James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 01/24] avcodec: remove deprecated FF_API_IDCT_NONE James Almer
2024-01-25 13:43 ` James Almer [this message]
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 03/24] avcodec: remove deprecated FF_API_AYUV_CODECID James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 04/24] avcodec: remove deprecated FF_API_VT_OUTPUT_CALLBACK James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 05/24] avcodec: remove deprecated FF_API_AVCODEC_CHROMA_POS James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 06/24] avcodec: remove deprecated FF_API_VT_HWACCEL_CONTEXT James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 07/24] avcodec: remove deprecated FF_API_AVCTX_FRAME_NUMBER James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 08/24] avcodec: remove deprecated FF_CODEC_CRYSTAL_HD James Almer
2024-01-25 14:12   ` Andreas Rheinhardt
2024-01-25 14:23     ` James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 09/24] avformat: remove deprecated FF_API_GET_END_PTS James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 10/24] avformat: remove deprecated FF_API_AVIODIRCONTEXT James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 11/24] avformat: remove deprecated FF_API_AVFORMAT_IO_CLOSE James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 12/24] avfilter: remove deprecated FF_API_LIBPLACEBO_OPTS James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 13/24] avutil: remove deprecated FF_API_FIFO_PEEK2 James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 14/24] avutil: remove deprecated FF_API_FIFO_OLD_API James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 15/24] avutil: remove deprecated FF_API_XVMC James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 16/24] avutil: remove deprecated FF_API_OLD_CHANNEL_LAYOUT James Almer
2024-02-04 20:02   ` Andreas Rheinhardt
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 17/24] avutil: remove deprecated FF_API_AV_FOPEN_UTF8 James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 18/24] avutil: remove deprecated FF_API_PKT_DURATION James Almer
2024-02-04 20:04   ` Andreas Rheinhardt
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 19/24] avutil: remove deprecated FF_API_REORDERED_OPAQUE James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 20/24] avutil: remove deprecated FF_API_FRAME_PICTURE_NUMBER James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 21/24] avcodec/version_major: postpone some deprecations until the next bump James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 22/24] avformat/version_major: " James Almer
2024-01-25 14:34   ` Andreas Rheinhardt
2024-01-25 14:35     ` James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 23/24] avutil/version_major: " James Almer
2024-01-25 13:43 ` [FFmpeg-devel] [PATCH 24/24] libs: bump major version for all libraries James Almer
2024-01-26 16:44   ` Vittorio Giovara
2024-01-26 16:48     ` James Almer
2024-01-26 16:52       ` Martin Storsjö
2024-01-26 17:02         ` James Almer
2024-01-26 17:09           ` Martin Storsjö
2024-01-26 18:18   ` Michael Niedermayer
2024-01-26 18:21     ` James Almer
2024-01-26 18:22     ` Michael Niedermayer
2024-01-25 16:23 ` [FFmpeg-devel] [PATCH 00/24] Major library version bump James Almer
2024-02-07 13:11   ` James Almer
2024-01-28 12:31 ` Anton Khirnov
2024-02-04 13:02   ` James Almer
2024-02-10 14:50 ` [FFmpeg-devel] [PATCH 25/27] avformat/avformat: Add FFInputFormat, hide internals of AVInputFormat Andreas Rheinhardt
2024-02-10 14:50 ` [FFmpeg-devel] [PATCH 26/27] avutil/opt: Don't use AV_OPT_TYPE_FLAGS for sentinels Andreas Rheinhardt
2024-02-10 14:50 ` [FFmpeg-devel] [PATCH 27/27] avformat/demux: Use enum AVCodecID for raw_codec_id Andreas Rheinhardt
2024-02-10 23:04 ` [FFmpeg-devel] [PATCH 28/35] avfilter/avfilter: Avoid allocation for AVFilterInternal Andreas Rheinhardt
2024-02-10 23:04 ` [FFmpeg-devel] [PATCH 29/35] avfilter: Add a header for internal generic-layer APIs Andreas Rheinhardt
2024-02-10 23:04 ` [FFmpeg-devel] [PATCH 30/35] avfilter/avfiltergraph: Avoid indirection when freeing filtergraph Andreas Rheinhardt
2024-02-10 23:04 ` [FFmpeg-devel] [PATCH 31/35] avfilter/avfiltergraph: Avoid allocation for AVFilterGraphInternal Andreas Rheinhardt
2024-02-10 23:04 ` [FFmpeg-devel] [PATCH 32/35] avfilter/af_hdcd: Drop a redundant log Andreas Rheinhardt
2024-02-13 17:31   ` Andreas Rheinhardt
2024-02-10 23:04 ` [FFmpeg-devel] [PATCH 33/35] avfilter/avfilter: Move AVFilterGraph private fields to FFFilterGraph Andreas Rheinhardt
2024-02-10 23:04 ` [FFmpeg-devel] [PATCH 34/35] avcodec/avcodec: Reorder AVCodecContext and AVSubtitleRect fields Andreas Rheinhardt
2024-02-10 23:04 ` [FFmpeg-devel] [PATCH 35/35] avfilter/avfilter: Reorder structure fields Andreas Rheinhardt
2024-03-04 15:11 ` [FFmpeg-devel] [PATCH] lavc: move AVCodecContext.pts_correction* to DecodeContext Anton Khirnov
2024-03-04 18:06 ` [FFmpeg-devel] [PATCH5] avcodec/codec_par: Reorder AVCodecParameters fields James Almer
2024-03-04 18:06 ` [FFmpeg-devel] [PATCH 1/2] avformat/avformat: remove AVFormatContext.ts_id James Almer
2024-03-04 18:06 ` [FFmpeg-devel] [PATCH 2/2] avformat/avformat: Reorder AVFormatContext fields James Almer
2024-03-04 18:06 ` [FFmpeg-devel] [PATCH] lavc: move AVCodecContext.pts_correction* to DecodeContext James Almer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240125134425.374-3-jamrial@gmail.com \
    --to=jamrial@gmail.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git