From 08491b8665d205dcd7c9038a156deac269eb5fe1 Mon Sep 17 00:00:00 2001 From: Adrian Grange Date: Fri, 18 Nov 2011 13:02:59 -0800 Subject: [PATCH] Remove redundant code (lf_or_gf and frame_lf_or_gf) Removed unused variables lf_or_gf and frame_lf_or_gf. Change-Id: I88692cd7d53e532d303c4525ee4667c1ecea3026 --- vp8/encoder/rdopt.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 6d4ed40a8..652c6ec8c 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -2017,7 +2017,6 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int int_mv frame_near_mv[4]; int_mv frame_best_ref_mv[4]; int frame_mdcounts[4][4]; - int frame_lf_or_gf[4]; unsigned char *y_buffer[4]; unsigned char *u_buffer[4]; unsigned char *v_buffer[4]; @@ -2035,8 +2034,6 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int y_buffer[LAST_FRAME] = lst_yv12->y_buffer + recon_yoffset; u_buffer[LAST_FRAME] = lst_yv12->u_buffer + recon_uvoffset; v_buffer[LAST_FRAME] = lst_yv12->v_buffer + recon_uvoffset; - - frame_lf_or_gf[LAST_FRAME] = 0; } if (cpi->ref_frame_flags & VP8_GOLD_FLAG) @@ -2049,8 +2046,6 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int y_buffer[GOLDEN_FRAME] = gld_yv12->y_buffer + recon_yoffset; u_buffer[GOLDEN_FRAME] = gld_yv12->u_buffer + recon_uvoffset; v_buffer[GOLDEN_FRAME] = gld_yv12->v_buffer + recon_uvoffset; - - frame_lf_or_gf[GOLDEN_FRAME] = 1; } if (cpi->ref_frame_flags & VP8_ALT_FLAG) @@ -2063,8 +2058,6 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int y_buffer[ALTREF_FRAME] = alt_yv12->y_buffer + recon_yoffset; u_buffer[ALTREF_FRAME] = alt_yv12->u_buffer + recon_uvoffset; v_buffer[ALTREF_FRAME] = alt_yv12->v_buffer + recon_uvoffset; - - frame_lf_or_gf[ALTREF_FRAME] = 1; } *returnintra = INT_MAX; @@ -2081,7 +2074,6 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int for (mode_index = 0; mode_index < MAX_MODES; mode_index++) { int this_rd = INT_MAX; - int lf_or_gf = 0; // Lat Frame (01) or gf/arf (1) int disable_skip = 0; int other_cost = 0; @@ -2160,7 +2152,6 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int mode_mv[NEARMV] = frame_near_mv[x->e_mbd.mode_info_context->mbmi.ref_frame]; best_ref_mv = frame_best_ref_mv[x->e_mbd.mode_info_context->mbmi.ref_frame]; vpx_memcpy(mdcounts, frame_mdcounts[x->e_mbd.mode_info_context->mbmi.ref_frame], sizeof(mdcounts)); - lf_or_gf = frame_lf_or_gf[x->e_mbd.mode_info_context->mbmi.ref_frame]; } // Experimental code. Special case for gf and arf zeromv modes. Increase zbin size to supress noise