vp10: remove unused (read|write)_uniform dead code since: 5d3327e Remove palette from VP10 Change-Id: I4a36575706ea6fffefe5bc778595112ef6ff37d8
diff --git a/vp10/decoder/decodemv.c b/vp10/decoder/decodemv.c index a28ae55..01b796c 100644 --- a/vp10/decoder/decodemv.c +++ b/vp10/decoder/decodemv.c
@@ -24,19 +24,6 @@ #include "vpx_dsp/vpx_dsp_common.h" -static INLINE int read_uniform(vpx_reader *r, int n) { - int l = get_unsigned_bits(n); - int m = (1 << l) - n; - int v = vpx_read_literal(r, l-1); - - assert(l != 0); - - if (v < m) - return v; - else - return (v << 1) - m + vpx_read_literal(r, 1); -} - static PREDICTION_MODE read_intra_mode(vpx_reader *r, const vpx_prob *p) { return (PREDICTION_MODE)vpx_read_tree(r, vp10_intra_mode_tree, p); }
diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c index ede8bb3..04ce61d 100644 --- a/vp10/encoder/bitstream.c +++ b/vp10/encoder/bitstream.c
@@ -45,19 +45,6 @@ static const struct vp10_token inter_mode_encodings[INTER_MODES] = {{2, 2}, {6, 3}, {0, 1}, {7, 3}}; -static INLINE void write_uniform(vpx_writer *w, int n, int v) { - int l = get_unsigned_bits(n); - int m = (1 << l) - n; - if (l == 0) - return; - if (v < m) { - vpx_write_literal(w, v, l - 1); - } else { - vpx_write_literal(w, m + ((v - m) >> 1), l - 1); - vpx_write_literal(w, (v - m) & 1, 1); - } -} - static struct vp10_token ext_tx_encodings[TX_TYPES]; void vp10_encode_token_init() {
diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c index 90a716d..b1077cb 100644 --- a/vp10/encoder/rdopt.c +++ b/vp10/encoder/rdopt.c
@@ -132,16 +132,6 @@ {{INTRA_FRAME, NONE}}, }; -static INLINE int write_uniform_cost(int n, int v) { - int l = get_unsigned_bits(n), m = (1 << l) - n; - if (l == 0) - return 0; - if (v < m) - return (l - 1) * vp10_cost_bit(128, 0); - else - return l * vp10_cost_bit(128, 0); -} - static void swap_block_ptr(MACROBLOCK *x, PICK_MODE_CONTEXT *ctx, int m, int n, int min_plane, int max_plane) { int i;