Merge "Remove "tplist" from VP9_COMP." into experimental

This commit is contained in:
Ronald S. Bultje 2013-04-11 15:17:03 -07:00 committed by Gerrit Code Review
commit 44dc18064e
3 changed files with 0 additions and 16 deletions

View File

@ -927,8 +927,6 @@ static void encode_sb(VP9_COMP *cpi,
if (output_enabled) {
(*tp)->Token = EOSB_TOKEN;
(*tp)++;
if (mb_row < cm->mb_rows)
cpi->tplist[mb_row].stop = *tp;
}
} else {
int i;
@ -958,8 +956,6 @@ static void encode_sb(VP9_COMP *cpi,
if (output_enabled) {
(*tp)->Token = EOSB_TOKEN;
(*tp)++;
if (mb_row + y_idx < cm->mb_rows)
cpi->tplist[mb_row + y_idx].stop = *tp;
}
}
}
@ -993,8 +989,6 @@ static void encode_sb64(VP9_COMP *cpi,
(*tp)->Token = EOSB_TOKEN;
(*tp)++;
if (mb_row < cm->mb_rows)
cpi->tplist[mb_row].stop = *tp;
} else {
int i;

View File

@ -300,9 +300,6 @@ static void setup_features(VP9_COMP *cpi) {
static void dealloc_compressor_data(VP9_COMP *cpi) {
vpx_free(cpi->tplist);
cpi->tplist = NULL;
// Delete last frame MV storage buffers
vpx_free(cpi->lfmv);
cpi->lfmv = 0;
@ -934,11 +931,6 @@ void vp9_alloc_compressor_data(VP9_COMP *cpi) {
!cpi->twopass.this_frame_stats)
vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR,
"Failed to allocate firstpass stats");
vpx_free(cpi->tplist);
CHECK_MEM_ERROR(cpi->tplist,
vpx_malloc(sizeof(TOKENLIST) * (cpi->common.mb_rows)));
}

View File

@ -566,8 +566,6 @@ typedef struct VP9_COMP {
unsigned char *active_map;
unsigned int active_map_enabled;
TOKENLIST *tplist;
fractional_mv_step_fp *find_fractional_mv_step;
vp9_full_search_fn_t full_search_sad;
vp9_refining_search_fn_t refining_search_sad;