From 792c10ddd61fb7cc26c63eba121467850bbee990 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Wed, 24 Jan 2007 04:25:03 +0000 Subject: [PATCH] minor cleanup in count_rice_bits_() --- src/libFLAC/stream_encoder.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c index 354d033c..26f7dbce 100644 --- a/src/libFLAC/stream_encoder.c +++ b/src/libFLAC/stream_encoder.c @@ -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 static __inline unsigned count_rice_bits_( const unsigned rice_parameter, @@ -4155,7 +4150,7 @@ static __inline unsigned count_rice_bits_( 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; 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; } #endif