diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-07-09 10:30:40 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-07-19 13:26:45 -0400 |
| commit | 6e91f62256db72b056f6bc61106809d3994f8e26 (patch) | |
| tree | a0c1d19a5c80019e6ca37cf4d543829167d57d74 /libavcodec | |
| parent | 836e8b9ba0d80ce03b0664f97245f8f3ac43d145 (diff) | |
| download | ffmpeg-6e91f62256db72b056f6bc61106809d3994f8e26.tar.gz | |
alac: reduce the number of parameters to bastardized_rice_decompress()
Use the ALACContext fields directly instead.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/alac.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/libavcodec/alac.c b/libavcodec/alac.c index 4848ea218e..8824ae8377 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -107,13 +107,10 @@ static void bastardized_rice_decompress(ALACContext *alac, int32_t *output_buffer, int output_size, int readsamplesize, - int rice_initial_history, - int rice_limit, - int rice_history_mult, - int rice_kmodifier_mask) + int rice_history_mult) { int output_count; - unsigned int history = rice_initial_history; + unsigned int history = alac->rice_initial_history; int sign_modifier = 0; for (output_count = 0; output_count < output_size; output_count++) { @@ -126,7 +123,7 @@ static void bastardized_rice_decompress(ALACContext *alac, /* read k, that is bits as is */ k = av_log2((history >> 9) + 3); - x= decode_scalar(&alac->gb, k, rice_limit, readsamplesize); + x = decode_scalar(&alac->gb, k, alac->rice_limit, readsamplesize); x_modified = sign_modifier + x; final_val = (x_modified + 1) / 2; @@ -152,7 +149,7 @@ static void bastardized_rice_decompress(ALACContext *alac, k = 7 - av_log2(history) + ((history + 16) >> 6 /* / 64 */); - block_size = decode_scalar(&alac->gb, k, rice_limit, 16); + block_size = decode_scalar(&alac->gb, k, alac->rice_limit, 16); if (block_size > 0) { if(block_size >= output_size - output_count){ @@ -434,10 +431,7 @@ static int alac_decode_frame(AVCodecContext *avctx, void *data, alac->predict_error_buffer[ch], outputsamples, readsamplesize, - alac->rice_initial_history, - alac->rice_limit, - ricemodifier[ch] * alac->rice_history_mult / 4, - (1 << alac->rice_limit) - 1); + ricemodifier[ch] * alac->rice_history_mult / 4); /* adaptive FIR filter */ if (prediction_type[ch] == 15) { |