[FFmpeg-cvslog] avcodec/opus: Move remaining celt declarations to opus_celt.h

[Andreas Rheinhardt]

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Oct  3 22:27:13 2022 +0200| [81b927a53bafd51b3874ae7c36c6948cc632c267] | committer: Andreas Rheinhardt

avcodec/opus: Move remaining celt declarations to opus_celt.h

Reviewed-by: Lynne <dev at lynne.ee>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=81b927a53bafd51b3874ae7c36c6948cc632c267
---

 libavcodec/opus.h      |  8 --------
 libavcodec/opus_celt.h | 13 ++++++++++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/libavcodec/opus.h b/libavcodec/opus.h
index a7dbe7ea8a..2dc6085207 100644
--- a/libavcodec/opus.h
+++ b/libavcodec/opus.h
@@ -73,8 +73,6 @@ enum OpusBandwidth {
 
 typedef struct SilkContext SilkContext;
 
-typedef struct CeltFrame CeltFrame;
-
 int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels);
 void ff_silk_free(SilkContext **ps);
 void ff_silk_flush(SilkContext *s);
@@ -88,10 +86,4 @@ int ff_silk_decode_superframe(SilkContext *s, OpusRangeCoder *rc,
                               enum OpusBandwidth bandwidth, int coded_channels,
                               int duration_ms);
 
-/* Encode or decode CELT bands */
-void ff_celt_quant_bands(CeltFrame *f, OpusRangeCoder *rc);
-
-/* Encode or decode CELT bitallocation */
-void ff_celt_bitalloc(CeltFrame *f, OpusRangeCoder *rc, int encode);
-
 #endif /* AVCODEC_OPUS_H */
diff --git a/libavcodec/opus_celt.h b/libavcodec/opus_celt.h
index c812b6645c..3dbf197160 100644
--- a/libavcodec/opus_celt.h
+++ b/libavcodec/opus_celt.h
@@ -1,5 +1,5 @@
 /*
- * Opus decoder/demuxer common functions
+ * Opus decoder/encoder CELT functions
  * Copyright (c) 2012 Andrew D'Addesio
  * Copyright (c) 2013-2014 Mozilla Corporation
  * Copyright (c) 2016 Rostislav Pehlivanov <atomnuker at gmail.com>
@@ -28,6 +28,7 @@
 
 #include "opus.h"
 #include "opusdsp.h"
+#include "opus_rc.h"
 
 #include "libavutil/float_dsp.h"
 #include "libavutil/libm.h"
@@ -87,7 +88,7 @@ typedef struct CeltBlock {
     float emph_coeff;
 } CeltBlock;
 
-struct CeltFrame {
+typedef struct CeltFrame {
     // constant values that do not change during context lifetime
     AVCodecContext      *avctx;
     AVTXContext        *tx[4];
@@ -136,7 +137,7 @@ struct CeltFrame {
     int fine_priority[CELT_MAX_BANDS];
     int pulses       [CELT_MAX_BANDS];
     int tf_change    [CELT_MAX_BANDS];
-};
+} CeltFrame;
 
 /* LCG for noise generation */
 static av_always_inline uint32_t celt_rng(CeltFrame *f)
@@ -167,4 +168,10 @@ void ff_celt_flush(CeltFrame *f);
 int ff_celt_decode_frame(CeltFrame *f, OpusRangeCoder *rc, float **output,
                          int coded_channels, int frame_size, int startband, int endband);
 
+/* Encode or decode CELT bands */
+void ff_celt_quant_bands(CeltFrame *f, OpusRangeCoder *rc);
+
+/* Encode or decode CELT bitallocation */
+void ff_celt_bitalloc(CeltFrame *f, OpusRangeCoder *rc, int encode);
+
 #endif /* AVCODEC_OPUS_CELT_H */