diff options
| author | Gaute Strokkenes <gaute.strokkenes@broadcom.com> | 2011-02-05 05:29:25 +0000 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-02-09 11:21:18 -0500 |
| commit | 315e3c25186292ad7cb00d9d92b3b2f850d37d40 (patch) | |
| tree | a8228741bcac70718c62d96a6f053a9036c2ef78 /vp8/decoder/onyxd_if.c | |
| parent | 350ffe8dae8e11fb4d00b00c467c1c99ca797f8b (diff) | |
| download | libvpx-315e3c25186292ad7cb00d9d92b3b2f850d37d40.tar libvpx-315e3c25186292ad7cb00d9d92b3b2f850d37d40.tar.gz libvpx-315e3c25186292ad7cb00d9d92b3b2f850d37d40.tar.bz2 libvpx-315e3c25186292ad7cb00d9d92b3b2f850d37d40.zip | |
Put more code under #if CONFIG_MULTITHREAD.
Change-Id: Icf4b692099d7d249fe3553852b1022b027b28e4b
Diffstat (limited to 'vp8/decoder/onyxd_if.c')
| -rw-r--r-- | vp8/decoder/onyxd_if.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c index adbb1f336..41966b9da 100644 --- a/vp8/decoder/onyxd_if.c +++ b/vp8/decoder/onyxd_if.c @@ -114,8 +114,10 @@ VP8D_PTR vp8dx_create_decompressor(VP8D_CONFIG *oxcf) pbi->ready_for_new_data = 1; pbi->CPUFreq = 0; /*vp8_get_processor_freq();*/ +#if CONFIG_MULTITHREAD pbi->max_threads = oxcf->max_threads; vp8_decoder_create_threads(pbi); +#endif /* vp8cx_init_de_quantizer() is first called here. Add check in frame_init_dequantizer() to avoid * unnecessary calling of vp8cx_init_de_quantizer() for every frame. @@ -149,8 +151,8 @@ void vp8dx_remove_decompressor(VP8D_PTR ptr) #if CONFIG_MULTITHREAD if (pbi->b_multithreaded_rd) vp8mt_de_alloc_temp_buffers(pbi, pbi->common.mb_rows); -#endif vp8_decoder_remove_threads(pbi); +#endif vp8_remove_common(&pbi->common); vpx_free(pbi); } @@ -407,6 +409,7 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign return retcode; } +#if CONFIG_MULTITHREAD if (pbi->b_multithreaded_rd && cm->multi_token_partition != ONE_PARTITION) { if (swap_frame_buffers (cm)) @@ -424,6 +427,7 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign return -1; } } else +#endif { if (swap_frame_buffers (cm)) { |