diff options
author | Måns Rullgård <mans@mansr.com> | 2010-06-24 18:17:12 +0000 |
---|---|---|
committer | Måns Rullgård <mans@mansr.com> | 2010-06-24 18:17:12 +0000 |
commit | 5113b3bd5cbd2c12fb1d692c74b457044cf0540f (patch) | |
tree | 42cce649606ed2f12a6888a0ec448dea50522805 /libavcodec | |
parent | 1f563bfa15bd974547c714368e5785faa2551e7d (diff) | |
download | ffmpeg-streaming-5113b3bd5cbd2c12fb1d692c74b457044cf0540f.zip ffmpeg-streaming-5113b3bd5cbd2c12fb1d692c74b457044cf0540f.tar.gz |
tta: replace potentially huge VLAs with malloc/free in context
Originally committed as revision 23759 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/tta.c | 51 |
1 files changed, 30 insertions, 21 deletions
diff --git a/libavcodec/tta.c b/libavcodec/tta.c index 4bdfd73..9014553 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -36,6 +36,24 @@ #define FORMAT_INT 1 #define FORMAT_FLOAT 3 +#define MAX_ORDER 16 +typedef struct TTAFilter { + int32_t shift, round, error, mode; + int32_t qm[MAX_ORDER]; + int32_t dx[MAX_ORDER]; + int32_t dl[MAX_ORDER]; +} TTAFilter; + +typedef struct TTARice { + uint32_t k0, k1, sum0, sum1; +} TTARice; + +typedef struct TTAChannel { + int32_t predictor; + TTAFilter filter; + TTARice rice; +} TTAChannel; + typedef struct TTAContext { AVCodecContext *avctx; GetBitContext gb; @@ -44,6 +62,8 @@ typedef struct TTAContext { int frame_length, last_frame_length, total_frames; int32_t *decode_buffer; + + TTAChannel *ch_ctx;; } TTAContext; #if 0 @@ -79,14 +99,6 @@ static const uint32_t shift_1[] = { static const uint32_t * const shift_16 = shift_1 + 4; #endif -#define MAX_ORDER 16 -typedef struct TTAFilter { - int32_t shift, round, error, mode; - int32_t qm[MAX_ORDER]; - int32_t dx[MAX_ORDER]; - int32_t dl[MAX_ORDER]; -} TTAFilter; - static const int32_t ttafilter_configs[4][2] = { {10, 1}, {9, 1}, @@ -175,10 +187,6 @@ static inline void ttafilter_process(TTAFilter *c, int32_t *in, int32_t mode) { memshl(c->dx, c->dx + 1); } -typedef struct TTARice { - uint32_t k0, k1, sum0, sum1; -} TTARice; - static void rice_init(TTARice *c, uint32_t k0, uint32_t k1) { c->k0 = k0; @@ -277,6 +285,9 @@ static av_cold int tta_decode_init(AVCodecContext * avctx) } s->decode_buffer = av_mallocz(sizeof(int32_t)*s->frame_length*s->channels); + s->ch_ctx = av_malloc(avctx->channels * sizeof(*s->ch_ctx)); + if (!s->ch_ctx) + return AVERROR(ENOMEM); } else { av_log(avctx, AV_LOG_ERROR, "Wrong extradata present\n"); return -1; @@ -296,9 +307,6 @@ static int tta_decode_frame(AVCodecContext *avctx, init_get_bits(&s->gb, buf, buf_size*8); { - int32_t predictors[s->channels]; - TTAFilter filters[s->channels]; - TTARice rices[s->channels]; int cur_chan = 0, framelen = s->frame_length; int32_t *p; @@ -313,15 +321,15 @@ static int tta_decode_frame(AVCodecContext *avctx, // init per channel states for (i = 0; i < s->channels; i++) { - predictors[i] = 0; - ttafilter_init(&(filters[i]), ttafilter_configs[s->bps-1][0], ttafilter_configs[s->bps-1][1]); - rice_init(&(rices[i]), 10, 10); + s->ch_ctx[i].predictor = 0; + ttafilter_init(&s->ch_ctx[i].filter, ttafilter_configs[s->bps-1][0], ttafilter_configs[s->bps-1][1]); + rice_init(&s->ch_ctx[i].rice, 10, 10); } for (p = s->decode_buffer; p < s->decode_buffer + (framelen * s->channels); p++) { - int32_t *predictor = &(predictors[cur_chan]); - TTAFilter *filter = &(filters[cur_chan]); - TTARice *rice = &(rices[cur_chan]); + int32_t *predictor = &s->ch_ctx[cur_chan].predictor; + TTAFilter *filter = &s->ch_ctx[cur_chan].filter; + TTARice *rice = &s->ch_ctx[cur_chan].rice; uint32_t unary, depth, k; int32_t value; @@ -443,6 +451,7 @@ static av_cold int tta_decode_close(AVCodecContext *avctx) { if (s->decode_buffer) av_free(s->decode_buffer); + av_freep(&s->ch_ctx); return 0; } |