diff options
Diffstat (limited to 'apps/codecs')
| -rw-r--r-- | apps/codecs/libfaad/fixed.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/codecs/libfaad/fixed.h b/apps/codecs/libfaad/fixed.h index 9781a846f7..6cda967399 100644 --- a/apps/codecs/libfaad/fixed.h +++ b/apps/codecs/libfaad/fixed.h | |||
| @@ -130,7 +130,7 @@ static INLINE void ComplexMult(real_t *y1, real_t *y2, | |||
| 130 | #define MUL_SHIFT6(A,B) (real_t)(((int64_t)(A)*(int64_t)(B)+(1 << (6-1))) >> 6) | 130 | #define MUL_SHIFT6(A,B) (real_t)(((int64_t)(A)*(int64_t)(B)+(1 << (6-1))) >> 6) |
| 131 | #define MUL_SHIFT23(A,B) (real_t)(((int64_t)(A)*(int64_t)(B)+(1 << (23-1))) >> 23) | 131 | #define MUL_SHIFT23(A,B) (real_t)(((int64_t)(A)*(int64_t)(B)+(1 << (23-1))) >> 23) |
| 132 | #define DESCALE(A,S) ((S)>0?(((A)>>((S)-1))+1)>>1:(A)<<-(S)) | 132 | #define DESCALE(A,S) ((S)>0?(((A)>>((S)-1))+1)>>1:(A)<<-(S)) |
| 133 | #define DESCALE_SHIFT(A,SH,SC) DESCALE((A),(SC)-(SH) | 133 | #define DESCALE_SHIFT(A,SH,SC) DESCALE((A),(SC)-(SH)) |
| 134 | 134 | ||
| 135 | #elif defined(__GNUC__) && defined (__arm__) | 135 | #elif defined(__GNUC__) && defined (__arm__) |
| 136 | 136 | ||
| @@ -241,7 +241,7 @@ static inline real_t DESCALE_SHIFT(unsigned val, int shift, int scale) | |||
| 241 | #define MUL_SHIFT6(A,B) (real_t)(((int64_t)(A)*(int64_t)(B)+(1 << (6-1))) >> 6) | 241 | #define MUL_SHIFT6(A,B) (real_t)(((int64_t)(A)*(int64_t)(B)+(1 << (6-1))) >> 6) |
| 242 | #define MUL_SHIFT23(A,B) (real_t)(((int64_t)(A)*(int64_t)(B)+(1 << (23-1))) >> 23) | 242 | #define MUL_SHIFT23(A,B) (real_t)(((int64_t)(A)*(int64_t)(B)+(1 << (23-1))) >> 23) |
| 243 | #define DESCALE(A,S) ((S)>0?(((A)>>((S)-1))+1)>>1:(A)<<-(S)) | 243 | #define DESCALE(A,S) ((S)>0?(((A)>>((S)-1))+1)>>1:(A)<<-(S)) |
| 244 | #define DESCALE_SHIFT(A,SH,SC) DESCALE((A),(SC)-(SH) | 244 | #define DESCALE_SHIFT(A,SH,SC) DESCALE((A),(SC)-(SH)) |
| 245 | 245 | ||
| 246 | /* Complex multiplication */ | 246 | /* Complex multiplication */ |
| 247 | static INLINE void ComplexMult(real_t *y1, real_t *y2, | 247 | static INLINE void ComplexMult(real_t *y1, real_t *y2, |