From de075a95e015686c03dea3f40884a018dc6ab1c5 Mon Sep 17 00:00:00 2001 From: Marco Paniconi Date: Mon, 22 Aug 2016 15:46:20 +0000 Subject: [PATCH] Revert "vp8: Move loopfilter synchronization to end of encode_frame call." This reverts commit c2fe9acceda922ca1d9f0d6185b340560b93597a. This change break linux browser test in chromium: https://build.chromium.org/p/chromium.webrtc/builders/Linux%20Tester Change-Id: I226782fad480c17a99ec6c785ad93cf4ab88f0ae --- vp8/encoder/onyx_if.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 10f853394..434429e8a 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -4392,6 +4392,13 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, unsigned long *size, /* build the bitstream */ vp8_pack_bitstream(cpi, dest, dest_end, size); +#if CONFIG_MULTITHREAD + /* wait for the lpf thread done */ + if (cpi->b_multi_threaded) { + sem_wait(&cpi->h_event_end_lpf); + } +#endif + /* Move storing frame_type out of the above loop since it is also * needed in motion search besides loopfilter */ cm->last_frame_type = cm->frame_type; @@ -5228,13 +5235,6 @@ int vp8_get_compressed_data(VP8_COMP *cpi, unsigned int *frame_flags, cpi->common.error.setjmp = 0; -#if CONFIG_MULTITHREAD - /* wait for the lpf thread done */ - if (cpi->b_multi_threaded) { - sem_wait(&cpi->h_event_end_lpf); - } -#endif - return 0; } -- 2.40.0