diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-02-10 14:26:40 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-02-10 14:26:40 -0500 |
| commit | ec3b8f1f3283242db6d9d6eebc4e0056efbb8940 (patch) | |
| tree | 8a087882804ecd079bc555ab9f38e3a59a9d5334 /vp8/decoder/onyxd_if.c | |
| parent | dc0aca14b59290133b63b4331ba115847b7e5a9a (diff) | |
| parent | fffa2a61d72883019c7c09466db7e947cb7de34d (diff) | |
| download | libvpx-ec3b8f1f3283242db6d9d6eebc4e0056efbb8940.tar libvpx-ec3b8f1f3283242db6d9d6eebc4e0056efbb8940.tar.gz libvpx-ec3b8f1f3283242db6d9d6eebc4e0056efbb8940.tar.bz2 libvpx-ec3b8f1f3283242db6d9d6eebc4e0056efbb8940.zip | |
Merge remote branch 'internal/upstream' into HEAD
Conflicts:
vp8/decoder/onyxd_int.h
Change-Id: Id9aa577f03e37b4f406ba3b593c3c4330812a49e
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 ad0bf376e..f0ee8e157 100644 --- a/vp8/decoder/onyxd_if.c +++ b/vp8/decoder/onyxd_if.c @@ -113,8 +113,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. @@ -152,8 +154,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); } @@ -410,6 +412,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)) @@ -427,6 +430,7 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign return -1; } } else +#endif { if (swap_frame_buffers (cm)) { |