virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

alacdec: allocate per-channel buffers based on channel count.

Browse Source 
reduces memory usage when the stream has fewer than MAX_CHANNELS
This commit is contained in:
Justin Ruggles
2011-10-05 20:08:46 -04:00
parent dcaa83a0fc
commit e5e4f92b5c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/alac.c
View File

@@ -88,7 +88,7 @@ typedef struct {
static void allocate_buffers(ALACContext *alac) static void allocate_buffers(ALACContext *alac)
{ {
int chan; int chan;
for (chan = 0; chan < MAX_CHANNELS; chan++) { for (chan = 0; chan < alac->numchannels; chan++) {
alac->predicterror_buffer[chan] = alac->predicterror_buffer[chan] =
av_malloc(alac->setinfo_max_samples_per_frame * 4); av_malloc(alac->setinfo_max_samples_per_frame * 4);
@@ -125,8 +125,6 @@ static int alac_set_info(ALACContext *alac)
bytestream_get_be32(&ptr); /* bitrate ? */ bytestream_get_be32(&ptr); /* bitrate ? */
bytestream_get_be32(&ptr); /* samplerate */ bytestream_get_be32(&ptr); /* samplerate */
allocate_buffers(alac);
return 0; return 0;
} }
@@ -670,6 +668,8 @@ static av_cold int alac_decode_init(AVCodecContext * avctx)
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
allocate_buffers(alac);
return 0; return 0;
} }
@@ -678,7 +678,7 @@ static av_cold int alac_decode_close(AVCodecContext *avctx)
ALACContext *alac = avctx->priv_data; ALACContext *alac = avctx->priv_data;
int chan; int chan;
for (chan = 0; chan < MAX_CHANNELS; chan++) { for (chan = 0; chan < alac->numchannels; chan++) {
av_freep(&alac->predicterror_buffer[chan]); av_freep(&alac->predicterror_buffer[chan]);
av_freep(&alac->outputsamples_buffer[chan]); av_freep(&alac->outputsamples_buffer[chan]);
av_freep(&alac->wasted_bits_buffer[chan]); av_freep(&alac->wasted_bits_buffer[chan]);