From patchwork Mon May 13 14:31:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 13094 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 15CB3447EF9 for ; Mon, 13 May 2019 17:32:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DC9FD6808F3; Mon, 13 May 2019 17:32:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 371CD68044C for ; Mon, 13 May 2019 17:32:35 +0300 (EEST) Received: by mail-qt1-f194.google.com with SMTP id k24so9983929qtq.7 for ; Mon, 13 May 2019 07:32:35 -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=vHnw3zlmD3qt+Q4NIPKVTB8PY1fylkTx5VukLMSw2yU=; b=BikOgxIxAkLejvHV6k7FJn7rVtJC1edzgen1zJ9LvuWUyZ8RcrqBD932kEOiVaJR6z Qm9I+XKqwfLSfnP3kVAmPKR5Ayoc1H3H3VNjZTFNoh1eNYQJn7EVrHLNK1lH4ZLo4txw r6f6mZg6Hq/Tw6TxPD4mjjtTiHMdK/feNg7gl801CZlui5wAjk2sndoXnhMtpv8z17ED CUQcBmeTlR1EZOyg3jxAxwQEtwS+SR/6EoDBBq8yLquJfDvTUz4ZGMNMqObTemeM05o/ 1BxMyfis+Db4lV1OyEgoKLZBvlYm6KQobqHBgGcmDKJb8d9EVdjf7TBiRkl2cjxNSd7p +4Sw== 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=vHnw3zlmD3qt+Q4NIPKVTB8PY1fylkTx5VukLMSw2yU=; b=fb5yyKTB7BP5lHR2izmltlrcflYRlrlX2Z8M17u9LMejTDPIEeDoPoDLjGJ5CrLzIo P/NftFAJm6lem6udvQ4UiL5LEHip2zrzS2saO0VaUIrz4OvVSy1w2CNv6lu9LlD/HVPh nutP4TTt4xKk6pVm3kFYgn6TZdgBZLitrh0jUj45LIIk2KfqN++SinsyQtmO1m7kuaaD lDDsPUJEuPiSWIupfOhlEToCs0CiBfQhRsKQiE8fK8KXzsQT0my5u8BL7viEAd9xSWvF a2/EKwhsdkfRMsdcKIh7iyFqGnIqN42L4IcC3x23kHdFPHjZKoay9+W/sQPjr6pkroSz /mKw== X-Gm-Message-State: APjAAAWzi5Oa/jLgk9ji/l3l75s1aid0Ze2Eow+Gy4A0vvA1PI+pwWc3 Kwpag26bxzjup8NzKzHWVTwD4S0QHWg= X-Google-Smtp-Source: APXvYqybyj+c8Wx1pa80W906/jI9uaOlv2oecU5V2k/MgVJgc0AwSQnMqdvcVySY2HTni/jE4TnU9g== X-Received: by 2002:ac8:1aa9:: with SMTP id x38mr24371039qtj.172.1557757953779; Mon, 13 May 2019 07:32:33 -0700 (PDT) Received: from localhost.localdomain ([191.83.212.194]) by smtp.gmail.com with ESMTPSA id f145sm3066861qke.32.2019.05.13.07.32.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 May 2019 07:32:33 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 May 2019 11:31:58 -0300 Message-Id: <20190513143158.1641-1-jamrial@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libdav1d: fine tune thread distribution X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" As suggested by Ronald, don't map auto threads to frame threads only, and instead distribute them between frame and tile more efficiently. Add a new framethreads override option, similar to the tilethreads one. Signed-off-by: James Almer --- libavcodec/libdav1d.c | 16 +++++++++++++--- libavcodec/version.h | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 30c6eccfef..d173d867a7 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -38,6 +38,7 @@ typedef struct Libdav1dContext { Dav1dData data; int tile_threads; + int frame_threads; int apply_grain; } Libdav1dContext; @@ -114,6 +115,7 @@ static av_cold int libdav1d_init(AVCodecContext *c) { Libdav1dContext *dav1d = c->priv_data; Dav1dSettings s; + int threads = c->thread_count ? c->thread_count : av_cpu_count(); int res; av_log(c, AV_LOG_INFO, "libdav1d %s\n", dav1d_version()); @@ -124,9 +126,16 @@ static av_cold int libdav1d_init(AVCodecContext *c) s.allocator.cookie = dav1d; s.allocator.alloc_picture_callback = libdav1d_picture_allocator; s.allocator.release_picture_callback = libdav1d_picture_release; - s.n_tile_threads = dav1d->tile_threads; s.apply_grain = dav1d->apply_grain; - s.n_frame_threads = FFMIN(c->thread_count ? c->thread_count : av_cpu_count(), DAV1D_MAX_FRAME_THREADS); + + s.n_tile_threads = dav1d->tile_threads + ? dav1d->tile_threads + : FFMIN(floor(sqrt(threads)), DAV1D_MAX_TILE_THREADS); + s.n_frame_threads = dav1d->frame_threads + ? dav1d->frame_threads + : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS); + av_log(c, AV_LOG_DEBUG, "Using %d frame threads, %d tile threads\n", + s.n_frame_threads, s.n_tile_threads); res = dav1d_open(&dav1d->c, &s); if (res < 0) @@ -317,7 +326,8 @@ static av_cold int libdav1d_close(AVCodecContext *c) #define OFFSET(x) offsetof(Libdav1dContext, x) #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM static const AVOption libdav1d_options[] = { - { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, DAV1D_MAX_TILE_THREADS, VD }, + { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD }, + { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD }, { "filmgrain", "Apply Film Grain", OFFSET(apply_grain), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VD }, { NULL } }; diff --git a/libavcodec/version.h b/libavcodec/version.h index d11beb7885..7ed60717f0 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 52 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \