shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Removed shadow warnings : mcomp.c rdopt.c"

--- a/vp8/encoder/mcomp.c

+++ b/vp8/encoder/mcomp.c

@@ -233,7 +233,7 @@

 #if ARCH_X86 || ARCH_X86_64

     MACROBLOCKD *xd = &x->e_mbd;

-    unsigned char *y0 = base_pre + d->offset + (bestmv->as_mv.row) * pre_stride + bestmv->as_mv.col;

+    unsigned char *y_0 = base_pre + d->offset + (bestmv->as_mv.row) * pre_stride + bestmv->as_mv.col;

     unsigned char *y;

     int buf_r1, buf_r2, buf_c1;

@@ -244,7 +244,7 @@

     y_stride = 32;

     /* Copy to intermediate buffer before searching. */

-    vfp->copymem(y0 - buf_c1 - pre_stride*buf_r1, pre_stride, xd->y_buf, y_stride, 16+buf_r1+buf_r2);

+    vfp->copymem(y_0 - buf_c1 - pre_stride*buf_r1, pre_stride, xd->y_buf, y_stride, 16+buf_r1+buf_r2);

     y = xd->y_buf + y_stride*buf_r1 +buf_c1;

 #else

     unsigned char *y = base_pre + d->offset + (bestmv->as_mv.row) * pre_stride + bestmv->as_mv.col;

@@ -375,12 +375,12 @@

 #if ARCH_X86 || ARCH_X86_64

     MACROBLOCKD *xd = &x->e_mbd;

-    unsigned char *y0 = base_pre + d->offset + (bestmv->as_mv.row) * pre_stride + bestmv->as_mv.col;

+    unsigned char *y_0 = base_pre + d->offset + (bestmv->as_mv.row) * pre_stride + bestmv->as_mv.col;

     unsigned char *y;

     y_stride = 32;

     /* Copy 18 rows x 32 cols area to intermediate buffer before searching. */

-     vfp->copymem(y0 - 1 - pre_stride, pre_stride, xd->y_buf, y_stride, 18);

+     vfp->copymem(y_0 - 1 - pre_stride, pre_stride, xd->y_buf, y_stride, 18);

      y = xd->y_buf + y_stride + 1;

 #else

      unsigned char *y = base_pre + d->offset + (bestmv->as_mv.row) * pre_stride + bestmv->as_mv.col;

@@ -686,12 +686,12 @@

 #if ARCH_X86 || ARCH_X86_64

     MACROBLOCKD *xd = &x->e_mbd;

-    unsigned char *y0 = base_pre + d->offset + (bestmv->as_mv.row) * pre_stride + bestmv->as_mv.col;

+    unsigned char *y_0 = base_pre + d->offset + (bestmv->as_mv.row) * pre_stride + bestmv->as_mv.col;

     unsigned char *y;

     y_stride = 32;

     /* Copy 18 rows x 32 cols area to intermediate buffer before searching. */

-    vfp->copymem(y0 - 1 - pre_stride, pre_stride, xd->y_buf, y_stride, 18);

+    vfp->copymem(y_0 - 1 - pre_stride, pre_stride, xd->y_buf, y_stride, 18);

     y = xd->y_buf + y_stride + 1;

 #else

     unsigned char *y = base_pre + d->offset + (bestmv->as_mv.row) * pre_stride + bestmv->as_mv.col;

--- a/vp8/encoder/rdopt.c

+++ b/vp8/encoder/rdopt.c

@@ -884,8 +884,8 @@

     for (mode = DC_PRED; mode <= TM_PRED; mode++)

     {

-        int rate;

-        int distortion;

+        int this_rate;

+        int this_distortion;

         int this_rd;

         xd->mode_info_context->mbmi.uv_mode = mode;

@@ -907,17 +907,17 @@

         vp8_quantize_mbuv(x);

         rate_to = rd_cost_mbuv(x);

-        rate = rate_to + x->intra_uv_mode_cost[xd->frame_type][xd->mode_info_context->mbmi.uv_mode];

+        this_rate = rate_to + x->intra_uv_mode_cost[xd->frame_type][xd->mode_info_context->mbmi.uv_mode];

-        distortion = vp8_mbuverror(x) / 4;

+        this_distortion = vp8_mbuverror(x) / 4;

-        this_rd = RDCOST(x->rdmult, x->rddiv, rate, distortion);

+        this_rd = RDCOST(x->rdmult, x->rddiv, this_rate, this_distortion);

         if (this_rd < best_rd)

         {

             best_rd = this_rd;

-            d = distortion;

-            r = rate;

+            d = this_distortion;

+            r = this_rate;

             *rate_tokenonly = rate_to;

             mode_selected = mode;

         }

@@ -1294,12 +1294,11 @@

                 if (bestsme < INT_MAX)

                 {

-                    int distortion;

+                    int disto;

                     unsigned int sse;

                     cpi->find_fractional_mv_step(x, c, e, &mode_mv[NEW4X4],

                         bsi->ref_mv, x->errorperbit, v_fn_ptr, x->mvcost,

-                        &distortion, &sse);

-

+                        &disto, &sse);

                 }

             } /* NEW4X4 */