alloccommon: give exported symbols a vp9_ prefix.

Also include the correct header in ratectrl.c so it picks up these
function prototypes.

Change-Id: Ic51b13119f1625f0691917f2713b23d0249dece7

diff --git a/vp8/common/alloccommon.c b/vp8/common/alloccommon.c
index 4323fdf4c4010c65d31b4bb6920e06c67345bd0f..a96afc27da66481cf5d625278945a9c36653f500 100644 (file)
--- a/vp8/common/alloccommon.c
+++ b/vp8/common/alloccommon.c
@@ -21,7 +21,7 @@
 
 extern  void vp8_init_scan_order_mask();
 
-void update_mode_info_border(VP8_COMMON *cpi, MODE_INFO *mi_base) {
+void vp9_update_mode_info_border(VP8_COMMON *cpi, MODE_INFO *mi_base) {
   int stride = cpi->mode_info_stride;
   int i;
 
@@ -33,7 +33,8 @@ void update_mode_info_border(VP8_COMMON *cpi, MODE_INFO *mi_base) {
     vpx_memset(&mi_base[i * stride], 0, sizeof(MODE_INFO));
   }
 }
-void update_mode_info_in_image(VP8_COMMON *cpi, MODE_INFO *mi) {
+
+void vp9_update_mode_info_in_image(VP8_COMMON *cpi, MODE_INFO *mi) {
   int i, j;
 
   // For each in image mode_info element set the in image flag to 1
@@ -139,8 +140,8 @@ int vp8_alloc_frame_buffers(VP8_COMMON *oci, int width, int height) {
     return 1;
   }
 
-  update_mode_info_border(oci, oci->mip);
-  update_mode_info_in_image(oci, oci->mi);
+  vp9_update_mode_info_border(oci, oci->mip);
+  vp9_update_mode_info_in_image(oci, oci->mi);
 
   return 0;
 }

diff --git a/vp8/common/alloccommon.h b/vp8/common/alloccommon.h
index ea93c252280b305bcdee0799181c7d6947541c57..72495584150cc17dc82467233c7febad535e0553 100644 (file)
--- a/vp8/common/alloccommon.h
+++ b/vp8/common/alloccommon.h
@@ -20,4 +20,7 @@ void vp8_de_alloc_frame_buffers(VP8_COMMON *oci);
 int vp8_alloc_frame_buffers(VP8_COMMON *oci, int width, int height);
 void vp8_setup_version(VP8_COMMON *oci);
 
+void vp9_update_mode_info_border(VP8_COMMON *cpi, MODE_INFO *mi_base);
+void vp9_update_mode_info_in_image(VP8_COMMON *cpi, MODE_INFO *mi);
+
 #endif

diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c
index 9240529e5fa785252419f6934f1f7692246bf741..450e41f85b542383d47cae7a47cccc8bc218accf 100644 (file)
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@ -786,8 +786,8 @@ static void init_frame(VP8D_COMP *pbi) {
     vpx_memset(pc->mip, 0,
                (pc->mb_cols + 1) * (pc->mb_rows + 1)* sizeof(MODE_INFO));
 
-    update_mode_info_border(pc, pc->mip);
-    update_mode_info_in_image(pc, pc->mi);
+    vp9_update_mode_info_border(pc, pc->mip);
+    vp9_update_mode_info_in_image(pc, pc->mi);
 
   } else {
 

diff --git a/vp8/encoder/ratectrl.c b/vp8/encoder/ratectrl.c
index e8e9c2c31d740bd0bf62a96088f62440bae82cd6..61fdf291ec8c60c84e752956ad03ead92acb2b75 100644 (file)
--- a/vp8/encoder/ratectrl.c
+++ b/vp8/encoder/ratectrl.c
@@ -16,6 +16,7 @@
 #include <assert.h>
 
 #include "math.h"
+#include "vp8/common/alloccommon.h"
 #include "vp8/common/common.h"
 #include "ratectrl.h"
 #include "vp8/common/entropymode.h"
@@ -264,10 +265,8 @@ void vp8_setup_key_frame(VP8_COMP *cpi) {
   vpx_memset(cm->mip, 0,
     (cm->mb_cols + 1) * (cm->mb_rows + 1)* sizeof(MODE_INFO));
 
-  update_mode_info_border(cm, cm->mip);
-  update_mode_info_in_image(cm, cm->mi);
-
-
+  vp9_update_mode_info_border(cm, cm->mip);
+  vp9_update_mode_info_in_image(cm, cm->mi);
 }
 
 void vp8_setup_inter_frame(VP8_COMP *cpi) {