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

Merge "Fix loopfilter race condition in multithreaded encoder" into eider

Browse Source
This commit is contained in:
John Koleszar 2012-04-26 16:07:20 -07:00 committed by Gerrit Code Review
commit 60b36abf85
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
vp8/encoder/onyx_if.c
View File

@ -1412,6 +1412,15 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf)
if (!oxcf) if (!oxcf)
return; return;
#if CONFIG_MULTITHREAD
/* wait for the last picture loopfilter thread done */
if (cpi->b_lpf_running)
{
sem_wait(&cpi->h_event_end_lpf);
cpi->b_lpf_running = 0;
}
#endif
if (cm->version != oxcf->Version) if (cm->version != oxcf->Version)
{ {
cm->version = oxcf->Version; cm->version = oxcf->Version;
@ -3194,6 +3203,15 @@ static void encode_frame_to_data_rate
// Clear down mmx registers to allow floating point in what follows // Clear down mmx registers to allow floating point in what follows
vp8_clear_system_state(); vp8_clear_system_state();
#if CONFIG_MULTITHREAD
/* wait for the last picture loopfilter thread done */
if (cpi->b_lpf_running)
{
sem_wait(&cpi->h_event_end_lpf);
cpi->b_lpf_running = 0;
}
#endif
// Test code for segmentation of gf/arf (0,0) // Test code for segmentation of gf/arf (0,0)
//segmentation_test_function( cpi); //segmentation_test_function( cpi);
@ -3748,14 +3766,7 @@ static void encode_frame_to_data_rate
vp8_setup_key_frame(cpi); vp8_setup_key_frame(cpi);
} }
#if CONFIG_MULTITHREAD
/* wait for the last picture loopfilter thread done */
if (cpi->b_lpf_running)
{
sem_wait(&cpi->h_event_end_lpf);
cpi->b_lpf_running = 0;
}
#endif
#if CONFIG_REALTIME_ONLY & CONFIG_ONTHEFLY_BITPACKING #if CONFIG_REALTIME_ONLY & CONFIG_ONTHEFLY_BITPACKING
{ {