]> granicus.if.org Git - libvpx/commitdiff
Revert "vp8: Move loopfilter synchronization to end of encode_frame call."
authorMarco Paniconi <marpan@google.com>
Mon, 22 Aug 2016 15:46:20 +0000 (15:46 +0000)
committerMarco Paniconi <marpan@google.com>
Mon, 22 Aug 2016 15:46:20 +0000 (15:46 +0000)
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

index 10f8533944ea56aeb9493ee6606ca76c7dfeb34f..434429e8a092bf6e4888d2e04ebf92af14575345 100644 (file)
@@ -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;
 }