generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Put more code under #if CONFIG_MULTITHREAD.

Browse Source 
Change-Id: Icf4b692099d7d249fe3553852b1022b027b28e4b
This commit is contained in:
Gaute Strokkenes
2011-02-05 05:29:25 +00:00
committed by John Koleszar
parent 350ffe8dae
commit 315e3c2518
13 changed files with 56 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vp8/decoder/decodframe.c
View File

@@ -485,9 +485,11 @@ static void setup_token_decoder(VP8D_COMP *pbi,
bool_decoder++;
}
#if CONFIG_MULTITHREAD
/* Clamp number of decoder threads */
if (pbi->decoding_thread_count > num_part - 1)
pbi->decoding_thread_count = num_part - 1;
#endif
}
@@ -846,7 +848,9 @@ int vp8_decode_frame(VP8D_COMP *pbi)
vpx_memcpy(&xd->dst, &pc->yv12_fb[pc->new_fb_idx], sizeof(YV12_BUFFER_CONFIG));
/* set up frame new frame for intra coded blocks */
#if CONFIG_MULTITHREAD
if (!(pbi->b_multithreaded_rd) || pc->multi_token_partition == ONE_PARTITION || !(pc->filter_level))
#endif
vp8_setup_intra_recon(&pc->yv12_fb[pc->new_fb_idx]);
vp8_setup_block_dptrs(xd);
@@ -866,6 +870,7 @@ int vp8_decode_frame(VP8D_COMP *pbi)
vpx_memcpy(&xd->block[0].bmi, &xd->mode_info_context->bmi[0], sizeof(B_MODE_INFO));
#if CONFIG_MULTITHREAD
if (pbi->b_multithreaded_rd && pc->multi_token_partition != ONE_PARTITION)
{
vp8mt_decode_mb_rows(pbi, xd);
@@ -880,6 +885,7 @@ int vp8_decode_frame(VP8D_COMP *pbi)
vp8_yv12_extend_frame_borders_ptr(&pc->yv12_fb[pc->new_fb_idx]); /*cm->frame_to_show);*/
}
else
#endif
{
int ibc = 0;
int num_part = 1 << pc->multi_token_partition;