From ebd724852ed4fead7b9a7116b76dbc7022110424 Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Tue, 7 Oct 2014 13:02:54 -0700 Subject: [PATCH] Remove vp9_blockd.h from vp9_common_data.c The basic data defs should be above block operation level. Change-Id: I7dd9836d01120ab75e0c472baac9f15495ed0db5 --- vp9/common/vp9_blockd.h | 2 -- vp9/common/vp9_common_data.c | 2 -- vp9/common/vp9_enums.h | 1 + 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 2436694..9e79ba0 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -49,8 +49,6 @@ typedef enum { typedef char ENTROPY_CONTEXT; -typedef char PARTITION_CONTEXT; - static INLINE int combine_entropy_contexts(ENTROPY_CONTEXT a, ENTROPY_CONTEXT b) { return (a != 0) + (b != 0); diff --git a/vp9/common/vp9_common_data.c b/vp9/common/vp9_common_data.c index d4c1b71..77bbe43 100644 --- a/vp9/common/vp9_common_data.c +++ b/vp9/common/vp9_common_data.c @@ -8,8 +8,6 @@ * be found in the AUTHORS file in the root of the source tree. */ - -#include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_common_data.h" // Log 2 conversion lookup tables for block width and height diff --git a/vp9/common/vp9_enums.h b/vp9/common/vp9_enums.h index 8817fdb..f83d21f 100644 --- a/vp9/common/vp9_enums.h +++ b/vp9/common/vp9_enums.h @@ -67,6 +67,7 @@ typedef enum PARTITION_TYPE { PARTITION_INVALID = PARTITION_TYPES } PARTITION_TYPE; +typedef char PARTITION_CONTEXT; #define PARTITION_PLOFFSET 4 // number of probability models per block size #define PARTITION_CONTEXTS (4 * PARTITION_PLOFFSET) -- 2.7.4