From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 87C2C444B8 for ; Wed, 14 Sep 2022 00:28:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6B67D68B9CE; Wed, 14 Sep 2022 03:28:07 +0300 (EEST) Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AAF8E68B7EB for ; Wed, 14 Sep 2022 03:28:00 +0300 (EEST) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-345482ec6adso116080827b3.18 for ; Tue, 13 Sep 2022 17:28:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=to:from:subject:mime-version:message-id:date:from:to:cc:subject :date; bh=JCtgmiVUpuZDlfaiDP5FHgeHsfsJ5TTHvURoq9O2+Mc=; b=M40BzrdGSr/xvhiGkxjCuho8Oo/3Fe4iRdn9lUHy0S0nl/o0+FauJb1VvnXe/bXmsx U815v2R3YrfHJNtVjmwvFEcS9Vklq/OnxvkvKGcxLahHmtXNab8o6ij9plHMNNt4sgP7 zIUWs4vtWjfnOeotJVk0G2lq9Jm+1EvYHcbET3lEn6PZ99Tn6j8QysF+ZRXAyQTAgla5 shvx039XjVYxpUQLNFvCI+MV7XuWm14h8YkRoYvqFi930XxKcwpiOb80g8tUpfZxgrcG i1Z3JmBrSiLd27QmytDSaIPdU0q7++CP+GABeC51fetzcC9gLAI35xbtpKQX+K1TwlWM diBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date; bh=JCtgmiVUpuZDlfaiDP5FHgeHsfsJ5TTHvURoq9O2+Mc=; b=ndktLa7zz8jNQYUQ6uNFaBL5ZBXlz+3XWA8REiSDxVzjEonM+tVvkszuwf7E5aUkqM QKX/IjVZNcLmI2u30Zm3fDhiheVSSkVlvuimIqH1EU6gqfElJycrxYykRYdAO28qBBhB pnB+sQMfFrgVKjRfNjndEgFYLfaqlUyPMmfSxkiPxRSqitYGN4aP5gtevsgVI0qcxsFa K/cPYVYtxgaGGRsu98HbgI55tANbMzChhdKTJGOM/WG+Juo4P7rm6jX/tyZFJZeTCTGn U+NQotqh9HkrwIHhsDEjZM1EMD9xKNFqqvbfnYpbwl/ZAYZFwEWKl/HYl6JeShPXaQ9e MDUA== X-Gm-Message-State: ACgBeo1D9WRnqvQ92TAePyGio0WH/kw0UjH19AqUd+fpNb6R4hYHFjha NSFwDTaCPa3Tz0HxX/yDLGD9SBl96CY3CYT2iU2PJbDfTStZiIbvN/6GSJZ4U39dUZUsYtmdKIb CJdqrIbecE6nUJZX307zIyHPTZ4q7//Ts3Ckf2xCO0gM1yzCP3z32zmsc5FVS X-Google-Smtp-Source: AA6agR7WfkAhBgdZzAFFFte6QQeYyt6jK+GeitjljTDXh3TM9PYbH0BmQVce+Nn9QVnq8lnnLoXVVRYlYw== X-Received: from jzern.mtv.corp.google.com ([2620:0:1000:2511:d13d:f59e:bae9:a363]) (user=jzern job=sendgmr) by 2002:a0d:d549:0:b0:345:6bae:1e6d with SMTP id x70-20020a0dd549000000b003456bae1e6dmr28698255ywd.197.1663115278899; Tue, 13 Sep 2022 17:27:58 -0700 (PDT) Date: Tue, 13 Sep 2022 17:27:57 -0700 Message-Id: <20220914002757.1570637-1-jzern@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.37.2.789.g6183377224-goog From: James Zern To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] avcodec/libvpxenc: add -min-gf-interval 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: this maps to the vpxenc argument with the same name and the VP9E_SET_MIN_GF_INTERVAL codec control Signed-off-by: James Zern --- doc/encoders.texi | 2 ++ libavcodec/libvpxenc.c | 11 +++++++++++ libavcodec/version.h | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index ac71f50ad2..5a5579d5e5 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -2176,6 +2176,8 @@ Set altref noise reduction filter type: backward, forward, centered. Set altref noise reduction filter strength. @item rc-lookahead, lag-in-frames (@emph{lag-in-frames}) Set number of frames to look ahead for frametype and ratecontrol. +@item min-gf-interval +Set minimum golden/alternate reference frame interval (VP9 only). @end table @item error-resilient diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 09b56aae2a..667cffc200 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -131,6 +131,7 @@ typedef struct VPxEncoderContext { int tune_content; int corpus_complexity; int tpl_model; + int min_gf_interval; AVFifo *hdr10_plus_fifo; /** * If the driver does not support ROI then warn the first time we @@ -186,6 +187,9 @@ static const char *const ctlidstr[] = { #ifdef VPX_CTRL_VP9E_SET_TPL [VP9E_SET_TPL] = "VP9E_SET_TPL", #endif +#ifdef VPX_CTRL_VP9E_SET_MIN_GF_INTERVAL + [VP9E_SET_MIN_GF_INTERVAL] = "VP9E_SET_MIN_GF_INTERVAL", +#endif #endif }; @@ -1173,6 +1177,10 @@ static av_cold int vpx_init(AVCodecContext *avctx, #ifdef VPX_CTRL_VP9E_SET_TPL if (ctx->tpl_model >= 0) codecctl_int(avctx, VP9E_SET_TPL, ctx->tpl_model); +#endif +#ifdef VPX_CTRL_VP9E_SET_MIN_GF_INTERVAL + if (ctx->min_gf_interval >= 0) + codecctl_int(avctx, VP9E_SET_MIN_GF_INTERVAL, ctx->min_gf_interval); #endif } #endif @@ -1911,6 +1919,9 @@ static const AVOption vp9_options[] = { #endif #ifdef VPX_CTRL_VP9E_SET_TPL { "enable-tpl", "Enable temporal dependency model", OFFSET(tpl_model), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE }, +#endif +#ifdef VPX_CTRL_VP9E_SET_MIN_GF_INTERVAL + { "min-gf-interval", "Minimum golden/alternate reference frame interval", OFFSET(min_gf_interval), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, VE }, #endif LEGACY_OPTIONS { NULL } diff --git a/libavcodec/version.h b/libavcodec/version.h index 2328be4b26..7e89daf017 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 43 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ -- 2.37.2.789.g6183377224-goog _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".