Commit 17544d14 authored by Ronald S. Bultje's avatar Ronald S. Bultje Committed by Gerrit Code Review
Browse files

Merge "Remove some unused code related to macroblock/splitmv coding." into experimental

parents 7873de14 4487f5a6
...@@ -141,13 +141,6 @@ const vp9_tree_index vp9_uv_mode_tree[VP9_UV_MODES * 2 - 2] = { ...@@ -141,13 +141,6 @@ const vp9_tree_index vp9_uv_mode_tree[VP9_UV_MODES * 2 - 2] = {
-H_PRED, -TM_PRED -H_PRED, -TM_PRED
}; };
const vp9_tree_index vp9_mv_ref_tree[8] = {
-ZEROMV, 2,
-NEARESTMV, 4,
-NEARMV, 6,
-NEWMV, -SPLITMV
};
const vp9_tree_index vp9_sb_mv_ref_tree[6] = { const vp9_tree_index vp9_sb_mv_ref_tree[6] = {
-ZEROMV, 2, -ZEROMV, 2,
-NEARESTMV, 4, -NEARESTMV, 4,
...@@ -168,7 +161,6 @@ struct vp9_token vp9_sb_kf_ymode_encodings[VP9_I32X32_MODES]; ...@@ -168,7 +161,6 @@ struct vp9_token vp9_sb_kf_ymode_encodings[VP9_I32X32_MODES];
struct vp9_token vp9_kf_ymode_encodings[VP9_YMODES]; struct vp9_token vp9_kf_ymode_encodings[VP9_YMODES];
struct vp9_token vp9_uv_mode_encodings[VP9_UV_MODES]; struct vp9_token vp9_uv_mode_encodings[VP9_UV_MODES];
struct vp9_token vp9_mv_ref_encoding_array[VP9_MVREFS];
struct vp9_token vp9_sb_mv_ref_encoding_array[VP9_MVREFS]; struct vp9_token vp9_sb_mv_ref_encoding_array[VP9_MVREFS];
struct vp9_token vp9_partition_encodings[PARTITION_TYPES]; struct vp9_token vp9_partition_encodings[PARTITION_TYPES];
...@@ -265,8 +257,6 @@ void vp9_entropy_mode_init() { ...@@ -265,8 +257,6 @@ void vp9_entropy_mode_init() {
vp9_switchable_interp_tree); vp9_switchable_interp_tree);
vp9_tokens_from_tree(vp9_partition_encodings, vp9_partition_tree); vp9_tokens_from_tree(vp9_partition_encodings, vp9_partition_tree);
vp9_tokens_from_tree_offset(vp9_mv_ref_encoding_array,
vp9_mv_ref_tree, NEARESTMV);
vp9_tokens_from_tree_offset(vp9_sb_mv_ref_encoding_array, vp9_tokens_from_tree_offset(vp9_sb_mv_ref_encoding_array,
vp9_sb_mv_ref_tree, NEARESTMV); vp9_sb_mv_ref_tree, NEARESTMV);
} }
......
...@@ -29,9 +29,7 @@ extern const vp9_tree_index vp9_kf_ymode_tree[]; ...@@ -29,9 +29,7 @@ extern const vp9_tree_index vp9_kf_ymode_tree[];
extern const vp9_tree_index vp9_uv_mode_tree[]; extern const vp9_tree_index vp9_uv_mode_tree[];
#define vp9_sb_ymode_tree vp9_uv_mode_tree #define vp9_sb_ymode_tree vp9_uv_mode_tree
#define vp9_sb_kf_ymode_tree vp9_uv_mode_tree #define vp9_sb_kf_ymode_tree vp9_uv_mode_tree
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_sb_mv_ref_tree[];
extern const vp9_tree_index vp9_sub_mv_ref_tree[];
extern struct vp9_token vp9_bmode_encodings[VP9_BINTRAMODES]; extern struct vp9_token vp9_bmode_encodings[VP9_BINTRAMODES];
extern struct vp9_token vp9_kf_bmode_encodings[VP9_BINTRAMODES]; extern struct vp9_token vp9_kf_bmode_encodings[VP9_BINTRAMODES];
...@@ -43,7 +41,6 @@ extern struct vp9_token vp9_uv_mode_encodings[VP9_UV_MODES]; ...@@ -43,7 +41,6 @@ extern struct vp9_token vp9_uv_mode_encodings[VP9_UV_MODES];
/* Inter mode values do not start at zero */ /* Inter mode values do not start at zero */
extern struct vp9_token vp9_mv_ref_encoding_array[VP9_MVREFS];
extern struct vp9_token vp9_sb_mv_ref_encoding_array[VP9_MVREFS]; extern struct vp9_token vp9_sb_mv_ref_encoding_array[VP9_MVREFS];
// probability models for partition information // probability models for partition information
......
...@@ -362,10 +362,6 @@ static MB_PREDICTION_MODE read_sb_mv_ref(vp9_reader *r, const vp9_prob *p) { ...@@ -362,10 +362,6 @@ static MB_PREDICTION_MODE read_sb_mv_ref(vp9_reader *r, const vp9_prob *p) {
return (MB_PREDICTION_MODE) treed_read(r, vp9_sb_mv_ref_tree, p); return (MB_PREDICTION_MODE) treed_read(r, vp9_sb_mv_ref_tree, p);
} }
static MB_PREDICTION_MODE read_mv_ref(vp9_reader *r, const vp9_prob *p) {
return (MB_PREDICTION_MODE) treed_read(r, vp9_mv_ref_tree, p);
}
#ifdef VPX_MODE_COUNT #ifdef VPX_MODE_COUNT
unsigned int vp9_mv_cont_count[5][4] = { unsigned int vp9_mv_cont_count[5][4] = {
{ 0, 0, 0, 0 }, { 0, 0, 0, 0 },
......
...@@ -526,15 +526,6 @@ static void pack_mb_tokens(vp9_writer* const bc, ...@@ -526,15 +526,6 @@ static void pack_mb_tokens(vp9_writer* const bc,
*tp = p; *tp = p;
} }
static void write_mv_ref(vp9_writer *bc, MB_PREDICTION_MODE m,
const vp9_prob *p) {
#if CONFIG_DEBUG
assert(NEARESTMV <= m && m <= SPLITMV);
#endif
write_token(bc, vp9_mv_ref_tree, p,
vp9_mv_ref_encoding_array - NEARESTMV + m);
}
static void write_sb_mv_ref(vp9_writer *bc, MB_PREDICTION_MODE m, static void write_sb_mv_ref(vp9_writer *bc, MB_PREDICTION_MODE m,
const vp9_prob *p) { const vp9_prob *p) {
#if CONFIG_DEBUG #if CONFIG_DEBUG
......
...@@ -926,8 +926,8 @@ int vp9_cost_mv_ref(VP9_COMP *cpi, ...@@ -926,8 +926,8 @@ int vp9_cost_mv_ref(VP9_COMP *cpi,
vp9_prob p [VP9_MVREFS - 1]; vp9_prob p [VP9_MVREFS - 1];
assert(NEARESTMV <= m && m <= SPLITMV); assert(NEARESTMV <= m && m <= SPLITMV);
vp9_mv_ref_probs(pc, p, mode_context); vp9_mv_ref_probs(pc, p, mode_context);
return cost_token(vp9_mv_ref_tree, p, return cost_token(vp9_sb_mv_ref_tree, p,
vp9_mv_ref_encoding_array - NEARESTMV + m); vp9_sb_mv_ref_encoding_array - NEARESTMV + m);
} else } else
return 0; return 0;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment