shithub: libvpx

Info  •  Files  •  Log  •  Branches

Add codec control to disable loopfilter for vp9

Change-Id: I6d693e84570c353d20ec314acea43363956c0590

--- a/examples/vp9_spatial_svc_encoder.c

+++ b/examples/vp9_spatial_svc_encoder.c

@@ -1054,6 +1054,7 @@

   vpx_codec_control(&encoder, VP9E_SET_TUNE_CONTENT, app_input.tune_content);

   vpx_codec_control(&encoder, VP9E_SET_DISABLE_OVERSHOOT_MAXQ_CBR, 0);

+  vpx_codec_control(&encoder, VP9E_SET_DISABLE_LOOPFILTER, 0);

   svc_drop_frame.framedrop_mode = FULL_SUPERFRAME_DROP;

   for (sl = 0; sl < (unsigned int)svc_ctx.spatial_layers; ++sl)

--- a/examples/vpx_temporal_svc_encoder.c

+++ b/examples/vpx_temporal_svc_encoder.c

@@ -841,6 +841,7 @@

     vpx_codec_control(&codec, VP8E_SET_STATIC_THRESHOLD, 1);

     vpx_codec_control(&codec, VP9E_SET_TUNE_CONTENT, 0);

     vpx_codec_control(&codec, VP9E_SET_TILE_COLUMNS, get_msb(cfg.g_threads));

+    vpx_codec_control(&codec, VP9E_SET_DISABLE_LOOPFILTER, 0);

 #if ROI_MAP

     set_roi_map(encoder->name, &cfg, &roi);

     if (vpx_codec_control(&codec, VP9E_SET_ROI_MAP, &roi))

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -3316,6 +3316,12 @@

     return;

   }

+  if (cpi->loopfilter_ctrl == NO_LOOPFILTER ||

+      (!is_reference_frame && cpi->loopfilter_ctrl == LOOPFILTER_REFERENCE)) {

+    lf->filter_level = 0;

+    return;

+  }

+

   if (xd->lossless) {

     lf->filter_level = 0;

     lf->last_filt_level = 0;

--- a/vp9/encoder/vp9_encoder.h

+++ b/vp9/encoder/vp9_encoder.h

@@ -147,6 +147,12 @@

   kVeryHighSad = 6,

 } CONTENT_STATE_SB;

+typedef enum {

+  LOOPFILTER_ALL = 0,

+  LOOPFILTER_REFERENCE = 1,  // Disable loopfilter on non reference frames.

+  NO_LOOPFILTER = 2,         // Disable loopfilter on all frames.

+} LOOPFILTER_CONTROL;

+

 typedef struct VP9EncoderConfig {

   BITSTREAM_PROFILE profile;

   vpx_bit_depth_t bit_depth;     // Codec bit-depth.

@@ -958,6 +964,8 @@

   int multi_layer_arf;

   vpx_roi_map_t roi;

+

+  LOOPFILTER_CONTROL loopfilter_ctrl;

 #if CONFIG_RATE_CTRL

   ENCODE_COMMAND encode_command;

   PARTITION_INFO *partition_info;

--- a/vp9/vp9_cx_iface.c

+++ b/vp9/vp9_cx_iface.c

@@ -1724,6 +1724,14 @@

   return VPX_CODEC_OK;

 }

+static vpx_codec_err_t ctrl_set_disable_loopfilter(vpx_codec_alg_priv_t *ctx,

+                                                   va_list args) {

+  VP9_COMP *const cpi = ctx->cpi;

+  const unsigned int data = va_arg(args, unsigned int);

+  cpi->loopfilter_ctrl = data;

+  return VPX_CODEC_OK;

+}

+

 static vpx_codec_ctrl_fn_map_t encoder_ctrl_maps[] = {

   { VP8_COPY_REFERENCE, ctrl_copy_reference },

@@ -1775,6 +1783,7 @@

   { VP9E_SET_SVC_GF_TEMPORAL_REF, ctrl_set_svc_gf_temporal_ref },

   { VP9E_SET_SVC_SPATIAL_LAYER_SYNC, ctrl_set_svc_spatial_layer_sync },

   { VP9E_SET_DELTA_Q_UV, ctrl_set_delta_q_uv },

+  { VP9E_SET_DISABLE_LOOPFILTER, ctrl_set_disable_loopfilter },

   // Getters

   { VP8E_GET_LAST_QUANTIZER, ctrl_get_quantizer },

--- a/vpx/vp8cx.h

+++ b/vpx/vp8cx.h

@@ -692,6 +692,15 @@

    * Supported in codecs: VP9

    */

   VP9E_SET_DISABLE_OVERSHOOT_MAXQ_CBR,

+

+  /*!\brief Codec control function to disable loopfilter.

+   *

+   * 0: Loopfilter on all frames, 1: Disable on non reference frames.

+   * 2: Disable on all frames.

+   *

+   * Supported in codecs: VP9

+   */

+  VP9E_SET_DISABLE_LOOPFILTER,

 };

 /*!\brief vpx 1-D scaling mode

@@ -1044,6 +1053,9 @@

 VPX_CTRL_USE_TYPE(VP9E_SET_DISABLE_OVERSHOOT_MAXQ_CBR, int)

 #define VPX_CTRL_VP9E_SET_DISABLE_OVERSHOOT_MAXQ_CBR

+

+VPX_CTRL_USE_TYPE(VP9E_SET_DISABLE_LOOPFILTER, int)

+#define VPX_CTRL_VP9E_SET_DISABLE_LOOPFILTER

 /*!\endcond */

 /*! @} - end defgroup vp8_encoder */

 #ifdef __cplusplus