highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/opusenc_psy: Remove unused/write-only context members

Browse Source 
Reviewed-by: Lynne <dev@lynne.ee>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-10-07 16:24:38 +02:00
parent bebd5b77af
commit a4dc60a258
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/opusenc_psy.c
View File

@ -470,12 +470,9 @@ int ff_opus_psy_celt_frame_process(OpusPsyContext *s, CeltFrame *f, int index)
if (f->transient != start_transient_flag) { if (f->transient != start_transient_flag) {
f->blocks = f->transient ? OPUS_BLOCK_SIZE(s->p.framesize)/CELT_OVERLAP : 1; f->blocks = f->transient ? OPUS_BLOCK_SIZE(s->p.framesize)/CELT_OVERLAP : 1;
s->redo_analysis = 1;
return 1; return 1;
} }
s->redo_analysis = 0;
return 0; return 0;
} }
@ -509,7 +506,6 @@ void ff_opus_psy_postencode_update(OpusPsyContext *s, CeltFrame *f)
s->avg_is_band /= (s->p.frames + 1); s->avg_is_band /= (s->p.frames + 1);
s->cs_num = 0;
s->steps_to_process = 0; s->steps_to_process = 0;
s->buffered_steps -= steps_out; s->buffered_steps -= steps_out;
s->total_packets_out += s->p.frames; s->total_packets_out += s->p.frames;
@ -521,7 +517,6 @@ av_cold int ff_opus_psy_init(OpusPsyContext *s, AVCodecContext *avctx,
{ {
int i, ch, ret; int i, ch, ret;
s->redo_analysis = 0;
s->lambda = 1.0f; s->lambda = 1.0f;
s->options = options; s->options = options;
s->avctx = avctx; s->avctx = avctx;

11
libavcodec/opusenc_psy.h
View File

@ -49,20 +49,12 @@ typedef struct OpusBandExcitation {
float excitation_init; float excitation_init;
} OpusBandExcitation; } OpusBandExcitation;
typedef struct PsyChain {
int start;
int end;
} PsyChain;
typedef struct OpusPsyContext { typedef struct OpusPsyContext {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFloatDSPContext *dsp; AVFloatDSPContext *dsp;
struct FFBufQueue *bufqueue; struct FFBufQueue *bufqueue;
OpusEncOptions *options; OpusEncOptions *options;
PsyChain cs[128];
int cs_num;
OpusBandExcitation ex[OPUS_MAX_CHANNELS][CELT_MAX_BANDS]; OpusBandExcitation ex[OPUS_MAX_CHANNELS][CELT_MAX_BANDS];
FFBesselFilter bfilter_lo[OPUS_MAX_CHANNELS][CELT_MAX_BANDS]; FFBesselFilter bfilter_lo[OPUS_MAX_CHANNELS][CELT_MAX_BANDS];
FFBesselFilter bfilter_hi[OPUS_MAX_CHANNELS][CELT_MAX_BANDS]; FFBesselFilter bfilter_hi[OPUS_MAX_CHANNELS][CELT_MAX_BANDS];
@ -78,15 +70,12 @@ typedef struct OpusPsyContext {
DECLARE_ALIGNED(32, float, scratch)[2048]; DECLARE_ALIGNED(32, float, scratch)[2048];
/* Stats */ /* Stats */
float rc_waste;
float avg_is_band; float avg_is_band;
int64_t dual_stereo_used; int64_t dual_stereo_used;
int64_t total_packets_out; int64_t total_packets_out;
/* State */ /* State */
FFBesselFilter lambda_lp;
OpusPacketInfo p; OpusPacketInfo p;
int redo_analysis;
int buffered_steps; int buffered_steps;
int steps_to_process; int steps_to_process;
int eof; int eof;