commit 002f14078ff6aa1f0c1548aa1902b3af9d42087e
author Jerome Jiang <jianj@google.com> Fri Jul 02 22:59:08 2021
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 02 22:59:08 2021
tree abc325501b44d600905ec6b6543444fb1fda1bee
parent 350b0b47f2b126ae33607002590d58aca18033bc
parent c64022fa3c3019da117fbafbe80535a9ffbd8163

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

vp9/vp9_cx_iface.c

diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c
index 7697806..2c09a39 100644
--- 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 },

vpx/vp8cx.h

diff --git a/vpx/vp8cx.h b/vpx/vp8cx.h
index 37ad07d..a5dd324 100644
--- 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
@@ -1037,6 +1043,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