har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/sonic: Don't allocate a temporary buffer for every frame

Browse Source 
Instead allocate it together with the buffer that it mirrors.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-09-27 11:34:34 +02:00
parent 4b4c7d6e1a
commit 992adc8aaf
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/sonic.c
View File

@ -500,14 +500,11 @@ static int predictor_calc_error(int *k, int *state, int order, int error)
// copes better with quantization, and calculates the // copes better with quantization, and calculates the
// actual whitened result as it goes. // actual whitened result as it goes.
static int modified_levinson_durbin(int *window, int window_entries, static void modified_levinson_durbin(int *window, int window_entries,
int *out, int out_entries, int channels, int *tap_quant) int *out, int out_entries, int channels, int *tap_quant)
{ {
int i; int i;
int *state = av_calloc(window_entries, sizeof(*state)); int *state = window + window_entries;
if (!state)
return AVERROR(ENOMEM);
memcpy(state, window, window_entries * sizeof(*state)); memcpy(state, window, window_entries * sizeof(*state));
@ -571,9 +568,6 @@ static int modified_levinson_durbin(int *window, int window_entries,
} }
#endif #endif
} }
av_free(state);
return 0;
} }
static inline int code_samplerate(int samplerate) static inline int code_samplerate(int samplerate)
@ -665,7 +659,7 @@ static av_cold int sonic_encode_init(AVCodecContext *avctx)
s->int_samples = av_calloc(s->frame_size, sizeof(*s->int_samples)); s->int_samples = av_calloc(s->frame_size, sizeof(*s->int_samples));
s->window_size = ((2*s->tail_size)+s->frame_size); s->window_size = ((2*s->tail_size)+s->frame_size);
s->window = av_calloc(s->window_size, sizeof(*s->window)); s->window = av_calloc(s->window_size, 2 * sizeof(*s->window));
if (!s->window || !s->int_samples) if (!s->window || !s->int_samples)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -776,10 +770,8 @@ static int sonic_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
s->tail[i] = s->int_samples[s->frame_size - s->tail_size + i]; s->tail[i] = s->int_samples[s->frame_size - s->tail_size + i];
// generate taps // generate taps
ret = modified_levinson_durbin(s->window, s->window_size, modified_levinson_durbin(s->window, s->window_size,
s->predictor_k, s->num_taps, s->channels, s->tap_quant); s->predictor_k, s->num_taps, s->channels, s->tap_quant);
if (ret < 0)
return ret;
if ((ret = intlist_write(&c, state, s->predictor_k, s->num_taps, 0)) < 0) if ((ret = intlist_write(&c, state, s->predictor_k, s->num_taps, 0)) < 0)
return ret; return ret;