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
This commit is contained in:
John Koleszar 2012-05-04 12:23:53 -07:00
parent 22f56b93e5
commit 14d827f44e
7 changed files with 14 additions and 14 deletions

View File

@ -160,7 +160,7 @@ const vp8_tree_index vp8_small_mvtree [14] =
void vp8_init_mbmode_probs(VP8_COMMON *x) void vp8_init_mbmode_probs(VP8_COMMON *x)
{ {
vpx_memcpy(x->fc.ymode_prob, vp8_ymode_prob, sizeof(vp8_ymode_prob)); 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->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->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)); vpx_memcpy(x->fc.sub_mv_ref_prob, sub_mv_ref_prob, sizeof(sub_mv_ref_prob));

View File

@ -94,7 +94,7 @@ const vp8_prob vp8_ymode_prob[VP8_YMODES-1] =
112, 86, 140, 37 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 145, 156, 163, 128
}; };

View File

@ -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 i;
int QIndex; int QIndex;
@ -117,7 +117,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
mode = xd->mode_info_context->mbmi.mode; mode = xd->mode_info_context->mbmi.mode;
if (xd->segmentation_enabled) if (xd->segmentation_enabled)
mb_init_dequantizer(pbi, xd); vp8_mb_init_dequantizer(pbi, xd);
#if CONFIG_ERROR_CONCEALMENT #if CONFIG_ERROR_CONCEALMENT
@ -980,7 +980,7 @@ int vp8_decode_frame(VP8D_COMP *pbi)
vp8cx_init_de_quantizer(pbi); vp8cx_init_de_quantizer(pbi);
/* MB level dequantizer setup */ /* 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. /* Determine if the golden frame or ARF buffer should be updated and how.

View File

@ -28,7 +28,7 @@
#include "error_concealment.h" #include "error_concealment.h"
#endif #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) 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; mode = xd->mode_info_context->mbmi.mode;
if (xd->segmentation_enabled) if (xd->segmentation_enabled)
mb_init_dequantizer(pbi, xd); vp8_mb_init_dequantizer(pbi, xd);
#if CONFIG_ERROR_CONCEALMENT #if CONFIG_ERROR_CONCEALMENT

View File

@ -15,11 +15,11 @@
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_rtcd.h" #include "vpx_rtcd.h"
const unsigned int NOISE_MOTION_THRESHOLD = 20*20; static const unsigned int NOISE_MOTION_THRESHOLD = 20*20;
const unsigned int NOISE_DIFF2_THRESHOLD = 75; static const unsigned int NOISE_DIFF2_THRESHOLD = 75;
// SSE_DIFF_THRESHOLD is selected as ~95% confidence assuming var(noise) ~= 100. // SSE_DIFF_THRESHOLD is selected as ~95% confidence assuming var(noise) ~= 100.
const unsigned int SSE_DIFF_THRESHOLD = 16*16*20; static const unsigned int SSE_DIFF_THRESHOLD = 16*16*20;
const unsigned int SSE_THRESHOLD = 16*16*40; static const unsigned int SSE_THRESHOLD = 16*16*40;
static uint8_t blend(uint8_t state, uint8_t sample, uint8_t factor_q8) static uint8_t blend(uint8_t state, uint8_t sample, uint8_t factor_q8)
{ {

View File

@ -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 )); return -(log( prob ) / log( 2.0 ));
} }

View File

@ -1339,7 +1339,7 @@ static void init_config(VP8_COMP *cpi, VP8_CONFIG *oxcf)
#endif #endif
} }
void update_layer_contexts (VP8_COMP *cpi) static void update_layer_contexts (VP8_COMP *cpi)
{ {
VP8_CONFIG *oxcf = &cpi->oxcf; VP8_CONFIG *oxcf = &cpi->oxcf;
@ -3020,7 +3020,7 @@ static int recode_loop_test( VP8_COMP *cpi,
return force_recode; 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; YV12_BUFFER_CONFIG *yv12_fb = cm->yv12_fb;