Commit 792c10dd authored by Josh Coalson's avatar Josh Coalson
Browse files

minor cleanup in count_rice_bits_()

parent f5dd4783
...@@ -4128,11 +4128,6 @@ void precompute_partition_info_escapes_( ...@@ -4128,11 +4128,6 @@ void precompute_partition_info_escapes_(
} }
} }
#undef VARIABLE_RICE_BITS
#ifndef EXACT_RICE_BITS_CALCULATION
#define VARIABLE_RICE_BITS(value, parameter) ((value) >> (parameter))
#endif
#ifdef EXACT_RICE_BITS_CALCULATION #ifdef EXACT_RICE_BITS_CALCULATION
static __inline unsigned count_rice_bits_( static __inline unsigned count_rice_bits_(
const unsigned rice_parameter, const unsigned rice_parameter,
...@@ -4155,7 +4150,7 @@ static __inline unsigned count_rice_bits_( ...@@ -4155,7 +4150,7 @@ static __inline unsigned count_rice_bits_(
const unsigned rice_parameter_estimate = rice_parameter-1; const unsigned rice_parameter_estimate = rice_parameter-1;
unsigned i, partition_bits = FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN + (1+rice_parameter) * partition_samples; unsigned i, partition_bits = FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN + (1+rice_parameter) * partition_samples;
for(i = 0; i < partition_samples; i++) for(i = 0; i < partition_samples; i++)
partition_bits += VARIABLE_RICE_BITS(abs_residual[i], rice_parameter_estimate); partition_bits += (abs_residual[i] >> rice_parameter_estimate);
return partition_bits; return partition_bits;
} }
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment