Reduce funcation call duplicates Change-Id: I27838eb49031b6b844fabc435c46a7b4afcedc40
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c index 9650974..bc850a2 100644 --- a/av1/encoder/encodeframe.c +++ b/av1/encoder/encodeframe.c
@@ -158,24 +158,14 @@ const struct buf_2d *ref, BLOCK_SIZE bs, int bd) { unsigned int var, sse; - switch (bd) { - case 10: - var = - cpi->fn_ptr[bs].vf(ref->buf, ref->stride, - CONVERT_TO_BYTEPTR(AV1_HIGH_VAR_OFFS_10), 0, &sse); - break; - case 12: - var = - cpi->fn_ptr[bs].vf(ref->buf, ref->stride, - CONVERT_TO_BYTEPTR(AV1_HIGH_VAR_OFFS_12), 0, &sse); - break; - case 8: - default: - var = - cpi->fn_ptr[bs].vf(ref->buf, ref->stride, - CONVERT_TO_BYTEPTR(AV1_HIGH_VAR_OFFS_8), 0, &sse); - break; - } + assert(bd == 8 || bd == 10 || bd == 12); + const int off_index = (bd - 8) >> 1; + const uint16_t *high_var_offs[3] = { AV1_HIGH_VAR_OFFS_8, + AV1_HIGH_VAR_OFFS_10, + AV1_HIGH_VAR_OFFS_12 }; + var = + cpi->fn_ptr[bs].vf(ref->buf, ref->stride, + CONVERT_TO_BYTEPTR(high_var_offs[off_index]), 0, &sse); return ROUND_POWER_OF_TWO(var, num_pels_log2_lookup[bs]); }