From patchwork Tue Oct 11 18:33:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 38698 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1008531pzb; Tue, 11 Oct 2022 11:34:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5S+kJn8myF7qt47ilYJ+HwIUlmSEjGOGhKkrayuIwB9H7xi81t8PpL+a6Vfg+hgbWrJLQf X-Received: by 2002:a17:907:3e14:b0:78d:b14b:6fa0 with SMTP id hp20-20020a1709073e1400b0078db14b6fa0mr10402521ejc.650.1665513295500; Tue, 11 Oct 2022 11:34:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665513295; cv=none; d=google.com; s=arc-20160816; b=X2MsodsaEVQudcZI8Y4ah+k0wJc7qimCOt2UiGVNwU/Hf6vuoQgjrSQYlZnkyewt0D dWJtyH+T9VQpn4am4rtSTnUDnkGkDnjbC0gUitKNW6NIjSQgkSpQsU9cHUKHy2DufjqB W6RXZDOhOaY5xwaX5X5a8UnfvlKcLZTTQ28lEjY9XDrTpQhH5q7wXjDDyIsU3LsfI8D6 sxvdN1yDsNWRIXo+3fEc9dPZwce7t6Hfq1UAgw1acX3EzPsDIrsBsdhKXoOxj5fDueTm uu+ev9Fm1nVWiR1D0wk1qnn+MNNCQn42J0FQUe3udMg/MuhqahfiOOmnK/YLFRlboIa4 wVBw== 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=Y6GpFEE4mle3TDLmrGBN0pM0z2TFyZhAaGv+HU1oUZw=; b=pIOcZvURsqUknZaTVpQsLdZ78VJTRHrCePeFKftoBRR1xkZ3t9+EvgffXMgPRn0/DB Kz7S3WjyLjVHdmajIrrhT+E/RM0v7WlWXC/ZytU53guKAsxZLnhKih197cgFpAtcF+9D J12qXOr2IRzK3XXMIjwG6mX+QVIjX8pRIekk2D5GlyhPWxcPbEI9i6+dShtkW1li7fmU drFRfVtYWWAyckofGxI+Qbtw2dMiyzZTXSkeTUI4mZTjWOt5e0eiXJrxxwza3o13vZD3 Yx577h190O9ez14a5ALKum5FuHAiJrgjK0wfbY6ljtcwqV9Kub1F3IXvz9vmKzDpoIaN kiBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="M5kPBl/D"; 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 m20-20020a056402511400b0045c2a0de3ddsi6376610edd.150.2022.10.11.11.34.53; Tue, 11 Oct 2022 11:34:55 -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="M5kPBl/D"; 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 547A268BCD2; Tue, 11 Oct 2022 21:34:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f49.google.com (mail-oo1-f49.google.com [209.85.161.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14D3E68BB3E for ; Tue, 11 Oct 2022 21:34:42 +0300 (EEST) Received: by mail-oo1-f49.google.com with SMTP id k11-20020a4ab28b000000b0047659ccfc28so10639762ooo.8 for ; Tue, 11 Oct 2022 11:34:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=nlQzRUm/wGnH147Rng3402elNApNBuOvaYuRXV4m4CI=; b=M5kPBl/DqVnmZ5U0YpFOhsh8shQiqNkW9BJj7M6W5A/dQJYiblbacadY1ls03zfmvq GQZTRnKebcvGrNgdsyzLkd7i7QQ/ojP9LFIHhndUhf5mCUPi7f+TTic6gyFqxe0kQgzk WWB+zUInHZp5LGs2TysRlEWeV72wj3SvRkXi74C3j0QmyNq/5jPN+w+t1y6SKvCLv2BW D2AUgSLQTNVBC7lWpkyNEUlLB4tn9MzcrQkn3vAH46RIsxyaUGLn+xfYXbPG43R5jHwF kt4cOml+PgiotoTGXJLGe+Dg72h/oFF5e4+1xKwbf98fHbTrf0YSDrQZpUtXQgkplBl0 SrmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nlQzRUm/wGnH147Rng3402elNApNBuOvaYuRXV4m4CI=; b=1CgLTzHKVTtMSTuCRc0gkBJfWz9p36eleT77hnOVI6T3jtjPjlSpQHpH5lbrb3NYVC 3aqqJ1Sj8XOYs1rn0PgXSqX+CEPm+4mlN7E3uRCSIXg+TzUrmvLtCzGPHtFCTG/MAtHK eOKkPa7uqz8ZIm9W/deGA5JBWr2PtJLpZ4s+Fbf5j5qniZvyIiTd6zgS04gVEc0UzqJ3 jyaQkxWykUhVVyI20oYt5e7JCHkTuSHcfxkfEbZlH9dMVpdUJDayCj+6yvXK7CaD4nPS J/tSOAFOiKtXKWAHoHUena/vhyc4OEhR1Zefo+3cF9IznhIBPpBhgzB3nfqnhAlHX0lO 7k5w== X-Gm-Message-State: ACrzQf3eV2R67CtDf1M9uXzCGmNckre6+4AoGI/Wy49Y5Ec24b5f9Swi 43nfmKfEUpV92CgAxSL/nLFRgIiUp24= X-Received: by 2002:a05:6830:20d1:b0:661:8f90:4e31 with SMTP id z17-20020a05683020d100b006618f904e31mr7320688otq.59.1665513281028; Tue, 11 Oct 2022 11:34:41 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id p204-20020aca42d5000000b003436fa2c23bsm5852667oia.7.2022.10.11.11.34.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Oct 2022 11:34:40 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Oct 2022 15:33:01 -0300 Message-Id: <20221011183301.1730-1-jamrial@gmail.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libdav1d: add an option to set max frame delay 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: Fc2Ejp2/AVf3 Signed-off-by: James Almer --- libavcodec/libdav1d.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index e76f33d7e2..028929404e 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -50,6 +50,7 @@ typedef struct Libdav1dContext { Dav1dData data; int tile_threads; int frame_threads; + int max_frame_delay; int apply_grain; int operating_point; int all_layers; @@ -246,7 +247,9 @@ static av_cold int libdav1d_init(AVCodecContext *c) s.n_threads = FFMAX(dav1d->frame_threads, dav1d->tile_threads); else s.n_threads = FFMIN(threads, DAV1D_MAX_THREADS); - s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : 0; + if (dav1d->max_frame_delay > 0 && (c->flags & AV_CODEC_FLAG_LOW_DELAY)) + av_log(c, AV_LOG_WARNING, "Low delay mode requested, forcing max_frame_delay 1\n"); + s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : dav1d->max_frame_delay; av_log(c, AV_LOG_DEBUG, "Using %d threads, %d max_frame_delay\n", s.n_threads, s.max_frame_delay); #else @@ -256,6 +259,8 @@ static av_cold int libdav1d_init(AVCodecContext *c) s.n_frame_threads = dav1d->frame_threads ? dav1d->frame_threads : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS); + if (dav1d->max_frame_delay > 0) + s.n_frame_threads = FFMIN(s.n_frame_threads, dav1d->max_frame_delay); av_log(c, AV_LOG_DEBUG, "Using %d frame threads, %d tile threads\n", s.n_frame_threads, s.n_tile_threads); #endif @@ -555,12 +560,16 @@ static av_cold int libdav1d_close(AVCodecContext *c) #ifndef DAV1D_MAX_TILE_THREADS #define DAV1D_MAX_TILE_THREADS DAV1D_MAX_THREADS #endif +#ifndef DAV1D_MAX_FRAME_DELAY +#define DAV1D_MAX_FRAME_DELAY DAV1D_MAX_FRAME_THREADS +#endif #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 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD | AV_OPT_FLAG_DEPRECATED }, { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD | AV_OPT_FLAG_DEPRECATED }, + { "max_frame_delay", "Max frame delay", OFFSET(max_frame_delay), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_DELAY, VD }, { "filmgrain", "Apply Film Grain", OFFSET(apply_grain), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VD | AV_OPT_FLAG_DEPRECATED }, { "oppoint", "Select an operating point of the scalable bitstream", OFFSET(operating_point), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 31, VD }, { "alllayers", "Output all spatial layers", OFFSET(all_layers), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD },