RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 01:02:33 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/binkaudio: Avoid allocation for array

Browse Source 
The array in question can not be too large (only 26 elements), so it can
simply be put on the context.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-09-04 16:52:49 +02:00
parent c703088c1b
commit ae343d6595
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/binkaudio.c
View File

@ -52,8 +52,8 @@ typedef struct BinkAudioContext {
int overlap_len; ///< overlap size (samples) int overlap_len; ///< overlap size (samples)
int block_size; int block_size;
int num_bands; int num_bands;
unsigned int *bands;
float root; float root;
unsigned int bands[26];
float previous[MAX_CHANNELS][BINK_BLOCK_MAX_SIZE / 16]; ///< coeffs from previous audio block float previous[MAX_CHANNELS][BINK_BLOCK_MAX_SIZE / 16]; ///< coeffs from previous audio block
float quant_table[96]; float quant_table[96];
AVPacket *pkt; AVPacket *pkt;
@ -122,10 +122,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
if (sample_rate_half <= ff_wma_critical_freqs[s->num_bands - 1]) if (sample_rate_half <= ff_wma_critical_freqs[s->num_bands - 1])
break; break;
s->bands = av_malloc((s->num_bands + 1) * sizeof(*s->bands));
if (!s->bands)
return AVERROR(ENOMEM);
/* populate bands data */ /* populate bands data */
s->bands[0] = 2; s->bands[0] = 2;
for (i = 1; i < s->num_bands; i++) for (i = 1; i < s->num_bands; i++)
@ -273,7 +269,6 @@ static int decode_block(BinkAudioContext *s, float **out, int use_dct)
static av_cold int decode_end(AVCodecContext *avctx) static av_cold int decode_end(AVCodecContext *avctx)
{ {
BinkAudioContext * s = avctx->priv_data; BinkAudioContext * s = avctx->priv_data;
av_freep(&s->bands);
if (CONFIG_BINKAUDIO_RDFT_DECODER && avctx->codec->id == AV_CODEC_ID_BINKAUDIO_RDFT) if (CONFIG_BINKAUDIO_RDFT_DECODER && avctx->codec->id == AV_CODEC_ID_BINKAUDIO_RDFT)
ff_rdft_end(&s->trans.rdft); ff_rdft_end(&s->trans.rdft);
else if (CONFIG_BINKAUDIO_DCT_DECODER) else if (CONFIG_BINKAUDIO_DCT_DECODER)