summaryrefslogtreecommitdiffstats
path: root/encoder.h
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-06 12:43:36 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-06 12:43:36 +0000
commita34035c1736ad9705a679f1cf1d71f9037616ae7 (patch)
tree5833ab64afb98bbd8995a925657ff83daca0d717 /encoder.h
parentAdding debian version 1.5-1. (diff)
downloadclzip-a34035c1736ad9705a679f1cf1d71f9037616ae7.tar.xz
clzip-a34035c1736ad9705a679f1cf1d71f9037616ae7.zip
Merging upstream version 1.6~pre1.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'encoder.h')
-rw-r--r--encoder.h265
1 files changed, 125 insertions, 140 deletions
diff --git a/encoder.h b/encoder.h
index a1d9478..4f14075 100644
--- a/encoder.h
+++ b/encoder.h
@@ -1,5 +1,5 @@
/* Clzip - LZMA lossless data compressor
- Copyright (C) 2010, 2011, 2012, 2013 Antonio Diaz Diaz.
+ Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ static inline void Dis_slots_init( void )
}
}
-static inline uint8_t get_slot( const uint32_t dis )
+static inline uint8_t get_slot( const unsigned dis )
{
if( dis < (1 << 10) ) return dis_slots[dis];
if( dis < (1 << 19) ) return dis_slots[dis>> 9] + 18;
@@ -115,15 +115,15 @@ static inline int price_symbol_reversed( const Bit_model bm[], int symbol,
}
-static inline int price_matched( const Bit_model bm[], unsigned symbol,
- unsigned match_byte )
+static inline int price_matched( const Bit_model bm[], int symbol,
+ int match_byte )
{
int price = 0;
- unsigned mask = 0x100;
- symbol |= 0x100;
+ int mask = 0x100;
+ symbol |= mask;
do {
- unsigned bit, match_bit;
+ int match_bit, bit;
match_byte <<= 1;
match_bit = match_byte & mask;
symbol <<= 1;
@@ -154,17 +154,17 @@ struct Matchfinder
{
unsigned long long partial_data_pos;
uint8_t * buffer; /* input buffer */
- int32_t * prev_positions; /* last seen position of key */
+ int32_t * prev_positions; /* 1 + last seen position of key. else 0 */
int32_t * prev_pos_tree; /* previous positions of key */
int match_len_limit;
int buffer_size;
int dictionary_size; /* bytes to keep in buffer before pos */
int pos; /* current pos in buffer */
int cyclic_pos; /* cycles through [0, dictionary_size] */
- int pos_limit; /* when reached, a new block must be read */
int stream_pos; /* first byte not yet read from file */
+ int pos_limit; /* when reached, a new block must be read */
int cycles;
- unsigned key4_mask;
+ int key4_mask;
int num_prev_positions; /* size of prev_positions */
int infd; /* input file descriptor */
bool at_stream_end; /* stream_pos shows real end of file */
@@ -173,8 +173,8 @@ struct Matchfinder
bool Mf_read_block( struct Matchfinder * const mf );
void Mf_normalize_pos( struct Matchfinder * const mf );
-bool Mf_init( struct Matchfinder * const mf,
- const int dict_size, const int match_len_limit, const int ifd );
+bool Mf_init( struct Matchfinder * const mf, const int dict_size,
+ const int match_len_limit, const int ifd );
static inline void Mf_free( struct Matchfinder * const mf )
{
@@ -182,8 +182,9 @@ static inline void Mf_free( struct Matchfinder * const mf )
free( mf->buffer );
}
-static inline uint8_t Mf_peek( const struct Matchfinder * const mf, const int i )
- { return mf->buffer[mf->pos+i]; }
+static inline uint8_t Mf_peek( const struct Matchfinder * const mf,
+ const int distance )
+ { return mf->buffer[mf->pos-distance]; }
static inline int Mf_available_bytes( const struct Matchfinder * const mf )
{ return mf->stream_pos - mf->pos; }
@@ -241,7 +242,7 @@ struct Range_encoder
uint8_t * buffer; /* output buffer */
int pos; /* current pos in buffer */
uint32_t range;
- int ff_count;
+ unsigned ff_count;
int outfd; /* output file descriptor */
uint8_t cache;
};
@@ -355,14 +356,14 @@ static inline void Re_encode_tree_reversed( struct Range_encoder * const renc,
}
static inline void Re_encode_matched( struct Range_encoder * const renc,
- Bit_model bm[], unsigned symbol,
- unsigned match_byte )
+ Bit_model bm[], int symbol,
+ int match_byte )
{
- unsigned mask = 0x100;
- symbol |= 0x100;
+ int mask = 0x100;
+ symbol |= mask;
do {
- unsigned bit, match_bit;
+ int match_bit, bit;
match_byte <<= 1;
match_bit = match_byte & mask;
symbol <<= 1;
@@ -382,44 +383,43 @@ struct Len_encoder
int counters[pos_states];
};
-static inline void Lee_update_prices( struct Len_encoder * const len_encoder,
+static inline void Lee_update_prices( struct Len_encoder * const le,
const int pos_state )
{
- int * const pps = len_encoder->prices[pos_state];
- int tmp = price0( len_encoder->lm.choice1 );
+ int * const pps = le->prices[pos_state];
+ int tmp = price0( le->lm.choice1 );
int len = 0;
- for( ; len < len_low_symbols && len < len_encoder->len_symbols; ++len )
- pps[len] = tmp +
- price_symbol( len_encoder->lm.bm_low[pos_state], len, len_low_bits );
- tmp = price1( len_encoder->lm.choice1 );
- for( ; len < len_low_symbols + len_mid_symbols && len < len_encoder->len_symbols; ++len )
- pps[len] = tmp + price0( len_encoder->lm.choice2 ) +
- price_symbol( len_encoder->lm.bm_mid[pos_state], len - len_low_symbols, len_mid_bits );
- for( ; len < len_encoder->len_symbols; ++len )
+ for( ; len < len_low_symbols && len < le->len_symbols; ++len )
+ pps[len] = tmp + price_symbol( le->lm.bm_low[pos_state], len, len_low_bits );
+ tmp = price1( le->lm.choice1 );
+ for( ; len < len_low_symbols + len_mid_symbols && len < le->len_symbols; ++len )
+ pps[len] = tmp + price0( le->lm.choice2 ) +
+ price_symbol( le->lm.bm_mid[pos_state], len - len_low_symbols, len_mid_bits );
+ for( ; len < le->len_symbols; ++len )
/* using 4 slots per value makes "Lee_price" faster */
- len_encoder->prices[3][len] = len_encoder->prices[2][len] =
- len_encoder->prices[1][len] = len_encoder->prices[0][len] =
- tmp + price1( len_encoder->lm.choice2 ) +
- price_symbol( len_encoder->lm.bm_high, len - len_low_symbols - len_mid_symbols, len_high_bits );
- len_encoder->counters[pos_state] = len_encoder->len_symbols;
+ le->prices[3][len] = le->prices[2][len] =
+ le->prices[1][len] = le->prices[0][len] =
+ tmp + price1( le->lm.choice2 ) +
+ price_symbol( le->lm.bm_high, len - len_low_symbols - len_mid_symbols, len_high_bits );
+ le->counters[pos_state] = le->len_symbols;
}
-static inline void Lee_init( struct Len_encoder * const len_encoder,
+static inline void Lee_init( struct Len_encoder * const le,
const int match_len_limit )
{
int i;
- Lm_init( &len_encoder->lm );
- len_encoder->len_symbols = match_len_limit + 1 - min_match_len;
- for( i = 0; i < pos_states; ++i ) Lee_update_prices( len_encoder, i );
+ Lm_init( &le->lm );
+ le->len_symbols = match_len_limit + 1 - min_match_len;
+ for( i = 0; i < pos_states; ++i ) Lee_update_prices( le, i );
}
-void Lee_encode( struct Len_encoder * const len_encoder,
+void Lee_encode( struct Len_encoder * const le,
struct Range_encoder * const renc,
int symbol, const int pos_state );
-static inline int Lee_price( const struct Len_encoder * const len_encoder,
+static inline int Lee_price( const struct Len_encoder * const le,
const int symbol, const int pos_state )
- { return len_encoder->prices[pos_state][symbol - min_match_len]; }
+ { return le->prices[pos_state][symbol - min_match_len]; }
enum { infinite_price = 0x0FFFFFFF,
@@ -432,46 +432,42 @@ struct Trial
{
State state;
int price; /* dual use var; cumulative price, match length */
- int dis; /* rep index or match distance */
+ int dis; /* rep index or match distance. (-1 for literal) */
int prev_index; /* index of prev trial in trials[] */
- int dis2;
int prev_index2; /* -2 trial is single step */
/* -1 literal + rep0 */
- /* >= 0 rep or match + literal + rep0 */
+ /* >= 0 ( rep or match ) + literal + rep0 */
int reps[num_rep_distances];
};
static inline void Tr_update( struct Trial * const trial, const int pr,
- const int d, const int p_i )
+ const int distance, const int p_i )
{
if( pr < trial->price )
{
- trial->price = pr;
- trial->dis = d; trial->prev_index = p_i;
+ trial->price = pr; trial->dis = distance; trial->prev_index = p_i;
trial->prev_index2 = single_step_trial;
}
}
static inline void Tr_update2( struct Trial * const trial, const int pr,
- const int d, const int p_i )
+ const int p_i )
{
if( pr < trial->price )
{
- trial->price = pr;
- trial->dis = d; trial->prev_index = p_i;
+ trial->price = pr; trial->dis = 0; trial->prev_index = p_i;
trial->prev_index2 = dual_step_trial;
}
}
static inline void Tr_update3( struct Trial * const trial, const int pr,
- const int d, const int p_i,
- const int d2, const int p_i2 )
+ const int distance, const int p_i,
+ const int p_i2 )
{
if( pr < trial->price )
{
- trial->price = pr;
- trial->dis = d; trial->prev_index = p_i;
- trial->dis2 = d2; trial->prev_index2 = p_i2;
+ trial->price = pr; trial->dis = distance; trial->prev_index = p_i;
+ trial->prev_index2 = p_i2;
}
}
@@ -497,7 +493,6 @@ struct LZ_encoder
struct Len_encoder match_len_encoder;
struct Len_encoder rep_len_encoder;
- int num_dis_slots;
struct Pair pairs[max_match_len+1];
struct Trial trials[max_num_trials];
@@ -505,20 +500,20 @@ struct LZ_encoder
int dis_prices[len_states][modeled_distances];
int align_prices[dis_align_size];
int align_price_count;
+ int num_dis_slots;
};
-bool LZe_init( struct LZ_encoder * const encoder,
- struct Matchfinder * const mf,
+bool LZe_init( struct LZ_encoder * const e, struct Matchfinder * const mf,
const File_header header, const int outfd );
-static inline void LZe_free( struct LZ_encoder * const encoder )
- { Re_free( &encoder->renc ); }
+static inline void LZe_free( struct LZ_encoder * const e )
+ { Re_free( &e->renc ); }
-static inline unsigned LZe_crc( const struct LZ_encoder * const encoder )
- { return encoder->crc ^ 0xFFFFFFFFU; }
+static inline unsigned LZe_crc( const struct LZ_encoder * const e )
+ { return e->crc ^ 0xFFFFFFFFU; }
- /* move-to-front dis in/into reps */
-static inline void LZe_mtf_reps( const int dis, int reps[num_rep_distances] )
+ /* move-to-front dis in/into reps if( dis > 0 ) */
+static inline void mtf_reps( const int dis, int reps[num_rep_distances] )
{
int i;
if( dis >= num_rep_distances )
@@ -534,155 +529,145 @@ static inline void LZe_mtf_reps( const int dis, int reps[num_rep_distances] )
}
}
-static inline int LZe_price_rep_len1( const struct LZ_encoder * const encoder,
+static inline int LZe_price_shortrep( const struct LZ_encoder * const e,
const State state, const int pos_state )
{
- return price0( encoder->bm_rep0[state] ) +
- price0( encoder->bm_len[state][pos_state] );
+ return price0( e->bm_rep0[state] ) + price0( e->bm_len[state][pos_state] );
}
-static inline int LZe_price_rep( const struct LZ_encoder * const encoder,
+static inline int LZe_price_rep( const struct LZ_encoder * const e,
const int rep,
const State state, const int pos_state )
{
int price;
- if( rep == 0 ) return price0( encoder->bm_rep0[state] ) +
- price1( encoder->bm_len[state][pos_state] );
- price = price1( encoder->bm_rep0[state] );
+ if( rep == 0 ) return price0( e->bm_rep0[state] ) +
+ price1( e->bm_len[state][pos_state] );
+ price = price1( e->bm_rep0[state] );
if( rep == 1 )
- price += price0( encoder->bm_rep1[state] );
+ price += price0( e->bm_rep1[state] );
else
{
- price += price1( encoder->bm_rep1[state] );
- price += price_bit( encoder->bm_rep2[state], rep - 2 );
+ price += price1( e->bm_rep1[state] );
+ price += price_bit( e->bm_rep2[state], rep - 2 );
}
return price;
}
-static inline int LZe_price_rep0_len( const struct LZ_encoder * const encoder,
+static inline int LZe_price_rep0_len( const struct LZ_encoder * const e,
const int len,
const State state, const int pos_state )
{
- return LZe_price_rep( encoder, 0, state, pos_state ) +
- Lee_price( &encoder->rep_len_encoder, len, pos_state );
+ return LZe_price_rep( e, 0, state, pos_state ) +
+ Lee_price( &e->rep_len_encoder, len, pos_state );
}
-static inline int LZe_price_dis( const struct LZ_encoder * const encoder,
- const int dis, const int len_state )
- {
- if( dis < modeled_distances )
- return encoder->dis_prices[len_state][dis];
- else
- return encoder->dis_slot_prices[len_state][get_slot( dis )] +
- encoder->align_prices[dis & (dis_align_size - 1)];
- }
-
-static inline int LZe_price_pair( const struct LZ_encoder * const encoder,
+static inline int LZe_price_pair( const struct LZ_encoder * const e,
const int dis, const int len,
const int pos_state )
{
- return Lee_price( &encoder->match_len_encoder, len, pos_state ) +
- LZe_price_dis( encoder, dis, get_len_state( len ) );
+ const int price = Lee_price( &e->match_len_encoder, len, pos_state );
+ const int len_state = get_len_state( len );
+ if( dis < modeled_distances )
+ return price + e->dis_prices[len_state][dis];
+ else
+ return price + e->dis_slot_prices[len_state][get_slot( dis )] +
+ e->align_prices[dis & (dis_align_size - 1)];
}
-static inline int LZe_price_literal( const struct LZ_encoder * const encoder,
- uint8_t prev_byte, uint8_t symbol )
- { return price_symbol( encoder->bm_literal[get_lit_state(prev_byte)], symbol, 8 ); }
+static inline int LZe_price_literal( const struct LZ_encoder * const e,
+ uint8_t prev_byte, uint8_t symbol )
+ { return price_symbol( e->bm_literal[get_lit_state(prev_byte)], symbol, 8 ); }
-static inline int LZe_price_matched( const struct LZ_encoder * const encoder,
+static inline int LZe_price_matched( const struct LZ_encoder * const e,
uint8_t prev_byte, uint8_t symbol,
uint8_t match_byte )
- { return price_matched( encoder->bm_literal[get_lit_state(prev_byte)],
- symbol, match_byte ); }
+ { return price_matched( e->bm_literal[get_lit_state(prev_byte)], symbol,
+ match_byte ); }
-static inline void LZe_encode_literal( struct LZ_encoder * const encoder,
+static inline void LZe_encode_literal( struct LZ_encoder * const e,
uint8_t prev_byte, uint8_t symbol )
- { Re_encode_tree( &encoder->renc,
- encoder->bm_literal[get_lit_state(prev_byte)], symbol, 8 ); }
+ { Re_encode_tree( &e->renc,
+ e->bm_literal[get_lit_state(prev_byte)], symbol, 8 ); }
-static inline void LZe_encode_matched( struct LZ_encoder * const encoder,
+static inline void LZe_encode_matched( struct LZ_encoder * const e,
uint8_t prev_byte, uint8_t symbol,
uint8_t match_byte )
- { Re_encode_matched( &encoder->renc,
- encoder->bm_literal[get_lit_state(prev_byte)],
+ { Re_encode_matched( &e->renc, e->bm_literal[get_lit_state(prev_byte)],
symbol, match_byte ); }
-static inline void LZe_encode_pair( struct LZ_encoder * const encoder,
- const uint32_t dis, const int len,
+static inline void LZe_encode_pair( struct LZ_encoder * const e,
+ const unsigned dis, const int len,
const int pos_state )
{
const int dis_slot = get_slot( dis );
- Lee_encode( &encoder->match_len_encoder, &encoder->renc, len, pos_state );
- Re_encode_tree( &encoder->renc, encoder->bm_dis_slot[get_len_state(len)],
- dis_slot, dis_slot_bits );
+ Lee_encode( &e->match_len_encoder, &e->renc, len, pos_state );
+ Re_encode_tree( &e->renc, e->bm_dis_slot[get_len_state(len)], dis_slot,
+ dis_slot_bits );
if( dis_slot >= start_dis_model )
{
const int direct_bits = ( dis_slot >> 1 ) - 1;
- const uint32_t base = ( 2 | ( dis_slot & 1 ) ) << direct_bits;
- const uint32_t direct_dis = dis - base;
+ const unsigned base = ( 2 | ( dis_slot & 1 ) ) << direct_bits;
+ const unsigned direct_dis = dis - base;
if( dis_slot < end_dis_model )
- Re_encode_tree_reversed( &encoder->renc,
- encoder->bm_dis + base - dis_slot - 1,
+ Re_encode_tree_reversed( &e->renc, e->bm_dis + base - dis_slot - 1,
direct_dis, direct_bits );
else
{
- Re_encode( &encoder->renc, direct_dis >> dis_align_bits,
+ Re_encode( &e->renc, direct_dis >> dis_align_bits,
direct_bits - dis_align_bits );
- Re_encode_tree_reversed( &encoder->renc, encoder->bm_align,
- direct_dis, dis_align_bits );
- --encoder->align_price_count;
+ Re_encode_tree_reversed( &e->renc, e->bm_align, direct_dis, dis_align_bits );
+ --e->align_price_count;
}
}
}
-static inline int LZe_read_match_distances( struct LZ_encoder * const encoder )
+static inline int LZe_read_match_distances( struct LZ_encoder * const e )
{
- const int num_pairs =
- Mf_get_match_pairs( encoder->matchfinder, encoder->pairs );
+ const int num_pairs = Mf_get_match_pairs( e->matchfinder, e->pairs );
if( num_pairs > 0 )
{
- int len = encoder->pairs[num_pairs-1].len;
- if( len == encoder->matchfinder->match_len_limit && len < max_match_len )
+ int len = e->pairs[num_pairs-1].len;
+ if( len == e->matchfinder->match_len_limit && len < max_match_len )
{
- len += Mf_true_match_len( encoder->matchfinder, len,
- encoder->pairs[num_pairs-1].dis + 1,
+ len += Mf_true_match_len( e->matchfinder, len,
+ e->pairs[num_pairs-1].dis + 1,
max_match_len - len );
- encoder->pairs[num_pairs-1].len = len;
+ e->pairs[num_pairs-1].len = len;
}
}
return num_pairs;
}
-static inline void LZe_move_pos( struct LZ_encoder * const encoder, int n )
+static inline void LZe_move_pos( struct LZ_encoder * const e, int n )
{
- if( --n >= 0 ) Mf_move_pos( encoder->matchfinder );
- while( --n >= 0 )
+ while( true )
{
- Mf_get_match_pairs( encoder->matchfinder, 0 );
- Mf_move_pos( encoder->matchfinder );
+ Mf_move_pos( e->matchfinder );
+ if( --n <= 0 ) break;
+ Mf_get_match_pairs( e->matchfinder, 0 );
}
}
-static inline void LZe_backward( struct LZ_encoder * const encoder, int cur )
+static inline void LZe_backward( struct LZ_encoder * const e, int cur )
{
- int * const dis = &encoder->trials[cur].dis;
+ int * const dis = &e->trials[cur].dis;
while( cur > 0 )
{
- const int prev_index = encoder->trials[cur].prev_index;
- struct Trial * const prev_trial = &encoder->trials[prev_index];
+ const int prev_index = e->trials[cur].prev_index;
+ struct Trial * const prev_trial = &e->trials[prev_index];
- if( encoder->trials[cur].prev_index2 != single_step_trial )
+ if( e->trials[cur].prev_index2 != single_step_trial )
{
prev_trial->dis = -1;
prev_trial->prev_index = prev_index - 1;
prev_trial->prev_index2 = single_step_trial;
- if( encoder->trials[cur].prev_index2 >= 0 )
+ if( e->trials[cur].prev_index2 >= 0 )
{
- struct Trial * const prev_trial2 = &encoder->trials[prev_index-1];
- prev_trial2->dis = encoder->trials[cur].dis2;
- prev_trial2->prev_index = encoder->trials[cur].prev_index2;
+ struct Trial * const prev_trial2 = &e->trials[prev_index-1];
+ prev_trial2->dis = *dis; *dis = 0;
+ prev_trial2->prev_index = e->trials[cur].prev_index2;
prev_trial2->prev_index2 = single_step_trial;
}
}
@@ -692,5 +677,5 @@ static inline void LZe_backward( struct LZ_encoder * const encoder, int cur )
}
}
-bool LZe_encode_member( struct LZ_encoder * const encoder,
+bool LZe_encode_member( struct LZ_encoder * const e,
const unsigned long long member_size );