summaryrefslogtreecommitdiff
path: root/chromium/third_party/libvpx/source/libvpx/vp9/encoder/vp9_block.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/libvpx/source/libvpx/vp9/encoder/vp9_block.h')
-rw-r--r--chromium/third_party/libvpx/source/libvpx/vp9/encoder/vp9_block.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/chromium/third_party/libvpx/source/libvpx/vp9/encoder/vp9_block.h b/chromium/third_party/libvpx/source/libvpx/vp9/encoder/vp9_block.h
index 1ea5fdf1ff2..c0c69f6b5cf 100644
--- a/chromium/third_party/libvpx/source/libvpx/vp9/encoder/vp9_block.h
+++ b/chromium/third_party/libvpx/source/libvpx/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.
@@ -131,6 +136,10 @@ struct macroblock {
int use_lp32x32fdct;
int skip_encode;
+ // In first pass, intra prediction is done based on source pixels
+ // at tile boundaries
+ int fp_src_pred;
+
// use fast quantization process
int quant_fp;
@@ -151,6 +160,8 @@ struct macroblock {
uint8_t sb_is_skin;
+ uint8_t skip_low_source_sad;
+
// Used to save the status of whether a block has a low variance in
// choose_partitioning. 0 for 64x64, 1~2 for 64x32, 3~4 for 32x64, 5~8 for
// 32x32, 9~24 for 16x16.