commit e3b5f5f2fe7b2aa778c5adcc82493cc988ec8c28
author Wan-Teh Chang <wtc@google.com> Thu Dec 15 13:42:21 2022 -0800
committer Wan-Teh Chang <wtc@google.com> Thu Dec 15 23:17:55 2022 +0000
tree 8600ffb9863f63ed9f773f4ce603650aa2bb4cf1
parent f97c63026174df67bc08c75fa72bf0ad01ca1a98

Simplify cm->tpl_mvs check in ensure_mv_buffer()

Simplify the check in ensure_mv_buffer() to determine if cm->tpl_mvs
should be reallocated.

Change-Id: If4c6c69b28b43c182239a7374efffa76d010ec54

av1/common/av1_common_int.h

diff --git a/av1/common/av1_common_int.h b/av1/common/av1_common_int.h
index f3f2823..b4f5783 100644
--- a/av1/common/av1_common_int.h
+++ b/av1/common/av1_common_int.h
@@ -1237,10 +1237,8 @@
 
   const int mem_size =
       ((mi_params->mi_rows + MAX_MIB_SIZE) >> 1) * (mi_params->mi_stride >> 1);
-  int realloc = cm->tpl_mvs == NULL;
-  if (cm->tpl_mvs) realloc |= cm->tpl_mvs_mem_size < mem_size;
 
-  if (realloc) {
+  if (cm->tpl_mvs == NULL || cm->tpl_mvs_mem_size < mem_size) {
     aom_free(cm->tpl_mvs);
     CHECK_MEM_ERROR(cm, cm->tpl_mvs,
                     (TPL_MV_REF *)aom_calloc(mem_size, sizeof(*cm->tpl_mvs)));