RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libvpxenc,vp9: add enable-tpl option 

enables temporal dependency model

Signed-off-by: James Zern <jzern@google.com>
This commit is contained in:
James Zern 2018-11-03 13:30:34 -07:00
parent 75625c555c
commit 6d3890ee34
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/encoders.texi
View File

@ -1692,6 +1692,8 @@ Corpus VBR mode is a variant of standard VBR where the complexity distribution
midpoint is passed in rather than calculated for a specific clip or chunk. midpoint is passed in rather than calculated for a specific clip or chunk.
The valid range is [0, 10000]. 0 (default) uses standard VBR. The valid range is [0, 10000]. 0 (default) uses standard VBR.
@item enable-tpl @var{boolean}
Enable temporal dependency model.
@end table @end table
@end table @end table

11
libavcodec/libvpxenc.c
View File

@ -111,6 +111,7 @@ typedef struct VPxEncoderContext {
int row_mt; int row_mt;
int tune_content; int tune_content;
int corpus_complexity; int corpus_complexity;
int tpl_model;
} VPxContext; } VPxContext;
/** String mappings for enum vp8e_enc_control_id */ /** String mappings for enum vp8e_enc_control_id */
@ -146,6 +147,9 @@ static const char *const ctlidstr[] = {
#ifdef VPX_CTRL_VP9E_SET_TUNE_CONTENT #ifdef VPX_CTRL_VP9E_SET_TUNE_CONTENT
[VP9E_SET_TUNE_CONTENT] = "VP9E_SET_TUNE_CONTENT", [VP9E_SET_TUNE_CONTENT] = "VP9E_SET_TUNE_CONTENT",
#endif #endif
#ifdef VPX_CTRL_VP9E_SET_TPL
[VP9E_SET_TPL] = "VP9E_SET_TPL",
#endif
#endif #endif
}; };
@ -716,6 +720,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
#ifdef VPX_CTRL_VP9E_SET_TUNE_CONTENT #ifdef VPX_CTRL_VP9E_SET_TUNE_CONTENT
if (ctx->tune_content >= 0) if (ctx->tune_content >= 0)
codecctl_int(avctx, VP9E_SET_TUNE_CONTENT, ctx->tune_content); codecctl_int(avctx, VP9E_SET_TUNE_CONTENT, ctx->tune_content);
#endif
#ifdef VPX_CTRL_VP9E_SET_TPL
if (ctx->tpl_model >= 0)
codecctl_int(avctx, VP9E_SET_TPL, ctx->tpl_model);
#endif #endif
} }
#endif #endif
@ -1156,6 +1164,9 @@ static const AVOption vp9_options[] = {
#endif #endif
#if VPX_ENCODER_ABI_VERSION >= 14 #if VPX_ENCODER_ABI_VERSION >= 14
{ "corpus-complexity", "corpus vbr complexity midpoint", OFFSET(corpus_complexity), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 10000, VE }, { "corpus-complexity", "corpus vbr complexity midpoint", OFFSET(corpus_complexity), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 10000, VE },
#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 #endif
LEGACY_OPTIONS LEGACY_OPTIONS
{ NULL } { NULL }