generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolve -Wshorten-64-to-32 warnings in prob.h.

Browse Source 
Change-Id: I1244ee908d81467f0fc8a8fce979fc8077a325b4
This commit is contained in:
Alex Converse 2016-07-28 09:53:23 -07:00
parent 3a04c9c9c4
commit d089ac4dda
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vpx_dsp/prob.h
View File

@ -47,11 +47,12 @@ static INLINE vpx_prob clip_prob(int p) {
return (p > 255) ? 255 : (p < 1) ? 1 : p; return (p > 255) ? 255 : (p < 1) ? 1 : p;
} }
static INLINE vpx_prob get_prob(int num, int den) { static INLINE vpx_prob get_prob(unsigned int num, unsigned int den) {
return (den == 0) ? 128u : clip_prob(((int64_t)num * 256 + (den >> 1)) / den); if (den == 0) return 128u;
return clip_prob((int)(((int64_t)num * 256 + (den >> 1)) / den));
} }
static INLINE vpx_prob get_binary_prob(int n0, int n1) { static INLINE vpx_prob get_binary_prob(unsigned int n0, unsigned int n1) {
return get_prob(n0, n0 + n1); return get_prob(n0, n0 + n1);
} }
@ -83,8 +84,7 @@ static INLINE vpx_prob mode_mv_merge_probs(vpx_prob pre_prob,
} else { } else {
const unsigned int count = VPXMIN(den, MODE_MV_COUNT_SAT); const unsigned int count = VPXMIN(den, MODE_MV_COUNT_SAT);
const unsigned int factor = count_to_update_factor[count]; const unsigned int factor = count_to_update_factor[count];
const vpx_prob prob = const vpx_prob prob = get_prob(ct[0], den);
clip_prob(((int64_t)(ct[0]) * 256 + (den >> 1)) / den);
return weighted_prob(pre_prob, prob, factor); return weighted_prob(pre_prob, prob, factor);
} }
} }