commit 13754540efb03f9cd8aa014ee0afaecfa1d60889
author Jonathan Matthews <jonathan.matthews@argondesign.com> Thu Feb 02 11:29:30 2017 +0000
committer Alex Converse <aconverse@google.com> Fri Feb 03 20:11:44 2017 +0000
tree 81524ca56822c715302807a834b55967dd2b4a79
parent 9aa9749de4ee643b8720b16f12632d6eaddadcb9

Bugfix: ensure for pareto coef that there are no zero range encodings

Introduced by change I98b33fab6b9f52690f6ad618ac55e725a97be056

BUG=aomedia:349

Change-Id: Ib6df52ac2442f60c159bae2271793b7570d53a19

av1/common/entropy.c

diff --git a/av1/common/entropy.c b/av1/common/entropy.c
index b794b8f..ea77fdb 100644
--- a/av1/common/entropy.c
+++ b/av1/common/entropy.c
@@ -4410,7 +4410,7 @@
   scale = CDF_PROB_TOP - cdf_head[ZERO_TOKEN];
   p = ROUND_POWER_OF_TWO(scale * (pdf_model[2] << (CDF_PROB_BITS - 8)),
                          CDF_PROB_BITS);
-  cdf_head[ONE_TOKEN] = cdf_head[ZERO_TOKEN] + AOMMAX(1, p);
+  cdf_head[ONE_TOKEN] = cdf_head[ZERO_TOKEN] + AOMMIN(AOMMAX(1, p), scale - 1);
   assert(cdf_head[ONE_TOKEN] < CDF_PROB_TOP);
   cdf_head[TWO_TOKEN] = CDF_PROB_TOP;