diff options
author | Yunqing Wang <yunqingwang@google.com> | 2017-02-15 00:54:10 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-02-15 00:54:10 +0000 |
commit | f2c1aea1180b43a1ab7642d504a84fabf1b147b8 (patch) | |
tree | b60bb38f9f046a0b3a9636183246f4ea498478d1 /vp9/encoder/vp9_block.h | |
parent | 615566aa81327767f89543927048dbbab1156e6d (diff) | |
parent | 71061e9332c05324007e7f6c900285273793366d (diff) | |
download | libvpx-f2c1aea1180b43a1ab7642d504a84fabf1b147b8.tar libvpx-f2c1aea1180b43a1ab7642d504a84fabf1b147b8.tar.gz libvpx-f2c1aea1180b43a1ab7642d504a84fabf1b147b8.tar.bz2 libvpx-f2c1aea1180b43a1ab7642d504a84fabf1b147b8.zip |
Merge "Row based multi-threading of encoding stage"
Diffstat (limited to 'vp9/encoder/vp9_block.h')
-rw-r--r-- | vp9/encoder/vp9_block.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_block.h b/vp9/encoder/vp9_block.h index 91d07e3a0..c0c69f6b5 100644 --- a/vp9/encoder/vp9_block.h +++ b/vp9/encoder/vp9_block.h @@ -11,6 +11,8 @@ #ifndef VP9_ENCODER_VP9_BLOCK_H_ #define VP9_ENCODER_VP9_BLOCK_H_ +#include "vpx_util/vpx_thread.h" + #include "vp9/common/vp9_entropymv.h" #include "vp9/common/vp9_entropy.h" @@ -88,6 +90,9 @@ struct macroblock { int mb_energy; int *m_search_count_ptr; int *ex_search_count_ptr; +#if CONFIG_MULTITHREAD + pthread_mutex_t *search_count_mutex; +#endif // These are set to their default values at the beginning, and then adjusted // further in the encoding process. |