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

rdmult data type change

Browse Source 
To fix a VS warning.

Change-Id: I4c530c0afe8d06acdb8cc78b7995aba57a25373d
This commit is contained in:
Deb Mukherjee 2014-10-03 00:09:41 -07:00
parent ba172ff0a5
commit 00a4b20fbe
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vp9/encoder/vp9_rd.c
View File

@ -138,7 +138,7 @@ static const int rd_frame_type_factor[FRAME_UPDATE_TYPES] = {
int vp9_compute_rd_mult(const VP9_COMP *cpi, int qindex) { int vp9_compute_rd_mult(const VP9_COMP *cpi, int qindex) {
const int64_t q = vp9_dc_quant(qindex, 0, cpi->common.bit_depth); const int64_t q = vp9_dc_quant(qindex, 0, cpi->common.bit_depth);
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
int rdmult = 0; int64_t rdmult = 0;
switch (cpi->common.bit_depth) { switch (cpi->common.bit_depth) {
case VPX_BITS_8: case VPX_BITS_8:
rdmult = 88 * q * q / 24; rdmult = 88 * q * q / 24;
@ -154,7 +154,7 @@ int vp9_compute_rd_mult(const VP9_COMP *cpi, int qindex) {
return -1; return -1;
} }
#else #else
int rdmult = 88 * q * q / 24; int64_t rdmult = 88 * q * q / 24;
#endif // CONFIG_VP9_HIGHBITDEPTH #endif // CONFIG_VP9_HIGHBITDEPTH
if (cpi->oxcf.pass == 2 && (cpi->common.frame_type != KEY_FRAME)) { if (cpi->oxcf.pass == 2 && (cpi->common.frame_type != KEY_FRAME)) {
const GF_GROUP *const gf_group = &cpi->twopass.gf_group; const GF_GROUP *const gf_group = &cpi->twopass.gf_group;
@ -164,7 +164,7 @@ int vp9_compute_rd_mult(const VP9_COMP *cpi, int qindex) {
rdmult = (rdmult * rd_frame_type_factor[frame_type]) >> 7; rdmult = (rdmult * rd_frame_type_factor[frame_type]) >> 7;
rdmult += ((rdmult * rd_boost_factor[boost_index]) >> 7); rdmult += ((rdmult * rd_boost_factor[boost_index]) >> 7);
} }
return rdmult; return (int)rdmult;
} }
static int compute_rd_thresh_factor(int qindex, vpx_bit_depth_t bit_depth) { static int compute_rd_thresh_factor(int qindex, vpx_bit_depth_t bit_depth) {