diff options
| author | Marco Paniconi <marpan@google.com> | 2016-08-18 02:46:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-08-18 02:46:31 +0000 |
| commit | 37a39ac138a75d87f72b24fb07142cd03f5c7caa (patch) | |
| tree | ca219e5c48efeb5ffffb109fb9e133ce26141640 | |
| parent | af3b0de732e2c90dd7216894559f3b1a5b5f21e5 (diff) | |
| parent | c2fe9acceda922ca1d9f0d6185b340560b93597a (diff) | |
| download | libvpx-37a39ac138a75d87f72b24fb07142cd03f5c7caa.tar libvpx-37a39ac138a75d87f72b24fb07142cd03f5c7caa.tar.gz libvpx-37a39ac138a75d87f72b24fb07142cd03f5c7caa.tar.bz2 libvpx-37a39ac138a75d87f72b24fb07142cd03f5c7caa.zip | |
Merge "vp8: Move loopfilter synchronization to end of encode_frame call."
| -rw-r--r-- | vp8/encoder/onyx_if.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 434429e8a..10f853394 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -4392,13 +4392,6 @@ 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; @@ -5235,6 +5228,13 @@ 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; } |