diff options
| author | Jingning Han <jingning@google.com> | 2013-05-04 22:09:43 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2013-05-07 09:08:25 -0700 |
| commit | 776c1482a302f5ea42dfe4517f51c0f1e48f2670 (patch) | |
| tree | 50af5bd8efe251aa065f94249f172a1922aae0f2 /vp9/common/vp9_entropymode.h | |
| parent | 8c70a0fcab18ed3ebbdceee43a9e4305251677ae (diff) | |
| download | libvpx-776c1482a302f5ea42dfe4517f51c0f1e48f2670.tar libvpx-776c1482a302f5ea42dfe4517f51c0f1e48f2670.tar.gz libvpx-776c1482a302f5ea42dfe4517f51c0f1e48f2670.tar.bz2 libvpx-776c1482a302f5ea42dfe4517f51c0f1e48f2670.zip | |
Merge SB8X8 into the codebase
Pull sb8x8 out of experimental list. verified via borg run tests.
Fixed unit test failures.
Change-Id: I12a4bbd17395930580c048ab68becad1ffe46e76
Diffstat (limited to 'vp9/common/vp9_entropymode.h')
| -rw-r--r-- | vp9/common/vp9_entropymode.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h index 24f988f25..f49bb3b42 100644 --- a/vp9/common/vp9_entropymode.h +++ b/vp9/common/vp9_entropymode.h @@ -15,9 +15,6 @@ #include "vp9/common/vp9_treecoder.h" #define SUBMVREF_COUNT 5 -#if !CONFIG_SB8X8 -#define VP9_NUMMBSPLITS 4 -#endif #if CONFIG_COMP_INTERINTRA_PRED #define VP9_DEF_INTERINTRA_PROB 248 @@ -26,16 +23,6 @@ #define SEPARATE_INTERINTRA_UV 0 #endif -#if !CONFIG_SB8X8 -typedef const int vp9_mbsplit[16]; - -extern vp9_mbsplit vp9_mbsplits[VP9_NUMMBSPLITS]; - -extern const int vp9_mbsplit_count[VP9_NUMMBSPLITS]; /* # of subsets */ - -extern const vp9_prob vp9_mbsplit_probs[VP9_NUMMBSPLITS - 1]; -#endif - extern int vp9_mv_cont(const int_mv *l, const int_mv *a); extern const vp9_prob vp9_sub_mv_ref_prob2[SUBMVREF_COUNT][VP9_SUBMVREFS - 1]; @@ -52,10 +39,6 @@ extern const vp9_tree_index vp9_kf_ymode_tree[]; extern const vp9_tree_index vp9_uv_mode_tree[]; #define vp9_sb_ymode_tree vp9_uv_mode_tree #define vp9_sb_kf_ymode_tree vp9_uv_mode_tree -#if !CONFIG_SB8X8 -extern const vp9_tree_index vp9_i8x8_mode_tree[]; -extern const vp9_tree_index vp9_mbsplit_tree[]; -#endif extern const vp9_tree_index vp9_mv_ref_tree[]; extern const vp9_tree_index vp9_sb_mv_ref_tree[]; extern const vp9_tree_index vp9_sub_mv_ref_tree[]; @@ -67,10 +50,6 @@ extern struct vp9_token vp9_sb_ymode_encodings[VP9_I32X32_MODES]; extern struct vp9_token vp9_sb_kf_ymode_encodings[VP9_I32X32_MODES]; extern struct vp9_token vp9_kf_ymode_encodings[VP9_YMODES]; extern struct vp9_token vp9_uv_mode_encodings[VP9_UV_MODES]; -#if !CONFIG_SB8X8 -extern struct vp9_token vp9_i8x8_mode_encodings[VP9_I8X8_MODES]; -extern struct vp9_token vp9_mbsplit_encodings[VP9_NUMMBSPLITS]; -#endif /* Inter mode values do not start at zero */ |