Remove __func__

Change-Id: Ibdf1c2d422b9e644eba76fc200c8c10217394036

diff --git a/vp10/common/vp10_fwd_txfm1d.c b/vp10/common/vp10_fwd_txfm1d.c
index 589347ce1dd91cd1a31a59b697a5911a66fd207c..61add7a63fb10e9a2ef93106eda25e124ffda624 100644 (file)
--- a/vp10/common/vp10_fwd_txfm1d.c
+++ b/vp10/common/vp10_fwd_txfm1d.c
@@ -17,7 +17,7 @@
     for (i = 0; i < size; ++i) {                                          \
       int buf_bit = get_max_bit(abs(buf[i])) + 1;                         \
       if (buf_bit > bit) {                                                \
-        printf("======== %s overflow ========\n", __func__);              \
+        printf("======== %s %d overflow ========\n", __FILE__, __LINE__); \
         printf("stage: %d node: %d\n", stage, i);                         \
         printf("bit: %d buf_bit: %d buf[i]: %d\n", bit, buf_bit, buf[i]); \
         printf("input:\n");                                               \

diff --git a/vp10/common/vp10_inv_txfm1d.c b/vp10/common/vp10_inv_txfm1d.c
index 7cc027f2e9ce8efdfbf3938489a623ed9bb59463..052cb0e8fe803ac3ade6cfe55f4044df89ad2558 100644 (file)
--- a/vp10/common/vp10_inv_txfm1d.c
+++ b/vp10/common/vp10_inv_txfm1d.c
@@ -17,7 +17,7 @@
     for (i = 0; i < size; ++i) {                                          \
       int buf_bit = get_max_bit(abs(buf[i])) + 1;                         \
       if (buf_bit > bit) {                                                \
-        printf("======== %s overflow ========\n", __func__);              \
+        printf("======== %s %d overflow ========\n", __FILE__, __LINE__); \
         printf("stage: %d node: %d\n", stage, i);                         \
         printf("bit: %d buf_bit: %d buf[i]: %d\n", bit, buf_bit, buf[i]); \
         printf("input:\n");                                               \

diff --git a/vp10/common/vp10_txfm.h b/vp10/common/vp10_txfm.h
index 12dc6914de3d3d4e34b28cb71898c51c6835d95b..567e7b8c7d56135f03470df780bd2016813cc463 100644 (file)
--- a/vp10/common/vp10_txfm.h
+++ b/vp10/common/vp10_txfm.h
@@ -10,9 +10,9 @@
 #ifndef VP10_TXFM_H_
 #define VP10_TXFM_H_
 
-#include <stdio.h>
-#include <math.h>
 #include <assert.h>
+#include <math.h>
+#include <stdio.h>
 
 #include "vp10/common/enums.h"
 #include "vpx/vpx_integer.h"
@@ -92,10 +92,10 @@ static INLINE int32_t half_btf(int32_t w0, int32_t in0, int32_t w1, int32_t in1,
 #if CONFIG_COEFFICIENT_RANGE_CHECKING
   int64_t result_64 = (int64_t)w0 * (int64_t)in0 + (int64_t)w1 * (int64_t)in1;
   if (result_32 != result_64) {
-    printf(
-        "%s overflow result_32: %d result_64: %lld w0: %d in0: %d w1: %d in1: "
-        "%d\n",
-        __func__, result_32, ((long long int)result_64), w0, in0, w1, in1);
+    printf("%s %d overflow result_32: %d result_64: %" PRId64
+           " w0: %d in0: %d w1: %d in1: "
+           "%d\n",
+           __FILE__, __LINE__, result_32, result_64, w0, in0, w1, in1);
     assert(0 && "half_btf overflow");
   }
 #endif