lzip/lzlib
1
0
Fork 0
Code Issues Activity

Adding upstream version 1.2.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-20 17:01:43 +01:00
parent 8d95be3bd8
commit 93dd762e5f
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
15 changed files with 138 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

44
encoder.cc
View file

@ -353,22 +353,23 @@ int LZ_encoder::sequence_optimizer( const int reps[num_rep_distances],
return 1;
}
{
const int normal_match_price = match_price + price0( bm_rep[state()] );
int len = min_match_len;
if( main_len <= replens[rep_index] )
{
main_len = replens[rep_index];
for( ; len <= main_len; ++len ) trials[len].price = infinite_price;
for( int len = min_match_len; len <= main_len; ++len )
trials[len].price = infinite_price;
}
else for( ; len <= main_len; ++len )
else
{
trials[len].dis = match_distances[len] + num_rep_distances;
trials[len].prev_index = 0;
trials[len].price = normal_match_price +
price_pair( match_distances[len], len, pos_state );
const int normal_match_price = match_price + price0( bm_rep[state()] );
for( int len = min_match_len; len <= main_len; ++len )
{
trials[len].dis = match_distances[len] + num_rep_distances;
trials[len].prev_index = 0;
trials[len].price = normal_match_price +
price_pair( match_distances[len], len, pos_state );
}
}
}
for( int rep = 0; rep < num_rep_distances; ++rep )
{
@ -474,10 +475,25 @@ int LZ_encoder::sequence_optimizer( const int reps[num_rep_distances],
while( num_trials < cur + newlen )
trials[++num_trials].price = infinite_price;
for( int len = min_match_len; len <= newlen; ++len )
trials[cur+len].update( match_distances[len] + num_rep_distances, cur,
normal_match_price +
price_pair( match_distances[len], len, pos_state ) );
int dis = match_distances[min_match_len];
int dis_state = get_dis_state( min_match_len );
int dis_price = infinite_price;
if( dis < modeled_distances )
trials[cur+min_match_len].update( dis + num_rep_distances, cur,
normal_match_price + dis_prices[dis_state][dis] +
len_encoder.price( min_match_len, pos_state ) );
for( int len = min_match_len + 1; len <= newlen; ++len )
{
if( dis != match_distances[len] || dis_state < max_dis_states - 1 )
{
dis = match_distances[len];
dis_state = get_dis_state( len );
dis_price = price_dis( dis, dis_state );
}
trials[cur+len].update( dis + num_rep_distances, cur,
normal_match_price + dis_price +
len_encoder.price( len, pos_state ) );
}
}
}
}