From 14d827f44eebd2c375bd27483d30964f439e4b6b Mon Sep 17 00:00:00 2001
From: John Koleszar <jkoleszar@google.com>
Date: Fri, 4 May 2012 12:23:53 -0700
Subject: [PATCH] fix vp8_ namespace issues
Make functions only referenced from one translation unit static. Other
symbols with extern linkage get a vp8/vpx prefix.
Change-Id: I928c7e0d0d36e89ac78cb54ff8bb28748727834f
---
vp8/common/entropymode.c | 2 +-
vp8/common/vp8_entropymodedata.h | 2 +-
vp8/decoder/decodframe.c | 6 +++---
vp8/decoder/threading.c | 4 ++--
vp8/encoder/denoising.c | 8 ++++----
vp8/encoder/firstpass.c | 2 +-
vp8/encoder/onyx_if.c | 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/vp8/common/entropymode.c b/vp8/common/entropymode.c
index f7ab0a59be..de7e828354 100644
--- a/vp8/common/entropymode.c
+++ b/vp8/common/entropymode.c
@@ -160,7 +160,7 @@ const vp8_tree_index vp8_small_mvtree [14] =
void vp8_init_mbmode_probs(VP8_COMMON *x)
{
vpx_memcpy(x->fc.ymode_prob, vp8_ymode_prob, sizeof(vp8_ymode_prob));
- vpx_memcpy(x->kf_ymode_prob, kf_ymode_prob, sizeof(kf_ymode_prob));
+ vpx_memcpy(x->kf_ymode_prob, vp8_kf_ymode_prob, sizeof(vp8_kf_ymode_prob));
vpx_memcpy(x->fc.uv_mode_prob, vp8_uv_mode_prob, sizeof(vp8_uv_mode_prob));
vpx_memcpy(x->kf_uv_mode_prob, vp8_kf_uv_mode_prob, sizeof(vp8_kf_uv_mode_prob));
vpx_memcpy(x->fc.sub_mv_ref_prob, sub_mv_ref_prob, sizeof(sub_mv_ref_prob));
diff --git a/vp8/common/vp8_entropymodedata.h b/vp8/common/vp8_entropymodedata.h
index 4642c6ab87..13e9a92fc1 100755
--- a/vp8/common/vp8_entropymodedata.h
+++ b/vp8/common/vp8_entropymodedata.h
@@ -94,7 +94,7 @@ const vp8_prob vp8_ymode_prob[VP8_YMODES-1] =
112, 86, 140, 37
};
-const vp8_prob kf_ymode_prob[VP8_YMODES-1] =
+const vp8_prob vp8_kf_ymode_prob[VP8_YMODES-1] =
{
145, 156, 163, 128
};
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c
index d2bb60270c..62a068b82f 100644
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@ -53,7 +53,7 @@ void vp8cx_init_de_quantizer(VP8D_COMP *pbi)
}
}
-void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd)
+void vp8_mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd)
{
int i;
int QIndex;
@@ -117,7 +117,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
mode = xd->mode_info_context->mbmi.mode;
if (xd->segmentation_enabled)
- mb_init_dequantizer(pbi, xd);
+ vp8_mb_init_dequantizer(pbi, xd);
#if CONFIG_ERROR_CONCEALMENT
@@ -980,7 +980,7 @@ int vp8_decode_frame(VP8D_COMP *pbi)
vp8cx_init_de_quantizer(pbi);
/* MB level dequantizer setup */
- mb_init_dequantizer(pbi, &pbi->mb);
+ vp8_mb_init_dequantizer(pbi, &pbi->mb);
}
/* Determine if the golden frame or ARF buffer should be updated and how.
diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c
index 845228bb5b..47a0349df0 100644
--- a/vp8/decoder/threading.c
+++ b/vp8/decoder/threading.c
@@ -28,7 +28,7 @@
#include "error_concealment.h"
#endif
-extern void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd);
+extern void vp8_mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd);
static void setup_decoding_thread_data(VP8D_COMP *pbi, MACROBLOCKD *xd, MB_ROW_DEC *mbrd, int count)
{
@@ -106,7 +106,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, unsigned int mb_i
mode = xd->mode_info_context->mbmi.mode;
if (xd->segmentation_enabled)
- mb_init_dequantizer(pbi, xd);
+ vp8_mb_init_dequantizer(pbi, xd);
#if CONFIG_ERROR_CONCEALMENT
diff --git a/vp8/encoder/denoising.c b/vp8/encoder/denoising.c
index d487065c08..09ed9dd3ce 100644
--- a/vp8/encoder/denoising.c
+++ b/vp8/encoder/denoising.c
@@ -15,11 +15,11 @@
#include "vpx_mem/vpx_mem.h"
#include "vpx_rtcd.h"
-const unsigned int NOISE_MOTION_THRESHOLD = 20*20;
-const unsigned int NOISE_DIFF2_THRESHOLD = 75;
+static const unsigned int NOISE_MOTION_THRESHOLD = 20*20;
+static const unsigned int NOISE_DIFF2_THRESHOLD = 75;
// SSE_DIFF_THRESHOLD is selected as ~95% confidence assuming var(noise) ~= 100.
-const unsigned int SSE_DIFF_THRESHOLD = 16*16*20;
-const unsigned int SSE_THRESHOLD = 16*16*40;
+static const unsigned int SSE_DIFF_THRESHOLD = 16*16*20;
+static const unsigned int SSE_THRESHOLD = 16*16*40;
static uint8_t blend(uint8_t state, uint8_t sample, uint8_t factor_q8)
{
diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c
index 48bdce8069..8de1a6a6fe 100644
--- a/vp8/encoder/firstpass.c
+++ b/vp8/encoder/firstpass.c
@@ -868,7 +868,7 @@ extern const int vp8_bits_per_mb[2][QINDEX_RANGE];
//
-double bitcost( double prob )
+static double bitcost( double prob )
{
return -(log( prob ) / log( 2.0 ));
}
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 8a59e1d53f..cee62fa503 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -1339,7 +1339,7 @@ static void init_config(VP8_COMP *cpi, VP8_CONFIG *oxcf)
#endif
}
-void update_layer_contexts (VP8_COMP *cpi)
+static void update_layer_contexts (VP8_COMP *cpi)
{
VP8_CONFIG *oxcf = &cpi->oxcf;
@@ -3020,7 +3020,7 @@ static int recode_loop_test( VP8_COMP *cpi,
return force_recode;
}
-void update_reference_frames(VP8_COMMON *cm)
+static void update_reference_frames(VP8_COMMON *cm)
{
YV12_BUFFER_CONFIG *yv12_fb = cm->yv12_fb;
--
GitLab