Port commits related to clpf and qm experiments
Manually cherry-picked following commits from AOMedia git repository:
bb2727c Sort includess for "clpf.h"
c297fd0 Add quantisation matrix range parameters.
0527894 Add encoder option and signaling for quant matrix control.
4106232 Turn off trellis coding for quantization matrices.
4017fca Modify tests to allow quantization matrices.
1c122c2 Add quant and dequant functions for new quant matrices.
95a8999 Enable CLPF
f72782b Fix a build issue
73bae50 Add quantisation matrices and selection functions
33208d2 Added support for constrained low pass filter (CLPF)
Change-Id: I60fc1ee1ac40e6b9d1d00affd97547ee5d5dd6be
diff --git a/vpx/vp8cx.h b/vpx/vp8cx.h
index 3b41058..087604d 100644
--- a/vpx/vp8cx.h
+++ b/vpx/vp8cx.h
@@ -314,6 +314,48 @@
* Supported in codecs: VP9
*/
VP9E_SET_LOSSLESS,
+#if CONFIG_AOM_QM
+ /*!\brief Codec control function to encode with quantisation matrices.
+ *
+ * AOM can operate with default quantisation matrices dependent on
+ * quantisation level and block type.
+ * 0 = do not use quantisation matrices
+ * 1 = use quantisation matrices
+ *
+ * By default, the encoder operates without quantisation matrices.
+ *
+ * Supported in codecs: AOM
+ */
+
+ VP9E_SET_ENABLE_QM,
+
+ /*!\brief Codec control function to set the min quant matrix flatness.
+ *
+ * AOM can operate with different ranges of quantisation matrices.
+ * As quantisation levels increase, the matrices get flatter. This
+ * control sets the minimum level of flatness from which the matrices
+ * are determined.
+ *
+ * By default, the encoder sets this minimum at half the available
+ * range.
+ *
+ * Supported in codecs: AOM
+ */
+ VP9E_SET_QM_MIN,
+
+ /*!\brief Codec control function to set the max quant matrix flatness.
+ *
+ * AOM can operate with different ranges of quantisation matrices.
+ * As quantisation levels increase, the matrices get flatter. This
+ * control sets the maximum level of flatness possible.
+ *
+ * By default, the encoder sets this maximum at the top of the
+ * available range.
+ *
+ * Supported in codecs: AOM
+ */
+ VP9E_SET_QM_MAX,
+#endif
/*!\brief Codec control function to set number of tile columns.
*
@@ -651,6 +693,17 @@
VPX_CTRL_USE_TYPE(VP9E_SET_LOSSLESS, unsigned int)
#define VPX_CTRL_VP9E_SET_LOSSLESS
+#if CONFIG_AOM_QM
+VPX_CTRL_USE_TYPE(VP9E_SET_ENABLE_QM, unsigned int)
+#define VPX_CTRL_VP9E_SET_ENABLE_QM
+
+VPX_CTRL_USE_TYPE(VP9E_SET_QM_MIN, unsigned int)
+#define VPX_CTRL_VP9E_SET_QM_MIN
+
+VPX_CTRL_USE_TYPE(VP9E_SET_QM_MAX, unsigned int)
+#define VPX_CTRL_VP9E_SET_QM_MAX
+#endif
+
VPX_CTRL_USE_TYPE(VP9E_SET_FRAME_PARALLEL_DECODING, unsigned int)
#define VPX_CTRL_VP9E_SET_FRAME_PARALLEL_DECODING
