Remove CONFIG_SEGMENT_GLOBALMV This tool is fully adopted. Change-Id: Id6754219e450c8dd9fc8c33e64a2ce42f73845f8
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 {