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

avcodec/opus_celt, opus_pvq: Move CeltPVQ typedef to opus_pvq.h

Browse Source 
It is more natural that way.

Reviewed-by: Lynne <dev@lynne.ee>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-10-03 22:03:55 +02:00
parent a622f4451f
commit 542c334eb5
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/opus_celt.h
View File

@@ -44,8 +44,6 @@
#define CELT_POSTFILTER_MINPERIOD 15 #define CELT_POSTFILTER_MINPERIOD 15
#define CELT_ENERGY_SILENCE (-28.0f) #define CELT_ENERGY_SILENCE (-28.0f)
typedef struct CeltPVQ CeltPVQ;
enum CeltSpread { enum CeltSpread {
CELT_SPREAD_NONE, CELT_SPREAD_NONE,
CELT_SPREAD_LIGHT, CELT_SPREAD_LIGHT,
@@ -96,7 +94,7 @@ struct CeltFrame {
av_tx_fn tx_fn[4]; av_tx_fn tx_fn[4];
AVFloatDSPContext *dsp; AVFloatDSPContext *dsp;
CeltBlock block[2]; CeltBlock block[2];
CeltPVQ *pvq; struct CeltPVQ *pvq;
OpusDSP opusdsp; OpusDSP opusdsp;
int channels; int channels;
int output_channels; int output_channels;

4
libavcodec/opus_pvq.h
View File

@@ -34,13 +34,13 @@
float *lowband_out, int level, float gain, \ float *lowband_out, int level, float gain, \
float *lowband_scratch, int fill) float *lowband_scratch, int fill)
struct CeltPVQ { typedef struct CeltPVQ {
DECLARE_ALIGNED(32, int, qcoeff )[256]; DECLARE_ALIGNED(32, int, qcoeff )[256];
DECLARE_ALIGNED(32, float, hadamard_tmp)[256]; DECLARE_ALIGNED(32, float, hadamard_tmp)[256];
float (*pvq_search)(float *X, int *y, int K, int N); float (*pvq_search)(float *X, int *y, int K, int N);
QUANT_FN(*quant_band); QUANT_FN(*quant_band);
}; } CeltPVQ;
void ff_celt_pvq_init_x86(struct CeltPVQ *s); void ff_celt_pvq_init_x86(struct CeltPVQ *s);