generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Remove vp9_blockd.h from vp9_common_data.c"

Browse Source
This commit is contained in:
Jingning Han 2014-10-07 15:34:07 -07:00 committed by Gerrit Code Review
commit 608c4acc1f
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vp9/common/vp9_blockd.h
View File

@ -49,8 +49,6 @@ typedef enum {
typedef char ENTROPY_CONTEXT; typedef char ENTROPY_CONTEXT;
typedef char PARTITION_CONTEXT;
static INLINE int combine_entropy_contexts(ENTROPY_CONTEXT a, static INLINE int combine_entropy_contexts(ENTROPY_CONTEXT a,
ENTROPY_CONTEXT b) { ENTROPY_CONTEXT b) {
return (a != 0) + (b != 0); return (a != 0) + (b != 0);

2
vp9/common/vp9_common_data.c
View File

@ -8,8 +8,6 @@
* be found in the AUTHORS file in the root of the source tree. * 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" #include "vp9/common/vp9_common_data.h"
// Log 2 conversion lookup tables for block width and height // Log 2 conversion lookup tables for block width and height

1
vp9/common/vp9_enums.h
View File

@ -67,6 +67,7 @@ typedef enum PARTITION_TYPE {
PARTITION_INVALID = PARTITION_TYPES PARTITION_INVALID = PARTITION_TYPES
} PARTITION_TYPE; } PARTITION_TYPE;
typedef char PARTITION_CONTEXT;
#define PARTITION_PLOFFSET 4 // number of probability models per block size #define PARTITION_PLOFFSET 4 // number of probability models per block size
#define PARTITION_CONTEXTS (4 * PARTITION_PLOFFSET) #define PARTITION_CONTEXTS (4 * PARTITION_PLOFFSET)