ref: dd45530ee6bda64fed83179652eb3546a866d2bf
parent: dd209fae3aaceeee2af61a3e806b5f53fe6a0131
parent: a0a6590e0fa4d7dd8eeaf0384ec27bfc8d925349
author: Adrian Grange <[email protected]>
date: Mon Nov 4 06:39:23 EST 2013
Merge "Remove unused member variables from VP9_COMP"
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -683,10 +683,6 @@
[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++;
}
}
@@ -1930,9 +1926,6 @@
#endif
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);
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -1032,11 +1032,6 @@
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),
--- a/vp9/encoder/vp9_onyx_int.h
+++ b/vp9/encoder/vp9_onyx_int.h
@@ -529,12 +529,6 @@
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