Yaowu Xu | c27fc14 | 2016-08-22 16:08:15 -0700 | [diff] [blame] | 1 | /* |
Yaowu Xu | 9c01aa1 | 2016-09-01 14:32:49 -0700 | [diff] [blame] | 2 | * Copyright (c) 2016, Alliance for Open Media. All rights reserved |
Yaowu Xu | c27fc14 | 2016-08-22 16:08:15 -0700 | [diff] [blame] | 3 | * |
Yaowu Xu | 9c01aa1 | 2016-09-01 14:32:49 -0700 | [diff] [blame] | 4 | * This source code is subject to the terms of the BSD 2 Clause License and |
| 5 | * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License |
| 6 | * was not distributed with this source code in the LICENSE file, you can |
| 7 | * obtain it at www.aomedia.org/license/software. If the Alliance for Open |
| 8 | * Media Patent License 1.0 was not distributed with this source code in the |
| 9 | * PATENTS file, you can obtain it at www.aomedia.org/license/patent. |
Yaowu Xu | c27fc14 | 2016-08-22 16:08:15 -0700 | [diff] [blame] | 10 | */ |
| 11 | |
Yaowu Xu | f883b42 | 2016-08-30 14:01:10 -0700 | [diff] [blame] | 12 | #ifndef AOM_DSP_BITREADER_H_ |
| 13 | #define AOM_DSP_BITREADER_H_ |
Yaowu Xu | c27fc14 | 2016-08-22 16:08:15 -0700 | [diff] [blame] | 14 | |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 15 | #include <assert.h> |
Alex Converse | 7fe2ae8 | 2016-09-28 11:33:20 -0700 | [diff] [blame] | 16 | #include <limits.h> |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 17 | |
Yaowu Xu | f883b42 | 2016-08-30 14:01:10 -0700 | [diff] [blame] | 18 | #include "./aom_config.h" |
Nathan E. Egge | baaaa16 | 2016-10-24 09:50:52 -0400 | [diff] [blame] | 19 | #if CONFIG_EC_ADAPT && !CONFIG_EC_MULTISYMBOL |
| 20 | #error "CONFIG_EC_ADAPT is enabled without enabling CONFIG_EC_MULTISYMBOL." |
| 21 | #endif |
| 22 | |
Yaowu Xu | f883b42 | 2016-08-30 14:01:10 -0700 | [diff] [blame] | 23 | #include "aom/aomdx.h" |
| 24 | #include "aom/aom_integer.h" |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 25 | #if CONFIG_ANS |
Alex Converse | 7fe2ae8 | 2016-09-28 11:33:20 -0700 | [diff] [blame] | 26 | #include "aom_dsp/ansreader.h" |
Nathan E. Egge | 8043cc4 | 2016-03-06 12:42:47 -0500 | [diff] [blame] | 27 | #elif CONFIG_DAALA_EC |
| 28 | #include "aom_dsp/daalaboolreader.h" |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 29 | #else |
Alex Converse | eb00cb2 | 2016-06-06 15:12:06 -0700 | [diff] [blame] | 30 | #include "aom_dsp/dkboolreader.h" |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 31 | #endif |
Yaowu Xu | c27fc14 | 2016-08-22 16:08:15 -0700 | [diff] [blame] | 32 | #include "aom_dsp/prob.h" |
Nathan E. Egge | 4446014 | 2016-06-20 13:44:22 -0400 | [diff] [blame] | 33 | #include "av1/common/odintrin.h" |
Yaowu Xu | c27fc14 | 2016-08-22 16:08:15 -0700 | [diff] [blame] | 34 | |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 35 | #if CONFIG_ACCOUNTING |
| 36 | #include "av1/common/accounting.h" |
| 37 | #define ACCT_STR_NAME acct_str |
| 38 | #define ACCT_STR_PARAM , const char *ACCT_STR_NAME |
| 39 | #define ACCT_STR_ARG(s) , s |
| 40 | #else |
| 41 | #define ACCT_STR_PARAM |
| 42 | #define ACCT_STR_ARG(s) |
| 43 | #endif |
| 44 | |
| 45 | #define aom_read(r, prob, ACCT_STR_NAME) \ |
| 46 | aom_read_(r, prob ACCT_STR_ARG(ACCT_STR_NAME)) |
| 47 | #define aom_read_bit(r, ACCT_STR_NAME) \ |
| 48 | aom_read_bit_(r ACCT_STR_ARG(ACCT_STR_NAME)) |
| 49 | #define aom_read_tree(r, tree, probs, ACCT_STR_NAME) \ |
| 50 | aom_read_tree_(r, tree, probs ACCT_STR_ARG(ACCT_STR_NAME)) |
| 51 | #define aom_read_literal(r, bits, ACCT_STR_NAME) \ |
| 52 | aom_read_literal_(r, bits ACCT_STR_ARG(ACCT_STR_NAME)) |
| 53 | #define aom_read_tree_bits(r, tree, probs, ACCT_STR_NAME) \ |
| 54 | aom_read_tree_bits_(r, tree, probs ACCT_STR_ARG(ACCT_STR_NAME)) |
Nathan E. Egge | e069849 | 2017-01-06 19:40:36 -0500 | [diff] [blame] | 55 | #define aom_read_cdf(r, cdf, nsymbs, ACCT_STR_NAME) \ |
| 56 | aom_read_cdf_(r, cdf, nsymbs ACCT_STR_ARG(ACCT_STR_NAME)) |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 57 | #define aom_read_symbol(r, cdf, nsymbs, ACCT_STR_NAME) \ |
| 58 | aom_read_symbol_(r, cdf, nsymbs ACCT_STR_ARG(ACCT_STR_NAME)) |
Nathan E. Egge | e069849 | 2017-01-06 19:40:36 -0500 | [diff] [blame] | 59 | #define aom_read_cdf_unscaled(r, cdf, nsymbs, ACCT_STR_NAME) \ |
| 60 | aom_read_cdf_unscaled_(r, cdf, nsymbs ACCT_STR_ARG(ACCT_STR_NAME)) |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 61 | |
Yaowu Xu | c27fc14 | 2016-08-22 16:08:15 -0700 | [diff] [blame] | 62 | #ifdef __cplusplus |
| 63 | extern "C" { |
| 64 | #endif |
| 65 | |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 66 | #if CONFIG_ANS |
| 67 | typedef struct AnsDecoder aom_reader; |
Nathan E. Egge | 8043cc4 | 2016-03-06 12:42:47 -0500 | [diff] [blame] | 68 | #elif CONFIG_DAALA_EC |
| 69 | typedef struct daala_reader aom_reader; |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 70 | #else |
Alex Converse | eb00cb2 | 2016-06-06 15:12:06 -0700 | [diff] [blame] | 71 | typedef struct aom_dk_reader aom_reader; |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 72 | #endif |
Yaowu Xu | c27fc14 | 2016-08-22 16:08:15 -0700 | [diff] [blame] | 73 | |
Alex Converse | eb00cb2 | 2016-06-06 15:12:06 -0700 | [diff] [blame] | 74 | static INLINE int aom_reader_init(aom_reader *r, const uint8_t *buffer, |
Alex Converse | 346440b | 2017-01-03 13:47:37 -0800 | [diff] [blame] | 75 | size_t size, aom_decrypt_cb decrypt_cb, |
Alex Converse | eb00cb2 | 2016-06-06 15:12:06 -0700 | [diff] [blame] | 76 | void *decrypt_state) { |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 77 | #if CONFIG_ANS |
| 78 | (void)decrypt_cb; |
| 79 | (void)decrypt_state; |
Alex Converse | 5b5140b | 2016-12-13 14:00:56 -0800 | [diff] [blame] | 80 | if (size > INT_MAX) return 1; |
Alex Converse | 346440b | 2017-01-03 13:47:37 -0800 | [diff] [blame] | 81 | return ans_read_init(r, buffer, (int)size); |
Nathan E. Egge | 8043cc4 | 2016-03-06 12:42:47 -0500 | [diff] [blame] | 82 | #elif CONFIG_DAALA_EC |
| 83 | (void)decrypt_cb; |
| 84 | (void)decrypt_state; |
Yaowu Xu | febe9b0 | 2016-11-09 10:00:31 -0800 | [diff] [blame] | 85 | return aom_daala_reader_init(r, buffer, (int)size); |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 86 | #else |
Alex Converse | eb00cb2 | 2016-06-06 15:12:06 -0700 | [diff] [blame] | 87 | return aom_dk_reader_init(r, buffer, size, decrypt_cb, decrypt_state); |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 88 | #endif |
Alex Converse | eb00cb2 | 2016-06-06 15:12:06 -0700 | [diff] [blame] | 89 | } |
Yaowu Xu | c27fc14 | 2016-08-22 16:08:15 -0700 | [diff] [blame] | 90 | |
Alex Converse | eb00cb2 | 2016-06-06 15:12:06 -0700 | [diff] [blame] | 91 | static INLINE const uint8_t *aom_reader_find_end(aom_reader *r) { |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 92 | #if CONFIG_ANS |
| 93 | (void)r; |
| 94 | assert(0 && "Use the raw buffer size with ANS"); |
| 95 | return NULL; |
Nathan E. Egge | 8043cc4 | 2016-03-06 12:42:47 -0500 | [diff] [blame] | 96 | #elif CONFIG_DAALA_EC |
| 97 | return aom_daala_reader_find_end(r); |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 98 | #else |
Alex Converse | eb00cb2 | 2016-06-06 15:12:06 -0700 | [diff] [blame] | 99 | return aom_dk_reader_find_end(r); |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 100 | #endif |
Alex Converse | eb00cb2 | 2016-06-06 15:12:06 -0700 | [diff] [blame] | 101 | } |
Yaowu Xu | c27fc14 | 2016-08-22 16:08:15 -0700 | [diff] [blame] | 102 | |
Yaowu Xu | f883b42 | 2016-08-30 14:01:10 -0700 | [diff] [blame] | 103 | static INLINE int aom_reader_has_error(aom_reader *r) { |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 104 | #if CONFIG_ANS |
| 105 | return ans_reader_has_error(r); |
Nathan E. Egge | 8043cc4 | 2016-03-06 12:42:47 -0500 | [diff] [blame] | 106 | #elif CONFIG_DAALA_EC |
| 107 | return aom_daala_reader_has_error(r); |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 108 | #else |
Alex Converse | eb00cb2 | 2016-06-06 15:12:06 -0700 | [diff] [blame] | 109 | return aom_dk_reader_has_error(r); |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 110 | #endif |
Yaowu Xu | c27fc14 | 2016-08-22 16:08:15 -0700 | [diff] [blame] | 111 | } |
| 112 | |
Michael Bebenita | d7baf45 | 2016-08-25 11:27:56 -0700 | [diff] [blame] | 113 | // Returns the position in the bit reader in bits. |
Nathan E. Egge | b244f39 | 2016-09-06 23:48:43 -0400 | [diff] [blame] | 114 | static INLINE uint32_t aom_reader_tell(const aom_reader *r) { |
Michael Bebenita | 868fc0b | 2016-08-03 16:13:04 -0700 | [diff] [blame] | 115 | #if CONFIG_ANS |
| 116 | (void)r; |
| 117 | assert(0 && "aom_reader_tell() is unimplemented for ANS"); |
| 118 | return 0; |
| 119 | #elif CONFIG_DAALA_EC |
| 120 | return aom_daala_reader_tell(r); |
| 121 | #else |
| 122 | return aom_dk_reader_tell(r); |
| 123 | #endif |
| 124 | } |
| 125 | |
Michael Bebenita | d7baf45 | 2016-08-25 11:27:56 -0700 | [diff] [blame] | 126 | // Returns the position in the bit reader in 1/8th bits. |
Nathan E. Egge | b244f39 | 2016-09-06 23:48:43 -0400 | [diff] [blame] | 127 | static INLINE uint32_t aom_reader_tell_frac(const aom_reader *r) { |
Michael Bebenita | d7baf45 | 2016-08-25 11:27:56 -0700 | [diff] [blame] | 128 | #if CONFIG_ANS |
| 129 | (void)r; |
| 130 | assert(0 && "aom_reader_tell_frac() is unimplemented for ANS"); |
| 131 | return 0; |
| 132 | #elif CONFIG_DAALA_EC |
| 133 | return aom_daala_reader_tell_frac(r); |
| 134 | #else |
| 135 | return aom_dk_reader_tell_frac(r); |
| 136 | #endif |
| 137 | } |
| 138 | |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 139 | #if CONFIG_ACCOUNTING |
| 140 | static INLINE void aom_process_accounting(const aom_reader *r ACCT_STR_PARAM) { |
| 141 | if (r->accounting != NULL) { |
| 142 | uint32_t tell_frac; |
| 143 | tell_frac = aom_reader_tell_frac(r); |
| 144 | aom_accounting_record(r->accounting, ACCT_STR_NAME, |
| 145 | tell_frac - r->accounting->last_tell_frac); |
| 146 | r->accounting->last_tell_frac = tell_frac; |
| 147 | } |
| 148 | } |
| 149 | #endif |
| 150 | |
| 151 | static INLINE int aom_read_(aom_reader *r, int prob ACCT_STR_PARAM) { |
| 152 | int ret; |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 153 | #if CONFIG_ANS |
Alex Converse | c54692b | 2017-01-25 16:41:05 -0800 | [diff] [blame] | 154 | ret = rabs_read(r, prob); |
Nathan E. Egge | 8043cc4 | 2016-03-06 12:42:47 -0500 | [diff] [blame] | 155 | #elif CONFIG_DAALA_EC |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 156 | ret = aom_daala_read(r, prob); |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 157 | #else |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 158 | ret = aom_dk_read(r, prob); |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 159 | #endif |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 160 | #if CONFIG_ACCOUNTING |
| 161 | if (ACCT_STR_NAME) aom_process_accounting(r, ACCT_STR_NAME); |
| 162 | #endif |
| 163 | return ret; |
Yaowu Xu | c27fc14 | 2016-08-22 16:08:15 -0700 | [diff] [blame] | 164 | } |
| 165 | |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 166 | static INLINE int aom_read_bit_(aom_reader *r ACCT_STR_PARAM) { |
| 167 | int ret; |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 168 | #if CONFIG_ANS |
Alex Converse | c54692b | 2017-01-25 16:41:05 -0800 | [diff] [blame] | 169 | ret = rabs_read_bit(r); // Non trivial optimization at half probability |
Nathan E. Egge | 24f1a90 | 2017-02-14 13:29:44 -0500 | [diff] [blame] | 170 | #elif CONFIG_DAALA_EC && CONFIG_RAWBITS |
Nathan E. Egge | 08c99eb | 2016-11-09 13:40:26 -0500 | [diff] [blame] | 171 | // Note this uses raw bits and is not the same as aom_daala_read(r, 128); |
| 172 | ret = aom_daala_read_bit(r); |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 173 | #else |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 174 | ret = aom_read(r, 128, NULL); // aom_prob_half |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 175 | #endif |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 176 | #if CONFIG_ACCOUNTING |
| 177 | if (ACCT_STR_NAME) aom_process_accounting(r, ACCT_STR_NAME); |
| 178 | #endif |
| 179 | return ret; |
Alex Converse | acef60b | 2016-09-23 14:21:02 -0700 | [diff] [blame] | 180 | } |
Yaowu Xu | c27fc14 | 2016-08-22 16:08:15 -0700 | [diff] [blame] | 181 | |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 182 | static INLINE int aom_read_literal_(aom_reader *r, int bits ACCT_STR_PARAM) { |
Nathan E. Egge | e691a24 | 2016-06-16 09:00:39 -0400 | [diff] [blame] | 183 | int literal = 0, bit; |
| 184 | |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 185 | for (bit = bits - 1; bit >= 0; bit--) literal |= aom_read_bit(r, NULL) << bit; |
| 186 | #if CONFIG_ACCOUNTING |
| 187 | if (ACCT_STR_NAME) aom_process_accounting(r, ACCT_STR_NAME); |
| 188 | #endif |
Nathan E. Egge | e691a24 | 2016-06-16 09:00:39 -0400 | [diff] [blame] | 189 | return literal; |
Yaowu Xu | c27fc14 | 2016-08-22 16:08:15 -0700 | [diff] [blame] | 190 | } |
| 191 | |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 192 | static INLINE int aom_read_tree_bits_(aom_reader *r, const aom_tree_index *tree, |
| 193 | const aom_prob *probs ACCT_STR_PARAM) { |
Nathan E. Egge | e691a24 | 2016-06-16 09:00:39 -0400 | [diff] [blame] | 194 | aom_tree_index i = 0; |
| 195 | |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 196 | while ((i = tree[i + aom_read(r, probs[i >> 1], NULL)]) > 0) continue; |
| 197 | #if CONFIG_ACCOUNTING |
| 198 | if (ACCT_STR_NAME) aom_process_accounting(r, ACCT_STR_NAME); |
| 199 | #endif |
Nathan E. Egge | e691a24 | 2016-06-16 09:00:39 -0400 | [diff] [blame] | 200 | return -i; |
Yaowu Xu | c27fc14 | 2016-08-22 16:08:15 -0700 | [diff] [blame] | 201 | } |
| 202 | |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 203 | static INLINE int aom_read_tree_(aom_reader *r, const aom_tree_index *tree, |
| 204 | const aom_prob *probs ACCT_STR_PARAM) { |
| 205 | int ret; |
Nathan E. Egge | 43acafd | 2016-03-06 13:41:53 -0500 | [diff] [blame] | 206 | #if CONFIG_DAALA_EC |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 207 | ret = daala_read_tree_bits(r, tree, probs); |
Nathan E. Egge | 43acafd | 2016-03-06 13:41:53 -0500 | [diff] [blame] | 208 | #else |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 209 | ret = aom_read_tree_bits(r, tree, probs, NULL); |
Nathan E. Egge | 43acafd | 2016-03-06 13:41:53 -0500 | [diff] [blame] | 210 | #endif |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 211 | #if CONFIG_ACCOUNTING |
| 212 | if (ACCT_STR_NAME) aom_process_accounting(r, ACCT_STR_NAME); |
| 213 | #endif |
| 214 | return ret; |
Nathan E. Egge | eeedc63 | 2016-06-19 12:02:33 -0400 | [diff] [blame] | 215 | } |
| 216 | |
Alex Converse | 58c520a | 2016-10-20 14:21:06 -0700 | [diff] [blame] | 217 | #if CONFIG_EC_MULTISYMBOL |
Nathan E. Egge | 2d8dd96 | 2016-12-23 10:42:43 -0500 | [diff] [blame] | 218 | static INLINE int aom_read_cdf_(aom_reader *r, const aom_cdf_prob *cdf, |
Nathan E. Egge | e069849 | 2017-01-06 19:40:36 -0500 | [diff] [blame] | 219 | int nsymbs ACCT_STR_PARAM) { |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 220 | int ret; |
Alex Converse | 1e4e29f | 2016-11-08 14:12:14 -0800 | [diff] [blame] | 221 | #if CONFIG_ANS |
Alex Converse | a1ac972 | 2016-10-12 15:59:58 -0700 | [diff] [blame] | 222 | (void)nsymbs; |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 223 | ret = rans_read(r, cdf); |
| 224 | #elif CONFIG_DAALA_EC |
| 225 | ret = daala_read_symbol(r, cdf, nsymbs); |
Alex Converse | a1ac972 | 2016-10-12 15:59:58 -0700 | [diff] [blame] | 226 | #else |
Alex Converse | 58c520a | 2016-10-20 14:21:06 -0700 | [diff] [blame] | 227 | #error \ |
| 228 | "CONFIG_EC_MULTISYMBOL is selected without a valid backing entropy " \ |
| 229 | "coder. Enable daala_ec or ans for a valid configuration." |
Alex Converse | a1ac972 | 2016-10-12 15:59:58 -0700 | [diff] [blame] | 230 | #endif |
Alex Converse | 58c520a | 2016-10-20 14:21:06 -0700 | [diff] [blame] | 231 | |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 232 | #if CONFIG_ACCOUNTING |
| 233 | if (ACCT_STR_NAME) aom_process_accounting(r, ACCT_STR_NAME); |
Nathan E. Egge | 4446014 | 2016-06-20 13:44:22 -0400 | [diff] [blame] | 234 | #endif |
Michael Bebenita | 6048d05 | 2016-08-25 14:40:54 -0700 | [diff] [blame] | 235 | return ret; |
Nathan E. Egge | 4446014 | 2016-06-20 13:44:22 -0400 | [diff] [blame] | 236 | } |
Nathan E. Egge | c98d286 | 2016-12-21 11:30:46 -0500 | [diff] [blame] | 237 | |
Nathan E. Egge | e069849 | 2017-01-06 19:40:36 -0500 | [diff] [blame] | 238 | static INLINE int aom_read_symbol_(aom_reader *r, aom_cdf_prob *cdf, |
| 239 | int nsymbs ACCT_STR_PARAM) { |
| 240 | int ret; |
| 241 | ret = aom_read_cdf(r, cdf, nsymbs, ACCT_STR_NAME); |
| 242 | #if CONFIG_EC_ADAPT |
| 243 | update_cdf(cdf, ret, nsymbs); |
| 244 | #endif |
| 245 | return ret; |
| 246 | } |
| 247 | |
Nathan E. Egge | c98d286 | 2016-12-21 11:30:46 -0500 | [diff] [blame] | 248 | #if CONFIG_PVQ |
Nathan E. Egge | e069849 | 2017-01-06 19:40:36 -0500 | [diff] [blame] | 249 | static INLINE int aom_read_cdf_unscaled_(aom_reader *r, const aom_cdf_prob *cdf, |
| 250 | int nsymbs ACCT_STR_PARAM) { |
Nathan E. Egge | c98d286 | 2016-12-21 11:30:46 -0500 | [diff] [blame] | 251 | int ret; |
| 252 | #if CONFIG_DAALA_EC |
| 253 | ret = od_ec_decode_cdf_unscaled(&r->ec, cdf, nsymbs); |
| 254 | #else |
| 255 | #error "CONFIG_PVQ currently requires CONFIG_DAALA_EC." |
| 256 | #endif |
| 257 | |
| 258 | #if CONFIG_ACCOUNTING |
| 259 | if (ACCT_STR_NAME) aom_process_accounting(r, ACCT_STR_NAME); |
| 260 | #endif |
| 261 | return ret; |
| 262 | } |
| 263 | #endif |
Alex Converse | 58c520a | 2016-10-20 14:21:06 -0700 | [diff] [blame] | 264 | #endif // CONFIG_EC_MULTISYMBOL |
Nathan E. Egge | 4446014 | 2016-06-20 13:44:22 -0400 | [diff] [blame] | 265 | |
Yaowu Xu | c27fc14 | 2016-08-22 16:08:15 -0700 | [diff] [blame] | 266 | #ifdef __cplusplus |
| 267 | } // extern "C" |
| 268 | #endif |
| 269 | |
Yaowu Xu | f883b42 | 2016-08-30 14:01:10 -0700 | [diff] [blame] | 270 | #endif // AOM_DSP_BITREADER_H_ |