From: James Zern <jzern@google.com>
Date: Thu, 29 Sep 2016 00:39:05 +0000 (-0700)
Subject: vpx_dsp/get_prob: relocate den == 0 test
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b4210940ce4183d4cfded42c323612c0c6d1688;p=libvpx

vpx_dsp/get_prob: relocate den == 0 test

to get_binary_prob(). the only other caller mode_mv_merge_probs() does
its own test on 0.

BUG=chromium:639712

Change-Id: I1178688706baeca2883f7aadbc254abb219a44ce
(cherry picked from commit 93c823e24b7b5b91de729217075c08e9082b80bd)
---

diff --git a/vpx_dsp/prob.h b/vpx_dsp/prob.h
index 4402cd30a..5656ddbab 100644
--- a/vpx_dsp/prob.h
+++ b/vpx_dsp/prob.h
@@ -11,6 +11,8 @@
 #ifndef VPX_DSP_PROB_H_
 #define VPX_DSP_PROB_H_
 
+#include <assert.h>
+
 #include "./vpx_config.h"
 #include "./vpx_dsp_common.h"
 
@@ -44,7 +46,7 @@ typedef int8_t vpx_tree_index;
 typedef const vpx_tree_index vpx_tree[];
 
 static INLINE vpx_prob get_prob(unsigned int num, unsigned int den) {
-  if (den == 0) return 128u;
+  assert(den != 0);
   {
     const int p = (int)(((int64_t)num * 256 + (den >> 1)) / den);
     // (p > 255) ? 255 : (p < 1) ? 1 : p;
@@ -54,7 +56,9 @@ static INLINE vpx_prob get_prob(unsigned int num, unsigned int den) {
 }
 
 static INLINE vpx_prob get_binary_prob(unsigned int n0, unsigned int n1) {
-  return get_prob(n0, n0 + n1);
+  const unsigned int den = n0 + n1;
+  if (den == 0) return 128u;
+  return get_prob(n0, den);
 }
 
 /* This function assumes prob1 and prob2 are already within [1,255] range. */