diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-02-10 00:05:09 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-02-10 00:05:10 -0500 |
| commit | 96ddc5c26e354d96a73cd0f3d16f2bde3ea8b0db (patch) | |
| tree | 05358c3c6813d8db292624862b0c69db9730f13b /vp8/encoder/onyx_if.c | |
| parent | 6e6b46d97295c8227717e294f07de7283303369a (diff) | |
| parent | fffa2a61d72883019c7c09466db7e947cb7de34d (diff) | |
| download | libvpx-96ddc5c26e354d96a73cd0f3d16f2bde3ea8b0db.tar libvpx-96ddc5c26e354d96a73cd0f3d16f2bde3ea8b0db.tar.gz libvpx-96ddc5c26e354d96a73cd0f3d16f2bde3ea8b0db.tar.bz2 libvpx-96ddc5c26e354d96a73cd0f3d16f2bde3ea8b0db.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: Ie85d40c44bb23d56a519010356b2856c02fb4c05
Diffstat (limited to 'vp8/encoder/onyx_if.c')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 1f5006ee1..7b2c6d849 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -331,6 +331,9 @@ static void setup_features(VP8_COMP *cpi) void vp8_dealloc_compressor_data(VP8_COMP *cpi) { + vpx_free(cpi->tplist); + cpi->tplist = NULL; + // Delete last frame MV storage buffers if (cpi->lfmv != 0) vpx_free(cpi->lfmv); @@ -1545,6 +1548,8 @@ void vp8_alloc_compressor_data(VP8_COMP *cpi) else cpi->mt_sync_range = 16; #endif + + CHECK_MEM_ERROR(cpi->tplist, vpx_malloc(sizeof(TOKENLIST) * cpi->common.mb_rows)); } @@ -2496,7 +2501,9 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf) init_mv_ref_counts(); #endif +#if CONFIG_MULTITHREAD vp8cx_create_encoder_threads(cpi); +#endif cpi->fn_ptr[BLOCK_16X16].sdf = VARIANCE_INVOKE(&cpi->rtcd.variance, sad16x16); cpi->fn_ptr[BLOCK_16X16].vf = VARIANCE_INVOKE(&cpi->rtcd.variance, var16x16); @@ -2771,7 +2778,9 @@ void vp8_remove_compressor(VP8_PTR *ptr) } +#if CONFIG_MULTITHREAD vp8cx_remove_encoder_threads(cpi); +#endif vp8_dealloc_compressor_data(cpi); vpx_free(cpi->mb.ss); |