From b6c4b17dc5dec2b6561a52a0795e06d384521776 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Mon, 1 Feb 2016 23:47:35 -0800
Subject: [PATCH] vp10: remove unused (read|write)_uniform
dead code since:
5d3327e Remove palette from VP10
cherry-picked from libvpx:
ebf2586 vp10: remove unused (read|write)_uniform
Change-Id: I4a36575706ea6fffefe5bc778595112ef6ff37d8
---
vp10/decoder/decodemv.c | 13 -------------
vp10/encoder/bitstream.c | 12 ------------
vp10/encoder/rdopt.c | 9 ---------
3 files changed, 34 deletions(-)
diff --git a/vp10/decoder/decodemv.c b/vp10/decoder/decodemv.c
index 4a34e5287e..68a0c79b69 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 0fd3d5a4ed..e6ee10a5a4 100644
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -48,18 +48,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 ca71429e7d..8e65cb86d5 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -127,15 +127,6 @@ static const REF_DEFINITION vp10_ref_order[MAX_REFS] = {
{ { GOLDEN_FRAME, ALTREF_FRAME } }, { { 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;
--
GitLab