diff options
| author | trav90 <travawine@palemoon.org> | 2018-10-18 21:53:44 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-10-18 21:53:44 -0500 |
| commit | ec910d81405c736a4490383a250299a7837c2e64 (patch) | |
| tree | 4f27cc226f93a863121aef6c56313e4153a69b3e /third_party/aom/av1/common/pvq.c | |
| parent | 01eb57073ba97b2d6cbf20f745dfcc508197adc3 (diff) | |
| download | UXP-ec910d81405c736a4490383a250299a7837c2e64.tar UXP-ec910d81405c736a4490383a250299a7837c2e64.tar.gz UXP-ec910d81405c736a4490383a250299a7837c2e64.tar.lz UXP-ec910d81405c736a4490383a250299a7837c2e64.tar.xz UXP-ec910d81405c736a4490383a250299a7837c2e64.zip | |
Update aom to commit id e87fb2378f01103d5d6e477a4ef6892dc714e614
Diffstat (limited to 'third_party/aom/av1/common/pvq.c')
| -rw-r--r-- | third_party/aom/av1/common/pvq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/aom/av1/common/pvq.c b/third_party/aom/av1/common/pvq.c index 75fe761d7..221c90c04 100644 --- a/third_party/aom/av1/common/pvq.c +++ b/third_party/aom/av1/common/pvq.c @@ -591,7 +591,7 @@ static int32_t od_pow(int32_t x, od_val16 beta) /*log2(g/OD_COMPAND_SCALE) = log2(x) - OD_COMPAND_SHIFT in Q(OD_LOG2_OUTSHIFT).*/ logr = od_log2(t) + (log2_x - OD_COMPAND_SHIFT)*OD_LOG2_OUTSCALE; - logr = OD_MULT16_32_QBETA(beta, logr); + logr = (od_val32)OD_MULT16_32_QBETA(beta, logr); return od_exp2(logr); } #endif @@ -974,7 +974,7 @@ void od_pvq_synthesis_partial(od_coeff *xcoeff, const od_coeff *ypulse, od_val32 x; /* This multiply doesn't round, so it introduces some bias. It would be nice (but not critical) to fix this. */ - x = OD_MULT16_32_Q16(ypulse[i], scale); + x = (od_val32)OD_MULT16_32_Q16(ypulse[i], scale); #if defined(OD_FLOAT_PVQ) xcoeff[i] = (od_coeff)floor(.5 + x*(qm_inv[i]*OD_QM_INV_SCALE_1)); |