Commit 630d3b95 authored by John Koleszar's avatar John Koleszar
Browse files

Revert "Multithreaded encoder, late sync loopfilter"

This commit is incomplete, as it does not synchronize the loop filter
before returning a handle to the reconstructed frame in
vpx_codec_get_preview_frame(), which can cause (false?) failures
when running the test_reconstruct_buffer test.

This may be related to a bug that does cause visible artifacts, which
is also under investigation.

This reverts commit 380d64ec.

Change-Id: Iad710941e7731d44fc2bde63bc63d6763cc4629e
parent f357e5e2
......@@ -3733,17 +3733,6 @@ static void encode_frame_to_data_rate
vp8_setup_key_frame(cpi);
}
#if CONFIG_MULTITHREAD
/* wait for loopfilter thread done (for last picture)
* don't do it for first frame, re-code and when PSNR is calculated
*/
if (cpi->b_multi_threaded && cm->current_video_frame && (!Loop) &&
(!cpi->b_calculate_psnr))
{
sem_wait(&cpi->h_event_end_lpf);
}
#endif
// transform / motion compensation build reconstruction frame
vp8_encode_frame(cpi);
......@@ -4128,8 +4117,8 @@ static void encode_frame_to_data_rate
vp8_pack_bitstream(cpi, dest, dest_end, size);
#if CONFIG_MULTITHREAD
/* if PSNR packets are generated we have to wait for the lpf */
if (cpi->b_multi_threaded && cpi->b_calculate_psnr)
/* wait for loopfilter thread done */
if (cpi->b_multi_threaded)
{
sem_wait(&cpi->h_event_end_lpf);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment