diff options
| author | Angie Chiang <angiebird@google.com> | 2019-07-31 22:03:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-07-31 22:03:27 +0000 |
| commit | 119dad38e64b66e602471239b864c08c6574087f (patch) | |
| tree | 2dc449397752f0039e2abc2328850a23d2a0f2c5 | |
| parent | 4b0bfe8f7d5cc99e6b803a57c1092e593ee28986 (diff) | |
| parent | f8c416f7bb32c781434bce40af9b86cf3e73b82f (diff) | |
| download | libvpx-119dad38e64b66e602471239b864c08c6574087f.tar libvpx-119dad38e64b66e602471239b864c08c6574087f.tar.gz libvpx-119dad38e64b66e602471239b864c08c6574087f.tar.bz2 libvpx-119dad38e64b66e602471239b864c08c6574087f.zip | |
Merge "Cosmetic changes of vp9_nb_mvs_inconsistency"
| -rw-r--r-- | vp9/encoder/vp9_non_greedy_mv.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_non_greedy_mv.c b/vp9/encoder/vp9_non_greedy_mv.c index f54e40cc7..d83aeca88 100644 --- a/vp9/encoder/vp9_non_greedy_mv.c +++ b/vp9/encoder/vp9_non_greedy_mv.c @@ -180,12 +180,12 @@ static int64_t log2_approximation(int64_t v) { int64_t vp9_nb_mvs_inconsistency(const MV *mv, const int_mv *nb_full_mvs, int mv_num) { - // The bahavior of this function is to compute log2 of mv difference, + // The behavior of this function is to compute log2 of mv difference, // i.e. min log2(1 + row_diff * row_diff + col_diff * col_diff) - // against available neghbor mvs. - // Since the log2 is monotonic increasing, we can compute + // against available neighbor mvs. + // Since the log2 is monotonically increasing, we can compute // min row_diff * row_diff + col_diff * col_diff first - // then apply log2 in the end + // then apply log2 in the end. int i; int64_t min_abs_diff = INT64_MAX; int cnt = 0; @@ -201,7 +201,6 @@ int64_t vp9_nb_mvs_inconsistency(const MV *mv, const int_mv *nb_full_mvs, } if (cnt) { return log2_approximation(1 + min_abs_diff); - } else { - return 0; } + return 0; } |