From patchwork Sat Jul 17 16:21:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28954 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp2849738ios; Sat, 17 Jul 2021 09:29:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJykwLhd7oGlc/yKOc1BToxZGftKQrE9qBh0y2zxqqkSiJlnHCo0GIw3g9BPV8EDC6GTmMFj X-Received: by 2002:a17:906:b18d:: with SMTP id w13mr18486573ejy.341.1626539377337; Sat, 17 Jul 2021 09:29:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626539377; cv=none; d=google.com; s=arc-20160816; b=sYu3a87CHbb9UfJUP/mO09jHhVzqqNtvYRNObeKhMJHhqrIrChqYuUmJqtM2z3s2Et DcizbN6KECxHsEsTTBNVPwqGTA3oatD0j/kgwsp9BYgMIWRKChDMFQu4cCziT4lj4oMk L/Lzu0L4TG1hUFlCoPEnlKSJKsi0BfFHpBSviiIjyL+atLNRWiTsSS5EZqkhC1uDt8FA 3kXOPl46FL0FLAzqogNCQeKBFpoY4QDkVjqJM6ES9AjMoh6iaPaTHfg7Cuui5NEldxWU GwwWXl1CMFdqIdZk/T7Vti1ojpTAvcx6Iiexygvio9IiO/oGE9CnnpKIsu7618ORFbex 0s0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=jQmkpSn0yhBF6NcQCE8U8fC16fMC+Q28BdTv+8s5WgQ=; b=tOmF0VPzCLmhfSn4IJcOs7wxSNfQ0TfKIYxzhVSd3uJkP13gLyVHyMhcogwlvnFgQl c3KhrJLMuaBYqZQyDxoKzerOXBQzhnRGkny1AqnZjSdwNSbHGouq2mJpnorjfOIJLyiK X3BWWSaZhOs9uffIFlXIxufp876wUZ+zT+GVVKdZHCIhHFJCJFVf2kuppovWMcr9WgMq wWZKQEOkyXt+OJZStShU1J1j2mpo6JIribFXimmz1X6d+CYCLg2AMx9Fewc2ZV3r8SaR ItpOkKvtCkuy82bmORRKbya/8FKmergf9UMF5nKlTf36Maxu9Kc6GQh2kdzLpPqOu4Us HI7Q== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w11si18991090ejc.221.2021.07.17.09.29.37; Sat, 17 Jul 2021 09:29:37 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8ACE568A847; Sat, 17 Jul 2021 19:29:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC2C5689F44 for ; Sat, 17 Jul 2021 19:29:28 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1m4n5g-001BAS-0E for ffmpeg-devel@ffmpeg.org; Sat, 17 Jul 2021 18:23:00 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 4n4hm2wkoljeH4n4hmDe5h; Sat, 17 Jul 2021 18:22:00 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=4F8Wr8CRQ3Kvt2gjoXcA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 17 Jul 2021 18:21:59 +0200 Message-Id: <20210717162159.17358-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfP0P2aIOP6orQfJz8IZZKrD4d8H6Gk3b/V1Yu0HpOXT3Jse8E1Y2S2KV7+uXPl+xyuSzugT6I/Dmsw1T5e73GkNnjjHFG5y2D4XHI6QGUuXeZtEZ/y3I rPSkMvKUlfYijOCc6p/LqY3YQ3sar5lT+9wdmXz1eFvYS6DiHoJebzde Subject: [FFmpeg-devel] [PATCH] fftools/cmdutils: Allow expressions for 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IoMGWcxlsoaZ This allows for example "-cpucount cpu/2" to use half the available CPUs Signed-off-by: Michael Niedermayer --- fftools/cmdutils.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 6e875104fd..a902354669 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -859,11 +859,12 @@ 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}, + AVOption opts[] = { + {"count", NULL, 0, AV_OPT_TYPE_INT, { .i64 = -1}, -1, INT_MAX, 0, "val"}, + {"cpu", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = -1}, 0, 0, 0, "val"}, {NULL}, }; - static const AVClass class = { + const AVClass class = { .class_name = "cpucount", .item_name = av_default_item_name, .option = opts, @@ -871,6 +872,8 @@ int opt_cpucount(void *optctx, const char *opt, const char *arg) }; const AVClass *pclass = &class; + opts[1].default_val.i64 = av_cpu_count(); + ret = av_opt_eval_int(&pclass, opts, arg, &count); if (!ret) {