commit ba2b89e8d660a7741e8f8ad12727c236b0520265
author James Zern <jzern@google.com> Wed May 18 10:14:12 2022 -0700
committer James Zern <jzern@google.com> Wed May 18 18:31:22 2022 +0000
tree 0abaabefee9f19c037c155f50d8c54f155360822
parent dc320fa788f681a414490553733acfafea079f2a

fix CONFIG_TUNE_VMAF build

after:
778194177 tune_vmaf: add missing alloc checks

Bug: aomedia:3276
Change-Id: I6c866c0a1d843537fd4af77a1dd344baf09c4958

av1/common/common.h

diff --git a/av1/common/common.h b/av1/common/common.h
index 0c0feb3..ccb45b6 100644
--- a/av1/common/common.h
+++ b/av1/common/common.h
@@ -48,7 +48,7 @@
 }
 
 #define CHECK_MEM_ERROR(cm, lval, expr) \
-  AOM_CHECK_MEM_ERROR(cm->error, lval, expr)
+  AOM_CHECK_MEM_ERROR((cm)->error, lval, expr)
 
 #define AOM_FRAME_MARKER 0x2
 

av1/encoder/tune_vmaf.c

diff --git a/av1/encoder/tune_vmaf.c b/av1/encoder/tune_vmaf.c
index 36b81de..0477bbd 100644
--- a/av1/encoder/tune_vmaf.c
+++ b/av1/encoder/tune_vmaf.c
@@ -157,7 +157,7 @@
   bool do_motion_search = false;
   if (mvs == NULL) {
     do_motion_search = true;
-    CHECK_MEM_ERROR(cm, mvs,
+    CHECK_MEM_ERROR(&cpi->common, mvs,
                     (FULLPEL_MV *)aom_calloc(mb_rows * mb_cols, sizeof(*mvs)));
   }
 
@@ -487,7 +487,7 @@
   double *best_unsharp_amounts =
       aom_calloc(num_cols * num_rows, sizeof(*best_unsharp_amounts));
   if (!best_unsharp_amounts) {
-    aom_internal_error(cm->error_info, AOM_CODEC_MEM_ERROR,
+    aom_internal_error(cm->error, AOM_CODEC_MEM_ERROR,
                        "Error allocating vmaf data");
   }
 
@@ -659,7 +659,7 @@
   aom_init_vmaf_context(&vmaf_context, cpi->vmaf_info.vmaf_model, cal_vmaf_neg);
   unsigned int *sses = aom_calloc(num_rows * num_cols, sizeof(*sses));
   if (!sses) {
-    aom_internal_error(cm->error_info, AOM_CODEC_MEM_ERROR,
+    aom_internal_error(cm->error, AOM_CODEC_MEM_ERROR,
                        "Error allocating vmaf data");
   }