ref: de075a95e015686c03dea3f40884a018dc6ab1c5
parent: c2fe9acceda922ca1d9f0d6185b340560b93597a
author: Marco Paniconi <[email protected]>
date: Mon Aug 22 11:46:20 EDT 2016
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
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -4392,6 +4392,13 @@
/* 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;
@@ -5227,13 +5234,6 @@
#endif
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;
}