shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Add codec control to get loopfilter level" into main

--- a/vp9/vp9_cx_iface.c

+++ b/vp9/vp9_cx_iface.c

@@ -834,6 +834,14 @@

   return VPX_CODEC_OK;

 }

+static vpx_codec_err_t ctrl_get_loopfilter_level(vpx_codec_alg_priv_t *ctx,

+                                                 va_list args) {

+  int *const arg = va_arg(args, int *);

+  if (arg == NULL) return VPX_CODEC_INVALID_PARAM;

+  *arg = ctx->cpi->common.lf.filter_level;

+  return VPX_CODEC_OK;

+}

+

 static vpx_codec_err_t update_extra_cfg(vpx_codec_alg_priv_t *ctx,

                                         const struct vp9_extracfg *extra_cfg) {

   const vpx_codec_err_t res = validate_config(ctx, &ctx->cfg, extra_cfg);

@@ -1967,6 +1975,7 @@

   // Getters

   { VP8E_GET_LAST_QUANTIZER, ctrl_get_quantizer },

   { VP8E_GET_LAST_QUANTIZER_64, ctrl_get_quantizer64 },

+  { VP9E_GET_LOOPFILTER_LEVEL, ctrl_get_loopfilter_level },

   { VP9_GET_REFERENCE, ctrl_get_reference },

   { VP9E_GET_SVC_LAYER_ID, ctrl_get_svc_layer_id },

   { VP9E_GET_ACTIVEMAP, ctrl_get_active_map },

--- a/vpx/vp8cx.h

+++ b/vpx/vp8cx.h

@@ -712,6 +712,12 @@

    * Supported in codecs: VP9

    */

   VP9E_SET_EXTERNAL_RATE_CONTROL,

+

+  /*!\brief Codec control function to get loopfilter level in the encoder.

+   *

+   * Supported in codecs: VP9

+   */

+  VP9E_GET_LOOPFILTER_LEVEL,

 };

 /*!\brief vpx 1-D scaling mode

@@ -1036,6 +1042,9 @@

 VPX_CTRL_USE_TYPE(VP9E_GET_LEVEL, int *)

 #define VPX_CTRL_VP9E_GET_LEVEL

+

+VPX_CTRL_USE_TYPE(VP9E_GET_LOOPFILTER_LEVEL, int *)

+#define VPX_CTRL_VP9E_GET_LOOPFILTER_LEVEL

 VPX_CTRL_USE_TYPE(VP9E_ENABLE_MOTION_VECTOR_UNIT_TEST, unsigned int)

 #define VPX_CTRL_VP9E_ENABLE_MOTION_VECTOR_UNIT_TEST