virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

avcodec/libvpxenc: add -min-gf-interval

Browse Source 
this maps to the vpxenc argument with the same name and the
VP9E_SET_MIN_GF_INTERVAL codec control

Signed-off-by: James Zern <jzern@google.com>
Reviewed-by: Vignesh Venkatasubramanian <vigneshv@google.com>
This commit is contained in:
James Zern 2022-09-13 17:23:53 -07:00
parent 48615f0a78
commit bd7d69fe35
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/encoders.texi
View File

@ -2176,6 +2176,8 @@ Set altref noise reduction filter type: backward, forward, centered.
Set altref noise reduction filter strength. Set altref noise reduction filter strength.
@item rc-lookahead, lag-in-frames (@emph{lag-in-frames}) @item rc-lookahead, lag-in-frames (@emph{lag-in-frames})
Set number of frames to look ahead for frametype and ratecontrol. 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 @end table
@item error-resilient @item error-resilient

11
libavcodec/libvpxenc.c
View File

@ -131,6 +131,7 @@ typedef struct VPxEncoderContext {
int tune_content; int tune_content;
int corpus_complexity; int corpus_complexity;
int tpl_model; int tpl_model;
int min_gf_interval;
AVFifo *hdr10_plus_fifo; AVFifo *hdr10_plus_fifo;
/** /**
* If the driver does not support ROI then warn the first time we * 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 #ifdef VPX_CTRL_VP9E_SET_TPL
[VP9E_SET_TPL] = "VP9E_SET_TPL", [VP9E_SET_TPL] = "VP9E_SET_TPL",
#endif #endif
#ifdef VPX_CTRL_VP9E_SET_MIN_GF_INTERVAL
[VP9E_SET_MIN_GF_INTERVAL] = "VP9E_SET_MIN_GF_INTERVAL",
#endif
#endif #endif
}; };
@ -1173,6 +1177,10 @@ static av_cold int vpx_init(AVCodecContext *avctx,
#ifdef VPX_CTRL_VP9E_SET_TPL #ifdef VPX_CTRL_VP9E_SET_TPL
if (ctx->tpl_model >= 0) if (ctx->tpl_model >= 0)
codecctl_int(avctx, VP9E_SET_TPL, ctx->tpl_model); 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
} }
#endif #endif
@ -1911,6 +1919,9 @@ static const AVOption vp9_options[] = {
#endif #endif
#ifdef VPX_CTRL_VP9E_SET_TPL #ifdef VPX_CTRL_VP9E_SET_TPL
{ "enable-tpl", "Enable temporal dependency model", OFFSET(tpl_model), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE }, { "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 #endif
LEGACY_OPTIONS LEGACY_OPTIONS
{ NULL } { NULL }

2
libavcodec/version.h
View File

@ -30,7 +30,7 @@
#include "version_major.h" #include "version_major.h"
#define LIBAVCODEC_VERSION_MINOR 44 #define LIBAVCODEC_VERSION_MINOR 44
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \