Commit c163cbdb authored by Thomas Daede's avatar Thomas Daede

Make symbols shared with libaom static.

Fixes #104.
parent 14c612d0
...@@ -161,7 +161,7 @@ static int od_ec_dec_normalize(od_ec_dec *dec, od_ec_window dif, unsigned rng, ...@@ -161,7 +161,7 @@ static int od_ec_dec_normalize(od_ec_dec *dec, od_ec_window dif, unsigned rng,
/*Initializes the decoder. /*Initializes the decoder.
buf: The input buffer to use. buf: The input buffer to use.
Return: 0 on success, or a negative value on error.*/ Return: 0 on success, or a negative value on error.*/
void od_ec_dec_init(od_ec_dec *dec, const unsigned char *buf, static void od_ec_dec_init(od_ec_dec *dec, const unsigned char *buf,
uint32_t storage) { uint32_t storage) {
dec->buf = buf; dec->buf = buf;
dec->tell_offs = 10 - (OD_EC_WINDOW_SIZE - 8); dec->tell_offs = 10 - (OD_EC_WINDOW_SIZE - 8);
...@@ -177,7 +177,7 @@ void od_ec_dec_init(od_ec_dec *dec, const unsigned char *buf, ...@@ -177,7 +177,7 @@ void od_ec_dec_init(od_ec_dec *dec, const unsigned char *buf,
/*Decode a single binary value. /*Decode a single binary value.
f: The probability that the bit is one, scaled by 32768. f: The probability that the bit is one, scaled by 32768.
Return: The value decoded (0 or 1).*/ Return: The value decoded (0 or 1).*/
int od_ec_decode_bool_q15(od_ec_dec *dec, unsigned f) { static int od_ec_decode_bool_q15(od_ec_dec *dec, unsigned f) {
od_ec_window dif; od_ec_window dif;
od_ec_window vw; od_ec_window vw;
unsigned r; unsigned r;
...@@ -212,7 +212,7 @@ int od_ec_decode_bool_q15(od_ec_dec *dec, unsigned f) { ...@@ -212,7 +212,7 @@ int od_ec_decode_bool_q15(od_ec_dec *dec, unsigned f) {
nsyms: The number of symbols in the alphabet. nsyms: The number of symbols in the alphabet.
This should be at most 16. This should be at most 16.
Return: The decoded symbol s.*/ Return: The decoded symbol s.*/
int od_ec_decode_cdf_q15(od_ec_dec *dec, const uint16_t *icdf, int nsyms) { static int od_ec_decode_cdf_q15(od_ec_dec *dec, const uint16_t *icdf, int nsyms) {
od_ec_window dif; od_ec_window dif;
unsigned r; unsigned r;
unsigned c; unsigned c;
......
...@@ -766,14 +766,14 @@ static INLINE int16_t av1_mode_context_analyzer( ...@@ -766,14 +766,14 @@ static INLINE int16_t av1_mode_context_analyzer(
return comp_ctx; return comp_ctx;
} }
void av1_setup_frame_buf_refs(AV1_COMMON *cm); static void av1_setup_frame_buf_refs(AV1_COMMON *cm);
void av1_setup_frame_sign_bias(AV1_COMMON *cm); void av1_setup_frame_sign_bias(AV1_COMMON *cm);
void av1_setup_skip_mode_allowed(AV1_COMMON *cm); void av1_setup_skip_mode_allowed(AV1_COMMON *cm);
void av1_copy_frame_mvs(const AV1_COMMON *const cm, MB_MODE_INFO *mi, void av1_copy_frame_mvs(const AV1_COMMON *const cm, MB_MODE_INFO *mi,
int mi_row, int mi_col, int x_mis, int y_mis); int mi_row, int mi_col, int x_mis, int y_mis);
void av1_find_mv_refs(const AV1_COMMON *cm, const MACROBLOCKD *xd, static void av1_find_mv_refs(const AV1_COMMON *cm, const MACROBLOCKD *xd,
MB_MODE_INFO *mi, MV_REFERENCE_FRAME ref_frame, MB_MODE_INFO *mi, MV_REFERENCE_FRAME ref_frame,
uint8_t ref_mv_count[MODE_CTX_REF_FRAMES], uint8_t ref_mv_count[MODE_CTX_REF_FRAMES],
CANDIDATE_MV ref_mv_stack[][MAX_REF_MV_STACK_SIZE], CANDIDATE_MV ref_mv_stack[][MAX_REF_MV_STACK_SIZE],
...@@ -781,12 +781,6 @@ void av1_find_mv_refs(const AV1_COMMON *cm, const MACROBLOCKD *xd, ...@@ -781,12 +781,6 @@ void av1_find_mv_refs(const AV1_COMMON *cm, const MACROBLOCKD *xd,
int_mv *global_mvs, int mi_row, int mi_col, int_mv *global_mvs, int mi_row, int mi_col,
int16_t *mode_context); int16_t *mode_context);
// check a list of motion vectors by sad score using a number rows of pixels
// above and a number cols of pixels in the left to select the one with best
// score to use as ref motion vector
void av1_find_best_ref_mvs(int allow_hp, int_mv *mvlist, int_mv *nearest_mv,
int_mv *near_mv, int is_integer);
int selectSamples(MV *mv, int *pts, int *pts_inref, int len, BLOCK_SIZE bsize); int selectSamples(MV *mv, int *pts, int *pts_inref, int len, BLOCK_SIZE bsize);
int findSamples(const AV1_COMMON *cm, MACROBLOCKD *xd, int mi_row, int mi_col, int findSamples(const AV1_COMMON *cm, MACROBLOCKD *xd, int mi_row, int mi_col,
int *pts, int *pts_inref); int *pts, int *pts_inref);
...@@ -1610,7 +1604,7 @@ static void setup_ref_mv_list( ...@@ -1610,7 +1604,7 @@ static void setup_ref_mv_list(
} }
} }
void av1_find_mv_refs(const AV1_COMMON *cm, const MACROBLOCKD *xd, static void av1_find_mv_refs(const AV1_COMMON *cm, const MACROBLOCKD *xd,
MB_MODE_INFO *mi, MV_REFERENCE_FRAME ref_frame, MB_MODE_INFO *mi, MV_REFERENCE_FRAME ref_frame,
uint8_t ref_mv_count[MODE_CTX_REF_FRAMES], uint8_t ref_mv_count[MODE_CTX_REF_FRAMES],
CANDIDATE_MV ref_mv_stack[][MAX_REF_MV_STACK_SIZE], CANDIDATE_MV ref_mv_stack[][MAX_REF_MV_STACK_SIZE],
...@@ -1653,18 +1647,7 @@ void av1_find_mv_refs(const AV1_COMMON *cm, const MACROBLOCKD *xd, ...@@ -1653,18 +1647,7 @@ void av1_find_mv_refs(const AV1_COMMON *cm, const MACROBLOCKD *xd,
zeromv, mi_row, mi_col, mode_context); zeromv, mi_row, mi_col, mode_context);
} }
void av1_find_best_ref_mvs(int allow_hp, int_mv *mvlist, int_mv *nearest_mv, static void av1_setup_frame_buf_refs(AV1_COMMON *cm) {
int_mv *near_mv, int is_integer) {
int i;
// Make sure all the candidates are properly clamped etc
for (i = 0; i < MAX_MV_REF_CANDIDATES; ++i) {
lower_mv_precision(&mvlist[i].as_mv, allow_hp, is_integer);
}
*nearest_mv = mvlist[0];
*near_mv = mvlist[1];
}
void av1_setup_frame_buf_refs(AV1_COMMON *cm) {
cm->cur_frame.cur_frame_offset = cm->frame_offset; cm->cur_frame.cur_frame_offset = cm->frame_offset;
MV_REFERENCE_FRAME ref_frame; MV_REFERENCE_FRAME ref_frame;
...@@ -1807,7 +1790,7 @@ static int motion_field_projection(AV1_COMMON *cm, MV_REFERENCE_FRAME ref_frame, ...@@ -1807,7 +1790,7 @@ static int motion_field_projection(AV1_COMMON *cm, MV_REFERENCE_FRAME ref_frame,
return 1; return 1;
} }
void av1_setup_motion_field(AV1_COMMON *cm) { static void av1_setup_motion_field(AV1_COMMON *cm) {
if (!cm->seq_params.enable_order_hint) return; if (!cm->seq_params.enable_order_hint) return;
TPL_MV_REF *tpl_mvs_base = cm->tpl_mvs; TPL_MV_REF *tpl_mvs_base = cm->tpl_mvs;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment