From patchwork Tue Sep 20 17:50:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 38109 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2106115pzh; Tue, 20 Sep 2022 10:51:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Oh31KwP4VHla7XhSdVuBEeuOlizI1R+OfZ4cIzXZ688Weu88eSp7TeIBYUza9umyDSz2b X-Received: by 2002:a17:907:2d2a:b0:77e:def7:65e9 with SMTP id gs42-20020a1709072d2a00b0077edef765e9mr17733643ejc.85.1663696262898; Tue, 20 Sep 2022 10:51:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663696262; cv=none; d=google.com; s=arc-20160816; b=D6sU3M7nJSfKyHBxwHh6gOrbTGvPSLpDQaqkz1qRJjAPcdclR2zYmE1qU7AiSJi5wo w3KRmgrsfSkX2dJUf806EIOFTSONOvc9hWLcGzEMv0SE/Oa1oFWGS/LMjRgqp1rg+HZJ y13O37DXPt1yIt9F0BsVKr4W7oc1ONC9QifFv7aHKp/ehe7fqbXd10qwdpSMFJxDRHAy gkZOoGUngM63tXVWdCL4Q4gmzstVWARKUx5O/DmgytI/oasndi8rIPD/iTWAJ+Yq5G+F Zz2O6xhaqYGWDEAfBnJDGAPDy7XlBCCHU2k4n4IFiD18y2Zbp7yB64sIofTZRqJSb33I skuw== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=XbqbIoFffoqZU265CnAInmKHh3sxvIonsHp1N3FjTwg=; b=TCZY70URTGbmucqmMVTXCV73Xvdzlbbck+bceHAhVs6Ih0ooA0/jNHzLPcOakFJjny j16tbY1aqHokkLfXZJwC1MkmkZPaKz3mng2mWWd78IshGAz4vkBmq8qg23R5c+LxYx8Y s3bRWSbj+MGnsQEDaEAR5KIUSBRipsP7jU5vSJv3chaNgLoPLsk0xGdKOWwsubjTFenP rJswT9icj8pOsgjCSVjUeEGMcPy5nRvgy+cRK3C/ju3b5pSCePxaLrcRcHUho+tebfYp mdsd4TKGCQx7hOxmBrePNG31RS7KzTFykyBnGJ3gSEQcfS2I+/BEBnjP1/Z9WB2uHWrA 3rug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=B4Xv2tzG; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y20-20020aa7c254000000b004545af041d4si345601edo.84.2022.09.20.10.51.02; Tue, 20 Sep 2022 10:51:02 -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=@rcombs.me header.s=google header.b=B4Xv2tzG; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 95E3C68BB2E; Tue, 20 Sep 2022 20:50:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 651CE68BA7A for ; Tue, 20 Sep 2022 20:50:37 +0300 (EEST) Received: by mail-qk1-f175.google.com with SMTP id d15so2175064qka.9 for ; Tue, 20 Sep 2022 10:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date; bh=D65m4sHSUQXhWVaBR01RLfgDGvZMQBgTU+qtfsgmbeY=; b=B4Xv2tzGtHjMayqIhbsxTs0cTqir+/+wNqFlDtXW5w6VJrvab3bkZMPncHJIs4ollR DGujpW7xxOhfz1Okbg7jp7rl9pmMcuI1xmKm8tXYgM0KhecrjC9+bqNWnbQR0U7zcMkl CrjFyO1K+9xuzxBb9Ic/Mddj8T761kUs6o0GUcuy7x5S0b8IHHfTXfrGBeIQ0emrmKxg 77vZVuQ09JjzSEssLxMztG9mEXSCuC/KCtvU0QOlEqGMgyVadt6PETsG7D1Sa0mDE3Kv MBNhFc3RlFyiVLl++FcD8ruyX+I1y1JdmBUmD8HeZh8suuxycxaOxrkOl2Ad1l6uXYrQ PlWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=D65m4sHSUQXhWVaBR01RLfgDGvZMQBgTU+qtfsgmbeY=; b=wWneUq27eVkQmHblXpxGyOfgjZjJLOSSV/9A2NXga9VkjjsdQxv5NAOdqRqthSBG1l qArLNYzjV4gb+7jXGhOpYsOnESov/6+tzIA7lUM34cOqRa7fRFeTHT9r6Wt9BH/ZT+Bk BZUPS7q6uyfPJUCb8hipkyO5qtED0O1TCMSty8p6IFeqnIUnv9sOIHmw1gLTesv7s9Pe vXn+Mhc+JN4houJ8h5mMSwipafYq9WRZ2LmqTHHjWWb/dh9BgkLSk8lgbeW/DogHkjko I4km/GZxYk1jLl8cfke8y8DPz2CFVrr9uylld/ELiEvBs3cYd+GtZbGIYqeWL09WGMGN ES5A== X-Gm-Message-State: ACrzQf1rKLiuXMv1sePKgDCx0w/qPWLK+d2tr1jq/Q6p48ajxP3wFH/c f3SfB9nODFADWfN12QlMAUUE/nuOqPbg X-Received: by 2002:ae9:c106:0:b0:6ce:33c8:c95d with SMTP id z6-20020ae9c106000000b006ce33c8c95dmr17154741qki.289.1663696235728; Tue, 20 Sep 2022 10:50:35 -0700 (PDT) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:50a3:2f65:4798:4cad]) by smtp.gmail.com with ESMTPSA id o1-20020a05622a008100b003431446588fsm189017qtw.5.2022.09.20.10.50.34 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 20 Sep 2022 10:50:34 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Sep 2022 12:50:16 -0500 Message-Id: <20220920175021.60790-3-rcombs@rcombs.me> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220920175021.60790-1-rcombs@rcombs.me> References: <20220920175021.60790-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/7] sws: add jobs option, distinct from 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: nF2Hm0f/ffaO This allows for more efficient use of asymmetric-multiprocessing systems. --- libswscale/options.c | 2 ++ libswscale/swscale_internal.h | 1 + libswscale/utils.c | 9 ++++++--- libswscale/version.h | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libswscale/options.c b/libswscale/options.c index 4d41b835b1..5765daa100 100644 --- a/libswscale/options.c +++ b/libswscale/options.c @@ -81,6 +81,8 @@ static const AVOption swscale_options[] = { { "threads", "number of threads", OFFSET(nb_threads), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, INT_MAX, VE, "threads" }, { "auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 0 }, .flags = VE, "threads" }, + { "jobs", "number of jobs", OFFSET(nb_jobs), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, VE, "jobs" }, + { "auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 0 }, .flags = VE, "jobs" }, { NULL } }; diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index abeebbb002..602082e12c 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -339,6 +339,7 @@ typedef struct SwsContext { int vChrDrop; ///< Binary logarithm of extra vertical subsampling factor in source image chroma planes specified by user. int sliceDir; ///< Direction that slices are fed to the scaler (1 = top-to-bottom, -1 = bottom-to-top). int nb_threads; ///< Number of threads used for scaling + int nb_jobs; ///< Number of slice jobs used for scaling double param[2]; ///< Input parameters for scaling algorithms that need them. AVFrame *frame_src; diff --git a/libswscale/utils.c b/libswscale/utils.c index 45baa22b23..c9ff9db957 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1277,18 +1277,21 @@ static int context_init_threaded(SwsContext *c, ff_sws_slice_worker, NULL, c->nb_threads); if (ret == AVERROR(ENOSYS)) { c->nb_threads = 1; + c->nb_jobs = 1; return 0; } else if (ret < 0) return ret; c->nb_threads = ret; + if (c->nb_jobs < 1) + c->nb_jobs = av_cpu_job_count(); - c->slice_ctx = av_calloc(c->nb_threads, sizeof(*c->slice_ctx)); - c->slice_err = av_calloc(c->nb_threads, sizeof(*c->slice_err)); + c->slice_ctx = av_calloc(c->nb_jobs, sizeof(*c->slice_ctx)); + c->slice_err = av_calloc(c->nb_jobs, sizeof(*c->slice_err)); if (!c->slice_ctx || !c->slice_err) return AVERROR(ENOMEM); - for (int i = 0; i < c->nb_threads; i++) { + for (int i = 0; i < c->nb_jobs; i++) { c->slice_ctx[i] = sws_alloc_context(); if (!c->slice_ctx[i]) return AVERROR(ENOMEM); diff --git a/libswscale/version.h b/libswscale/version.h index 9bb3b171a7..4529a2d7d4 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -29,7 +29,7 @@ #include "version_major.h" #define LIBSWSCALE_VERSION_MINOR 8 -#define LIBSWSCALE_VERSION_MICRO 112 +#define LIBSWSCALE_VERSION_MICRO 113 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ LIBSWSCALE_VERSION_MINOR, \