From patchwork Sun Apr 14 19:57:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 48058 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:670b:b0:1a9:af23:56c1 with SMTP id wh11csp1434556pzb; Sun, 14 Apr 2024 12:57:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUnyPrZCMPwiuiZFaRO39wi6O/DP/1yPJIm/NmRndF2XvLmMffH13xTcsdZahg3gSKC9j1z6TwIui2/ZhOruobwsMLK2oxdPeFjxQ== X-Google-Smtp-Source: AGHT+IGrMOLz3DHWRSdDNdn+nVlEfg0QZK5xwTK0uOdRydsx3c9DYsNnqAlbrWoisv2UxTFeRviv X-Received: by 2002:a2e:9e82:0:b0:2d8:a82f:50a0 with SMTP id f2-20020a2e9e82000000b002d8a82f50a0mr4742088ljk.35.1713124661311; Sun, 14 Apr 2024 12:57:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713124661; cv=none; d=google.com; s=arc-20160816; b=NUtg+10MjLKgvF5kqhrji5ch1KTeKlVqLqaMKXST7wswbi0Vuh7Qv0jJWK/0VvzUWv NCzmIITMWpMGP4sQhNwzMVuoLh8wydHU01Zim8NJkpi4aWpkvPUJphn0b61n0Pwo4mOK QyNZSYJIxVOSqhn+9mpeKlO8kb2yalPTwFvqz9xqQoOiJj8HsuE6JlIxO3s0Sz8ztVhV sxIAsZIjphrhOMTa+iUDNPirsJj1yO5tMQm9VAStu7DItl22HwZBPWA6TcGPgM314vk0 z+8pIfTGd+fCBVDH1tsQBeKDUdi5eIFu/QhHzpwlCfGFiNoJeX1jy9axWGdKjILKeRud GVDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=WCPGNvrgYJ2BkJ0SaZwjiN/GorVoGKhWgFkfzTNbKC0=; fh=LnlYe9qYwgML7nWWXqAumr7YCmPjjpEPjQf6GasgJC0=; b=jqANBHNUzd5vPTTNoS0lzuUEF6iH7RyEUlXZM4yvX7nMQzpYMuljoi0/BHFMOmh8no abblZ1JtP/dO/lEXwCzgwMCFeWk+MZydnG331xobIbgbUAfYs38qL6Myf27dWM/7wRre 11tUpbUtjWMrQK8Z1EmJXugZYqtpjZXtEMwvC001Ui0RmSBH3qfQPsA3gvdOUHqzRXMF PUbHMcizyFdlaFJ03TMuwwAO1UG2etkwuC1u5qb+M/GKuX1T9Lvl/jmA2SLnjnQfWv9Y ZI+t+PJDEiQVTPlx7RRx7/uITtM4DYhmvR1LFbyr62i5Ox7ywQyH67j0aEVuMGpdNSTI jhYQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=hxR+kZ3A; 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=NONE dis=NONE) header.from=rothenpieler.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w12-20020a50d78c000000b0056fffc2fa67si2555642edi.490.2024.04.14.12.57.40; Sun, 14 Apr 2024 12:57:41 -0700 (PDT) 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=@rothenpieler.org header.s=mail header.b=hxR+kZ3A; 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=NONE dis=NONE) header.from=rothenpieler.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20A1C68D390; Sun, 14 Apr 2024 22:57:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [144.76.60.213]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EECA468D220 for ; Sun, 14 Apr 2024 22:57:30 +0300 (EEST) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id EB10C28191146; Sun, 14 Apr 2024 21:57:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1713124649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=peEbNPyO53h30cjgh0fjRluCT4bMtTDkLSoCWws5OxA=; b=hxR+kZ3AfghcSuqYzpNpBN8OyokDx6iSF/iDn1l4SzB62MCTRkvq2EBCRkmqMR3NhzEXIU tAmFzbP6D2/OEqTNjpQZ2SG7T0HyEybYO7Y45U+AIS4XBFF875DM175UI81JcFAIVFdn1P Vk1wWMmYcOBizMGE4EiGPKAJR4ZIiv55EroKLT5oEqAv27cYrFA3giMyjyVi+do0Brd0pc qz4DHTbUf/4OTw81Fe7dJY84xAWS/bryTEdG1KJAszsxLjLh2JkhFDOUxtcVSLb3rkAxfN LBO1OfRzFiO6UBcImM1ZxpP4owuIao2nFbh+/s7AENzJ3rPhx4Ga3BiLjGhJbg== From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Sun, 14 Apr 2024 21:57:20 +0200 Message-Id: <20240414195720.21646-1-timo@rothenpieler.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutil/opt: add AV_OPT_FLAG_FORCE_CONST 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 Cc: Timo Rothenpieler Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MeSnZz1r1PQd --- doc/APIchanges | 3 +++ libavutil/opt.c | 14 ++++++++++++++ libavutil/opt.h | 5 +++++ libavutil/version.h | 2 +- 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 63e7a47126..da2c87909b 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2024-03-07 API changes, most recent first: +2024-04-xx - xxxxxxxxxx - lavu 59.15.101 - opt.h + Add AV_OPT_FLAG_FORCE_CONST. + 2024-04-11 - xxxxxxxxxx - lavc 61.5.102 - avcodec.h AVCodecContext.decoded_side_data may now be set by libavcodec after calling avcodec_open2(). diff --git a/libavutil/opt.c b/libavutil/opt.c index d11e9d2ac5..9e51fa47f9 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -365,6 +365,20 @@ static int set_string_number(void *obj, void *target_obj, const AVOption *o, con if (o_named->flags & AV_OPT_FLAG_DEPRECATED) av_log(obj, AV_LOG_WARNING, "The \"%s\" option is deprecated: %s\n", o_named->name, o_named->help); + } else if (o->flags & AV_OPT_FLAG_FORCE_CONST) { + av_log(obj, AV_LOG_ERROR, "The \"%s\" option only accepts one of its pre-defined constant values", + o->name); + buf[0] = ':'; buf[1] = ' '; buf[2] = 0; + for (o_named = NULL; o_named = av_opt_next(target_obj, o_named); ) { + if (o_named->type == AV_OPT_TYPE_CONST && + o_named->unit && o->unit && + !strcmp(o_named->unit, o->unit)) { + av_log(obj, AV_LOG_ERROR, "%s%s", buf, o_named->name); + buf[0] = ','; + } + } + av_log(obj, AV_LOG_ERROR, "\n"); + return AVERROR(EINVAL); } else { if (o->unit) { for (o_named = NULL; o_named = av_opt_next(target_obj, o_named); ) { diff --git a/libavutil/opt.h b/libavutil/opt.h index e6013662f6..67e2b687b2 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -305,6 +305,11 @@ enum AVOptionType{ * Set if option constants can also reside in child objects. */ #define AV_OPT_FLAG_CHILD_CONSTS (1 << 18) +/** + * The option will only accept AV_OPT_TYPE_CONST values. + * Any other user supplied values will be rejected. + */ +#define AV_OPT_FLAG_FORCE_CONST (1 << 19) /** * May be set as default_val for AV_OPT_TYPE_FLAG_ARRAY options. diff --git a/libavutil/version.h b/libavutil/version.h index 1f2bddc022..5de2d92146 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -80,7 +80,7 @@ #define LIBAVUTIL_VERSION_MAJOR 59 #define LIBAVUTIL_VERSION_MINOR 15 -#define LIBAVUTIL_VERSION_MICRO 100 +#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \