virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

aacenc_tns: re-enable coefficient compression

Browse Source 
This time in a platform/compiler-generic way.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
This commit is contained in:
Rostislav Pehlivanov
2015-08-21 21:36:06 +01:00
parent 88a5f93f62
commit 5df166e430
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/aacenc_tns.c
View File

@@ -49,12 +49,16 @@ static inline void conv_to_float(float *arr, int32_t *cof, int num)
/* Input: quantized 4 bit coef, output: 1 if first (MSB) 2 bits are the same */ /* Input: quantized 4 bit coef, output: 1 if first (MSB) 2 bits are the same */
static inline int coef_test_compression(int coef) static inline int coef_test_compression(int coef)
{ {
int res = 0; int tmp = coef >> 2;
/*coef = coef >> 3; int res = ff_ctz(tmp);
res += ffs(coef); if (res > 1)
coef = coef >> 1; return 1; /* ...00 -> compressable */
res += ffs(coef);*/ else if (res == 1)
return 0; return 0; /* ...10 -> uncompressable */
else if (ff_ctz(tmp >> 1) > 0)
return 0; /* ...0 1 -> uncompressable */
else
return 1; /* ...1 1 -> compressable */
} }
static inline int compress_coef(int *coefs, int num) static inline int compress_coef(int *coefs, int num)
@@ -62,7 +66,7 @@ static inline int compress_coef(int *coefs, int num)
int i, res = 0; int i, res = 0;
for (i = 0; i < num; i++) for (i = 0; i < num; i++)
res += coef_test_compression(coefs[i]); res += coef_test_compression(coefs[i]);
return 0; return res == num ? 1 : 0;
} }
/** /**