Remove Global_Motion_Params and GLOBAL_MOTION_TYPE
After https://aomedia-review.googlesource.com/#/c/5589/ ,
the Global_Motion_Params and GLOBAL_MOTION_TYPE types
are redundant, and can be removed in favour of
WarpedMotionParams and TransformationType respectively.
Change-Id: I33f3796e5c469e595fd012ccdb65a672dd1bb86c
diff --git a/av1/common/entropymv.c b/av1/common/entropymv.c
index 029f9f6..a727169 100644
--- a/av1/common/entropymv.c
+++ b/av1/common/entropymv.c
@@ -128,13 +128,21 @@
};
#if CONFIG_GLOBAL_MOTION
-const aom_tree_index
- av1_global_motion_types_tree[TREE_SIZE(GLOBAL_MOTION_TYPES)] = {
- -GLOBAL_ZERO, 2, -GLOBAL_TRANSLATION, 4, -GLOBAL_ROTZOOM, -GLOBAL_AFFINE
- };
+#if GLOBAL_TRANS_TYPES == 4
+const aom_tree_index av1_global_motion_types_tree[TREE_SIZE(
+ GLOBAL_TRANS_TYPES)] = { -IDENTITY, 2, -TRANSLATION, 4, -ROTZOOM, -AFFINE };
-static const aom_prob default_global_motion_types_prob[GLOBAL_MOTION_TYPES -
- 1] = { 224, 128, 128 };
+static const aom_prob default_global_motion_types_prob[GLOBAL_TRANS_TYPES - 1] =
+ { 224, 128, 240 };
+
+#elif GLOBAL_TRANS_TYPES == 3
+
+const aom_tree_index av1_global_motion_types_tree[TREE_SIZE(
+ GLOBAL_TRANS_TYPES)] = { -IDENTITY, 2, -TRANSLATION, -ROTZOOM };
+
+static const aom_prob default_global_motion_types_prob[GLOBAL_TRANS_TYPES - 1] =
+ { 224, 128 };
+#endif // GLOBAL_TRANS_TYPES
#endif // CONFIG_GLOBAL_MOTION
static INLINE int mv_class_base(MV_CLASS_TYPE c) {
