From patchwork Mon Jun 7 23:04:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 28145 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp3886627iof; Mon, 7 Jun 2021 16:06:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxRI9v49DtErSGa7wsjnYjZ28WA/PIo37tSHnGNSnp+1/w5OdHFZmVWBF4pf8HhOn/DehV3 X-Received: by 2002:a17:906:e10d:: with SMTP id gj13mr19945237ejb.150.1623107160753; Mon, 07 Jun 2021 16:06:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623107160; cv=none; d=google.com; s=arc-20160816; b=Zrm5jnKuz9KOWi8J/3e+v2p71TojC6+vM53JZATYKR0ssxZVp13J5iFVsyicfCwRtQ pEnqn+5yp4DqLczbbzbSoYaU5yFVn/fSjlSg+dy4jvmP2lrg6Poarq2Z0LVFsF5DyCwp H/4GuZXBAJEuy0MARaEkMjDa8IMS/CY7f3Z29SRsCXvtKz+h8/RSLju2h9RVgXvFZ8F8 s9eAQZcdXvJWJoK+dWdw6kX9sebwS4BiGkwfwdQd0AXgfKhFzdTPOOlVzkGnbmk0ld7n UtdZjq8A9DjCltCyY2Xq0ac3jSDgywbKLjXPEYBoyzZ6zMqyKBPjDB12lfSkHsFpB5pk wB1Q== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=7PH6nnlExoupq+AiynGEl0YhaKcKO+kKU6DIGaLr78I=; b=CymoVlUhhN2VDAuERlniEYqDNmBL91kVpf83gFEg/jJHkmvCgPeisptAk6ckXxl7BJ ndy4pgcBjupq1G7QtY1ReN9nDLfEXPoldgJ4kiIc7hwlsE4s9Kx0sHz7xlwTA2UquIqW 9/3AJytIr0jE0td4nWdm7EPaz9YeKw2XUqlK1x97jVEa3TJPtSNsJ7WLkq83iLXXdmwG W7ThlwDnShMBCkJ6w3R2R84VU8qUwX23oSJqi9o7A0d6j0CU1txd9RzusehiXoo1d3zO mUaQ2OSX4RkhwavXbWdgchLlJnXtpImj8LtYMS0DRbXsLGGfn1LXrlRgpGoLoNA3M73Z 1YzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ZpZpHF1G; 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 h11si12917959edw.427.2021.06.07.16.06.00; Mon, 07 Jun 2021 16:06:00 -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=@gmail.com header.s=20161025 header.b=ZpZpHF1G; 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 EE063680C0F; Tue, 8 Jun 2021 02:04:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 492AF680A2B for ; Tue, 8 Jun 2021 02:04:50 +0300 (EEST) Received: by mail-lf1-f46.google.com with SMTP id v8so28962000lft.8 for ; Mon, 07 Jun 2021 16:04:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SPFMbIFXJf7I1JEEyfxQrRWUvUTDwBFzNpApDQWd7Vk=; b=ZpZpHF1G013u8JlwuWlS4CrLoXtF3vV0P9u7rDHN2I04utR6ncg7e9nEhL5fYNjKif f2oabqo7oQQ0kCWQWVbM+Kck+fa9XgEJcXnjfYbs57lBkM40K4Zbyob9oZwPbL1UZadC zBrbOWs2sk4o95pto+092ZgZzGJzWMGaxc8kur8crwMwUwhBnnkn6Piibmfxj/ymoKws T3G67qIPCAFgryyriT9tMZgKO9zTO5SvqjIMoXXBWUzHkS+thjr0fGOURfz93x4Hdnxc FWIrZcFK3IuZ1okhLF78YsoYRDUYnHOxTkiBQpzawNUMWPwsBocHuB0RJgcCssCdC9+k zOUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SPFMbIFXJf7I1JEEyfxQrRWUvUTDwBFzNpApDQWd7Vk=; b=VEjIZvIgQe6INVeQeoPT8EHPOUfrWT7gtCdBA5p25eiMqWuoHmVVYrAf8t/JY/Kn88 ozvD0Ju1mj8+Yc/7zB7LyXXuPF7W+eH0gvsPjxGrwVXO+TTntjKQeMGkkqxOvfzd3HoZ Zo0t56MuWQUg/AGi7fqbI/yKGPOBdZCzkR0+ot0lMLsK9qW3vIAE6CUQaM7Lkrt6U8mB rd8Q0qu9ARaIEvU8zscTYsAcwE5s5CcSzQL38J3j/3inKAuZ1CoxVgIU3lyZajwZbUSn +NW4paXqgxZ8DvRd92ViiVPqg64w6+tztiTqj1XM64RCwaz5X2gt927dgK9Uffr6Q3yo EsgA== X-Gm-Message-State: AOAM531wlJFEngqYUTwHQpVTYumkTR7xFFrVgcEedUvX+w9cZFs2OICs z7Cm4Zy8M1zdUP8GKI4+S3+IfpeJ8Uvesg== X-Received: by 2002:a05:6512:987:: with SMTP id w7mr13235916lft.41.1623107089376; Mon, 07 Jun 2021 16:04:49 -0700 (PDT) Received: from localhost.localdomain (84-217-56-54.customers.ownit.se. [84.217.56.54]) by smtp.gmail.com with ESMTPSA id v9sm1999563ljv.131.2021.06.07.16.04.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 16:04:49 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Jun 2021 01:04:03 +0200 Message-Id: <20210607230414.612-25-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210607230414.612-1-dcnieho@gmail.com> References: <20210607230414.612-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 24/35] avutil/opt: AVOptionRange gains is_set field. 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: Diederick Niehorster Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: l+5qrp9Uqmtp When querying a range of formats of an avdevice, sometimes for a given format the queried option is not available. This is not an error as the user is asking for a valid capability, it just doesn't always apply to all the matching formats of the device. This is now communicated through a special value (like 0 or -1), but that is a problem (like always with special values). The is_set field alleviates the use of special values. This will be used when implementing the avdevice capabilities API for avdevice/dshow in a later commit Signed-off-by: Diederick Niehorster --- libavutil/opt.c | 1 + libavutil/opt.h | 5 +++++ libavutil/version.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 4124efd9b6..ab127b30fa 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1865,6 +1865,7 @@ int av_opt_query_ranges_default(AVOptionRanges **ranges_arg, void *obj, const ch ranges->nb_ranges = 1; ranges->nb_components = 1; range->is_range = 1; + range->is_set = 1; range->value_min = field->min; range->value_max = field->max; diff --git a/libavutil/opt.h b/libavutil/opt.h index c2329e5589..ac0b4567a6 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -325,6 +325,11 @@ typedef struct AVOptionRange { * If set to 1 the struct encodes a range, if set to 0 a single value. */ int is_range; + /** + * Is set flag. + * If set to 1 the struct contains a value, if set to 0, the range is empty. + */ + int is_set; } AVOptionRange; /** diff --git a/libavutil/version.h b/libavutil/version.h index e11eaa20d0..34b83112de 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 0 +#define LIBAVUTIL_VERSION_MINOR 1 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \