commit f11fb88269c8b04e89f3787d263bdc3d2d8dea74
author hui su <huisu@google.com> Mon Mar 27 14:56:33 2017 -0700
committer Hui Su <huisu@google.com> Tue Mar 28 16:55:47 2017 +0000
tree b352c6309223b482ce809bcc1cff4617b9c4ccc4
parent 233ef94776862d7b243f89fd07538f443e5b801c

Add av1_ prefix to fwd_txfm()

Change-Id: Ie18fd2b8a3caf3948748ee353fe41e37f5803ba3

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index ce5a304..effeecc 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -498,10 +498,10 @@
 #if CONFIG_AOM_HIGHBITDEPTH
     if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
       fwd_txfm_param.bd = xd->bd;
-      highbd_fwd_txfm(pred, pvq_ref_coeff, diff_stride, &fwd_txfm_param);
+      av1_highbd_fwd_txfm(pred, pvq_ref_coeff, diff_stride, &fwd_txfm_param);
     } else {
 #endif  // CONFIG_AOM_HIGHBITDEPTH
-      fwd_txfm(pred, pvq_ref_coeff, diff_stride, &fwd_txfm_param);
+      av1_fwd_txfm(pred, pvq_ref_coeff, diff_stride, &fwd_txfm_param);
 #if CONFIG_AOM_HIGHBITDEPTH
     }
 #endif  // CONFIG_AOM_HIGHBITDEPTH

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index cac0abf..1c5289f 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -627,7 +627,7 @@
 #if CONFIG_AOM_HIGHBITDEPTH
   fwd_txfm_param.bd = xd->bd;
   if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
-    highbd_fwd_txfm(src_diff, coeff, diff_stride, &fwd_txfm_param);
+    av1_highbd_fwd_txfm(src_diff, coeff, diff_stride, &fwd_txfm_param);
     if (xform_quant_idx != AV1_XFORM_QUANT_SKIP_QUANT) {
       if (LIKELY(!x->skip_block)) {
         quant_func_list[xform_quant_idx][QUANT_FUNC_HIGHBD](
@@ -643,7 +643,7 @@
     return;
   }
 #endif  // CONFIG_AOM_HIGHBITDEPTH
-  fwd_txfm(src_diff, coeff, diff_stride, &fwd_txfm_param);
+  av1_fwd_txfm(src_diff, coeff, diff_stride, &fwd_txfm_param);
   if (xform_quant_idx != AV1_XFORM_QUANT_SKIP_QUANT) {
     if (LIKELY(!x->skip_block)) {
       quant_func_list[xform_quant_idx][QUANT_FUNC_LOWBD](
@@ -661,12 +661,12 @@
 #if CONFIG_AOM_HIGHBITDEPTH
   fwd_txfm_param.bd = xd->bd;
   if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
-    highbd_fwd_txfm(src_int16, coeff, diff_stride, &fwd_txfm_param);
-    highbd_fwd_txfm(pred, ref_coeff, diff_stride, &fwd_txfm_param);
+    av1_highbd_fwd_txfm(src_int16, coeff, diff_stride, &fwd_txfm_param);
+    av1_highbd_fwd_txfm(pred, ref_coeff, diff_stride, &fwd_txfm_param);
   } else {
 #endif
-    fwd_txfm(src_int16, coeff, diff_stride, &fwd_txfm_param);
-    fwd_txfm(pred, ref_coeff, diff_stride, &fwd_txfm_param);
+    av1_fwd_txfm(src_int16, coeff, diff_stride, &fwd_txfm_param);
+    av1_fwd_txfm(pred, ref_coeff, diff_stride, &fwd_txfm_param);
 #if CONFIG_AOM_HIGHBITDEPTH
   }
 #endif

av1/encoder/hybrid_fwd_txfm.c

diff --git a/av1/encoder/hybrid_fwd_txfm.c b/av1/encoder/hybrid_fwd_txfm.c
index 9505f66..fbc0f07 100644
--- a/av1/encoder/hybrid_fwd_txfm.c
+++ b/av1/encoder/hybrid_fwd_txfm.c
@@ -403,8 +403,8 @@
 #endif  // CONFIG_TX64X64
 #endif  // CONFIG_AOM_HIGHBITDEPTH
 
-void fwd_txfm(const int16_t *src_diff, tran_low_t *coeff, int diff_stride,
-              FWD_TXFM_PARAM *fwd_txfm_param) {
+void av1_fwd_txfm(const int16_t *src_diff, tran_low_t *coeff, int diff_stride,
+                  FWD_TXFM_PARAM *fwd_txfm_param) {
   const int fwd_txfm_opt = FWD_TXFM_OPT_NORMAL;
   const TX_TYPE tx_type = fwd_txfm_param->tx_type;
   const TX_SIZE tx_size = fwd_txfm_param->tx_size;
@@ -455,8 +455,8 @@
 }
 
 #if CONFIG_AOM_HIGHBITDEPTH
-void highbd_fwd_txfm(const int16_t *src_diff, tran_low_t *coeff,
-                     int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
+void av1_highbd_fwd_txfm(const int16_t *src_diff, tran_low_t *coeff,
+                         int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param) {
   const int fwd_txfm_opt = FWD_TXFM_OPT_NORMAL;
   const TX_TYPE tx_type = fwd_txfm_param->tx_type;
   const TX_SIZE tx_size = fwd_txfm_param->tx_size;

av1/encoder/hybrid_fwd_txfm.h

diff --git a/av1/encoder/hybrid_fwd_txfm.h b/av1/encoder/hybrid_fwd_txfm.h
index a5b4b2e..3866c38 100644
--- a/av1/encoder/hybrid_fwd_txfm.h
+++ b/av1/encoder/hybrid_fwd_txfm.h
@@ -29,12 +29,12 @@
 extern "C" {
 #endif
 
-void fwd_txfm(const int16_t *src_diff, tran_low_t *coeff, int diff_stride,
-              FWD_TXFM_PARAM *fwd_txfm_param);
+void av1_fwd_txfm(const int16_t *src_diff, tran_low_t *coeff, int diff_stride,
+                  FWD_TXFM_PARAM *fwd_txfm_param);
 
 #if CONFIG_AOM_HIGHBITDEPTH
-void highbd_fwd_txfm(const int16_t *src_diff, tran_low_t *coeff,
-                     int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param);
+void av1_highbd_fwd_txfm(const int16_t *src_diff, tran_low_t *coeff,
+                         int diff_stride, FWD_TXFM_PARAM *fwd_txfm_param);
 #endif  // CONFIG_AOM_HIGHBITDEPTH
 
 #ifdef __cplusplus