From 4106232b9c39023f2d871db098d6da2f3b3356a0 Mon Sep 17 00:00:00 2001
From: Thomas Davies <thdavies@cisco.com>
Date: Thu, 18 Feb 2016 17:51:20 +0000
Subject: [PATCH] Turn off trellis coding for quantization matrices.
Change-Id: I080c7449c269054cf441c251acd8930431e94b46
---
vp10/encoder/speed_features.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/vp10/encoder/speed_features.c b/vp10/encoder/speed_features.c
index d95dc65c40..c961b7e432 100644
--- a/vp10/encoder/speed_features.c
+++ b/vp10/encoder/speed_features.c
@@ -571,7 +571,12 @@ void vp10_set_speed_features_framesize_independent(VP10_COMP *cpi) {
vp10_find_best_sub_pixel_tree_pruned_evenmore;
}
+#if !CONFIG_AOM_QM
x->optimize = sf->optimize_coefficients == 1 && oxcf->pass != 1;
+#else
+ // FIXME: trellis not very efficient for quantisation matrices
+ x->optimize = 0;
+#endif
x->min_partition_size = sf->default_min_partition_size;
x->max_partition_size = sf->default_max_partition_size;
--
GitLab