From patchwork Wed Jul 29 22:08:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 21374 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 344DD44921E for ; Thu, 30 Jul 2020 01:09:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1401168BA81; Thu, 30 Jul 2020 01:09:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 409A668B7CF for ; Thu, 30 Jul 2020 01:09:45 +0300 (EEST) Received: by mail-qk1-f196.google.com with SMTP id h7so23824791qkk.7 for ; Wed, 29 Jul 2020 15:09:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=fpmwjRm6tIS/72cC0dFn14FexqBNbsuKRzQWbjwS+hI=; b=N0sn0Iyvu10qIV06TeZDMxQQlFwjdQN/OFY9qPX8rTxXdRn1sSH87tuWQmAeTz9jxv 1DNIqXlju1m8BrHTkU8U4gQEZn9hnfArMoMxBjUx2OvwD/0LTReuc3aVfa2MJbd6IKkI HZvUlpIRtOsyVSDDlVnC/0CzuusIBR6ipCv8tkEVnSDI65GmBRnZRiJKGs2ECx/PTbGP atm+vV9+tBN1RmHHkuwWAT+tLzbhD//AlR29N0p3bor0trPn5x5H04KsWw2NYpfG0MPY 9BfhsCyjP8S81pgIdJLgxCadFABjxUiD8wAd2i/zRFDp++fQzF18OmEn6CEKoLYGMLRh GPdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=fpmwjRm6tIS/72cC0dFn14FexqBNbsuKRzQWbjwS+hI=; b=fqCZER2e4ysGMbIxjROw3RiXGSROwy+r4g+AaFAnB+cZKkZRI8DJknItADlKjO4ZAp pOZeKr6kLbzBFpZTrNFvlCVdD4UjO+yu1Yv36zcpSiBJGICyK6lOKnGfZtvM57WeVk13 5k1fYUyqq/yjvdZCefLu5iCBtRrftTXX5U++Ii+N4+RYW7mYymINRFZDGJ1WhhO+WXPS /p1vtE1YW0cWQvU/SNn9ALbkMdVHaCE0B+uJxpOkeLVlpakOa8GKaMYu16H4vNDNuR+z ufFD06MIWIy9VntueRchPyrSw27q0FapKZB8kcAlayEutm/ktlUM5ZIl/bne7mQNXJyY v+vw== X-Gm-Message-State: AOAM530TrJIlSYJZ+c/VWp1hAjYaKC/MHwGSI/WYGy5sedZui6hAcjGK aAcP8DiFKfAOnpWRK+x7DdlbrlLa X-Google-Smtp-Source: ABdhPJw5TYgrB4s/WZIrnBfru4+dI8oImfggBGAH37gGKy0wEZp7VtipBu0dDIIk6QWwqXZVe1O6RQ== X-Received: by 2002:a37:4783:: with SMTP id u125mr36571250qka.172.1596060583567; Wed, 29 Jul 2020 15:09:43 -0700 (PDT) Received: from localhost.localdomain ([191.83.218.91]) by smtp.gmail.com with ESMTPSA id j31sm2728255qtb.63.2020.07.29.15.09.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2020 15:09:42 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Jul 2020 19:08:58 -0300 Message-Id: <20200729220858.29264-1-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/options_table: make AVCodecContext->level search for child constants X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" This change makes it possible for child encoders to define custom level option names which can be used for setting the AVCodecContext->level. Based on 337fe4bcc2 Signed-off-by: James Almer --- libavcodec/options_table.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 8ba137f51e..1d0db1b5a4 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -264,8 +264,8 @@ static const AVOption avcodec_options[] = { {"profile", NULL, OFFSET(profile), AV_OPT_TYPE_INT, {.i64 = FF_PROFILE_UNKNOWN }, INT_MIN, INT_MAX, V|A|E|CC, "avctx.profile"}, {"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "avctx.profile"}, {"main10", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_HEVC_MAIN_10 }, INT_MIN, INT_MAX, V|E, "avctx.profile"}, -{"level", NULL, OFFSET(level), AV_OPT_TYPE_INT, {.i64 = FF_LEVEL_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "level"}, -{"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_LEVEL_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "level"}, +{"level", NULL, OFFSET(level), AV_OPT_TYPE_INT, {.i64 = FF_LEVEL_UNKNOWN }, INT_MIN, INT_MAX, V|A|E|CC, "avctx.level"}, +{"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_LEVEL_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "avctx.level"}, {"lowres", "decode at 1= 1/2, 2=1/4, 3=1/8 resolutions", OFFSET(lowres), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, V|A|D}, #if FF_API_PRIVATE_OPT {"skip_threshold", "frame skip threshold", OFFSET(frame_skip_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},