Mercurial > libavcodec.hg
changeset 2954:43f14ef874de libavcodec
Support for samples with fft_order = 7
Fail init for unknown fft order, to prevent an array overflow
Output sound high-pitched compared to binary. Sample here
http://a1862.g.akamai.net/7/1862/14448/v1/esa.download.akamai.com/13452/qt/ESA_VenusExpress_110K_Stream.mov
| author | rtognimp |
|---|---|
| date | Tue, 06 Dec 2005 17:42:16 +0000 |
| parents | d7b4288ed47b |
| children | 64f38f1be88f |
| files | qdm2.c |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/qdm2.c Tue Dec 06 16:58:03 2005 +0000 +++ b/qdm2.c Tue Dec 06 17:42:16 2005 +0000 @@ -1876,10 +1876,7 @@ s->group_order = av_log2(s->group_size) + 1; s->frame_size = s->group_size / 16; // 16 iterations per super block - if (s->fft_order == 8) - s->sub_sampling = 1; - else - s->sub_sampling = 2; + s->sub_sampling = s->fft_order - 7; s->frequency_range = 255 / (1 << (2 - s->sub_sampling)); switch ((s->sub_sampling * 2 + s->channels - 1)) { @@ -1899,11 +1896,11 @@ s->cm_table_select = tmp_val; if (s->sub_sampling == 0) - tmp = 16000; + tmp = 7999; else tmp = ((-(s->sub_sampling -1)) & 8000) + 20000; /* - 0: 16000 -> 1 + 0: 7999 -> 0 1: 20000 -> 2 2: 28000 -> 2 */ @@ -1914,8 +1911,11 @@ else s->coeff_per_sb_select = 2; - if (s->fft_order != 8 && s->fft_order != 9) + // Fail on unknown fft order, if it's > 9 it can overflow s->exptab[] + if ((s->fft_order < 7) || (s->fft_order > 9)) { av_log(avctx, AV_LOG_ERROR, "Unknown FFT order (%d), contact the developers!\n", s->fft_order); + return -1; + } ff_fft_init(&s->fft_ctx, s->fft_order - 1, 1);