From d2499ead93dc4298c0882fe98902acb1b5209f99 Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 19 Oct 2018 23:05:00 -0500 Subject: Update libaom to commit ID 1e227d41f0616de9548a673a83a21ef990b62591 --- third_party/aom/av1/encoder/context_tree.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'third_party/aom/av1/encoder/context_tree.h') diff --git a/third_party/aom/av1/encoder/context_tree.h b/third_party/aom/av1/encoder/context_tree.h index c05f48a7a..4efc34985 100644 --- a/third_party/aom/av1/encoder/context_tree.h +++ b/third_party/aom/av1/encoder/context_tree.h @@ -9,8 +9,8 @@ * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ -#ifndef AV1_ENCODER_CONTEXT_TREE_H_ -#define AV1_ENCODER_CONTEXT_TREE_H_ +#ifndef AOM_AV1_ENCODER_CONTEXT_TREE_H_ +#define AOM_AV1_ENCODER_CONTEXT_TREE_H_ #include "av1/common/blockd.h" #include "av1/encoder/block.h" @@ -56,6 +56,8 @@ typedef struct { int hybrid_pred_diff; int comp_pred_diff; int single_pred_diff; + // Skip certain ref frames during RD search of rectangular partitions. + int skip_ref_frame_mask; // TODO(jingning) Use RD_COST struct here instead. This involves a boarder // scope of refactoring. @@ -109,4 +111,4 @@ void av1_copy_tree_context(PICK_MODE_CONTEXT *dst_ctx, } // extern "C" #endif -#endif /* AV1_ENCODER_CONTEXT_TREE_H_ */ +#endif // AOM_AV1_ENCODER_CONTEXT_TREE_H_ -- cgit v1.2.3