Remove vp9_blockd.h from vp9_common_data.c
The basic data defs should be above block operation level. Change-Id: I7dd9836d01120ab75e0c472baac9f15495ed0db5
This commit is contained in:
Родитель
7ee58985bd
Коммит
ebd724852e
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче