From patchwork Tue Feb 27 20:30:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46591 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51b:b0:19e:cdac:8cce with SMTP id gm27csp2238650pzb; Tue, 27 Feb 2024 12:32:51 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUu5+DCZapG4ydWkSkgbjncMgppgaFiHudhnV/wjOt5hc/EdaplzuwzCnpJNRijxTmknY6xdnREjRIV48z68M+eJrcsrJGqWQBlrw== X-Google-Smtp-Source: AGHT+IFSropq0aYVHJB1FDeT76pFBm9EAVMKcVoX2WnJ146VnTr6sqlWw1Gh92jDXKr/0qoYUt8H X-Received: by 2002:aa7:d954:0:b0:566:4624:b121 with SMTP id l20-20020aa7d954000000b005664624b121mr1540284eds.35.1709065971212; Tue, 27 Feb 2024 12:32:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709065971; cv=none; d=google.com; s=arc-20160816; b=vDiuJqyGva/lmflwDMClP0JpP79cKX8sZn+qCSDH9y10otS+8a6isb85TycjHqtIJT dK9tuxORmblSBa51tLDdyOs5xE7ltcyq2DpZUmLTvqHPDgr68Dp+spfmmGcDu4DBW2yk Uc6mEGPbkEhx33ojgKHXtu9jVs7dud7e4qELD2/nXlBWIKwt0F3iI+yBF7fM3gm6PO7M cF4/MYtFkEeoTqVvyPxxgWczY5w+CbCHKNdvaJvQDHED59xEAr1BzeIZPW8DZPuGB25Y 1zbFxLw6ZtaUEp+73wbWjx/W2JJ75FlPBfk5MX4XHWvddERfVW9FrGf2EG7mGg43ERDX n+5w== 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=TgDxnWTeW7WuL8+pBDbUwUw6M1y/iIKvb6F9lez46dQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=yvt63BaTAt3u2Ch8+OgdmBJQgMRDy1WZsa140tzZgRphaLhPzqXu00ajcI4nc9t+Em VrKYqH1eBoxznfReCPQpsBuxxKugtPqls5bPXPAhyLJ/YeU5mfCrgiSarLYpGEc8VKZk HgjBX4RFdN+kYdCLUkU6beS7IJyFiDlE6HJ0qisZuRtQXosZWYWi90juNGxI1j71RML5 LTK1YdLw/jOT+d7HNzMigk5x7XE5Z7R5rzfdDgT7NR7n0bttRiTM8gcOk7ZZRM0zli5B SYLCzHRsOAePVRoAZE9jPRS4o6UeBqL5sZQYaIYywmlghFRxqLmU1KTcB+FN9FvrUEsL r+6g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=jBxYQ+eM; 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 w4-20020aa7da44000000b00566358e2376si915392eds.72.2024.02.27.12.32.50; Tue, 27 Feb 2024 12:32:51 -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=jBxYQ+eM; 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 0D39268CEBF; Tue, 27 Feb 2024 22:32:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8101768CE33 for ; Tue, 27 Feb 2024 22:32:26 +0200 (EET) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-6e55bb75c9eso178553b3a.3 for ; Tue, 27 Feb 2024 12:32:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709065944; x=1709670744; 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=LjPY6/m70qj6e0weAkco2OwyTXz6I7ILnLHKxMZL088=; b=jBxYQ+eMes9hhIsyAVZrmx1btrq3O9CweYrHwfplF3aZSnsN11WFtdgQa0BJhDSthI 4pB/7kR96IVOC7nIKOHRQ0tEmUyHWnLRo+JhQSK/1rOIPmWP1J+n4BbEVmDqvMZCAaXe KrrdaYwQX+orU54Jnj6zicg8nGUbH/NPG0Gry5LXwbqYwQGhNcHBgwilbsS80ZDUwxBh OnwrznNFnfOcPcze54NLodBjehc7zy+Q0RvuP3JrWLK95TtzmNx+Qvnjnj1sltpqDf9c 7FvynGa5lJ2dfpl5AocRuNHp9+tgs/xOLHL4k6cMPX5gHYYwT3xGv2BLWsmMuBa7WYDY cCDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709065944; x=1709670744; 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=LjPY6/m70qj6e0weAkco2OwyTXz6I7ILnLHKxMZL088=; b=Q0EJCROvBRXv3J4Vs9U8ExThOyykqdBV5rlRPhKWJC+PIKl79o2iTY736B77PU0GvK BKaPhyHghGeVscOzZZok6WaxOJ1f2WBtwdctqvD6Hq0suM1IhFPPyZy+gCrI9DzG8oPU hVOVWt7lz5AJmimqAvYT/LJ6WCkm0Lp/NkiWOwLuDsP9WsBNklsgGv6JKOW8UiWru59h aXdsi+lQ6fDsdTuTlZ016g+TNX6GSxEXQ1NOspC9ij7sFnnYIWIW6SOwRhksqwmC8iyo 7sCu4QFmJ3SgF0yK1bNxDQ1JVIyqqPAvs4isI8JRlYOZ+odvTDL+ySAMBKIFzhOuUMlf lOzw== X-Gm-Message-State: AOJu0YzPtfW4jy9KDw1uY/VTCtbhLxl6dnlUQ5Qiaji92nY3wDRzPPUh 4CqGhvu/Zh/F6S9kzh6Z0DqePdOnUCeygEzltDZPCsXnbxA+sYAwYqaa4rXh X-Received: by 2002:a05:6a21:920b:b0:1a0:adbc:7a96 with SMTP id tl11-20020a056a21920b00b001a0adbc7a96mr3373233pzb.36.1709065943689; Tue, 27 Feb 2024 12:32:23 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id m22-20020a637116000000b005d880b41598sm6294325pgc.94.2024.02.27.12.32.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 12:32:22 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Feb 2024 17:30:40 -0300 Message-ID: <20240227203040.1989-3-jamrial@gmail.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240227203040.1989-1-jamrial@gmail.com> References: <20240227203040.1989-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3 v2] avutil/opt: add an unsigned option type 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: jsZYFx3nrV5F Signed-off-by: James Almer --- libavutil/opt.c | 19 +++++++++++++++++++ libavutil/opt.h | 2 ++ libavutil/tests/opt.c | 9 +++++++++ tests/ref/fate/opt | 32 ++++++++++++++++++++++++++++++-- 4 files changed, 60 insertions(+), 2 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 0681b19896..d37f0dda69 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -72,6 +72,9 @@ static int read_number(const AVOption *o, const void *dst, double *num, int *den case AV_OPT_TYPE_INT: *intnum = *(int *)dst; return 0; + case AV_OPT_TYPE_UINT: + *intnum = *(unsigned int *)dst; + return 0; #if FF_API_OLD_CHANNEL_LAYOUT FF_DISABLE_DEPRECATION_WARNINGS case AV_OPT_TYPE_CHANNEL_LAYOUT: @@ -128,6 +131,7 @@ static int write_number(void *obj, const AVOption *o, void *dst, double num, int case AV_OPT_TYPE_BOOL: case AV_OPT_TYPE_FLAGS: case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_UINT: *(int *)dst = llrint(num / den) * intnum; break; case AV_OPT_TYPE_DURATION: @@ -231,6 +235,7 @@ static int set_string(void *obj, const AVOption *o, const char *val, uint8_t **d opt->type == AV_OPT_TYPE_UINT64 || \ opt->type == AV_OPT_TYPE_CONST || \ opt->type == AV_OPT_TYPE_FLAGS || \ + opt->type == AV_OPT_TYPE_UINT || \ opt->type == AV_OPT_TYPE_INT) \ ? opt->default_val.i64 \ : opt->default_val.dbl) @@ -529,6 +534,7 @@ FF_ENABLE_DEPRECATION_WARNINGS return set_string_binary(obj, o, val, dst); case AV_OPT_TYPE_FLAGS: case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_UINT: case AV_OPT_TYPE_INT64: case AV_OPT_TYPE_UINT64: case AV_OPT_TYPE_FLOAT: @@ -610,6 +616,7 @@ int av_opt_eval_ ## name(void *obj, const AVOption *o, \ OPT_EVAL_NUMBER(flags, AV_OPT_TYPE_FLAGS, int) OPT_EVAL_NUMBER(int, AV_OPT_TYPE_INT, int) +OPT_EVAL_NUMBER(uint, AV_OPT_TYPE_UINT, unsigned int) OPT_EVAL_NUMBER(int64, AV_OPT_TYPE_INT64, int64_t) OPT_EVAL_NUMBER(float, AV_OPT_TYPE_FLOAT, float) OPT_EVAL_NUMBER(double, AV_OPT_TYPE_DOUBLE, double) @@ -871,6 +878,9 @@ int av_opt_get(void *obj, const char *name, int search_flags, uint8_t **out_val) case AV_OPT_TYPE_INT: ret = snprintf(buf, sizeof(buf), "%d", *(int *)dst); break; + case AV_OPT_TYPE_UINT: + ret = snprintf(buf, sizeof(buf), "%u", *(unsigned int *)dst); + break; case AV_OPT_TYPE_INT64: ret = snprintf(buf, sizeof(buf), "%"PRId64, *(int64_t *)dst); break; @@ -1276,6 +1286,9 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit, case AV_OPT_TYPE_INT: av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); break; + case AV_OPT_TYPE_UINT: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; case AV_OPT_TYPE_INT64: av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); break; @@ -1358,6 +1371,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (av_opt_query_ranges(&r, obj, opt->name, AV_OPT_SEARCH_FAKE_OBJ) >= 0) { switch (opt->type) { case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_UINT: case AV_OPT_TYPE_INT64: case AV_OPT_TYPE_UINT64: case AV_OPT_TYPE_DOUBLE: @@ -1405,6 +1419,7 @@ FF_ENABLE_DEPRECATION_WARNINGS av_log(av_log_obj, AV_LOG_INFO, "%s", buf); break; } + case AV_OPT_TYPE_UINT: case AV_OPT_TYPE_INT: case AV_OPT_TYPE_UINT64: case AV_OPT_TYPE_INT64: { @@ -1490,6 +1505,7 @@ void av_opt_set_defaults2(void *s, int mask, int flags) case AV_OPT_TYPE_BOOL: case AV_OPT_TYPE_FLAGS: case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_UINT: case AV_OPT_TYPE_INT64: case AV_OPT_TYPE_UINT64: case AV_OPT_TYPE_DURATION: @@ -1858,6 +1874,7 @@ static int opt_size(enum AVOptionType type) switch(type) { case AV_OPT_TYPE_BOOL: case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_UINT: case AV_OPT_TYPE_FLAGS: return sizeof(int); case AV_OPT_TYPE_DURATION: @@ -1997,6 +2014,7 @@ int av_opt_query_ranges_default(AVOptionRanges **ranges_arg, void *obj, const ch switch (field->type) { case AV_OPT_TYPE_BOOL: case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_UINT: case AV_OPT_TYPE_INT64: case AV_OPT_TYPE_UINT64: case AV_OPT_TYPE_PIXEL_FMT: @@ -2089,6 +2107,7 @@ int av_opt_is_set_to_default(void *obj, const AVOption *o) case AV_OPT_TYPE_PIXEL_FMT: case AV_OPT_TYPE_SAMPLE_FMT: case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_UINT: #if FF_API_OLD_CHANNEL_LAYOUT FF_DISABLE_DEPRECATION_WARNINGS case AV_OPT_TYPE_CHANNEL_LAYOUT: diff --git a/libavutil/opt.h b/libavutil/opt.h index 461b5d3b6b..ba494f0fcf 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -243,6 +243,7 @@ enum AVOptionType{ #endif AV_OPT_TYPE_BOOL, AV_OPT_TYPE_CHLAYOUT, + AV_OPT_TYPE_UINT, }; /** @@ -552,6 +553,7 @@ enum { */ int av_opt_eval_flags (void *obj, const AVOption *o, const char *val, int *flags_out); int av_opt_eval_int (void *obj, const AVOption *o, const char *val, int *int_out); +int av_opt_eval_uint (void *obj, const AVOption *o, const char *val, unsigned *uint_out); int av_opt_eval_int64 (void *obj, const AVOption *o, const char *val, int64_t *int64_out); int av_opt_eval_float (void *obj, const AVOption *o, const char *val, float *float_out); int av_opt_eval_double(void *obj, const AVOption *o, const char *val, double *double_out); diff --git a/libavutil/tests/opt.c b/libavutil/tests/opt.c index 11f29468fb..faeaa00f30 100644 --- a/libavutil/tests/opt.c +++ b/libavutil/tests/opt.c @@ -31,6 +31,7 @@ typedef struct TestContext { const AVClass *class; int num; + unsigned unum; int toggle; char *string; int flags; @@ -67,6 +68,7 @@ typedef struct TestContext { static const AVOption test_options[]= { {"num", "set num", OFFSET(num), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, 100, 1 }, + {"unum", "set unum", OFFSET(unum), AV_OPT_TYPE_UINT, { .i64 = 1U << 31 }, 0, 1U << 31, 1 }, {"toggle", "set toggle", OFFSET(toggle), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, 1 }, {"rational", "set rational", OFFSET(rational), AV_OPT_TYPE_RATIONAL, { .dbl = 1 }, 0, 10, 1 }, {"string", "set string", OFFSET(string), AV_OPT_TYPE_STRING, { .str = "default" }, CHAR_MIN, CHAR_MAX, 1 }, @@ -127,6 +129,7 @@ int main(void) av_opt_set_defaults(&test_ctx); printf("num=%d\n", test_ctx.num); + printf("unum=%u\n", test_ctx.unum); printf("toggle=%d\n", test_ctx.toggle); printf("string=%s\n", test_ctx.string); printf("escape=%s\n", test_ctx.escape); @@ -291,6 +294,12 @@ int main(void) "num=-1", "num=-2", "num=101", + "unum=bogus", + "unum=44", + "unum=44.4", + "unum=-1", + "unum=2147483648", + "unum=2147483649", "num64=bogus", "num64=44", "num64=44.4", diff --git a/tests/ref/fate/opt b/tests/ref/fate/opt index d164b9eb0c..408467e77c 100644 --- a/tests/ref/fate/opt +++ b/tests/ref/fate/opt @@ -1,5 +1,6 @@ Testing default values num=0 +unum=2147483648 toggle=1 string=default escape=\=, @@ -19,6 +20,7 @@ flt=0.333333 dbl=0.333333 TestContext AVOptions: -num E.......... set num (from -1 to 100) (default 0) + -unum E.......... set unum (from 0 to 2.14748e+09) (default 2147483648) -toggle E.......... set toggle (from 0 to 1) (default 1) -rational E.......... set rational (from 0 to 10) (default 1/1) -string E.......... set string (default "default") @@ -48,6 +50,7 @@ TestContext AVOptions: Testing av_opt_is_set_to_default() name: num default:1 error: +name: unum default:0 error: name: toggle default:0 error: name: rational default:0 error: name: string default:0 error: @@ -75,6 +78,7 @@ name: bool3 default:1 error: name: dict1 default:1 error: name: dict2 default:0 error: name: num default:1 error: +name: unum default:1 error: name: toggle default:1 error: name: rational default:1 error: name: string default:1 error: @@ -104,6 +108,7 @@ name: dict2 default:1 error: Testing av_opt_get/av_opt_set() name: num get: 0 set: OK get: 0 OK +name: unum get: 2147483648 set: OK get: 2147483648 OK name: toggle get: 1 set: OK get: 1 OK name: rational get: 1/1 set: OK get: 1/1 OK name: string get: default set: OK get: default OK @@ -129,8 +134,9 @@ name: dict1 get: set: OK get: name: dict2 get: happy=\:-) set: OK get: happy=\:-) OK Test av_opt_serialize() -num=0,toggle=1,rational=1/1,string=default,escape=\\\=\,,flags=0x00000001,size=200x300,pix_fmt=0bgr,sample_fmt=s16,video_rate=25/1,duration=0.001,color=0xffc0cbff,cl=hexagonal,bin=62696E00,bin1=,bin2=,num64=4294967296,flt=0.333333,dbl=0.333333,bool1=auto,bool2=true,bool3=false,dict1=,dict2=happy\=\\:-) +num=0,unum=2147483648,toggle=1,rational=1/1,string=default,escape=\\\=\,,flags=0x00000001,size=200x300,pix_fmt=0bgr,sample_fmt=s16,video_rate=25/1,duration=0.001,color=0xffc0cbff,cl=hexagonal,bin=62696E00,bin1=,bin2=,num64=4294967296,flt=0.333333,dbl=0.333333,bool1=auto,bool2=true,bool3=false,dict1=,dict2=happy\=\\:-) Setting entry with key 'num' to value '0' +Setting entry with key 'unum' to value '2147483648' Setting entry with key 'toggle' to value '1' Setting entry with key 'rational' to value '1/1' Setting entry with key 'string' to value 'default' @@ -154,7 +160,7 @@ Setting entry with key 'bool2' to value 'true' Setting entry with key 'bool3' to value 'false' Setting entry with key 'dict1' to value '' Setting entry with key 'dict2' to value 'happy=\:-)' -num=0,toggle=1,rational=1/1,string=default,escape=\\\=\,,flags=0x00000001,size=200x300,pix_fmt=0bgr,sample_fmt=s16,video_rate=25/1,duration=0.001,color=0xffc0cbff,cl=hexagonal,bin=62696E00,bin1=,bin2=,num64=4294967296,flt=0.333333,dbl=0.333333,bool1=auto,bool2=true,bool3=false,dict1=,dict2=happy\=\\:-) +num=0,unum=2147483648,toggle=1,rational=1/1,string=default,escape=\\\=\,,flags=0x00000001,size=200x300,pix_fmt=0bgr,sample_fmt=s16,video_rate=25/1,duration=0.001,color=0xffc0cbff,cl=hexagonal,bin=62696E00,bin1=,bin2=,num64=4294967296,flt=0.333333,dbl=0.333333,bool1=auto,bool2=true,bool3=false,dict1=,dict2=happy\=\\:-) Testing av_set_options_string() Setting options string '' @@ -334,6 +340,28 @@ Setting options string 'num=101' Setting entry with key 'num' to value '101' Value 101.000000 for parameter 'num' out of range [-1 - 100] Error 'num=101' +Setting options string 'unum=bogus' +Setting entry with key 'unum' to value 'bogus' +Undefined constant or missing '(' in 'bogus' +Unable to parse option value "bogus" +Error 'unum=bogus' +Setting options string 'unum=44' +Setting entry with key 'unum' to value '44' +OK 'unum=44' +Setting options string 'unum=44.4' +Setting entry with key 'unum' to value '44.4' +OK 'unum=44.4' +Setting options string 'unum=-1' +Setting entry with key 'unum' to value '-1' +Value -1.000000 for parameter 'unum' out of range [0 - 2.14748e+09] +Error 'unum=-1' +Setting options string 'unum=2147483648' +Setting entry with key 'unum' to value '2147483648' +OK 'unum=2147483648' +Setting options string 'unum=2147483649' +Setting entry with key 'unum' to value '2147483649' +Value 2147483649.000000 for parameter 'unum' out of range [0 - 2.14748e+09] +Error 'unum=2147483649' Setting options string 'num64=bogus' Setting entry with key 'num64' to value 'bogus' Undefined constant or missing '(' in 'bogus'