Change variable name for MVD class offset
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c index fcddc28..00bb41a 100644 --- a/av1/decoder/decodemv.c +++ b/av1/decoder/decodemv.c
@@ -1257,11 +1257,10 @@ const int class0 = mv_class == MV_CLASS_0; #if CONFIG_ADAPTIVE_MVD - int use_integer_mv = 1; - if (mv_class > MV_CLASS_0 && is_adaptive_mvd) use_integer_mv = 0; - if (use_integer_mv) { + int use_mv_class_offset = 1; + if (mv_class > MV_CLASS_0 && is_adaptive_mvd) use_mv_class_offset = 0; + if (use_mv_class_offset) { #endif // CONFIG_ADAPTIVE_MVD - // Integer part if (class0) { d = aom_read_symbol(r, mvcomp->class0_cdf, CLASS0_SIZE, ACCT_STR);
diff --git a/av1/encoder/encodemv.c b/av1/encoder/encodemv.c index f73a645..5306c79 100644 --- a/av1/encoder/encodemv.c +++ b/av1/encoder/encodemv.c
@@ -47,13 +47,13 @@ #endif // CONFIG_ADAPTIVE_MVD #if CONFIG_ADAPTIVE_MVD - int use_integer_mv = 1; + int use_mv_class_offset = 1; if (is_adaptive_mvd && (mv_class != MV_CLASS_0 || d > 0)) { assert(fr == 3 && hp == 1); precision = MV_SUBPEL_NONE; } - if (mv_class > MV_CLASS_0 && is_adaptive_mvd) use_integer_mv = 0; - if (use_integer_mv) { + if (mv_class > MV_CLASS_0 && is_adaptive_mvd) use_mv_class_offset = 0; + if (use_mv_class_offset) { #endif // CONFIG_ADAPTIVE_MVD // Integer bits if (mv_class == MV_CLASS_0) { @@ -144,15 +144,14 @@ MV_CLASSES); #if CONFIG_ADAPTIVE_MVD - int use_integer_mv = 1; + int use_mv_class_offset = 1; if (is_adaptive_mvd && (mv_class != MV_CLASS_0 || d > 0)) { assert(fr == 3 && hp == 1); precision = MV_SUBPEL_NONE; } - if (mv_class > MV_CLASS_0 && is_adaptive_mvd) use_integer_mv = 0; - if (use_integer_mv) { + if (mv_class > MV_CLASS_0 && is_adaptive_mvd) use_mv_class_offset = 0; + if (use_mv_class_offset) { #endif // CONFIG_ADAPTIVE_MVD - // Integer bits if (mv_class == MV_CLASS_0) { aom_write_symbol(w, d, mvcomp->class0_cdf, CLASS0_SIZE);