summaryrefslogtreecommitdiff
path: root/vp8
diff options
context:
space:
mode:
Diffstat (limited to 'vp8')
-rw-r--r--vp8/encoder/onyx_if.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 8415ac6e2..bb2a7963a 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -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);
}