Commit 5113b3bd authored by Måns Rullgård's avatar Måns Rullgård
Browse files

tta: replace potentially huge VLAs with malloc/free in context

Originally committed as revision 23759 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 1f563bfa
...@@ -36,6 +36,24 @@ ...@@ -36,6 +36,24 @@
#define FORMAT_INT 1 #define FORMAT_INT 1
#define FORMAT_FLOAT 3 #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 { typedef struct TTAContext {
AVCodecContext *avctx; AVCodecContext *avctx;
GetBitContext gb; GetBitContext gb;
...@@ -44,6 +62,8 @@ typedef struct TTAContext { ...@@ -44,6 +62,8 @@ typedef struct TTAContext {
int frame_length, last_frame_length, total_frames; int frame_length, last_frame_length, total_frames;
int32_t *decode_buffer; int32_t *decode_buffer;
TTAChannel *ch_ctx;;
} TTAContext; } TTAContext;
#if 0 #if 0
...@@ -79,14 +99,6 @@ static const uint32_t shift_1[] = { ...@@ -79,14 +99,6 @@ static const uint32_t shift_1[] = {
static const uint32_t * const shift_16 = shift_1 + 4; static const uint32_t * const shift_16 = shift_1 + 4;
#endif #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] = { static const int32_t ttafilter_configs[4][2] = {
{10, 1}, {10, 1},
{9, 1}, {9, 1},
...@@ -175,10 +187,6 @@ static inline void ttafilter_process(TTAFilter *c, int32_t *in, int32_t mode) { ...@@ -175,10 +187,6 @@ static inline void ttafilter_process(TTAFilter *c, int32_t *in, int32_t mode) {
memshl(c->dx, c->dx + 1); 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) static void rice_init(TTARice *c, uint32_t k0, uint32_t k1)
{ {
c->k0 = k0; c->k0 = k0;
...@@ -277,6 +285,9 @@ static av_cold int tta_decode_init(AVCodecContext * avctx) ...@@ -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->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 { } else {
av_log(avctx, AV_LOG_ERROR, "Wrong extradata present\n"); av_log(avctx, AV_LOG_ERROR, "Wrong extradata present\n");
return -1; return -1;
...@@ -296,9 +307,6 @@ static int tta_decode_frame(AVCodecContext *avctx, ...@@ -296,9 +307,6 @@ static int tta_decode_frame(AVCodecContext *avctx,
init_get_bits(&s->gb, buf, buf_size*8); 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; int cur_chan = 0, framelen = s->frame_length;
int32_t *p; int32_t *p;
...@@ -313,15 +321,15 @@ static int tta_decode_frame(AVCodecContext *avctx, ...@@ -313,15 +321,15 @@ static int tta_decode_frame(AVCodecContext *avctx,
// init per channel states // init per channel states
for (i = 0; i < s->channels; i++) { for (i = 0; i < s->channels; i++) {
predictors[i] = 0; s->ch_ctx[i].predictor = 0;
ttafilter_init(&(filters[i]), ttafilter_configs[s->bps-1][0], ttafilter_configs[s->bps-1][1]); ttafilter_init(&s->ch_ctx[i].filter, ttafilter_configs[s->bps-1][0], ttafilter_configs[s->bps-1][1]);
rice_init(&(rices[i]), 10, 10); rice_init(&s->ch_ctx[i].rice, 10, 10);
} }
for (p = s->decode_buffer; p < s->decode_buffer + (framelen * s->channels); p++) { for (p = s->decode_buffer; p < s->decode_buffer + (framelen * s->channels); p++) {
int32_t *predictor = &(predictors[cur_chan]); int32_t *predictor = &s->ch_ctx[cur_chan].predictor;
TTAFilter *filter = &(filters[cur_chan]); TTAFilter *filter = &s->ch_ctx[cur_chan].filter;
TTARice *rice = &(rices[cur_chan]); TTARice *rice = &s->ch_ctx[cur_chan].rice;
uint32_t unary, depth, k; uint32_t unary, depth, k;
int32_t value; int32_t value;
...@@ -443,6 +451,7 @@ static av_cold int tta_decode_close(AVCodecContext *avctx) { ...@@ -443,6 +451,7 @@ static av_cold int tta_decode_close(AVCodecContext *avctx) {
if (s->decode_buffer) if (s->decode_buffer)
av_free(s->decode_buffer); av_free(s->decode_buffer);
av_freep(&s->ch_ctx);
return 0; return 0;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment