projects
/
platform
/
upstream
/
libvpx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3cf5908
)
avoid signed mismatch warning in gcc
author
Jim Bankoski
<jimbankoski@google.com>
Fri, 1 Aug 2014 13:46:40 +0000
(06:46 -0700)
committer
Jim Bankoski
<jimbankoski@google.com>
Mon, 4 Aug 2014 15:52:40 +0000
(08:52 -0700)
Change-Id: I9d995178fd764be252e571fa23901da0f991bbb8
vp9/encoder/vp9_rd.c
patch
|
blob
|
history
diff --git
a/vp9/encoder/vp9_rd.c
b/vp9/encoder/vp9_rd.c
index
c149c61
..
f1c25be
100644
(file)
--- a/
vp9/encoder/vp9_rd.c
+++ b/
vp9/encoder/vp9_rd.c
@@
-313,8
+313,8
@@
void vp9_model_rd_from_var_lapndz(unsigned int var, unsigned int n,
int d_q10, r_q10;
const uint64_t xsq_q10_64 =
((((uint64_t)qstep * qstep * n) << 10) + (var >> 1)) / var;
- const int xsq_q10 = xsq_q10_64 > MAX_XSQ_Q10 ?
- MAX_XSQ_Q10 : (int)xsq_q10_64;
+ const int xsq_q10 = xsq_q10_64 >
(uint64_t)
MAX_XSQ_Q10 ?
+
(int)
MAX_XSQ_Q10 : (int)xsq_q10_64;
model_rd_norm(xsq_q10, &r_q10, &d_q10);
*rate = (n * r_q10 + 2) >> 2;
*dist = (var * (int64_t)d_q10 + 512) >> 10;