diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-03 22:47:58 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-05 02:15:43 +0200 |
| commit | c095358289559d91932bd2ea48f90848ecee1f80 (patch) | |
| tree | c36a638e81c8f2caaa6579263e4b47e73ad0c524 /libavcodec/opus.h | |
| parent | 81b927a53bafd51b3874ae7c36c6948cc632c267 (diff) | |
avcodec/opus: Move defines to better places
Move ROUND_MUL* macros to their only users and the Celt
macros to opus_celt.h. Also improve the other headers
a bit while at it.
Reviewed-by: Lynne <dev@lynne.ee>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/opus.h')
| -rw-r--r-- | libavcodec/opus.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavcodec/opus.h b/libavcodec/opus.h index 2dc6085207..0f1cb8b98b 100644 --- a/libavcodec/opus.h +++ b/libavcodec/opus.h @@ -32,18 +32,9 @@ #define MAX_FRAMES 48 #define MAX_PACKET_DUR 5760 -#define CELT_SHORT_BLOCKSIZE 120 -#define CELT_OVERLAP CELT_SHORT_BLOCKSIZE -#define CELT_MAX_LOG_BLOCKS 3 -#define CELT_MAX_FRAME_SIZE (CELT_SHORT_BLOCKSIZE * (1 << CELT_MAX_LOG_BLOCKS)) -#define CELT_MAX_BANDS 21 - #define SILK_HISTORY 322 #define SILK_MAX_LPC 16 -#define ROUND_MULL(a,b,s) (((MUL64(a, b) >> ((s) - 1)) + 1) >> 1) -#define ROUND_MUL16(a,b) ((MUL16(a, b) + 16384) >> 15) - #define OPUS_TS_HEADER 0x7FE0 // 0x3ff (11 bits) #define OPUS_TS_MASK 0xFFE0 // top 11 bits |