From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id DF18949B31 for ; Sun, 3 Mar 2024 16:29:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F3FD68D39F; Sun, 3 Mar 2024 18:29:40 +0200 (EET) Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07D9568D368 for ; Sun, 3 Mar 2024 18:29:34 +0200 (EET) Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-566adfeced4so3708510a12.1 for ; Sun, 03 Mar 2024 08:29:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709483372; x=1710088172; darn=ffmpeg.org; h=user-agent:in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:to:from:date:from:to:cc:subject :date:message-id:reply-to; bh=iGTqG8CoR4AD5dwWbDPxFEccxJCpypjrAHYVtRx4O8g=; b=hDpgPEIEqgNpccZxujvqQzHtWTSrImCB1ptuIqhxpz7soOb73n6ePYB8Hr27im5tsw KHfYfiMBV0v1dQZU+F4fBcySn3kwF36jRVPAimE7a00ldaLWbwesq3JqyRCobpHib6se Pq265VirIdl1D/Mwo6C6KTCmWOxrbe68+SPyvU4vSWESR/5/VITAxePXryZHXSVM9mI9 SBCrXbu7DDAN+yjGrtO9AV5om7TAi4v5aPx10EdL6gIhR03np4F2pzLi+L83v1MyuA8k qbq6W0EhyR5vXPSl3zotW2R9iMdgqgkrDrPG9PsDhd18esiXXfcNDOw/ZuIcoQjOgfJU 6GMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709483372; x=1710088172; h=user-agent:in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=iGTqG8CoR4AD5dwWbDPxFEccxJCpypjrAHYVtRx4O8g=; b=DOa7sHuA6SHEdw6xeXQ0xOxTOSIKQHn4/7FOKnvdrBAhEIW2h0SyKjSM1INNore+Qa wDyBQKWPnV1+PWab7DRNTarR0KWnHPEVH/0F+XEvtcnShnOrMXrC55wBw9DBCFo9iv0C eABYH+BzKpn/t2v14/DA0XI4DkeL2d0AS3mjY0x9b99eP2zHQj+ZBmuBB5dZRog+RImp KOLsoWQh75NVG4CrJf5zPosPJlQBBbkFeuUji9rRq3q039QzWRT1zxVn1A58A6tHeIMH NPOH5tb+GnmwHW4AP+XVGpL9VHVDJsbbe9uUgkUlKN2SOXu81W9zbLoUUmhxK5+pnt8o hJ+g== X-Gm-Message-State: AOJu0YzUUml7ZuqxWXj8PznAaTLcsmOR+0u23/L1nCWP+wr+EUYENvS6 i7lb1FIrKQ4Rtr1R7MAB/Uxb3PS/Rk2ZnckkjujQIdWtHgKMSJ/DBgTz1Kj5 X-Google-Smtp-Source: AGHT+IEfvSTy5vOokbe6VL+uXYq9S+WY1299X2ZHIiz8olZDkjtflq/Y5bFvpP1PkJ7OFz1bfVjOnw== X-Received: by 2002:a50:d58a:0:b0:566:6dfa:9d71 with SMTP id v10-20020a50d58a000000b005666dfa9d71mr4310524edi.40.1709483372447; Sun, 03 Mar 2024 08:29:32 -0800 (PST) Received: from mariano ([188.210.239.74]) by smtp.gmail.com with ESMTPSA id bo19-20020a0564020b3300b005653f390f77sm3621750edb.10.2024.03.03.08.29.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Mar 2024 08:29:32 -0800 (PST) Received: by mariano (Postfix, from userid 1000) id 49849BFCDC; Sun, 3 Mar 2024 17:29:30 +0100 (CET) Date: Sun, 3 Mar 2024 17:29:30 +0100 From: Stefano Sabatini To: FFmpeg development discussions and patches Message-ID: Mail-Followup-To: FFmpeg development discussions and patches References: <20240227135947.503-1-jamrial@gmail.com> <20240227135947.503-2-jamrial@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240227135947.503-2-jamrial@gmail.com> User-Agent: Mutt/2.1.4 (2021-12-11) Subject: Re: [FFmpeg-devel] [PATCH 2/2] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On date Tuesday 2024-02-27 10:59:47 -0300, James Almer wrote: > Signed-off-by: James Almer > --- > libavutil/opt.c | 20 ++++++++++++++++++++ > libavutil/opt.h | 1 + > libavutil/tests/opt.c | 9 +++++++++ > tests/ref/fate/opt | 32 ++++++++++++++++++++++++++++++-- > 4 files changed, 60 insertions(+), 2 deletions(-) Use case? > diff --git a/libavutil/opt.c b/libavutil/opt.c > index 0681b19896..45d6aa5849 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 *)dst; > + return 0; > #if FF_API_OLD_CHANNEL_LAYOUT > FF_DISABLE_DEPRECATION_WARNINGS > case AV_OPT_TYPE_CHANNEL_LAYOUT: > @@ -130,6 +133,9 @@ static int write_number(void *obj, const AVOption *o, void *dst, double num, int > case AV_OPT_TYPE_INT: > *(int *)dst = llrint(num / den) * intnum; > break; > + case AV_OPT_TYPE_UINT: > + *(unsigned *)dst = llrint(num / den) * intnum; > + break; > case AV_OPT_TYPE_DURATION: > #if FF_API_OLD_CHANNEL_LAYOUT > FF_DISABLE_DEPRECATION_WARNINGS > @@ -231,6 +237,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 +536,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: > @@ -871,6 +879,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 +1287,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 +1372,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 +1420,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 +1506,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 +1875,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 +2015,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 +2108,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..9fec1b0509 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, > }; > > /** > diff --git a/libavutil/tests/opt.c b/libavutil/tests/opt.c > index a914d0359a..747042896f 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 = 1 }, 0, INT_MAX + 1U, 1 }, Do we have additional checks in case the validity interval includes signed values? What happens in that case? _______________________________________________ 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".