Modify datatype of ref_relative_dist
Modified datatype of ref_relative_dist to match
that of display_order_hint
Change-Id: I54ac08cd8415d51d26c0506539de433a6214ef82
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 00e7ec6..c54b468 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4409,14 +4409,13 @@
const AV1_COMMON *const cm = &cpi->common;
const OrderHintInfo *const order_hint_info = &cm->seq_params.order_hint_info;
MV_REFERENCE_FRAME ref_frame;
- int dist;
int min_past_dist = INT32_MAX, min_future_dist = INT32_MAX;
cpi->nearest_past_ref = NONE_FRAME;
cpi->nearest_future_ref = NONE_FRAME;
for (ref_frame = LAST_FRAME; ref_frame <= ALTREF_FRAME; ++ref_frame) {
cpi->ref_relative_dist[ref_frame - LAST_FRAME] = 0;
if (cpi->ref_frame_flags & av1_ref_frame_flag_list[ref_frame]) {
- dist = av1_encoder_get_relative_dist(
+ int dist = av1_encoder_get_relative_dist(
order_hint_info,
cm->cur_frame->ref_display_order_hint[ref_frame - LAST_FRAME],
cm->current_frame.display_order_hint);
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index 1800e78..430f651 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -1041,7 +1041,7 @@
int deltaq_used;
// Indicates the true relative distance of ref frame w.r.t. current frame
- int8_t ref_relative_dist[INTER_REFS_PER_FRAME];
+ int ref_relative_dist[INTER_REFS_PER_FRAME];
// Indicate nearest references w.r.t. current frame in past and future
int8_t nearest_past_ref;