Get rid of some cast.

Change-Id: Iff5ccf2400bcb7b78c7b70f289ea65c982efddd5

diff --git a/vp8/encoder/block.h b/vp8/encoder/block.h
index fb309f461cbf1075601a98886e4bfe314ae9c37b..3652ede3bd4f564b45f02e5a30b5a477b7ab3247 100644 (file)
--- a/vp8/encoder/block.h
+++ b/vp8/encoder/block.h
@@ -125,9 +125,9 @@ typedef struct
 #endif
     int mbmode_cost[2][MB_MODE_COUNT];
     int intra_uv_mode_cost[2][MB_MODE_COUNT];
-    unsigned int bmode_costs[VP8_BINTRAMODES][VP8_BINTRAMODES][VP8_BINTRAMODES];
-    unsigned int i8x8_mode_costs[MB_MODE_COUNT];
-    unsigned int inter_bmode_costs[B_MODE_COUNT];
+    int bmode_costs[VP8_BINTRAMODES][VP8_BINTRAMODES][VP8_BINTRAMODES];
+    int i8x8_mode_costs[MB_MODE_COUNT];
+    int inter_bmode_costs[B_MODE_COUNT];
 
     // These define limits to motion vector components to prevent them from extending outside the UMV borders
     int mv_col_min;

diff --git a/vp8/encoder/modecosts.c b/vp8/encoder/modecosts.c
index eb8f082f347f09d1253bb6b56b2910258d85e099..a156d6205e5284b495994d0dec4a3e41068469f4 100644 (file)
--- a/vp8/encoder/modecosts.c
+++ b/vp8/encoder/modecosts.c
@@ -40,9 +40,8 @@ void vp8_init_mode_costs(VP8_COMP *c)
 #if CONFIG_ADAPTIVE_ENTROPY
     vp8_cost_tokens((int *)c->mb.inter_bmode_costs,
         vp8_sub_mv_ref_prob, vp8_sub_mv_ref_tree);
-        //x->fc.sub_mv_ref_prob[1], vp8_sub_mv_ref_tree);
 #else
-    vp8_cost_tokens((int *)c->mb.inter_bmode_costs,
+    vp8_cost_tokens(c->mb.inter_bmode_costs,
         vp8_sub_mv_ref_prob, vp8_sub_mv_ref_tree);
 #endif
 
@@ -54,7 +53,7 @@ void vp8_init_mode_costs(VP8_COMP *c)
                     x->fc.uv_mode_prob[VP8_YMODES-1], vp8_uv_mode_tree);
     vp8_cost_tokens(c->mb.intra_uv_mode_cost[0],
                     x->kf_uv_mode_prob[VP8_YMODES-1], vp8_uv_mode_tree);
-    vp8_cost_tokens((int *)c->mb.i8x8_mode_costs,
+    vp8_cost_tokens(c->mb.i8x8_mode_costs,
                     x->fc.i8x8_mode_prob,vp8_i8x8_mode_tree);
 
 }

diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index cc1f7cd200f7a9a4dec7f80688c997c103ccfdd9..e24e33e3113eb365082b024149ad5aecfbf9347b 100644 (file)
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -861,7 +861,7 @@ static int rd_pick_intra4x4block(
     B_PREDICTION_MODE *best_second_mode,
     int allow_comp,
 #endif
-    unsigned int *bmode_costs,
+    int *bmode_costs,
     ENTROPY_CONTEXT *a,
     ENTROPY_CONTEXT *l,
 
@@ -978,7 +978,7 @@ static int rd_pick_intra4x4mby_modes(VP8_COMP *cpi, MACROBLOCK *mb, int *Rate,
     ENTROPY_CONTEXT_PLANES t_above, t_left;
     ENTROPY_CONTEXT *ta;
     ENTROPY_CONTEXT *tl;
-    unsigned int *bmode_costs;
+    int *bmode_costs;
 
     if (update_contexts)
     {
@@ -996,9 +996,8 @@ static int rd_pick_intra4x4mby_modes(VP8_COMP *cpi, MACROBLOCK *mb, int *Rate,
         tl = (ENTROPY_CONTEXT *)&t_left;
     }
 
-#if 0
-    vp8_intra_prediction_down_copy(xd);
-#endif
+    // TODO(agrange)
+    //vp8_intra_prediction_down_copy(xd);
 
     bmode_costs = mb->inter_bmode_costs;
 
@@ -1132,7 +1131,7 @@ static int rd_pick_intra8x8block(
 #if CONFIG_COMP_INTRA_PRED
     B_PREDICTION_MODE *best_second_mode,
 #endif
-    unsigned int *mode_costs,
+    int *mode_costs,
     ENTROPY_CONTEXT *a,
     ENTROPY_CONTEXT *l,
     int *bestrate,
@@ -1274,7 +1273,7 @@ int rd_pick_intra8x8mby_modes(VP8_COMP *cpi,
     ENTROPY_CONTEXT_PLANES t_above, t_left;
     ENTROPY_CONTEXT *ta;
     ENTROPY_CONTEXT *tl;
-    unsigned int *i8x8mode_costs;
+    int *i8x8mode_costs;
 
     vpx_memcpy(&t_above, mb->e_mbd.above_context, sizeof(ENTROPY_CONTEXT_PLANES));
     vpx_memcpy(&t_left, mb->e_mbd.left_context, sizeof(ENTROPY_CONTEXT_PLANES));