generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Removed mb_norm_activity_map"

Browse Source
This commit is contained in:
Scott LaVarnway
2012-11-06 16:28:54 -08:00
committed by Gerrit Code Review
parent ee28bb87b4 78bf8284cf
commit 80fe4723d2
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vp8/encoder/onyx_if.c
View File

@@ -355,8 +355,6 @@ static void dealloc_compressor_data(VP8_COMP *cpi)
/* Activity mask based per mb zbin adjustments */ /* Activity mask based per mb zbin adjustments */
vpx_free(cpi->mb_activity_map); vpx_free(cpi->mb_activity_map);
cpi->mb_activity_map = 0; cpi->mb_activity_map = 0;
vpx_free(cpi->mb_norm_activity_map);
cpi->mb_norm_activity_map = 0;
vpx_free(cpi->mb.pip); vpx_free(cpi->mb.pip);
cpi->mb.pip = 0; cpi->mb.pip = 0;
@@ -1097,11 +1095,6 @@ void vp8_alloc_compressor_data(VP8_COMP *cpi)
vpx_calloc(sizeof(*cpi->mb_activity_map), vpx_calloc(sizeof(*cpi->mb_activity_map),
cm->mb_rows * cm->mb_cols)); 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. */ /* allocate memory for storing last frame's MVs for MV prediction. */
vpx_free(cpi->lfmv); vpx_free(cpi->lfmv);
CHECK_MEM_ERROR(cpi->lfmv, vpx_calloc((cm->mb_rows+2) * (cm->mb_cols+2), CHECK_MEM_ERROR(cpi->lfmv, vpx_calloc((cm->mb_rows+2) * (cm->mb_cols+2),

1
vp8/encoder/onyx_int.h
View File

@@ -649,7 +649,6 @@ typedef struct VP8_COMP
/* Per MB activity measurement */ /* Per MB activity measurement */
unsigned int activity_avg; unsigned int activity_avg;
unsigned int * mb_activity_map; unsigned int * mb_activity_map;
int * mb_norm_activity_map;
/* Record of which MBs still refer to last golden frame either /* Record of which MBs still refer to last golden frame either
* directly or through 0,0 * directly or through 0,0