diff options
Diffstat (limited to 'vp8/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index cb7cc65d7..4c95f28d6 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -408,7 +408,6 @@ unsigned int vp8_activity_masking(VP8_COMP *cpi, MACROBLOCK *x) int sum; unsigned int a; unsigned int b; - unsigned int d; /* TODO: This could also be done over smaller areas (8x8), but that would * require extensive changes elsewhere, as lambda is assumed to be fixed * over an entire MB in most of the code. @@ -629,7 +628,6 @@ void vp8_encode_frame(VP8_COMP *cpi) VP8_COMMON *const cm = & cpi->common; MACROBLOCKD *const xd = & x->e_mbd; - int i; TOKENEXTRA *tp = cpi->tok; int segment_counts[MAX_MB_SEGMENTS]; int totalrate; @@ -712,9 +710,7 @@ void vp8_encode_frame(VP8_COMP *cpi) } vp8_initialize_rd_consts(cpi, vp8_dc_quant(cm->base_qindex, cm->y1dc_delta_q)); - //vp8_initialize_rd_consts( cpi, vp8_dc_quant(cpi->avg_frame_qindex, cm->y1dc_delta_q) ); vp8cx_initialize_me_consts(cpi, cm->base_qindex); - //vp8cx_initialize_me_consts( cpi, cpi->avg_frame_qindex); // Copy data over into macro block data sturctures. @@ -734,20 +730,6 @@ void vp8_encode_frame(VP8_COMP *cpi) x->activity_sum = 0; -#if 0 - // Experimental rd code - // 2 Pass - Possibly set Rdmult based on last frame distortion + this frame target bits or other metrics - // such as cpi->rate_correction_factor that indicate relative complexity. - /*if ( cpi->pass == 2 && (cpi->last_frame_distortion > 0) && (cpi->target_bits_per_mb > 0) ) - { - //x->rdmult = ((cpi->last_frame_distortion * 256)/cpi->common.MBs)/ cpi->target_bits_per_mb; - x->rdmult = (int)(cpi->RDMULT * cpi->rate_correction_factor); - } - else - x->rdmult = cpi->RDMULT; */ - //x->rdmult = (int)(cpi->RDMULT * pow( (cpi->rate_correction_factor * 2.0), 0.75 )); -#endif - xd->mode_info_context->mbmi.mode = DC_PRED; xd->mode_info_context->mbmi.uv_mode = DC_PRED; |