From: Jim Bankoski <jimbankoski@google.com>
Date: Fri, 14 Feb 2014 15:14:20 +0000 (-0800)
Subject: vp9_vaq.c resolve vs warnings
X-Git-Tag: v1.4.0~2361^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a60b76bd09be9028a106cf1a3adc706b7284180e;p=libvpx

vp9_vaq.c resolve vs warnings

Change-Id: I8f1107a33f0ec51010fb00eae3d28ee8b4d748c2
---

diff --git a/vp9/encoder/vp9_vaq.c b/vp9/encoder/vp9_vaq.c
index acd7c416e..896cd2ca2 100644
--- a/vp9/encoder/vp9_vaq.c
+++ b/vp9/encoder/vp9_vaq.c
@@ -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);
 }