Commit dead17d2 authored by Yue Chen's avatar Yue Chen
Browse files

Clear test failures and compiler warnings of MOTION_VAR

(1) Properly set params to default values to clear a unit test
failure when seg feature and motion_var are both on.
(2) Silenced compiling warnings in obmc variance functions.

Change-Id: Iaf4ee47c9941a228638d6046bcd1206f4a4f566a
parent f7751bec
......@@ -986,13 +986,13 @@ static INLINE void obmc_variance(const uint8_t *pre, int pre_stride,
}
}
#define OBMC_VAR(W, H) \
unsigned int aom_obmc_variance##W##x##H##_c( \
const uint8_t *pre, int pre_stride, const int32_t *wsrc, \
const int32_t *mask, unsigned int *sse) { \
int sum; \
obmc_variance(pre, pre_stride, wsrc, mask, W, H, sse, &sum); \
return *sse - (((int64_t)sum * sum) / (W * H)); \
#define OBMC_VAR(W, H) \
unsigned int aom_obmc_variance##W##x##H##_c( \
const uint8_t *pre, int pre_stride, const int32_t *wsrc, \
const int32_t *mask, unsigned int *sse) { \
int sum; \
obmc_variance(pre, pre_stride, wsrc, mask, W, H, sse, &sum); \
return *sse - (unsigned int)(((int64_t)sum * sum) / (W * H)); \
}
#define OBMC_SUBPIX_VAR(W, H) \
......
......@@ -124,7 +124,7 @@ static INLINE void obmc_variance_w8n(const uint8_t *pre, const int pre_stride,
} else { \
obmc_variance_w8n(pre, pre_stride, wsrc, mask, sse, &sum, W, H); \
} \
return *sse - (((int64_t)sum * sum) / (W * H)); \
return *sse - (unsigned int)(((int64_t)sum * sum) / (W * H)); \
}
#if CONFIG_EXT_PARTITION
......
......@@ -11410,6 +11410,11 @@ void av1_rd_pick_inter_mode_sb_seg_skip(const AV1_COMP *cpi,
mbmi->pred_mv[0].as_int = 0;
#endif // CONFIG_REF_MV
mbmi->motion_mode = SIMPLE_TRANSLATION;
#if CONFIG_MOTION_VAR
av1_count_overlappable_neighbors(cm, xd, mi_row, mi_col);
#endif
if (cm->interp_filter != BILINEAR) {
best_filter = EIGHTTAP_REGULAR;
if (cm->interp_filter == SWITCHABLE &&
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment