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

vp9_vaq.c resolve vs warnings

Browse Source 
Change-Id: I8f1107a33f0ec51010fb00eae3d28ee8b4d748c2
This commit is contained in:
Jim Bankoski 2014-02-14 07:14:20 -08:00
parent fb4f10a26e
commit a60b76bd09
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vp9/encoder/vp9_vaq.c
View File

@ -75,9 +75,9 @@ void vp9_vaq_init() {
void vp9_vaq_frame_setup(VP9_COMP *cpi) {
VP9_COMMON *cm = &cpi->common;
struct segmentation *seg = &cm->seg;
int base_q = vp9_convert_qindex_to_q(cm->base_qindex);
int base_rdmult = vp9_compute_rd_mult(cpi, cm->base_qindex +
cm->y_dc_delta_q);
const double base_q = vp9_convert_qindex_to_q(cm->base_qindex);
const int base_rdmult = vp9_compute_rd_mult(cpi, cm->base_qindex +
cm->y_dc_delta_q);
int i;
if (cm->frame_type == KEY_FRAME ||
@ -143,9 +143,6 @@ int vp9_block_energy(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs) {
vp9_clear_system_state(); // __asm emms;
// if (var <= 1000)
// return 0;
energy = 0.9*(logf(var + 1) - 10.0);
energy = 0.9 * (log(var + 1.0) - 10.0);
return clamp(round(energy), ENERGY_MIN, ENERGY_MAX);
}