From: Yaowu Xu Date: Mon, 14 Jan 2013 21:56:52 +0000 (-0800) Subject: Fix compiler warnings X-Git-Tag: v1.3.0~1210^2~7^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=113005b11dd4e0e31bf22756d89ccd823078db10;p=libvpx Fix compiler warnings The warnings caused verify failure with gerrit for several commits Change-Id: I030df8638bd69b8783a3ac58e720ff9f0bfd546c --- diff --git a/vp9/encoder/vp9_dct.c b/vp9/encoder/vp9_dct.c index 9f7673061..bfde02ccb 100644 --- a/vp9/encoder/vp9_dct.c +++ b/vp9/encoder/vp9_dct.c @@ -2136,8 +2136,6 @@ static void vp9_short_fdct16x16_c_f(short *input, short *out, int pitch, void vp9_short_fdct8x8_c_f(short *block, short *coefs, int pitch, int scale) { int j1, i, j, k; - static int count = 0; - short x[8 * 8]; float b[8]; float b1[8]; float d[8][8]; diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 3ae8bd6d6..3f5133062 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2266,7 +2266,6 @@ static void encode_superblock32(VP9_COMP *cpi, TOKENEXTRA **t, uint8_t *vdst = xd->dst.v_buffer; int src_y_stride = x->src.y_stride, dst_y_stride = xd->dst.y_stride; int src_uv_stride = x->src.uv_stride, dst_uv_stride = xd->dst.uv_stride; - int seg_ref_active; unsigned char ref_pred_flag; int n; TOKENEXTRA *tp[4]; @@ -2308,10 +2307,7 @@ static void encode_superblock32(VP9_COMP *cpi, TOKENEXTRA **t, vp9_update_zbin_extra(cpi, x); - seg_ref_active = vp9_segfeature_active(xd, segment_id, SEG_LVL_REF_FRAME); - // SET VARIOUS PREDICTION FLAGS - // Did the chosen reference frame match its predicted value. ref_pred_flag = ((xd->mode_info_context->mbmi.ref_frame == vp9_get_pred_ref(cm, xd))); @@ -2502,7 +2498,6 @@ static void encode_superblock64(VP9_COMP *cpi, TOKENEXTRA **t, uint8_t *vdst = xd->dst.v_buffer; int src_y_stride = x->src.y_stride, dst_y_stride = xd->dst.y_stride; int src_uv_stride = x->src.uv_stride, dst_uv_stride = xd->dst.uv_stride; - int seg_ref_active; unsigned char ref_pred_flag; int n; TOKENEXTRA *tp[16]; @@ -2545,10 +2540,6 @@ static void encode_superblock64(VP9_COMP *cpi, TOKENEXTRA **t, vp9_update_zbin_extra(cpi, x); - seg_ref_active = vp9_segfeature_active(xd, segment_id, SEG_LVL_REF_FRAME); - - // SET VARIOUS PREDICTION FLAGS - // Did the chosen reference frame match its predicted value. ref_pred_flag = ((xd->mode_info_context->mbmi.ref_frame == vp9_get_pred_ref(cm, xd))); diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index a82670b6e..fe2c0f3a7 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -4464,14 +4464,13 @@ void vp9_rd_pick_intra_mode_sb32(VP9_COMP *cpi, MACROBLOCK *x, MACROBLOCKD *xd = &x->e_mbd; int rate_y, rate_uv; int rate_y_tokenonly, rate_uv_tokenonly; - int error_y, error_uv; int dist_y, dist_uv; int y_skip, uv_skip; int64_t txfm_cache[NB_TXFM_MODES]; - error_y = rd_pick_intra_sby_mode(cpi, x, &rate_y, &rate_y_tokenonly, + rd_pick_intra_sby_mode(cpi, x, &rate_y, &rate_y_tokenonly, &dist_y, &y_skip, txfm_cache); - error_uv = rd_pick_intra_sbuv_mode(cpi, x, &rate_uv, &rate_uv_tokenonly, + rd_pick_intra_sbuv_mode(cpi, x, &rate_uv, &rate_uv_tokenonly, &dist_uv, &uv_skip); if (cpi->common.mb_no_coeff_skip && y_skip && uv_skip) { @@ -4493,14 +4492,13 @@ void vp9_rd_pick_intra_mode_sb64(VP9_COMP *cpi, MACROBLOCK *x, MACROBLOCKD *xd = &x->e_mbd; int rate_y, rate_uv; int rate_y_tokenonly, rate_uv_tokenonly; - int error_y, error_uv; int dist_y, dist_uv; int y_skip, uv_skip; int64_t txfm_cache[NB_TXFM_MODES]; - error_y = rd_pick_intra_sb64y_mode(cpi, x, &rate_y, &rate_y_tokenonly, + rd_pick_intra_sb64y_mode(cpi, x, &rate_y, &rate_y_tokenonly, &dist_y, &y_skip, txfm_cache); - error_uv = rd_pick_intra_sb64uv_mode(cpi, x, &rate_uv, &rate_uv_tokenonly, + rd_pick_intra_sb64uv_mode(cpi, x, &rate_uv, &rate_uv_tokenonly, &dist_uv, &uv_skip); if (cpi->common.mb_no_coeff_skip && y_skip && uv_skip) { @@ -4602,6 +4600,7 @@ void vp9_rd_pick_intra_mode(VP9_COMP *cpi, MACROBLOCK *x, rate = rateuv8x8 + rate16x16 - rateuv8x8_tokenonly - rate16x16_tokenonly + vp9_cost_bit(vp9_get_pred_prob(cm, xd, PRED_MBSKIP), 1); dist = dist16x16 + (distuv8x8 >> 2); + mbmi->txfm_size = txfm_size_16x16; memset(x->mb_context[xd->sb_index][xd->mb_index].txfm_rd_diff, 0, sizeof(x->mb_context[xd->sb_index][xd->mb_index].txfm_rd_diff)); @@ -4697,7 +4696,6 @@ static int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, int near_sadidx[8] = { 0, 1, 2, 3, 4, 5, 6, 7 }; int saddone = 0; int64_t best_rd = LLONG_MAX; - int64_t best_yrd = LLONG_MAX; int64_t best_txfm_rd[NB_TXFM_MODES]; int64_t best_txfm_diff[NB_TXFM_MODES]; int64_t best_pred_diff[NB_PREDICTION_TYPES]; @@ -5071,11 +5069,6 @@ static int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, } other_cost += ref_costs[xd->mode_info_context->mbmi.ref_frame]; - - /* Calculate the final y RD estimate for this mode */ - best_yrd = RDCOST(x->rdmult, x->rddiv, (rate2 - rate_uv - other_cost), - (distortion2 - distortion_uv)); - *returnrate = rate2; *returndistortion = distortion2; best_rd = this_rd;