diff mbox

[FFmpeg-devel] Add a commandline option to control loop restoration for libaom

Message ID 20191223201622.18270-1-wangcao@google.com
State Accepted
Headers show

Commit Message

Wang Cao Dec. 23, 2019, 8:16 p.m. UTC 
Signed-off-by: Wang Cao <wangcao@google.com>
---
 doc/encoders.texi      | 3 +++
 libavcodec/libaomenc.c | 6 ++++++
 2 files changed, 9 insertions(+)

Comments

James Zern Jan. 17, 2020, 10:45 p.m. UTC | #1 
On Mon, Dec 23, 2019 at 12:53 PM Wang Cao <doubleecao@gmail.com> wrote:
>
> Signed-off-by: Wang Cao <wangcao@google.com>
> ---
>  doc/encoders.texi      | 3 +++
>  libavcodec/libaomenc.c | 6 ++++++
>  2 files changed, 9 insertions(+)
>

lgtm. sorry for losing track of this.

> [...]
> +    if (ctx->enable_restoration >= 0)
> +      codecctl_int(avctx, AV1E_SET_ENABLE_RESTORATION, ctx->enable_restoration);

indent is 4, I fixed this locally.
James Zern Jan. 17, 2020, 10:56 p.m. UTC | #2 
On Fri, Jan 17, 2020 at 2:45 PM James Zern <jzern@google.com> wrote:
>
> On Mon, Dec 23, 2019 at 12:53 PM Wang Cao <doubleecao@gmail.com> wrote:
> >
> > Signed-off-by: Wang Cao <wangcao@google.com>
> > ---
> >  doc/encoders.texi      | 3 +++
> >  libavcodec/libaomenc.c | 6 ++++++
> >  2 files changed, 9 insertions(+)
> >
>
> lgtm. sorry for losing track of this.
>

applied, thanks.

> > [...]
> > +    if (ctx->enable_restoration >= 0)
> > +      codecctl_int(avctx, AV1E_SET_ENABLE_RESTORATION, ctx->enable_restoration);
>
> indent is 4, I fixed this locally.
diff mbox

Patch

diff --git a/doc/encoders.texi b/doc/encoders.texi
index 4ee518a124..56b36c156b 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -1587,6 +1587,9 @@  Enable row based multi-threading. Disabled by default.
 Enable Constrained Directional Enhancement Filter. The libaom-av1
 encoder enables CDEF by default.
 
+@item enable-restoration (@emph{boolean})
+Enable Loop Restoration Filter. Default is true for libaom-av1.
+
 @item enable-global-motion (@emph{boolean})
 Enable the use of global motion for block prediction. Default is true.
 
diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
index e06697c1bf..41a250302d 100644
--- a/libavcodec/libaomenc.c
+++ b/libavcodec/libaomenc.c
@@ -92,6 +92,7 @@  typedef struct AOMEncoderContext {
     int enable_cdef;
     int enable_global_motion;
     int enable_intrabc;
+    int enable_restoration;
 } AOMContext;
 
 static const char *const ctlidstr[] = {
@@ -110,6 +111,7 @@  static const char *const ctlidstr[] = {
     [AV1E_SET_SUPERBLOCK_SIZE]  = "AV1E_SET_SUPERBLOCK_SIZE",
     [AV1E_SET_TILE_COLUMNS]     = "AV1E_SET_TILE_COLUMNS",
     [AV1E_SET_TILE_ROWS]        = "AV1E_SET_TILE_ROWS",
+    [AV1E_SET_ENABLE_RESTORATION] = "AV1E_SET_ENABLE_RESTORATION",
 #ifdef AOM_CTRL_AV1E_SET_ROW_MT
     [AV1E_SET_ROW_MT]           = "AV1E_SET_ROW_MT",
 #endif
@@ -688,6 +690,9 @@  static av_cold int aom_init(AVCodecContext *avctx,
         codecctl_int(avctx, AOME_SET_ARNR_STRENGTH,    ctx->arnr_strength);
     if (ctx->enable_cdef >= 0)
         codecctl_int(avctx, AV1E_SET_ENABLE_CDEF, ctx->enable_cdef);
+    if (ctx->enable_restoration >= 0)
+      codecctl_int(avctx, AV1E_SET_ENABLE_RESTORATION, ctx->enable_restoration);
+
     codecctl_int(avctx, AOME_SET_STATIC_THRESHOLD, ctx->static_thresh);
     if (ctx->crf >= 0)
         codecctl_int(avctx, AOME_SET_CQ_LEVEL,          ctx->crf);
@@ -1084,6 +1089,7 @@  static const AVOption options[] = {
     { "enable-cdef",      "Enable CDEF filtering",                 OFFSET(enable_cdef),    AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE},
     { "enable-global-motion",  "Enable global motion",             OFFSET(enable_global_motion), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE},
     { "enable-intrabc",  "Enable intra block copy prediction mode", OFFSET(enable_intrabc), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE},
+    { "enable-restoration",      "Enable Loop Restoration filtering",                 OFFSET(enable_restoration),    AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE},
     { NULL },
 };