ref: 78bf8284cfd81c04c979f3b37411fdd324b8eb06
parent: 01824d1848c1feeb727ea7dfd6522f8966133953
author: Scott LaVarnway <slavarnway@google.com>
date: Tue Nov 6 04:47:45 EST 2012
Removed mb_norm_activity_map Not used. Change-Id: I07ba929e3ff82b4b0c86f731769cdf5434c7a816
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -355,8 +355,6 @@
/* Activity mask based per mb zbin adjustments */
vpx_free(cpi->mb_activity_map);
cpi->mb_activity_map = 0;
- vpx_free(cpi->mb_norm_activity_map);
- cpi->mb_norm_activity_map = 0;
vpx_free(cpi->mb.pip);
cpi->mb.pip = 0;
@@ -1095,11 +1093,6 @@
vpx_free(cpi->mb_activity_map);
CHECK_MEM_ERROR(cpi->mb_activity_map,
vpx_calloc(sizeof(*cpi->mb_activity_map),
- cm->mb_rows * cm->mb_cols));
-
- vpx_free(cpi->mb_norm_activity_map);
- CHECK_MEM_ERROR(cpi->mb_norm_activity_map,
- vpx_calloc(sizeof(*cpi->mb_norm_activity_map),
cm->mb_rows * cm->mb_cols));
/* allocate memory for storing last frame's MVs for MV prediction. */
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -651,7 +651,6 @@
/* Per MB activity measurement */
unsigned int activity_avg;
unsigned int * mb_activity_map;
- int * mb_norm_activity_map;
/* Record of which MBs still refer to last golden frame either
* directly or through 0,0