commit f5550733e8b4bd4eced3108d45653917757fcb1b
author Alex Converse <aconverse@google.com> Wed Jun 08 16:14:57 2016 -0700
committer Yaowu Xu <yaowu@google.com> Tue Sep 06 21:23:36 2016 +0000
tree bebf996e120efafceb8b00a5ad3d5bef9a247ce6
parent f87b9021f1a345bce24ee87ff62d20f7bed494b2

Move CHECK_MEM_ERROR implementation to aom/internal.

Allow using it in aom_dsp.

Change-Id: Ide7d58b6d11f8a45d473fc13bf730ba5bccb5516

aom/internal/aom_codec_internal.h

diff --git a/aom/internal/aom_codec_internal.h b/aom/internal/aom_codec_internal.h
index fc758b8..4399279 100644
--- a/aom/internal/aom_codec_internal.h
+++ b/aom/internal/aom_codec_internal.h
@@ -43,6 +43,7 @@
  */
 #ifndef AOM_INTERNAL_AOM_CODEC_INTERNAL_H_
 #define AOM_INTERNAL_AOM_CODEC_INTERNAL_H_
+#include "./aom_config.h"
 #include "../aom_decoder.h"
 #include "../aom_encoder.h"
 #include <stdarg.h>
@@ -439,6 +440,24 @@
                         aom_codec_err_t error, const char *fmt,
                         ...) CLANG_ANALYZER_NORETURN;
 
+#if CONFIG_DEBUG
+#define AOM_CHECK_MEM_ERROR(error_info, lval, expr)                         \
+  do {                                                                      \
+    lval = (expr);                                                          \
+    if (!lval)                                                              \
+      aom_internal_error(error_info, AOM_CODEC_MEM_ERROR,                   \
+                         "Failed to allocate " #lval " at %s:%d", __FILE__, \
+                         __LINE__);                                         \
+  } while (0)
+#else
+#define AOM_CHECK_MEM_ERROR(error_info, lval, expr)       \
+  do {                                                    \
+    lval = (expr);                                        \
+    if (!lval)                                            \
+      aom_internal_error(error_info, AOM_CODEC_MEM_ERROR, \
+                         "Failed to allocate " #lval);    \
+  } while (0)
+#endif
 #ifdef __cplusplus
 }  // extern "C"
 #endif

av1/common/common.h

diff --git a/av1/common/common.h b/av1/common/common.h
index 5b8100b..551055a 100644
--- a/av1/common/common.h
+++ b/av1/common/common.h
@@ -16,7 +16,6 @@
 
 #include <assert.h>
 
-#include "./aom_config.h"
 #include "aom_dsp/aom_dsp_common.h"
 #include "aom_mem/aom_mem.h"
 #include "aom/aom_integer.h"
@@ -49,24 +48,8 @@
   return num_values > 0 ? get_msb(num_values) + 1 : 0;
 }
 
-#if CONFIG_DEBUG
-#define CHECK_MEM_ERROR(cm, lval, expr)                                     \
-  do {                                                                      \
-    lval = (expr);                                                          \
-    if (!lval)                                                              \
-      aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR,                   \
-                         "Failed to allocate " #lval " at %s:%d", __FILE__, \
-                         __LINE__);                                         \
-  } while (0)
-#else
-#define CHECK_MEM_ERROR(cm, lval, expr)                   \
-  do {                                                    \
-    lval = (expr);                                        \
-    if (!lval)                                            \
-      aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR, \
-                         "Failed to allocate " #lval);    \
-  } while (0)
-#endif
+#define CHECK_MEM_ERROR(cm, lval, expr) \
+  AOM_CHECK_MEM_ERROR(&cm->error, lval, expr)
 // TODO(yaowu: validate the usage of these codes or develop new ones.)
 #define AV1_SYNC_CODE_0 0x49
 #define AV1_SYNC_CODE_1 0x83