generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove reimplementation of get_unary.

Browse Source 
Based on a patch by Alex Beregszaszi.

Originally committed as revision 10279 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2007-09-01 21:03:17 +00:00
parent 9d14ffbcce
commit becc0ef95b
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/alac.c
View File

@ -55,6 +55,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "bitstream.h" #include "bitstream.h"
#include "bytestream.h" #include "bytestream.h"
#include "unary.h"
#define ALAC_EXTRADATA_SIZE 36 #define ALAC_EXTRADATA_SIZE 36
#define MAX_CHANNELS 2 #define MAX_CHANNELS 2
@ -159,14 +160,12 @@ static void bastardized_rice_decompress(ALACContext *alac,
int sign_modifier = 0; int sign_modifier = 0;
for (output_count = 0; output_count < output_size; output_count++) { for (output_count = 0; output_count < output_size; output_count++) {
int32_t x = 0; int32_t x;
int32_t x_modified; int32_t x_modified;
int32_t final_val; int32_t final_val;
/* read x - number of 1s before 0 represent the rice */ /* read x - number of 1s before 0 represent the rice */
while (x <= 8 && get_bits1(&alac->gb)) { x = get_unary_0_9(&alac->gb);
x++;
}
if (x > 8) { /* RICE THRESHOLD */ if (x > 8) { /* RICE THRESHOLD */
/* use alternative encoding */ /* use alternative encoding */
@ -227,10 +226,7 @@ static void bastardized_rice_decompress(ALACContext *alac,
sign_modifier = 1; sign_modifier = 1;
x = 0; x = get_unary_0_9(&alac->gb);
while (x <= 8 && get_bits1(&alac->gb)) {
x++;
}
if (x > 8) { if (x > 8) {
block_size = get_bits(&alac->gb, 16); block_size = get_bits(&alac->gb, 16);

5
libavcodec/unary.h
View File

@ -48,4 +48,9 @@ static inline int get_unary_0_33(GetBitContext *gb)
return get_unary(gb, 0, 33); return get_unary(gb, 0, 33);
} }
static inline int get_unary_0_9(GetBitContext *gb)
{
return get_unary(gb, 0, 9);
}
#endif /* AVCODEC_UNARY_H */ #endif /* AVCODEC_UNARY_H */