From f3035f2bc7b20931d84e8fb2e0f144e63a272fd7 Mon Sep 17 00:00:00 2001 From: "Nathan E. Egge" Date: Mon, 20 Jun 2016 23:01:29 -0400 Subject: [PATCH] Revert code formatting of OD_UNIFORM_CDFS_Q15. The formatting of OD_UNIFORM_CDFS_Q15[] in entcode.c is helpful for for understanding what is contained in the array (e.g., the uniform probability distributions of small sizes 2 through 16). This patch reverts the change made in f4b2926d and adds linter hints to ignore the formatting. Change-Id: I2ad9fe6673b86e6067cb97b40f0f0e69a119cdf5 --- aom_dsp/entcode.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/aom_dsp/entcode.c b/aom_dsp/entcode.c index 7563f9f61..49284b0d2 100644 --- a/aom_dsp/entcode.c +++ b/aom_dsp/entcode.c @@ -30,21 +30,30 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ /*CDFs for uniform probability distributions of small sizes (2 through 16, inclusive).*/ +// clang-format off const uint16_t OD_UNIFORM_CDFS_Q15[135] = { - 16384, 32768, 10923, 21845, 32768, 8192, 16384, 24576, 32768, 6554, 13107, - 19661, 26214, 32768, 5461, 10923, 16384, 21845, 27307, 32768, 4681, 9362, - 14043, 18725, 23406, 28087, 32768, 4096, 8192, 12288, 16384, 20480, 24576, - 28672, 32768, 3641, 7282, 10923, 14564, 18204, 21845, 25486, 29127, 32768, - 3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491, 32768, 2979, - 5958, 8937, 11916, 14895, 17873, 20852, 23831, 26810, 29789, 32768, 2731, - 5461, 8192, 10923, 13653, 16384, 19115, 21845, 24576, 27307, 30037, 32768, - 2521, 5041, 7562, 10082, 12603, 15124, 17644, 20165, 22686, 25206, 27727, - 30247, 32768, 2341, 4681, 7022, 9362, 11703, 14043, 16384, 18725, 21065, - 23406, 25746, 28087, 30427, 32768, 2185, 4369, 6554, 8738, 10923, 13107, - 15292, 17476, 19661, 21845, 24030, 26214, 28399, 30583, 32768, 2048, 4096, - 6144, 8192, 10240, 12288, 14336, 16384, 18432, 20480, 22528, 24576, 26624, - 28672, 30720, 32768 + 16384, 32768, + 10923, 21845, 32768, + 8192, 16384, 24576, 32768, + 6554, 13107, 19661, 26214, 32768, + 5461, 10923, 16384, 21845, 27307, 32768, + 4681, 9362, 14043, 18725, 23406, 28087, 32768, + 4096, 8192, 12288, 16384, 20480, 24576, 28672, 32768, + 3641, 7282, 10923, 14564, 18204, 21845, 25486, 29127, 32768, + 3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491, 32768, + 2979, 5958, 8937, 11916, 14895, 17873, 20852, 23831, 26810, 29789, 32768, + 2731, 5461, 8192, 10923, 13653, 16384, 19115, 21845, 24576, 27307, 30037, + 32768, + 2521, 5041, 7562, 10082, 12603, 15124, 17644, 20165, 22686, 25206, 27727, + 30247, 32768, + 2341, 4681, 7022, 9362, 11703, 14043, 16384, 18725, 21065, 23406, 25746, + 28087, 30427, 32768, + 2185, 4369, 6554, 8738, 10923, 13107, 15292, 17476, 19661, 21845, 24030, + 26214, 28399, 30583, 32768, + 2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384, 18432, 20480, 22528, + 24576, 26624, 28672, 30720, 32768 }; +// clang-format on /*Given the current total integer number of bits used and the current value of rng, computes the fraction number of bits used to OD_BITRES precision.