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_celt.h | |
| parent | 81b927a53bafd51b3874ae7c36c6948cc632c267 (diff) | |
| download | ffmpeg-c095358289559d91932bd2ea48f90848ecee1f80.tar.gz | |
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_celt.h')
| -rw-r--r-- | libavcodec/opus_celt.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/opus_celt.h b/libavcodec/opus_celt.h index 3dbf197160..2dbb79be6c 100644 --- a/libavcodec/opus_celt.h +++ b/libavcodec/opus_celt.h @@ -24,9 +24,9 @@ #ifndef AVCODEC_OPUS_CELT_H #define AVCODEC_OPUS_CELT_H -#include <float.h> +#include <stdint.h> -#include "opus.h" +#include "avcodec.h" #include "opusdsp.h" #include "opus_rc.h" @@ -35,6 +35,12 @@ #include "libavutil/mem_internal.h" #include "libavutil/tx.h" +#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 CELT_VECTORS 11 #define CELT_ALLOC_STEPS 6 #define CELT_FINE_OFFSET 21 |