From patchwork Fri Sep 3 12:52:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29978 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1259817iov; Fri, 3 Sep 2021 05:53:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwOdPaXzeiA6Kfu8UWFTqpJsPK0MgpGci13u7tuJ8TC5CY+Wn1afwyEMiwNMBWx8WSdABPE X-Received: by 2002:a50:8ad7:: with SMTP id k23mr3885333edk.310.1630673584889; Fri, 03 Sep 2021 05:53:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630673584; cv=none; d=google.com; s=arc-20160816; b=eVZRKfQuOQlsOtJU2hFxSD7Tg7WEspQUZPKeWDH9qYC+0dagt6VJjQ9e1nLAIEJOxV aniyuCvtl1Q45cGqIvZfMUOx/IB6ufkjsrWjUfKRG55CtotKzKFJ4l0WgDWYc6rfMTOQ IBV0RDQs/1mWw13UKj6AkGRxXJxvvT3gh+Qt0LYovfou0o1ih1X/5KortBuexlJl5EUZ wnLz5zBQbWpkVClUbVnpXWdOziONec/ScRVaTLSha1QJcgj9x9YbQLMVA8vs1yAuPxGK 9df5pc6Iyd64A1YcLnVKEnNf+Y9mM6OQg9P8axKRBEzT67DefTtVwov1DPOl7iMTu7/+ U1Ag== 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=fGm39s1KB44RdHzQ7MTTtwcEN72NtjfcO0AE3snW+Yo=; b=hN0iFvp0ylQyEU6Lgum9t+ELIyHLjG3sUEbQ7GgMeKUS7lV9Z9BayY2NYI4zB+yCny 2xnX5FG5Gt7eUlkKzU1o42R/sRKRtgrfvSEbrvb30n3uVrM2RXBCBcHwsg2RjIJENEpY GsTr5hnYujQgv3QrdrEr9izgpe4SIgXBq2/U/3IHDDTj651CLnjBzHcOm7fnYH+H7q/g qcyL76W3o20eUeGwc8F6A397E6QLBECE3WVJY5Tn/ooRD0Kc7kXkVWE/TY63GiBmDzlc 9yeg1Uqj6T54gr0GKC+sBgOU6BZxbLGIDzqpsW/4GicISJJYcNJzYxI6UIvqmEzft/JJ 1iZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=OA1iT20Y; 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 k9si1519790edr.250.2021.09.03.05.53.04; Fri, 03 Sep 2021 05:53:04 -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=20210112 header.b=OA1iT20Y; 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 6C852689E61; Fri, 3 Sep 2021 15:53:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51A8E680830 for ; Fri, 3 Sep 2021 15:52:53 +0300 (EEST) Received: by mail-qv1-f53.google.com with SMTP id g11so3058790qvd.2 for ; Fri, 03 Sep 2021 05:52:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=tASYNq9+viWYNA1k48vKhKpvsDEvp1VMiFyBBGZtVrM=; b=OA1iT20Y4v/+ZLmNZTB8b54oCrjMQpIuyaviF1Dk33xgduoYmyUp6XkNdCpL0oFLuy lAvk6x8T+92JawzzEmeQ8XA7hsnPi41Ds/lNcEx3+JKM0NPBqIW8VRos9cwGyDjhfRVZ O1hNf9A3B2oK7S/LJ85D2eeQtZkQ1VN6XRTqZujCf4Gnqg+eF5iKA4fQB16pxoaRFAcD RElReZ7ePpqgp6hN4kE953ZiDo6eyP3LDC8FQzXUvpWKtyiZJcJsqLM1fzxS4dDsO2oE 2NeHU2WHn4KW7Ofa6sAKrbGFVoCYAfgi5pm0h8D60W03Lj+xIlDUIMd1TsVWSxhiwrrd soNQ== 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=tASYNq9+viWYNA1k48vKhKpvsDEvp1VMiFyBBGZtVrM=; b=BkLwsjfRY+WjhZW1usnpMrg4b9dhYzW4at2JyKHT2+D/W5quJw6Mp69xkwP9f7djTC 9a758UOGDZYAE2CNbET0LI12iMajvaxGrHBfNWBtiw0/IQwXeh6NLMVW6YGH2ZhkGb0P e0dnKPS+u+cSVyCZdgplJkKFDg41r78R95hgVNzPBG3A3AqnJBE9ffPMTOvQOMfbl27H TDYoz/0qDhJ8frBK/AHEXi/ARqHqJ7mWlcE8eOut0eVxSPiO9StXG4Osk05iDXFeVeEY bqrnsiT99+4/ag8ZXhtaxnhgw5NqDAR1OLiDyFarO7/asYYHKaBjCabqZdYfuMxhs8jN 65eg== X-Gm-Message-State: AOAM533jXudWPG5c3Ftv4+jeekV4SGjHvrnyOCR4qwx/iHKAXI68DpwL ltxG/8z0BAxjR8CAMIPoHUdiMoCjiBk= X-Received: by 2002:a0c:d412:: with SMTP id t18mr3436451qvh.53.1630673571400; Fri, 03 Sep 2021 05:52:51 -0700 (PDT) Received: from localhost.localdomain ([181.23.66.70]) by smtp.gmail.com with ESMTPSA id i67sm3764602qkd.90.2021.09.03.05.52.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 05:52:51 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Sep 2021 09:52:22 -0300 Message-Id: <20210903125222.591-1-jamrial@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] ffmpeg: allow to pass "auto" to filter_threads 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: udIrkWb1KGmL This way it accepts the same values as the libavcodec specific option "threads" Fixes FATE with THREADS=auto which was broken in bdc1bdf3f5 Signed-off-by: James Almer --- fftools/ffmpeg_opt.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 428934a3d8..2a0b3fbd4f 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -264,6 +264,24 @@ static AVDictionary *strip_specifiers(AVDictionary *dict) return ret; } +static int opt_filter_threads(void *optctx, const char *opt, const char *arg) +{ + static const AVOption opts[] = { + { "filter_threads", NULL, 0, AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, .unit = "filter_threads"}, + { "auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 0 }, .unit = "filter_threads"}, + { NULL }, + }; + static const AVClass class = { + .class_name = "", + .item_name = av_default_item_name, + .option = opts, + .version = LIBAVUTIL_VERSION_INT, + }; + const AVClass *pclass = &class; + + return av_opt_eval_int(&pclass, &opts[0], arg, &filter_nbthreads); +} + static int opt_abort_on(void *optctx, const char *opt, const char *arg) { static const AVOption opts[] = { @@ -3620,7 +3638,7 @@ const OptionDef options[] = { "set profile", "profile" }, { "filter", HAS_ARG | OPT_STRING | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(filters) }, "set stream filtergraph", "filter_graph" }, - { "filter_threads", HAS_ARG | OPT_INT, { &filter_nbthreads }, + { "filter_threads", HAS_ARG, { .func_arg = opt_filter_threads }, "number of non-complex filter threads" }, { "filter_script", HAS_ARG | OPT_STRING | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(filter_scripts) }, "read stream filtergraph description from a file", "filename" },