shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Removed shadow warnings : bitstream.c encodeframe.c onyx_if.c"

--- a/vp8/encoder/bitstream.c

+++ b/vp8/encoder/bitstream.c

@@ -90,17 +90,17 @@

     if (new_b + (n << 8) < old_b)

     {

-        int i = 0;

+        int j = 0;

         vp8_write_bit(w, 1);

         do

         {

-            const vp8_prob p = Pnew[i];

+            const vp8_prob p = Pnew[j];

-            vp8_write_literal(w, Pcur[i] = p ? p : 1, 8);

+            vp8_write_literal(w, Pcur[j] = p ? p : 1, 8);

         }

-        while (++i < n);

+        while (++j < n);

     }

     else

         vp8_write_bit(w, 0);

@@ -245,15 +245,15 @@

             if (L)

             {

-                const unsigned char *pp = b->prob;

-                int v = e >> 1;

-                int n = L;              /* number of bits in v, assumed nonzero */

-                int i = 0;

+                const unsigned char *proba = b->prob;

+                const int v2 = e >> 1;

+                int n2 = L;              /* number of bits in v2, assumed nonzero */

+                i = 0;

                 do

                 {

-                    const int bb = (v >> --n) & 1;

-                    split = 1 + (((range - 1) * pp[i>>1]) >> 8);

+                    const int bb = (v2 >> --n2) & 1;

+                    split = 1 + (((range - 1) * proba[i>>1]) >> 8);

                     i = b->tree[i+bb];

                     if (bb)

@@ -301,7 +301,7 @@

                     lowvalue <<= shift;

                 }

-                while (n);

+                while (n2);

             }

--- a/vp8/encoder/encodeframe.c

+++ b/vp8/encoder/encodeframe.c

@@ -853,11 +853,10 @@

             if (xd->segmentation_enabled)

             {

-                int i, j;

+                int j;

                 if (xd->segmentation_enabled)

                 {

-

                     for (i = 0; i < cpi->encoding_thread_count; i++)

                     {

                         for (j = 0; j < 4; j++)

--- a/vp8/encoder/onyx_if.c

+++ b/vp8/encoder/onyx_if.c

@@ -825,7 +825,7 @@

         {

             unsigned int sum = 0;

             unsigned int total_mbs = cm->MBs;

-            int i, thresh;

+            int thresh;

             unsigned int total_skip;

             int min = 2000;

--- a/vp8/encoder/quantize.c

+++ b/vp8/encoder/quantize.c

@@ -184,17 +184,17 @@

     for (i = 0; i < 16; i++)

     {

         int dq;

-        int round;

+        int rounding;

         /*TODO: These arrays should be stored in zig-zag order.*/

         rc = vp8_default_zig_zag1d[i];

         z = coeff_ptr[rc];

         dq = dequant_ptr[rc];

-        round = dq >> 1;

+        rounding = dq >> 1;

         /* Sign of z. */

         sz = -(z < 0);

         x = (z + sz) ^ sz;

-        x += round;

+        x += rounding;

         if (x >= dq)

         {

             /* Quantize x. */

--- a/vp8/encoder/ratectrl.c

+++ b/vp8/encoder/ratectrl.c

@@ -614,7 +614,6 @@

 static void calc_pframe_target_size(VP8_COMP *cpi)

 {

     int min_frame_target;

-    int Adjustment;

     int old_per_frame_bandwidth = cpi->per_frame_bandwidth;

     if ( cpi->current_layer > 0)

@@ -658,6 +657,7 @@

         /* 1 pass */

         else

         {

+            int Adjustment;

             /* Make rate adjustment to recover bits spent in key frame

              * Test to see if the key frame inter data rate correction

              * should still be in force

@@ -688,7 +688,7 @@

              */

             if ((cpi->gf_overspend_bits > 0) && (cpi->this_frame_target > min_frame_target))

             {

-                int Adjustment = (cpi->non_gf_bitrate_adjustment <= cpi->gf_overspend_bits) ? cpi->non_gf_bitrate_adjustment : cpi->gf_overspend_bits;

+                Adjustment = (cpi->non_gf_bitrate_adjustment <= cpi->gf_overspend_bits) ? cpi->non_gf_bitrate_adjustment : cpi->gf_overspend_bits;

                 if (Adjustment > (cpi->this_frame_target - min_frame_target))

                     Adjustment = (cpi->this_frame_target - min_frame_target);