From patchwork Thu May 11 16:04:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41580 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp4739441pzb; Thu, 11 May 2023 09:04:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4/RF++mADFL6l/+Y0HcsZrk1n9KYoSQ4B4AD7veJ0YHu9u9r4cT0d6d/7XG4IdrrZ2SczL X-Received: by 2002:a17:906:fe43:b0:965:cc76:7716 with SMTP id wz3-20020a170906fe4300b00965cc767716mr17947119ejb.76.1683821091677; Thu, 11 May 2023 09:04:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683821091; cv=none; d=google.com; s=arc-20160816; b=RaYz1KbwAGZVK2zdx7vg+DAokK2SXOTmKK+/0wuKLxN6Tv87HFzeWLB2xKEyFriZRJ IQ9zIvvpRNhKtokvsMeKlwLtulcAGqnnEnmKqb/9L4wXAqxC082bnV5xcmDL235VdBvN i2Z1yn3oht/BoqDvUsTSj7ATdh+zuRtxRv3B/3gWcQj7T5I7OYnjqHgC+MPZy3w2ZTgL 7Z0x68WflS3sHSPgSpKgCIIKpXEhyK2lNf1ebnVq7Ha08DIl8Sozw3DEDaQ5ovnBWA/u e0QMZttxf6QMBxUwHJvnI9DQh8Fhv+DNLJ3JkUTjcRJQB7Se5gITn1Kc73v+PNw8hFBu 8fUQ== 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=rLcR6FjpbX/cipAuGVgpZoMKVzcUbQYtHCKnchlFGGU=; b=NTejxO+tLsstfqflJbaYckwIZdPe3DGTB+pCABheEQhPqTcnCcJaUp5EXI7Z9q3wtq png4or7eenmQPPYbPKIRs3jWetZZ17Wu1wNJhkmKKco9PbiNBTFzif0/OcMfWZldBvpc RVqOGhGE0fjX5tsEUHcKEBA7qi8YioCNs8/ZSEpKHJSnGO9ia29vkg2PqBx+3uskmE9G ZoOjZ9hGEeLfxFLZ7+2k52O1TgvAlP3a5ZuWvdHxv2VLN7v6EfoyVwtygYVu8VjLNUI2 JIlLzEEet7ewbEwXDuqJjrrgMb+CNUi/5t5HJ+8BwtTo0wYqC8hhJcYXP/Vfz2JseQxL nugg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=LlrwX8Jo; 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 bj2-20020a170906b04200b0095f90da23b6si4137048ejb.506.2023.05.11.09.04.50; Thu, 11 May 2023 09:04:51 -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=20221208 header.b=LlrwX8Jo; 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 6FCC268C170; Thu, 11 May 2023 19:04:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EBC6668A084 for ; Thu, 11 May 2023 19:04:41 +0300 (EEST) Received: by mail-oi1-f173.google.com with SMTP id 5614622812f47-38ef6217221so4842600b6e.3 for ; Thu, 11 May 2023 09:04:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683821080; x=1686413080; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=jHD/k6cUE52kdLo4pE4SUDIRts9h3abCimPZjPouOvI=; b=LlrwX8JoInqJ9pP4YaoKB7/sfyVj4AKD+QUp3vJ/6qPvsnE5XnOAyi99B0YZKcVZuV gJMKdXYay8YCHAwtCV57EOsz0e0Y18TpaVKo6XBwKpg8PPPuH6k6SCk1xjHSmf4ZRzvf ybylwQr1MD7qSw99Vmy7AJD9THnFpGz4+c4NaJqfkP4paTTDhY50W1IKHrqtPx6w1sQU nWTzmaM+VwmK22/PfHETvKuOfGGyPqxSZoOIpMu+Y2LmXUtcOci0NGjoly4lSZEMltSP Z9VPndxyb1DIfZrN+kS2vjBZD2uek96JVupqfdDWEH5+ZiR8b27K8uweejucI3to5MaL WQRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683821080; x=1686413080; 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=jHD/k6cUE52kdLo4pE4SUDIRts9h3abCimPZjPouOvI=; b=L4uGcyFd2sZXXvXl419tA1uRiwBKLOWX5tc9E5bcyKu81tvOohYKJbih91+41OfBMS sBr38dx1tF+4RC9Z4MlvK8lq6IA9fIrHOu/4N9qRSbBczhA5e8YXjy96uBRVU0yOPQG1 HU3VUMJeOTmA74oepFvOG7Fsakwdg4kkYpTDsU96/XGbLZvmaaTdSwvZMLEzfif9kyDF +Y+3ZrP7iG8ktEr0EPWha9CzplqEHqp+uKCNWIOmCv52Sk4grf5E6Waf7JWSWSx+bqRU 9O/V9QRPTcxXcEQbTpBoAh+DEW3xICxPGKy2Kn49xQdTIdWEALL+DEBnQPTmwhZZo5JU LcrA== X-Gm-Message-State: AC+VfDxabXqukwB8sTxj4pbTNPL6j1Rtgp4WH86vYJ/QSnu2F0jrUHBN JkKiGSdMlYxUm/xhLTNu7PWGQNXPIlo= X-Received: by 2002:aca:903:0:b0:394:2600:3d9d with SMTP id 3-20020aca0903000000b0039426003d9dmr3837891oij.34.1683821080017; Thu, 11 May 2023 09:04:40 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id p186-20020acabfc3000000b0039235300211sm3514934oif.24.2023.05.11.09.04.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 09:04:39 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 May 2023 13:04:45 -0300 Message-Id: <20230511160445.2214-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libdav1d: export decoder 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: ABw6yDWvlADc As this is a AV_CODEC_CAP_OTHER_THREADS decoder, threading is handled by the underlying library. In this case, the frame delay is calculated by libdav1d based on the values from avctx->thread_count and the private max_frame_delay option. Make said max_frame_delay option an exported one, and store the final delay used by libdav1d here, for the caller to query if needed. Signed-off-by: James Almer --- doc/decoders.texi | 3 ++- libavcodec/libdav1d.c | 16 +++++++++++++++- libavcodec/version.h | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/doc/decoders.texi b/doc/decoders.texi index 09b8314dd2..0130b35603 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -86,7 +86,8 @@ global option @code{threads} instead. @item max_frame_delay Set max amount of frames the decoder may buffer internally. The default value is 0 -(autodetect). +(autodetect). The decoder will afterwards export the final calculated frame delay here +when using libdav1d >= 1.1.0. @item filmgrain Apply film grain to the decoded video if present in the bitstream. Defaults to the diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index af072da681..de06a2c09e 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -278,6 +278,14 @@ static av_cold int libdav1d_init(AVCodecContext *c) if (res < 0) return AVERROR(ENOMEM); +#if FF_DAV1D_VERSION_AT_LEAST(6,7) + res = dav1d_get_frame_delay(&s); + if (res < 0) // Should not happen + return AVERROR_EXTERNAL; + + dav1d->max_frame_delay = res; +#endif + return 0; } @@ -648,10 +656,16 @@ 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 +#if FF_DAV1D_VERSION_AT_LEAST(6,7) +#define X AV_OPT_FLAG_EXPORT +#else +#define X 0 +#endif + 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 }, + { "max_frame_delay", "Max frame delay", OFFSET(max_frame_delay), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_DELAY, VD|X }, { "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 }, diff --git a/libavcodec/version.h b/libavcodec/version.h index 8b53586be1..6d4d7ca018 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 11 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \