root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added precomputed range coder probability price table.

This commit is contained in:
Lasse Collin 2008-01-15 07:40:21 +02:00
parent 362dc3843b
commit d13d693155
7 changed files with 153 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/liblzma/common/init_encoder.c
View File

@ -33,9 +33,10 @@ lzma_init_encoder(void)
lzma_init_check();
#endif
// FIXME TODO Create precalculated tables.
#if defined(HAVE_ENCODER) && defined(HAVE_FILTER_LZMA)
#if defined(HAVE_SMALL) && defined(HAVE_ENCODER) && defined(HAVE_FILTER_LZMA)
lzma_rc_init();
#endif
#if defined(HAVE_ENCODER) && defined(HAVE_FILTER_LZMA)
lzma_fastpos_init();
#endif

9
src/liblzma/rangecoder/Makefile.am
View File

@ -12,6 +12,8 @@
## Lesser General Public License for more details.
##
EXTRA_DIST = price_table_gen.c
noinst_LTLIBRARIES = librangecoder.la
librangecoder_la_SOURCES = range_common.h
@ -20,7 +22,12 @@ librangecoder_la_CPPFLAGS = \
-I@top_srcdir@/src/liblzma/common
if COND_MAIN_ENCODER
librangecoder_la_SOURCES += range_encoder.c range_encoder.h
librangecoder_la_SOURCES += range_encoder.h
if COND_SMALL
librangecoder_la_SOURCES += price_table_init.c
else
librangecoder_la_SOURCES += price_table.c
endif
endif
if COND_MAIN_DECODER

70
src/liblzma/rangecoder/price_table.c Normal file
View File

@ -0,0 +1,70 @@
/* This file has been automatically generated by price_table_gen.c. */
#include "range_encoder.h"
const uint32_t lzma_rc_prob_prices[BIT_MODEL_TOTAL >> MOVE_REDUCING_BITS] = {
0, 576, 512, 480, 448, 432, 416, 400,
384, 376, 368, 360, 352, 344, 336, 328,
320, 316, 312, 308, 304, 300, 296, 292,
288, 284, 280, 276, 272, 268, 264, 260,
256, 254, 252, 250, 248, 246, 244, 242,
240, 238, 236, 234, 232, 230, 228, 226,
224, 222, 220, 218, 216, 214, 212, 210,
208, 206, 204, 202, 200, 198, 196, 194,
192, 191, 190, 189, 188, 187, 186, 185,
184, 183, 182, 181, 180, 179, 178, 177,
176, 175, 174, 173, 172, 171, 170, 169,
168, 167, 166, 165, 164, 163, 162, 161,
160, 159, 158, 157, 156, 155, 154, 153,
152, 151, 150, 149, 148, 147, 146, 145,
144, 143, 142, 141, 140, 139, 138, 137,
136, 135, 134, 133, 132, 131, 130, 129,
128, 127, 127, 126, 126, 125, 125, 124,
124, 123, 123, 122, 122, 121, 121, 120,
120, 119, 119, 118, 118, 117, 117, 116,
116, 115, 115, 114, 114, 113, 113, 112,
112, 111, 111, 110, 110, 109, 109, 108,
108, 107, 107, 106, 106, 105, 105, 104,
104, 103, 103, 102, 102, 101, 101, 100,
100, 99, 99, 98, 98, 97, 97, 96,
96, 95, 95, 94, 94, 93, 93, 92,
92, 91, 91, 90, 90, 89, 89, 88,
88, 87, 87, 86, 86, 85, 85, 84,
84, 83, 83, 82, 82, 81, 81, 80,
80, 79, 79, 78, 78, 77, 77, 76,
76, 75, 75, 74, 74, 73, 73, 72,
72, 71, 71, 70, 70, 69, 69, 68,
68, 67, 67, 66, 66, 65, 65, 64,
64, 63, 63, 63, 63, 62, 62, 62,
62, 61, 61, 61, 61, 60, 60, 60,
60, 59, 59, 59, 59, 58, 58, 58,
58, 57, 57, 57, 57, 56, 56, 56,
56, 55, 55, 55, 55, 54, 54, 54,
54, 53, 53, 53, 53, 52, 52, 52,
52, 51, 51, 51, 51, 50, 50, 50,
50, 49, 49, 49, 49, 48, 48, 48,
48, 47, 47, 47, 47, 46, 46, 46,
46, 45, 45, 45, 45, 44, 44, 44,
44, 43, 43, 43, 43, 42, 42, 42,
42, 41, 41, 41, 41, 40, 40, 40,
40, 39, 39, 39, 39, 38, 38, 38,
38, 37, 37, 37, 37, 36, 36, 36,
36, 35, 35, 35, 35, 34, 34, 34,
34, 33, 33, 33, 33, 32, 32, 32,
32, 31, 31, 31, 31, 30, 30, 30,
30, 29, 29, 29, 29, 28, 28, 28,
28, 27, 27, 27, 27, 26, 26, 26,
26, 25, 25, 25, 25, 24, 24, 24,
24, 23, 23, 23, 23, 22, 22, 22,
22, 21, 21, 21, 21, 20, 20, 20,
20, 19, 19, 19, 19, 18, 18, 18,
18, 17, 17, 17, 17, 16, 16, 16,
16, 15, 15, 15, 15, 14, 14, 14,
14, 13, 13, 13, 13, 12, 12, 12,
12, 11, 11, 11, 11, 10, 10, 10,
10, 9, 9, 9, 9, 8, 8, 8,
8, 7, 7, 7, 7, 6, 6, 6,
6, 5, 5, 5, 5, 4, 4, 4,
4, 3, 3, 3, 3, 2, 2, 2,
2, 1, 1, 1, 1, 0, 0, 0
};

