diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2008-04-17 03:22:35 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2008-04-17 03:22:35 +0000 |
commit | 1f655c4fe4f3718a4eedf4a301ce77bd42cdde32 (patch) | |
tree | bbd6733afb7aa680392d2e088ea41046f4758d06 /libavcodec/alac.c | |
parent | 5eeba07ec92c8e068e9501d54e1d79af82dc347d (diff) | |
download | ffmpeg-streaming-1f655c4fe4f3718a4eedf4a301ce77bd42cdde32.zip ffmpeg-streaming-1f655c4fe4f3718a4eedf4a301ce77bd42cdde32.tar.gz |
indent
Originally committed as revision 12875 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/alac.c')
-rw-r--r-- | libavcodec/alac.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/libavcodec/alac.c b/libavcodec/alac.c index 11e9847..d14b391 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -154,21 +154,21 @@ static inline int decode_scalar(GetBitContext *gb, int k, int limit, int readsam /* use alternative encoding */ x = get_bits(gb, readsamplesize); } else { - if (k >= limit) - k = limit; + if (k >= limit) + k = limit; - if (k != 1) { - int extrabits = show_bits(gb, k); + if (k != 1) { + int extrabits = show_bits(gb, k); - /* multiply x by 2^k - 1, as part of their strange algorithm */ - x = (x << k) - x; + /* multiply x by 2^k - 1, as part of their strange algorithm */ + x = (x << k) - x; - if (extrabits > 1) { - x += extrabits - 1; - skip_bits(gb, k); - } else - skip_bits(gb, k - 1); - } + if (extrabits > 1) { + x += extrabits - 1; + skip_bits(gb, k); + } else + skip_bits(gb, k - 1); + } } return x; } @@ -192,12 +192,12 @@ static void bastardized_rice_decompress(ALACContext *alac, int32_t x_modified; int32_t final_val; - /* standard rice encoding */ - int k; /* size of extra bits */ + /* standard rice encoding */ + int k; /* size of extra bits */ - /* read k, that is bits as is */ - k = 31 - count_leading_zeros((history >> 9) + 3); - x= decode_scalar(&alac->gb, k, rice_kmodifier, readsamplesize); + /* read k, that is bits as is */ + k = 31 - count_leading_zeros((history >> 9) + 3); + x= decode_scalar(&alac->gb, k, rice_kmodifier, readsamplesize); x_modified = sign_modifier + x; final_val = (x_modified + 1) / 2; @@ -220,9 +220,9 @@ static void bastardized_rice_decompress(ALACContext *alac, sign_modifier = 1; - k = count_leading_zeros(history) + ((history + 16) >> 6 /* / 64 */) - 24; + k = count_leading_zeros(history) + ((history + 16) >> 6 /* / 64 */) - 24; - block_size= decode_scalar(&alac->gb, k, rice_kmodifier, 16); + block_size= decode_scalar(&alac->gb, k, rice_kmodifier, 16); if (block_size > 0) { memset(&output_buffer[output_count+1], 0, block_size * 4); |