diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-04-11 10:28:45 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-04-11 12:27:14 -0700 |
| commit | 2e2b8a53cc481a02a07584e1c13c994374b0990e (patch) | |
| tree | ad273aa500aa9b734a5715c4f03306fa2905d1bc /vp9/encoder | |
| parent | 605ff051f7e9445f5c62908302251adb5745fc63 (diff) | |
| download | libvpx-2e2b8a53cc481a02a07584e1c13c994374b0990e.tar libvpx-2e2b8a53cc481a02a07584e1c13c994374b0990e.tar.gz libvpx-2e2b8a53cc481a02a07584e1c13c994374b0990e.tar.bz2 libvpx-2e2b8a53cc481a02a07584e1c13c994374b0990e.zip | |
Remove "tplist" from VP9_COMP.
It is write-only.
Change-Id: I2412344688d96593cc01c038e7f51410d0f85ed0
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 6 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 8 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_int.h | 2 |
3 files changed, 0 insertions, 16 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index ee442514d..b0df15207 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -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; diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index aab072e65..c1203f04b 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -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))); } diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index f4a93f234..ac59acc08 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -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; |