55
src/liblzma/rangecoder/price_table_gen.c Normal file
View File

@ -0,0 +1,55 @@
///////////////////////////////////////////////////////////////////////////////
//
/// \file price_table_gen.c
/// \brief Probability price table generator
///
/// Compiling: gcc -std=c99 -o price_table_gen price_table_gen.c
//
// Copyright (C) 2007 Lasse Collin
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
///////////////////////////////////////////////////////////////////////////////
#include <sys/types.h>
#include <inttypes.h>
#include <stdio.h>
#include "range_common.h"
#include "price_table_init.c"
int
main(void)
{
lzma_rc_init();
printf("/* This file has been automatically generated by "
"price_table_gen.c. */\n\n"
"#include \"range_encoder.h\"\n\n"
"const uint32_t lzma_rc_prob_prices["
"BIT_MODEL_TOTAL >> MOVE_REDUCING_BITS] = {");
const size_t array_size = sizeof(lzma_rc_prob_prices)
/ sizeof(lzma_rc_prob_prices[0]);
for (size_t i = 0; i < array_size; ++i) {
if (i % 8 == 0)
printf("\n\t");
printf("% 4" PRIu32, lzma_rc_prob_prices[i]);
if (i != array_size - 1)
printf(",");
}
printf("\n};\n");
return 0;
}

6
src/liblzma/rangecoder/range_encoder.c → src/liblzma/rangecoder/price_table_init.c
View File

@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////////
//
/// \file range_encoder.c
/// \file price_table_init.c
/// \brief Static initializations for the range encoder's prices array
//
// Copyright (C) 1999-2006 Igor Pavlov
@ -18,7 +18,9 @@
//
///////////////////////////////////////////////////////////////////////////////
#include "range_encoder.h"
#ifdef HAVE_CONFIG_H
# include "range_encoder.h"
#endif
#define NUM_BITS (BIT_MODEL_TOTAL_BITS - MOVE_REDUCING_BITS)

4
src/liblzma/rangecoder/range_common.h
View File

@ -21,7 +21,9 @@
#ifndef LZMA_RANGE_COMMON_H
#define LZMA_RANGE_COMMON_H
#include "common.h"
#ifdef HAVE_CONFIG_H
# include "common.h"
#endif
///////////////

21
src/liblzma/rangecoder/range_encoder.h
View File

@ -246,21 +246,20 @@ do { \
} while (0)
//////////////////////
// Global variables //
//////////////////////
// Probability prices used by *_get_price() macros. This is initialized
// by lzma_rc_init() and is not modified later.
#ifdef HAVE_SMALL
/// Probability prices used by *_get_price() macros. This is initialized
/// by lzma_rc_init() and is not modified later.
extern uint32_t lzma_rc_prob_prices[BIT_MODEL_TOTAL >> MOVE_REDUCING_BITS];
///////////////
// Functions //
///////////////
/// Initializes lzma_rc_prob_prices[]. This needs to be called only once.
extern void lzma_rc_init(void);
#else
// Not building a size optimized version, so we use a precomputed
// constant table.
extern const uint32_t
lzma_rc_prob_prices[BIT_MODEL_TOTAL >> MOVE_REDUCING_BITS];
#endif
#endif