From patchwork Thu Jan 25 13:43:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 45812 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8888:b0:199:de12:6fa6 with SMTP id d8csp80595pzf; Thu, 25 Jan 2024 05:45:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IE/3A7s0Cf9KIaRMzL3B5O+byPsk43AAcS+gZ+N/UJbEMfuguP2VEPZE5K7aC+GEgGr3c4j X-Received: by 2002:a17:906:2012:b0:a30:bfb1:f895 with SMTP id 18-20020a170906201200b00a30bfb1f895mr997207ejo.10.1706190307392; Thu, 25 Jan 2024 05:45:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706190307; cv=none; d=google.com; s=arc-20160816; b=zznDZjlzU0GxjqkWFlbPLtXxwfY9D8sqL76RYDUaxEmxFdKwRNrRawbaitfP2oIH/s JxHUTh1Jmmmcng3SXenONSz0mNar37R9sUKcTi4rMDxMpciat/XTiRP41sbZU4Fb3X7u jbBqIVW3XhyB1EtWQB8cboajkn7gC0KHYU1bcoNClQ0wjZyI2TnQqjmcFM0Jle3FJRvT IjpUNHtVgW1Tuqj7AHZvumKSERR5gnLzIl2UEOF7yywa1xLOegH65Hnlrlwvu28OjGCR rxy5E91C3pMmyi4t6H1drcrm1RBoA3PjL6wpfV19YzGYp2lrfcYpPJN7K5o2EWcRtUKb UDlA== 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:dkim-signature:delivered-to; bh=CDaMYghRgJQYZA/0y3yttjD6u/MpEEun5drryaua4ys=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=l762hkTlPjxHWxeBNzS+rtPr8050ReH4SX6BCeDUhzcUTYVEjsDLdVFcHQVAQU566A YUG+ejkc75Al43xN1cAYXhlS2ZcHeFJFgjejQdpSxmiL/9VJKbrKUNoSygdNWUXfEV0C F46JuLTgCEr9uIKIV0CyqqUpTCQFZ9R1oQQY8uOu/8r854c7/qxOyUJ6SEba7OGM0cCi 0EWozWNVSgK0Y9mkZWwrFwQOYcaS/rWy4lHXwFmV1mWym5WSKWzE7m6Unq5VOVrZqxJO iDL6ICMbaB7QHaaJEWdX8BN2HHxJ+2FdJ9U0R9khaxj+OgmhCOV4tzgUwjtmmuNnYOMM yK6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=ljYHj7h0; 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 g17-20020a170906199100b00a315c3010e9si873429ejd.342.2024.01.25.05.45.06; Thu, 25 Jan 2024 05:45:07 -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=ljYHj7h0; 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 25D7068D0EA; Thu, 25 Jan 2024 15:44:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C611668D0CE for ; Thu, 25 Jan 2024 15:44:35 +0200 (EET) Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-5cddc5455aeso3700110a12.1 for ; Thu, 25 Jan 2024 05:44:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706190273; x=1706795073; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=E6lM7R+3AyF5zKoBnqCcASNbY3149aQHo2XEj25AZBQ=; b=ljYHj7h0KZUwuL1HTZqC+wICPa7XXOkjxReKmgcZwHt82l+nWulVhCghdTbrujKxLX N7g3IfnVoDiRcKFLWedYIJnL/MWYkKyXaNwHAzg23wjW8jlY+SP5yueevG5Rmd0zTIU6 oyWpaQIxNzO7unYg2d5V2sska92MMoflzP7P6c/uZJu9EGKGClgUSIfUx9RT0W/BcsEJ tGHgVl82y0W6r2ZMoETeqR4kPJz1ysPVeQ0YQOJmPV+b2YKckvcP9rUxQXaY3uKNgZ4e 9HFo7DP73rDb0+aAakZHEeRFj4D2mn87t/A3ovt5MfulX7yw+dq1/7I+wdwzJUqos4se U82w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706190273; x=1706795073; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E6lM7R+3AyF5zKoBnqCcASNbY3149aQHo2XEj25AZBQ=; b=KAr4kXbisVVyqjC7t3TKxopGb+AYH67FFuJ3i/xfN7WBLuDvdKihad+GA58yEYjedI kvc8M6A47ceWsx5yw23e68Aa6e9VWhLpxg81edSuBg+HryulW3AHyoeFpVYpBXIosdLW 1zHqnPjNPpiEVdtUgKKgc9N7G4DR1MGJNiLjzsEGAiccHc9wdWxI8UN4380roiDeYACd /sdw71r3kRnDloOSCHvB+h04mPKmmKQvrBbcO4o+I9QRDA4bPg+Wx540kBBcmIDNIL3I RNjbJr/Pc7ZYKZAvYKd8xhJ4JKo+wX1Oo1b+bpC2ofagAL1mjfAdjoQgnBnvOdVnyyuY 5CDw== X-Gm-Message-State: AOJu0YxCDKggSPSdxczIBwy39Ya0Vgt56pR2/g9InxNvtFn+wSTrEDDC K071hGevrIVJ2duZ6Tqydq5Hb8vX9vd8uJcW1Amck8hi7HTlSGwoKpg18RQy X-Received: by 2002:a17:90a:9a6:b0:290:6c93:1e2a with SMTP id 35-20020a17090a09a600b002906c931e2amr556986pjo.51.1706190273442; Thu, 25 Jan 2024 05:44:33 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id k17-20020a170902f29100b001d707a14316sm11785146plc.75.2024.01.25.05.44.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 05:44:33 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jan 2024 10:43:25 -0300 Message-ID: <20240125134425.374-3-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240125134425.374-1-jamrial@gmail.com> References: <20240125134425.374-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/24] avcodec: remove deprecated FF_API_SVTAV1_OPTS 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: 6F8R6bpfT8mu Signed-off-by: James Almer --- 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)