ref: 976d0450ac86780e8141a5bf95611f647689f685
parent: 10afa9e2295f56faa6696bd8c48d99510bbaec0d
parent: 7228a38aef3ea2fd4368e45ddcb3772dd5d7b4d2
author: Paul Wilkins <paulwilkins@google.com>
date: Tue Oct 30 04:18:16 EDT 2012
Merge "alloccommon: give exported symbols a vp9_ prefix." into experimental
--- 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 @@
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 @@
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;
}
--- a/vp8/common/alloccommon.h
+++ b/vp8/common/alloccommon.h
@@ -20,4 +20,7 @@
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
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@ -786,8 +786,8 @@
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 {
--- 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 @@
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) {