Remove CONFIG_SEGMENT_GLOBALMV
This tool is fully adopted.
Change-Id: Id6754219e450c8dd9fc8c33e64a2ce42f73845f8
diff --git a/av1/common/seg_common.h b/av1/common/seg_common.h
index 75064cd..c59c2e4 100644
--- a/av1/common/seg_common.h
+++ b/av1/common/seg_common.h
@@ -34,9 +34,7 @@
SEG_LVL_ALT_LF_V, // Use alternate loop filter value on v plane
SEG_LVL_REF_FRAME, // Optional Segment reference frame
SEG_LVL_SKIP, // Optional Segment (0,0) + skip mode
-#if CONFIG_SEGMENT_GLOBALMV
SEG_LVL_GLOBALMV,
-#endif
SEG_LVL_MAX
} SEG_LVL_FEATURES;
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 690a060..dc0196e 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -974,14 +974,8 @@
ref_frame[0] = (MV_REFERENCE_FRAME)get_segdata(&cm->seg, segment_id,
SEG_LVL_REF_FRAME);
ref_frame[1] = NONE_FRAME;
- }
-#if CONFIG_SEGMENT_GLOBALMV
- else if (segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP) ||
- segfeature_active(&cm->seg, segment_id, SEG_LVL_GLOBALMV))
-#else
- else if (segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP))
-#endif
- {
+ } else if (segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP) ||
+ segfeature_active(&cm->seg, segment_id, SEG_LVL_GLOBALMV)) {
ref_frame[0] = LAST_FRAME;
ref_frame[1] = NONE_FRAME;
} else {
@@ -1311,11 +1305,8 @@
RefBuffer *ref_buf = &cm->frame_refs[frame - LAST_FRAME];
return frame != INTRA_FRAME && av1_is_valid_scale(&ref_buf->sf);
}
- if (segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP)
-#if CONFIG_SEGMENT_GLOBALMV
- || segfeature_active(&cm->seg, segment_id, SEG_LVL_GLOBALMV)
-#endif
- ) {
+ if (segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP) ||
+ segfeature_active(&cm->seg, segment_id, SEG_LVL_GLOBALMV)) {
if (!av1_is_valid_scale(&cm->frame_refs[0].sf)) return 0;
}
const int ctx = av1_get_intra_inter_context(xd);
@@ -1399,13 +1390,8 @@
assert(is_compound);
mbmi->mode = NEAREST_NEARESTMV;
} else {
-#if CONFIG_SEGMENT_GLOBALMV
if (segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP) ||
- segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_GLOBALMV))
-#else
- if (segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP))
-#endif
- {
+ segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_GLOBALMV)) {
mbmi->mode = GLOBALMV;
} else {
if (is_compound)
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 840b192..ba94a6de 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -244,11 +244,8 @@
static void write_is_inter(const AV1_COMMON *cm, const MACROBLOCKD *xd,
int segment_id, aom_writer *w, const int is_inter) {
if (!segfeature_active(&cm->seg, segment_id, SEG_LVL_REF_FRAME)) {
- if (segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP)
-#if CONFIG_SEGMENT_GLOBALMV
- || segfeature_active(&cm->seg, segment_id, SEG_LVL_GLOBALMV)
-#endif
- )
+ if (segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP) ||
+ segfeature_active(&cm->seg, segment_id, SEG_LVL_GLOBALMV))
if (!av1_is_valid_scale(&cm->frame_refs[0].sf))
return; // LAST_FRAME not valid for reference
@@ -501,14 +498,8 @@
assert(!is_compound);
assert(mbmi->ref_frame[0] ==
get_segdata(&cm->seg, segment_id, SEG_LVL_REF_FRAME));
- }
-#if CONFIG_SEGMENT_GLOBALMV
- else if (segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP) ||
- segfeature_active(&cm->seg, segment_id, SEG_LVL_GLOBALMV))
-#else
- else if (segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP))
-#endif
- {
+ } else if (segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP) ||
+ segfeature_active(&cm->seg, segment_id, SEG_LVL_GLOBALMV)) {
assert(!is_compound);
assert(mbmi->ref_frame[0] == LAST_FRAME);
} else {
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 139d0b4..f7fa86c 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -109,7 +109,6 @@
set(CONFIG_OBU_REDUNDANT_FRAME_HEADER 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_RD_DEBUG 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_SCALABILITY 1 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_SEGMENT_GLOBALMV 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_SHORT_FILTER 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_SKIP_SGR 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_SPATIAL_SEGMENTATION 1 CACHE NUMBER "AV1 experiment flag.")
