[FFmpeg-devel] libvpxenc,vp9: add enable-tpl option

Submitted by James Zern on Nov. 3, 2018, 9:01 p.m.

Details

Message ID 20181103210126.124147-1-jzern@google.com
State New
Headers show

Commit Message

James Zern Nov. 3, 2018, 9:01 p.m.
enables temporal dependency model

Signed-off-by: James Zern <jzern@google.com>
---
 doc/encoders.texi      |  2 ++
 libavcodec/libvpxenc.c | 11 +++++++++++
 2 files changed, 13 insertions(+)

Comments

James Zern Nov. 8, 2018, 10:46 p.m.
On Sat, Nov 3, 2018 at 2:01 PM James Zern <jzern@google.com> wrote:
>
> enables temporal dependency model
>
> Signed-off-by: James Zern <jzern@google.com>
> ---
>  doc/encoders.texi      |  2 ++
>  libavcodec/libvpxenc.c | 11 +++++++++++
>  2 files changed, 13 insertions(+)
>

If there aren't any comments I'll submit this one soon.
James Zern Nov. 10, 2018, 1:48 a.m.
On Thu, Nov 8, 2018 at 2:46 PM James Zern <jzern@google.com> wrote:
>
> On Sat, Nov 3, 2018 at 2:01 PM James Zern <jzern@google.com> wrote:
> >
> > enables temporal dependency model
> >
> > Signed-off-by: James Zern <jzern@google.com>
> > ---
> >  doc/encoders.texi      |  2 ++
> >  libavcodec/libvpxenc.c | 11 +++++++++++
> >  2 files changed, 13 insertions(+)
> >
>
> If there aren't any comments I'll submit this one soon.

applied.

Patch hide | download patch | download mbox

diff --git a/doc/encoders.texi b/doc/encoders.texi
index 899faac49b..fced8d7369 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -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.
 
 The valid range is [0, 10000]. 0 (default) uses standard VBR.
+@item enable-tpl @var{boolean}
+Enable temporal dependency model.
 @end table
 
 @end table
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index 09f7a88452..e03dc3539a 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -111,6 +111,7 @@  typedef struct VPxEncoderContext {
     int row_mt;
     int tune_content;
     int corpus_complexity;
+    int tpl_model;
 } VPxContext;
 
 /** String mappings for enum vp8e_enc_control_id */
@@ -146,6 +147,9 @@  static const char *const ctlidstr[] = {
 #ifdef VPX_CTRL_VP9E_SET_TUNE_CONTENT
     [VP9E_SET_TUNE_CONTENT]            = "VP9E_SET_TUNE_CONTENT",
 #endif
+#ifdef VPX_CTRL_VP9E_SET_TPL
+    [VP9E_SET_TPL]                     = "VP9E_SET_TPL",
+#endif
 #endif
 };
 
@@ -716,6 +720,10 @@  FF_ENABLE_DEPRECATION_WARNINGS
 #ifdef VPX_CTRL_VP9E_SET_TUNE_CONTENT
         if (ctx->tune_content >= 0)
             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
@@ -1156,6 +1164,9 @@  static const AVOption vp9_options[] = {
 #endif
 #if VPX_ENCODER_ABI_VERSION >= 14
     { "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
     LEGACY_OPTIONS
     { NULL }