From patchwork Sat Jul 17 00:26:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 28948 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp2266037ios; Fri, 16 Jul 2021 17:26:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/4aa4ggmVWsklNlfbObGs+qiNxwKUuzkaaz5ejtm74oYC0XJkwfRzsFBUPCX4O3qlUkPG X-Received: by 2002:a05:6402:20e:: with SMTP id t14mr17829091edv.193.1626481610319; Fri, 16 Jul 2021 17:26:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626481610; cv=none; d=google.com; s=arc-20160816; b=rcpQIwgAOmeNY5Hg+TG5rDaTMVnWqj+K0jnwUuKnah0rxShcj2WtrXw1fq9y858j1X 8gmY0hUo1E+k4YhpuTvWaniFqH/pipT9G+yp93DDwUo1+F/ywRUBbVbe0SRQUzEbA1k4 QpPqYsPjVgjHfY9jkJziPu1rXjczINNGwqxggcSRf7VK0TnNat3HBpSn5MOGzV+9gdHU lVwDCEy9qRUcV2QEa6X1KZv3iZ3S4Bb7XrWpVHC8YqbkALwX+c16VhJhGIjOTqxiMNf7 Fd+YZ8ZN6/42Ktv2xk3xTHIlXiEobRsgYeI3kMtKMZRP6YoDvs6+BGu3qpJHdXJVccyI E4Ag== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=UnQssWbS/UKb3QROqYdciDi3OqRaIIWeI0qnz4A2WY0=; b=BA+H9jS1SMJbvEOgn7N1AZPlaBUZur1EatUYteXvFAN4Q5CP8vFHGWB1M647mtQqcx GMi8D68Azh6BewZc4Vzm9364CumXrmmoKe+VjZulwq/eEQsPssTfgeAHvbkIeCm20uVf 84WefGnZRoMFufv90B4FpO1aUjT1Pflk2x5BIv/GM7XG5MouVST7uq8aDlhYcHAMClb6 FXh0jf2dDx1fiw1Phj089s9+oDSwc9austhwddbyT7W/h7KSFfWXR/41T+KUqnDnDrU9 um2S/HLe6Xlq9TUIhj3RSoWj/VVO54XCgzrLW3B9gXzYGX3EJL07GlK3AnSVOTd8Y0IX MwYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=AxsVX9kJ; 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 x16si13001059ejo.182.2021.07.16.17.26.49; Fri, 16 Jul 2021 17:26:50 -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=AxsVX9kJ; 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 0741C68A348; Sat, 17 Jul 2021 03:26:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BBD9768A348 for ; Sat, 17 Jul 2021 03:26:39 +0300 (EEST) Received: by mail-pg1-f171.google.com with SMTP id h4so11582853pgp.5 for ; Fri, 16 Jul 2021 17:26:39 -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=2Ulq8RiWjTEjhwuhnqYGhd3yOoybn9H/Sw3wUN7VDXc=; b=AxsVX9kJnbfDacrvs/ZGP3K66nzrNxIPotZgl4hGLmbXGkA9X9hizKXJVGLJOzNZEe t0Kf80mOK3DZqSv3q8nGRnAqiRoVrhJ1EfZ31NmMdKqucFMiGvnCnZOfuH/oSPu1EAvm qPd0PtDrPVyGAynoeQziduLwHeCv9PMUyIAAGRzV3bTso0fY33VnNRJZtxwuQ3R11DPt LMHsDy4lVZb8OvkJ9DPjrYDsR+k3EvP+UnmVVn1psCmGXX0DSia02omB59SBGOR+3/tS ArB//24kXntfaXD8Almtwq1r1iT8lJP/Zg+NEYU7TGBajmwj4eKGAzyA6uBQQMq93JIo n7Rw== 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=2Ulq8RiWjTEjhwuhnqYGhd3yOoybn9H/Sw3wUN7VDXc=; b=E9qoOm8qw1raWFjv+fWKVDLdr7MRrE1EU1ABeZLAAQcxgqKpPJ01SnXUT1DzVqy/3d OUPo4yW1Norwzt1FU0DaowlhbGktnsGHLSsw0LJB3nQTiFVZjRg4eDSjGb3rQAIVvdom Obb+OgJ8xoRSQNF1y3xpkM75D0QswChK/ylFv4kZzCfA6e88T2ZoGXrYDAFkYmHfEg4f GG2suyZAIB1/YDr+XL98ayp5P9sokHxcXhsvOdR4MIHQNIf+r1bCm6Qavjurikrg5rmX kf4lyXbqVTg1tpnEgWJ3CMdAKb0oc4nvWAOvvJXJXlMGa0mOHxZYtpdsIqxTxhl5xOT9 wuYg== X-Gm-Message-State: AOAM530KJr5ixQTuIYoJIs+trwu4LP4oWY88F1SCSjDF0xN2b2GKw7/d uQSRXSFKC73qvPhlKVP3sgWDlP484Xo= X-Received: by 2002:a65:63cc:: with SMTP id n12mr12395692pgv.362.1626481596991; Fri, 16 Jul 2021 17:26:36 -0700 (PDT) Received: from localhost.localdomain ([191.83.217.217]) by smtp.gmail.com with ESMTPSA id 127sm11562142pfy.107.2021.07.16.17.26.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jul 2021 17:26:36 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Jul 2021 21:26:16 -0300 Message-Id: <20210717002616.5906-1-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] cmdutils: simplify opt_cpucount() 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: yMSzwmESgyY3 Signed-off-by: James Almer --- fftools/cmdutils.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 6e875104fd..a3b6b78d50 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -856,28 +856,15 @@ int opt_cpuflags(void *optctx, const char *opt, const char *arg) int opt_cpucount(void *optctx, const char *opt, const char *arg) { - int ret; - int count; - - static const AVOption opts[] = { - {"count", NULL, 0, AV_OPT_TYPE_INT, { .i64 = -1}, -1, INT_MAX, NULL}, - {NULL}, - }; - static const AVClass class = { - .class_name = "cpucount", - .item_name = av_default_item_name, - .option = opts, - .version = LIBAVUTIL_VERSION_INT, - }; - const AVClass *pclass = &class; - - ret = av_opt_eval_int(&pclass, opts, arg, &count); + char *tail; + int64_t count; - if (!ret) { - av_force_cpu_count(count); - } + count = strtol(arg, &tail, 10); + if (*tail || count < -1 || count > INT_MAX) + return AVERROR(EINVAL); - return ret; + av_force_cpu_count(count); + return 0; } int opt_loglevel(void *optctx, const char *opt, const char *arg)