Turn off trellis coding for quantization matrices.

Change-Id: I080c7449c269054cf441c251acd8930431e94b46

Turn off trellis coding for quantization matrices.
Change-Id: I080c7449c269054cf441c251acd8930431e94b46
4106232b · Thomas Davies · Yaowu Xu · 4017fca3 · 4106232b
Commit 4106232b authored Feb 18, 2016 by Thomas Davies Committed by Yaowu Xu Feb 25, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

vp10/encoder/speed_features.c vp10/encoder/speed_features.c +5 -0

No files found.
--- 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;