Move ANS to aom_dsp.
That's where it lives in aom/master.
Change-Id: I38f405827d9c2d0b06ef5f3bfd7cadc35d5991ef
diff --git a/av1/av1_common.mk b/av1/av1_common.mk
index cd3e1d1..9976e7a 100644
--- a/av1/av1_common.mk
+++ b/av1/av1_common.mk
@@ -11,11 +11,9 @@
AV1_COMMON_SRCS-yes += av1_common.mk
AV1_COMMON_SRCS-yes += av1_iface_common.h
-AV1_COMMON_SRCS-yes += common/ans.h
AV1_COMMON_SRCS-yes += common/alloccommon.c
AV1_COMMON_SRCS-yes += common/blockd.c
AV1_COMMON_SRCS-yes += common/debugmodes.c
-AV1_COMMON_SRCS-yes += common/divide.h
AV1_COMMON_SRCS-yes += common/entropy.c
AV1_COMMON_SRCS-yes += common/entropymode.c
AV1_COMMON_SRCS-yes += common/entropymv.c
@@ -82,9 +80,6 @@
endif
AV1_COMMON_SRCS-yes += common/av1_convolve.c
AV1_COMMON_SRCS-yes += common/av1_convolve.h
-AV1_COMMON_SRCS-$(CONFIG_ANS) += common/ans.h
-AV1_COMMON_SRCS-$(CONFIG_ANS) += common/divide.h
-AV1_COMMON_SRCS-$(CONFIG_ANS) += common/divide.c
AV1_COMMON_SRCS-$(CONFIG_LOOP_RESTORATION) += common/restoration.h
AV1_COMMON_SRCS-$(CONFIG_LOOP_RESTORATION) += common/restoration.c
ifeq (yes,$(filter yes,$(CONFIG_GLOBAL_MOTION) $(CONFIG_WARPED_MOTION)))
diff --git a/av1/av1_cx.mk b/av1/av1_cx.mk
index c4df1a5..ecbe2b3 100644
--- a/av1/av1_cx.mk
+++ b/av1/av1_cx.mk
@@ -86,8 +86,6 @@
AV1_CX_SRCS-yes += encoder/resize.c
AV1_CX_SRCS-yes += encoder/resize.h
AV1_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/blockiness.c
-AV1_CX_SRCS-$(CONFIG_ANS) += encoder/buf_ans.h
-AV1_CX_SRCS-$(CONFIG_ANS) += encoder/buf_ans.c
AV1_CX_SRCS-yes += encoder/tokenize.c
AV1_CX_SRCS-yes += encoder/treewriter.c
diff --git a/av1/common/ans.h b/av1/common/ans.h
deleted file mode 100644
index 1a632ee..0000000
--- a/av1/common/ans.h
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Copyright (c) 2015 The WebM project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef AV1_COMMON_ANS_H_
-#define AV1_COMMON_ANS_H_
-// An implementation of Asymmetric Numeral Systems
-// http://arxiv.org/abs/1311.2540v2
-
-#include <assert.h>
-#include "./aom_config.h"
-#include "aom/aom_integer.h"
-#include "aom_dsp/prob.h"
-#include "aom_ports/mem_ops.h"
-
-#define ANS_DIVIDE_BY_MULTIPLY 1
-#if ANS_DIVIDE_BY_MULTIPLY
-#include "av1/common/divide.h"
-#define ANS_DIVREM(quotient, remainder, dividend, divisor) \
- do { \
- quotient = fastdiv(dividend, divisor); \
- remainder = dividend - quotient * divisor; \
- } while (0)
-#define ANS_DIV(dividend, divisor) fastdiv(dividend, divisor)
-#else
-#define ANS_DIVREM(quotient, remainder, dividend, divisor) \
- do { \
- quotient = dividend / divisor; \
- remainder = dividend % divisor; \
- } while (0)
-#define ANS_DIV(dividend, divisor) ((dividend) / (divisor))
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-struct AnsCoder {
- uint8_t *buf;
- int buf_offset;
- uint32_t state;
-};
-
-struct AnsDecoder {
- const uint8_t *buf;
- int buf_offset;
- uint32_t state;
-};
-
-typedef uint8_t AnsP8;
-#define ans_p8_precision 256u
-#define ans_p8_shift 8
-typedef uint16_t AnsP10;
-#define ans_p10_precision 1024u
-
-#define rans_precision ans_p10_precision
-
-#define l_base (ans_p10_precision * 4) // l_base % precision must be 0
-#define io_base 256
-// Range I = { l_base, l_base + 1, ..., l_base * io_base - 1 }
-
-static INLINE void ans_write_init(struct AnsCoder *const ans,
- uint8_t *const buf) {
- ans->buf = buf;
- ans->buf_offset = 0;
- ans->state = l_base;
-}
-
-static INLINE int ans_write_end(struct AnsCoder *const ans) {
- uint32_t state;
- assert(ans->state >= l_base);
- assert(ans->state < l_base * io_base);
- state = ans->state - l_base;
- if (state < (1 << 6)) {
- ans->buf[ans->buf_offset] = (0x00 << 6) + state;
- return ans->buf_offset + 1;
- } else if (state < (1 << 14)) {
- mem_put_le16(ans->buf + ans->buf_offset, (0x01 << 14) + state);
- return ans->buf_offset + 2;
- } else if (state < (1 << 22)) {
- mem_put_le24(ans->buf + ans->buf_offset, (0x02 << 22) + state);
- return ans->buf_offset + 3;
- } else {
- assert(0 && "State is too large to be serialized");
- return ans->buf_offset;
- }
-}
-
-// rABS with descending spread
-// p or p0 takes the place of l_s from the paper
-// ans_p8_precision is m
-static INLINE void rabs_desc_write(struct AnsCoder *ans, int val, AnsP8 p0) {
- const AnsP8 p = ans_p8_precision - p0;
- const unsigned l_s = val ? p : p0;
- unsigned quot, rem;
- if (ans->state >= l_base / ans_p8_precision * io_base * l_s) {
- ans->buf[ans->buf_offset++] = ans->state % io_base;
- ans->state /= io_base;
- }
- ANS_DIVREM(quot, rem, ans->state, l_s);
- ans->state = quot * ans_p8_precision + rem + (val ? 0 : p);
-}
-
-#define ANS_IMPL1 0
-#define UNPREDICTABLE(x) x
-static INLINE int rabs_desc_read(struct AnsDecoder *ans, AnsP8 p0) {
- int val;
-#if ANS_IMPL1
- unsigned l_s;
-#else
- unsigned quot, rem, x, xn;
-#endif
- const AnsP8 p = ans_p8_precision - p0;
- if (ans->state < l_base) {
- ans->state = ans->state * io_base + ans->buf[--ans->buf_offset];
- }
-#if ANS_IMPL1
- val = ans->state % ans_p8_precision < p;
- l_s = val ? p : p0;
- ans->state = (ans->state / ans_p8_precision) * l_s +
- ans->state % ans_p8_precision - (!val * p);
-#else
- x = ans->state;
- quot = x / ans_p8_precision;
- rem = x % ans_p8_precision;
- xn = quot * p;
- val = rem < p;
- if (UNPREDICTABLE(val)) {
- ans->state = xn + rem;
- } else {
- // ans->state = quot * p0 + rem - p;
- ans->state = x - xn - p;
- }
-#endif
- return val;
-}
-
-// rABS with ascending spread
-// p or p0 takes the place of l_s from the paper
-// ans_p8_precision is m
-static INLINE void rabs_asc_write(struct AnsCoder *ans, int val, AnsP8 p0) {
- const AnsP8 p = ans_p8_precision - p0;
- const unsigned l_s = val ? p : p0;
- unsigned quot, rem;
- if (ans->state >= l_base / ans_p8_precision * io_base * l_s) {
- ans->buf[ans->buf_offset++] = ans->state % io_base;
- ans->state /= io_base;
- }
- ANS_DIVREM(quot, rem, ans->state, l_s);
- ans->state = quot * ans_p8_precision + rem + (val ? p0 : 0);
-}
-
-static INLINE int rabs_asc_read(struct AnsDecoder *ans, AnsP8 p0) {
- int val;
-#if ANS_IMPL1
- unsigned l_s;
-#else
- unsigned quot, rem, x, xn;
-#endif
- const AnsP8 p = ans_p8_precision - p0;
- if (ans->state < l_base) {
- ans->state = ans->state * io_base + ans->buf[--ans->buf_offset];
- }
-#if ANS_IMPL1
- val = ans->state % ans_p8_precision < p;
- l_s = val ? p : p0;
- ans->state = (ans->state / ans_p8_precision) * l_s +
- ans->state % ans_p8_precision - (!val * p);
-#else
- x = ans->state;
- quot = x / ans_p8_precision;
- rem = x % ans_p8_precision;
- xn = quot * p;
- val = rem >= p0;
- if (UNPREDICTABLE(val)) {
- ans->state = xn + rem - p0;
- } else {
- // ans->state = quot * p0 + rem - p0;
- ans->state = x - xn;
- }
-#endif
- return val;
-}
-
-#define rabs_read rabs_desc_read
-#define rabs_write rabs_desc_write
-
-// uABS with normalization
-static INLINE void uabs_write(struct AnsCoder *ans, int val, AnsP8 p0) {
- AnsP8 p = ans_p8_precision - p0;
- const unsigned l_s = val ? p : p0;
- while (ans->state >= l_base / ans_p8_precision * io_base * l_s) {
- ans->buf[ans->buf_offset++] = ans->state % io_base;
- ans->state /= io_base;
- }
- if (!val)
- ans->state = ANS_DIV(ans->state * ans_p8_precision, p0);
- else
- ans->state = ANS_DIV((ans->state + 1) * ans_p8_precision + p - 1, p) - 1;
-}
-
-static INLINE int uabs_read(struct AnsDecoder *ans, AnsP8 p0) {
- AnsP8 p = ans_p8_precision - p0;
- int s;
- // unsigned int xp1;
- unsigned xp, sp;
- unsigned state = ans->state;
- while (state < l_base && ans->buf_offset > 0) {
- state = state * io_base + ans->buf[--ans->buf_offset];
- }
- sp = state * p;
- // xp1 = (sp + p) / ans_p8_precision;
- xp = sp / ans_p8_precision;
- // s = xp1 - xp;
- s = (sp & 0xFF) >= p0;
- if (UNPREDICTABLE(s))
- ans->state = xp;
- else
- ans->state = state - xp;
- return s;
-}
-
-static INLINE int uabs_read_bit(struct AnsDecoder *ans) {
- int s;
- unsigned state = ans->state;
- while (state < l_base && ans->buf_offset > 0) {
- state = state * io_base + ans->buf[--ans->buf_offset];
- }
- s = (int)(state & 1);
- ans->state = state >> 1;
- return s;
-}
-
-static INLINE int uabs_read_literal(struct AnsDecoder *ans, int bits) {
- int literal = 0, bit;
- assert(bits < 31);
-
- // TODO(aconverse): Investigate ways to read/write literals faster,
- // e.g. 8-bit chunks.
- for (bit = bits - 1; bit >= 0; bit--) literal |= uabs_read_bit(ans) << bit;
-
- return literal;
-}
-
-// TODO(aconverse): Replace trees with tokensets.
-static INLINE int uabs_read_tree(struct AnsDecoder *ans,
- const aom_tree_index *tree,
- const AnsP8 *probs) {
- aom_tree_index i = 0;
-
- while ((i = tree[i + uabs_read(ans, probs[i >> 1])]) > 0) continue;
-
- return -i;
-}
-
-struct rans_sym {
- AnsP10 prob;
- AnsP10 cum_prob; // not-inclusive
-};
-
-struct rans_dec_sym {
- uint8_t val;
- AnsP10 prob;
- AnsP10 cum_prob; // not-inclusive
-};
-
-// This is now just a boring cdf. It starts with an explicit zero.
-// TODO(aconverse): Remove starting zero.
-typedef uint16_t rans_dec_lut[16];
-
-static INLINE void rans_build_cdf_from_pdf(const AnsP10 token_probs[],
- rans_dec_lut cdf_tab) {
- int i;
- cdf_tab[0] = 0;
- for (i = 1; cdf_tab[i - 1] < rans_precision; ++i) {
- cdf_tab[i] = cdf_tab[i - 1] + token_probs[i - 1];
- }
- assert(cdf_tab[i - 1] == rans_precision);
-}
-
-static INLINE int ans_find_largest(const AnsP10 *const pdf_tab, int num_syms) {
- int largest_idx = -1;
- int largest_p = -1;
- int i;
- for (i = 0; i < num_syms; ++i) {
- int p = pdf_tab[i];
- if (p > largest_p) {
- largest_p = p;
- largest_idx = i;
- }
- }
- return largest_idx;
-}
-
-static INLINE void rans_merge_prob8_pdf(AnsP10 *const out_pdf,
- const AnsP8 node_prob,
- const AnsP10 *const src_pdf,
- int in_syms) {
- int i;
- int adjustment = rans_precision;
- const int round_fact = ans_p8_precision >> 1;
- const AnsP8 p1 = ans_p8_precision - node_prob;
- const int out_syms = in_syms + 1;
- assert(src_pdf != out_pdf);
-
- out_pdf[0] = node_prob << (10 - 8);
- adjustment -= out_pdf[0];
- for (i = 0; i < in_syms; ++i) {
- int p = (p1 * src_pdf[i] + round_fact) >> ans_p8_shift;
- p = AOMMIN(p, (int)rans_precision - in_syms);
- p = AOMMAX(p, 1);
- out_pdf[i + 1] = p;
- adjustment -= p;
- }
-
- // Adjust probabilities so they sum to the total probability
- if (adjustment > 0) {
- i = ans_find_largest(out_pdf, out_syms);
- out_pdf[i] += adjustment;
- } else {
- while (adjustment < 0) {
- i = ans_find_largest(out_pdf, out_syms);
- --out_pdf[i];
- assert(out_pdf[i] > 0);
- adjustment++;
- }
- }
-}
-
-// rANS with normalization
-// sym->prob takes the place of l_s from the paper
-// ans_p10_precision is m
-static INLINE void rans_write(struct AnsCoder *ans,
- const struct rans_sym *const sym) {
- const AnsP10 p = sym->prob;
- while (ans->state >= l_base / rans_precision * io_base * p) {
- ans->buf[ans->buf_offset++] = ans->state % io_base;
- ans->state /= io_base;
- }
- ans->state =
- (ans->state / p) * rans_precision + ans->state % p + sym->cum_prob;
-}
-
-static INLINE void fetch_sym(struct rans_dec_sym *out, const rans_dec_lut cdf,
- AnsP10 rem) {
- int i = 0;
- // TODO(skal): if critical, could be a binary search.
- // Or, better, an O(1) alias-table.
- while (rem >= cdf[i]) {
- ++i;
- }
- out->val = i - 1;
- out->prob = (AnsP10)(cdf[i] - cdf[i - 1]);
- out->cum_prob = (AnsP10)cdf[i - 1];
-}
-
-static INLINE int rans_read(struct AnsDecoder *ans, const rans_dec_lut tab) {
- unsigned rem;
- unsigned quo;
- struct rans_dec_sym sym;
- while (ans->state < l_base && ans->buf_offset > 0) {
- ans->state = ans->state * io_base + ans->buf[--ans->buf_offset];
- }
- quo = ans->state / rans_precision;
- rem = ans->state % rans_precision;
- fetch_sym(&sym, tab, rem);
- ans->state = quo * sym.prob + rem - sym.cum_prob;
- return sym.val;
-}
-
-static INLINE int ans_read_init(struct AnsDecoder *const ans,
- const uint8_t *const buf, int offset) {
- unsigned x;
- if (offset < 1) return 1;
- ans->buf = buf;
- x = buf[offset - 1] >> 6;
- if (x == 0) {
- ans->buf_offset = offset - 1;
- ans->state = buf[offset - 1] & 0x3F;
- } else if (x == 1) {
- if (offset < 2) return 1;
- ans->buf_offset = offset - 2;
- ans->state = mem_get_le16(buf + offset - 2) & 0x3FFF;
- } else if (x == 2) {
- if (offset < 3) return 1;
- ans->buf_offset = offset - 3;
- ans->state = mem_get_le24(buf + offset - 3) & 0x3FFFFF;
- } else {
- // x == 3 implies this byte is a superframe marker
- return 1;
- }
- ans->state += l_base;
- if (ans->state >= l_base * io_base) return 1;
- return 0;
-}
-
-static INLINE int ans_read_end(struct AnsDecoder *const ans) {
- return ans->state == l_base;
-}
-
-static INLINE int ans_reader_has_error(const struct AnsDecoder *const ans) {
- return ans->state < l_base && ans->buf_offset == 0;
-}
-#undef ANS_DIVREM
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-#endif // AV1_COMMON_ANS_H_
diff --git a/av1/common/divide.c b/av1/common/divide.c
deleted file mode 100644
index 3c82be8..0000000
--- a/av1/common/divide.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2015 The WebM project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "av1/common/divide.h"
-
-/* Constants for divide by multiply for small divisors generated with:
-void init_fastdiv() {
- int i;
- for (i = 3; i < 256; ++i) {
- const int s = 31 ^ __builtin_clz(2 * i + 1);
- const unsigned long long base = (1ull << (sizeof(unsigned) * 8 + s)) - 1;
- fastdiv_tab[i].mult = (base / i + 1) & 0xFFFFFFFF;
- fastdiv_tab[i].shift = s;
- }
- for (i = 0; i < 8; ++i) {
- fastdiv_tab[1 << i].mult = 0;
- fastdiv_tab[1 << i].shift = i;
- }
-}
-*/
-const struct fastdiv_elem av1_fastdiv_tab[256] = {
- { 0, 0 }, { 0, 0 }, { 0, 1 },
- { 1431655766, 2 }, { 0, 2 }, { 2576980378u, 3 },
- { 1431655766, 3 }, { 613566757, 3 }, { 0, 3 },
- { 3340530120u, 4 }, { 2576980378u, 4 }, { 1952257862, 4 },
- { 1431655766, 4 }, { 991146300, 4 }, { 613566757, 4 },
- { 286331154u, 4 }, { 0, 4 }, { 3789677026u, 5 },
- { 3340530120u, 5 }, { 2938661835u, 5 }, { 2576980378u, 5 },
- { 2249744775u, 5 }, { 1952257862, 5 }, { 1680639377, 5 },
- { 1431655766, 5 }, { 1202590843, 5 }, { 991146300, 5 },
- { 795364315, 5 }, { 613566757, 5 }, { 444306962, 5 },
- { 286331154, 5 }, { 138547333, 5 }, { 0, 5 },
- { 4034666248u, 6 }, { 3789677026u, 6 }, { 3558687189u, 6 },
- { 3340530120u, 6 }, { 3134165325u, 6 }, { 2938661835u, 6 },
- { 2753184165u, 6 }, { 2576980378u, 6 }, { 2409371898u, 6 },
- { 2249744775u, 6 }, { 2097542168u, 6 }, { 1952257862, 6 },
- { 1813430637, 6 }, { 1680639377, 6 }, { 1553498810, 6 },
- { 1431655766, 6 }, { 1314785907, 6 }, { 1202590843, 6 },
- { 1094795586, 6 }, { 991146300, 6 }, { 891408307, 6 },
- { 795364315, 6 }, { 702812831, 6 }, { 613566757, 6 },
- { 527452125, 6 }, { 444306962, 6 }, { 363980280, 6 },
- { 286331154, 6 }, { 211227900, 6 }, { 138547333, 6 },
- { 68174085, 6 }, { 0, 6 }, { 4162814457u, 7 },
- { 4034666248u, 7 }, { 3910343360u, 7 }, { 3789677026u, 7 },
- { 3672508268u, 7 }, { 3558687189u, 7 }, { 3448072337u, 7 },
- { 3340530120u, 7 }, { 3235934265u, 7 }, { 3134165325u, 7 },
- { 3035110223u, 7 }, { 2938661835u, 7 }, { 2844718599u, 7 },
- { 2753184165u, 7 }, { 2663967058u, 7 }, { 2576980378u, 7 },
- { 2492141518u, 7 }, { 2409371898u, 7 }, { 2328596727u, 7 },
- { 2249744775u, 7 }, { 2172748162u, 7 }, { 2097542168, 7 },
- { 2024065048, 7 }, { 1952257862, 7 }, { 1882064321, 7 },
- { 1813430637, 7 }, { 1746305385, 7 }, { 1680639377, 7 },
- { 1616385542, 7 }, { 1553498810, 7 }, { 1491936009, 7 },
- { 1431655766, 7 }, { 1372618415, 7 }, { 1314785907, 7 },
- { 1258121734, 7 }, { 1202590843, 7 }, { 1148159575, 7 },
- { 1094795586, 7 }, { 1042467791, 7 }, { 991146300, 7 },
- { 940802361, 7 }, { 891408307, 7 }, { 842937507, 7 },
- { 795364315, 7 }, { 748664025, 7 }, { 702812831, 7 },
- { 657787785, 7 }, { 613566757, 7 }, { 570128403, 7 },
- { 527452125, 7 }, { 485518043, 7 }, { 444306962, 7 },
- { 403800345, 7 }, { 363980280, 7 }, { 324829460, 7 },
- { 286331154, 7 }, { 248469183, 7 }, { 211227900, 7 },
- { 174592167, 7 }, { 138547333, 7 }, { 103079216, 7 },
- { 68174085, 7 }, { 33818641, 7 }, { 0, 7 },
- { 4228378656u, 8 }, { 4162814457u, 8 }, { 4098251237u, 8 },
- { 4034666248u, 8 }, { 3972037425u, 8 }, { 3910343360u, 8 },
- { 3849563281u, 8 }, { 3789677026u, 8 }, { 3730665024u, 8 },
- { 3672508268u, 8 }, { 3615188300u, 8 }, { 3558687189u, 8 },
- { 3502987511u, 8 }, { 3448072337u, 8 }, { 3393925206u, 8 },
- { 3340530120u, 8 }, { 3287871517u, 8 }, { 3235934265u, 8 },
- { 3184703642u, 8 }, { 3134165325u, 8 }, { 3084305374u, 8 },
- { 3035110223u, 8 }, { 2986566663u, 8 }, { 2938661835u, 8 },
- { 2891383213u, 8 }, { 2844718599u, 8 }, { 2798656110u, 8 },
- { 2753184165u, 8 }, { 2708291480u, 8 }, { 2663967058u, 8 },
- { 2620200175u, 8 }, { 2576980378u, 8 }, { 2534297473u, 8 },
- { 2492141518u, 8 }, { 2450502814u, 8 }, { 2409371898u, 8 },
- { 2368739540u, 8 }, { 2328596727u, 8 }, { 2288934667u, 8 },
- { 2249744775u, 8 }, { 2211018668u, 8 }, { 2172748162u, 8 },
- { 2134925265u, 8 }, { 2097542168, 8 }, { 2060591247, 8 },
- { 2024065048, 8 }, { 1987956292, 8 }, { 1952257862, 8 },
- { 1916962805, 8 }, { 1882064321, 8 }, { 1847555765, 8 },
- { 1813430637, 8 }, { 1779682582, 8 }, { 1746305385, 8 },
- { 1713292966, 8 }, { 1680639377, 8 }, { 1648338801, 8 },
- { 1616385542, 8 }, { 1584774030, 8 }, { 1553498810, 8 },
- { 1522554545, 8 }, { 1491936009, 8 }, { 1461638086, 8 },
- { 1431655766, 8 }, { 1401984144, 8 }, { 1372618415, 8 },
- { 1343553873, 8 }, { 1314785907, 8 }, { 1286310003, 8 },
- { 1258121734, 8 }, { 1230216764, 8 }, { 1202590843, 8 },
- { 1175239808, 8 }, { 1148159575, 8 }, { 1121346142, 8 },
- { 1094795586, 8 }, { 1068504060, 8 }, { 1042467791, 8 },
- { 1016683080, 8 }, { 991146300, 8 }, { 965853890, 8 },
- { 940802361, 8 }, { 915988286, 8 }, { 891408307, 8 },
- { 867059126, 8 }, { 842937507, 8 }, { 819040276, 8 },
- { 795364315, 8 }, { 771906565, 8 }, { 748664025, 8 },
- { 725633745, 8 }, { 702812831, 8 }, { 680198441, 8 },
- { 657787785, 8 }, { 635578121, 8 }, { 613566757, 8 },
- { 591751050, 8 }, { 570128403, 8 }, { 548696263, 8 },
- { 527452125, 8 }, { 506393524, 8 }, { 485518043, 8 },
- { 464823301, 8 }, { 444306962, 8 }, { 423966729, 8 },
- { 403800345, 8 }, { 383805589, 8 }, { 363980280, 8 },
- { 344322273, 8 }, { 324829460, 8 }, { 305499766, 8 },
- { 286331154, 8 }, { 267321616, 8 }, { 248469183, 8 },
- { 229771913, 8 }, { 211227900, 8 }, { 192835267, 8 },
- { 174592167, 8 }, { 156496785, 8 }, { 138547333, 8 },
- { 120742053, 8 }, { 103079216, 8 }, { 85557118, 8 },
- { 68174085, 8 }, { 50928466, 8 }, { 33818641, 8 },
- { 16843010, 8 },
-};
diff --git a/av1/common/divide.h b/av1/common/divide.h
deleted file mode 100644
index b96ad4c..0000000
--- a/av1/common/divide.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2015 The WebM project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef AV1_COMMON_DIVIDE_H_
-#define AV1_COMMON_DIVIDE_H_
-// An implemntation of the divide by multiply alogrithm
-// https://gmplib.org/~tege/divcnst-pldi94.pdf
-
-#include <limits.h>
-
-#include "./aom_config.h"
-#include "aom/aom_integer.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-struct fastdiv_elem {
- unsigned mult;
- unsigned shift;
-};
-
-extern const struct fastdiv_elem av1_fastdiv_tab[256];
-
-static INLINE unsigned fastdiv(unsigned x, int y) {
- unsigned t =
- ((uint64_t)x * av1_fastdiv_tab[y].mult) >> (sizeof(x) * CHAR_BIT);
- return (t + x) >> av1_fastdiv_tab[y].shift;
-}
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-#endif // AV1_COMMON_DIVIDE_H_
diff --git a/av1/common/entropy.h b/av1/common/entropy.h
index ac47b3b..4ce502b 100644
--- a/av1/common/entropy.h
+++ b/av1/common/entropy.h
@@ -16,7 +16,7 @@
#include "aom_dsp/prob.h"
#if CONFIG_ANS
-#include "av1/common/ans.h"
+#include "aom_dsp/ans.h"
#endif // CONFIG_ANS
#include "av1/common/common.h"
#include "av1/common/enums.h"
diff --git a/av1/decoder/bitreader.h b/av1/decoder/bitreader.h
index aaf1bb8..4d77664 100644
--- a/av1/decoder/bitreader.h
+++ b/av1/decoder/bitreader.h
@@ -17,7 +17,7 @@
#include "./aom_config.h"
#if CONFIG_ANS
-#include "av1/common/ans.h"
+#include "aom_dsp/ans.h"
#include "aom/aomdx.h" // for av1_decrypt_cb
#define aom_reader struct AnsDecoder
#define aom_reader_has_error ans_reader_has_error
diff --git a/av1/decoder/detokenize.c b/av1/decoder/detokenize.c
index 778bf12..fbcf8fe 100644
--- a/av1/decoder/detokenize.c
+++ b/av1/decoder/detokenize.c
@@ -12,7 +12,9 @@
#include "aom_mem/aom_mem.h"
#include "aom_ports/mem.h"
-#include "av1/common/ans.h"
+#if CONFIG_ANS
+#include "aom_dsp/ans.h"
+#endif // CONFIG_ANS
#include "av1/common/blockd.h"
#include "av1/common/common.h"
#include "av1/common/entropy.h"
diff --git a/av1/decoder/detokenize.h b/av1/decoder/detokenize.h
index de9ded9..69d6fab 100644
--- a/av1/decoder/detokenize.h
+++ b/av1/decoder/detokenize.h
@@ -13,7 +13,9 @@
#define AV1_DECODER_DETOKENIZE_H_
#include "av1/decoder/decoder.h"
-#include "av1/common/ans.h"
+#if CONFIG_ANS
+#include "aom_dsp/ans.h"
+#endif // CONFIG_ANS
#include "av1/common/scan.h"
#ifdef __cplusplus
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 0f2daa1..2cdc82f 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -37,7 +37,7 @@
#include "av1/common/tile_common.h"
#if CONFIG_ANS
-#include "av1/encoder/buf_ans.h"
+#include "aom_dsp/buf_ans.h"
#endif // CONFIG_ANS
#include "av1/encoder/bitstream.h"
#include "av1/encoder/cost.h"
diff --git a/av1/encoder/bitwriter.h b/av1/encoder/bitwriter.h
index 2247e30..e4e7250 100644
--- a/av1/encoder/bitwriter.h
+++ b/av1/encoder/bitwriter.h
@@ -23,7 +23,7 @@
#if CONFIG_ANS
typedef struct BufAnsCoder BufAnsCoder;
-#include "av1/encoder/buf_ans.h"
+#include "aom_dsp/buf_ans.h"
#define aom_writer BufAnsCoder
#define aom_write buf_uabs_write
#define aom_write_bit buf_uabs_write_bit
diff --git a/av1/encoder/buf_ans.c b/av1/encoder/buf_ans.c
deleted file mode 100644
index d20edc3..0000000
--- a/av1/encoder/buf_ans.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2016 The WebM project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <string.h>
-
-#include "av1/common/common.h"
-#include "av1/encoder/buf_ans.h"
-#include "av1/encoder/encoder.h"
-#include "aom_mem/aom_mem.h"
-
-void av1_buf_ans_alloc(struct BufAnsCoder *c, struct AV1Common *cm,
- int size_hint) {
- c->cm = cm;
- c->size = size_hint;
- CHECK_MEM_ERROR(cm, c->buf, aom_malloc(c->size * sizeof(*c->buf)));
- // Initialize to overfull to trigger the assert in write.
- c->offset = c->size + 1;
-}
-
-void av1_buf_ans_free(struct BufAnsCoder *c) {
- aom_free(c->buf);
- c->buf = NULL;
- c->size = 0;
-}
-
-void av1_buf_ans_grow(struct BufAnsCoder *c) {
- struct buffered_ans_symbol *new_buf = NULL;
- int new_size = c->size * 2;
- CHECK_MEM_ERROR(c->cm, new_buf, aom_malloc(new_size * sizeof(*new_buf)));
- memcpy(new_buf, c->buf, c->size * sizeof(*c->buf));
- aom_free(c->buf);
- c->buf = new_buf;
- c->size = new_size;
-}
diff --git a/av1/encoder/buf_ans.h b/av1/encoder/buf_ans.h
deleted file mode 100644
index 1ba6e6c..0000000
--- a/av1/encoder/buf_ans.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2016 The WebM project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef AV1_ENCODER_BUF_ANS_H_
-#define AV1_ENCODER_BUF_ANS_H_
-// Buffered forward ANS writer.
-// Symbols are written to the writer in forward (decode) order and serialzed
-// backwards due to ANS's stack like behavior.
-
-#include <assert.h>
-#include "./aom_config.h"
-#include "aom/aom_integer.h"
-#include "av1/common/ans.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-#define ANS_METHOD_UABS 0
-#define ANS_METHOD_RANS 1
-
-struct buffered_ans_symbol {
- uint8_t method; // one of ANS_METHOD_UABS or ANS_METHOD_RANS
- // TODO(aconverse): Should be possible to write this interms of start for ABS
- AnsP10 val_start; // Boolean value for ABS, start in symbol cycle for Rans
- AnsP10 prob; // Probability of this symbol
-};
-
-struct BufAnsCoder {
- struct AV1Common *cm;
- struct buffered_ans_symbol *buf;
- int size;
- int offset;
-};
-
-void av1_buf_ans_alloc(struct BufAnsCoder *c, struct AV1Common *cm,
- int size_hint);
-
-void av1_buf_ans_free(struct BufAnsCoder *c);
-
-void av1_buf_ans_grow(struct BufAnsCoder *c);
-
-static INLINE void buf_ans_write_reset(struct BufAnsCoder *const c) {
- c->offset = 0;
-}
-
-static INLINE void buf_uabs_write(struct BufAnsCoder *const c, uint8_t val,
- AnsP8 prob) {
- assert(c->offset <= c->size);
- if (c->offset == c->size) {
- av1_buf_ans_grow(c);
- }
- c->buf[c->offset].method = ANS_METHOD_UABS;
- c->buf[c->offset].val_start = val;
- c->buf[c->offset].prob = prob;
- ++c->offset;
-}
-
-static INLINE void buf_rans_write(struct BufAnsCoder *const c,
- const struct rans_sym *const sym) {
- assert(c->offset <= c->size);
- if (c->offset == c->size) {
- av1_buf_ans_grow(c);
- }
- c->buf[c->offset].method = ANS_METHOD_RANS;
- c->buf[c->offset].val_start = sym->cum_prob;
- c->buf[c->offset].prob = sym->prob;
- ++c->offset;
-}
-
-static INLINE void buf_ans_flush(const struct BufAnsCoder *const c,
- struct AnsCoder *ans) {
- int offset;
- for (offset = c->offset - 1; offset >= 0; --offset) {
- if (c->buf[offset].method == ANS_METHOD_RANS) {
- struct rans_sym sym;
- sym.prob = c->buf[offset].prob;
- sym.cum_prob = c->buf[offset].val_start;
- rans_write(ans, &sym);
- } else {
- uabs_write(ans, (uint8_t)c->buf[offset].val_start,
- (AnsP8)c->buf[offset].prob);
- }
- }
-}
-
-static INLINE void buf_uabs_write_bit(struct BufAnsCoder *c, int bit) {
- buf_uabs_write(c, bit, 128);
-}
-
-static INLINE void buf_uabs_write_literal(struct BufAnsCoder *c, int literal,
- int bits) {
- int bit;
-
- assert(bits < 31);
- for (bit = bits - 1; bit >= 0; bit--)
- buf_uabs_write_bit(c, 1 & (literal >> bit));
-}
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-#endif // AV1_ENCODER_BUF_ANS_H_
diff --git a/av1/encoder/cost.c b/av1/encoder/cost.c
index f6636ec..8acb341 100644
--- a/av1/encoder/cost.c
+++ b/av1/encoder/cost.c
@@ -12,7 +12,7 @@
#include "av1/encoder/cost.h"
#if CONFIG_ANS
-#include "av1/common/ans.h"
+#include "aom_dsp/ans.h"
#endif // CONFIG_ANS
#include "av1/common/entropy.h"
diff --git a/av1/encoder/cost.h b/av1/encoder/cost.h
index 4e4d9bb..87652cd 100644
--- a/av1/encoder/cost.h
+++ b/av1/encoder/cost.h
@@ -14,7 +14,7 @@
#include "aom_dsp/prob.h"
#include "aom/aom_integer.h"
#if CONFIG_ANS
-#include "av1/common/ans.h"
+#include "aom_dsp/ans.h"
#endif // CONFIG_ANS
#ifdef __cplusplus
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index b6facfa..a5dcfc6 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -32,7 +32,7 @@
#include "av1/encoder/aq_variance.h"
#include "av1/encoder/bitstream.h"
#if CONFIG_ANS
-#include "av1/encoder/buf_ans.h"
+#include "aom_dsp/buf_ans.h"
#endif
#include "av1/encoder/context_tree.h"
#include "av1/encoder/encodeframe.h"
@@ -485,7 +485,7 @@
cpi->source_diff_var = NULL;
}
#if CONFIG_ANS
- av1_buf_ans_free(&cpi->buf_ans);
+ aom_buf_ans_free(&cpi->buf_ans);
#endif // CONFIG_ANS
}
@@ -811,7 +811,7 @@
CHECK_MEM_ERROR(cm, cpi->tile_tok[0][0],
aom_calloc(tokens, sizeof(*cpi->tile_tok[0][0])));
#if CONFIG_ANS
- av1_buf_ans_alloc(&cpi->buf_ans, cm, tokens);
+ aom_buf_ans_alloc(&cpi->buf_ans, &cm->error, tokens);
#endif // CONFIG_ANS
}
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index 86503d7..8120e89 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -22,7 +22,7 @@
#include "av1/common/onyxc_int.h"
#include "av1/encoder/aq_cyclicrefresh.h"
#if CONFIG_ANS
-#include "av1/encoder/buf_ans.h"
+#include "aom_dsp/buf_ans.h"
#endif
#include "av1/encoder/context_tree.h"
#include "av1/encoder/encodemb.h"
diff --git a/av1/encoder/rd.h b/av1/encoder/rd.h
index 42c37e3..54c10b2 100644
--- a/av1/encoder/rd.h
+++ b/av1/encoder/rd.h
@@ -15,7 +15,7 @@
#include <limits.h>
#if CONFIG_ANS
-#include "av1/common/ans.h"
+#include "aom_dsp/ans.h"
#endif // CONFIG_ANS
#include "av1/common/blockd.h"
