diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 44ade18de..86332bcf9 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -683,10 +683,6 @@ static void update_stats(VP9_COMP *cpi) { [mbmi->ref_frame[0] != GOLDEN_FRAME]++; } } - - // Count of last ref frame 0,0 usage - if (mbmi->mode == ZEROMV && mbmi->ref_frame[0] == LAST_FRAME) - cpi->inter_zz_count++; } } @@ -1931,9 +1927,6 @@ static void encode_frame_internal(VP9_COMP *cpi) { totalrate = 0; - // Reset frame count of inter 0,0 motion vector usage. - cpi->inter_zz_count = 0; - vp9_zero(cm->counts.switchable_interp); vp9_zero(cpi->tx_stepdown_count); diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index b664f1e99..0b05cf283 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -1032,11 +1032,6 @@ void vp9_alloc_compressor_data(VP9_COMP *cpi) { CHECK_MEM_ERROR(cm, cpi->tok, vpx_calloc(tokens, sizeof(*cpi->tok))); } - // Data used for real time vc mode to see if gf needs refreshing - cpi->inter_zz_count = 0; - cpi->gf_bad_count = 0; - cpi->gf_update_recommended = 0; - vpx_free(cpi->mb_activity_map); CHECK_MEM_ERROR(cm, cpi->mb_activity_map, vpx_calloc(sizeof(unsigned int), diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 0498043fc..44f1e2684 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -529,12 +529,6 @@ typedef struct VP9_COMP { unsigned int max_mv_magnitude; int mv_step_param; - // Data used for real time conferencing mode to help determine if it - // would be good to update the gf - int inter_zz_count; - int gf_bad_count; - int gf_update_recommended; - unsigned char *segmentation_map; // segment threashold for encode breakout