History

avcodec/on2avc: use correct fft sizes

Also rename the contexts and the functions so their names will reflect their intended size. With the earlier patch this fixes the audio corruption regression caused by 6ba0aa1770ba29eb4126c6a706f6b0cd3809648f. Fixes ticket #10029.

Marton Balint committed 3 years ago

Commit 2eb7df11 parent f296c761 file · +16 −16Browse files

Unified · Split

libavcodec/on2avc.c+16−16
@@ -51,9 +51,9 @@ typedef struct On2AVCContext { · 50 unmodified lines
51 AVCodecContext *avctx;51 AVCodecContext *avctx;
52 AVFloatDSPContext *fdsp;52 AVFloatDSPContext *fdsp;
53 AVTXContext *mdct, *mdct_half, *mdct_small;53 AVTXContext *mdct, *mdct_half, *mdct_small;
54 AVTXContext *fft128, *fft256, *fft512, *fft1024;54 AVTXContext *fft64, *fft128, *fft256, *fft512;
55 av_tx_fn mdct_fn, mdct_half_fn, mdct_small_fn;55 av_tx_fn mdct_fn, mdct_half_fn, mdct_small_fn;
56 av_tx_fn fft128_fn, fft256_fn, fft512_fn, fft1024_fn;56 av_tx_fn fft64_fn, fft128_fn, fft256_fn, fft512_fn;
57 void (*wtf)(struct On2AVCContext *ctx, float *out, float *in, int size);57 void (*wtf)(struct On2AVCContext *ctx, float *out, float *in, int size);
58 58
59 int is_av500;59 int is_av500;
@@ -475,16 +475,16 @@ static void wtf_end_512(On2AVCContext *c, float *out, float *src, · 415 unmodified lines
475 zero_head_and_tail(tmp1 + 256, 128, 13, 7);475 zero_head_and_tail(tmp1 + 256, 128, 13, 7);
476 zero_head_and_tail(tmp1 + 384, 128, 15, 5);476 zero_head_and_tail(tmp1 + 384, 128, 15, 5);
477 477
478 c->fft128_fn(c->fft128, src + 0, tmp1 + 0, sizeof(float));478 c->fft64_fn(c->fft64, src + 0, tmp1 + 0, sizeof(float));
479 c->fft128_fn(c->fft128, src + 128, tmp1 + 128, sizeof(float));479 c->fft64_fn(c->fft64, src + 128, tmp1 + 128, sizeof(float));
480 c->fft128_fn(c->fft128, src + 256, tmp1 + 256, sizeof(float));480 c->fft64_fn(c->fft64, src + 256, tmp1 + 256, sizeof(float));
481 c->fft128_fn(c->fft128, src + 384, tmp1 + 384, sizeof(float));481 c->fft64_fn(c->fft64, src + 384, tmp1 + 384, sizeof(float));
482 482
483 combine_fft(src, src + 128, src + 256, src + 384, tmp1,483 combine_fft(src, src + 128, src + 256, src + 384, tmp1,
484 ff_on2avc_ctab_1, ff_on2avc_ctab_2,484 ff_on2avc_ctab_1, ff_on2avc_ctab_2,
485 ff_on2avc_ctab_3, ff_on2avc_ctab_4, 512, 2);485 ff_on2avc_ctab_3, ff_on2avc_ctab_4, 512, 2);
486 486
487 c->fft512_fn(c->fft512, src, tmp1, sizeof(float));487 c->fft256_fn(c->fft256, src, tmp1, sizeof(float));
488 488
489 pretwiddle(&tmp0[ 0], src, 512, 84, 4, 16, 4, ff_on2avc_tabs_20_84_1);489 pretwiddle(&tmp0[ 0], src, 512, 84, 4, 16, 4, ff_on2avc_tabs_20_84_1);
490 pretwiddle(&tmp0[128], src, 512, 84, 4, 16, 4, ff_on2avc_tabs_20_84_2);490 pretwiddle(&tmp0[128], src, 512, 84, 4, 16, 4, ff_on2avc_tabs_20_84_2);
@@ -503,16 +503,16 @@ static void wtf_end_1024(On2AVCContext *c, float *out, float *src, · 12 unmodified lines
503 zero_head_and_tail(tmp1 + 512, 256, 13, 7);503 zero_head_and_tail(tmp1 + 512, 256, 13, 7);
504 zero_head_and_tail(tmp1 + 768, 256, 15, 5);504 zero_head_and_tail(tmp1 + 768, 256, 15, 5);
505 505
506 c->fft256_fn(c->fft256, src + 0, tmp1 + 0, sizeof(float));506 c->fft128_fn(c->fft128, src + 0, tmp1 + 0, sizeof(float));
507 c->fft256_fn(c->fft256, src + 256, tmp1 + 256, sizeof(float));507 c->fft128_fn(c->fft128, src + 256, tmp1 + 256, sizeof(float));
508 c->fft256_fn(c->fft256, src + 512, tmp1 + 512, sizeof(float));508 c->fft128_fn(c->fft128, src + 512, tmp1 + 512, sizeof(float));
509 c->fft256_fn(c->fft256, src + 768, tmp1 + 768, sizeof(float));509 c->fft128_fn(c->fft128, src + 768, tmp1 + 768, sizeof(float));
510 510
511 combine_fft(src, src + 256, src + 512, src + 768, tmp1,511 combine_fft(src, src + 256, src + 512, src + 768, tmp1,
512 ff_on2avc_ctab_1, ff_on2avc_ctab_2,512 ff_on2avc_ctab_1, ff_on2avc_ctab_2,
513 ff_on2avc_ctab_3, ff_on2avc_ctab_4, 1024, 1);513 ff_on2avc_ctab_3, ff_on2avc_ctab_4, 1024, 1);
514 514
515 c->fft1024_fn(c->fft1024, src, tmp1, sizeof(float));515 c->fft512_fn(c->fft512, src, tmp1, sizeof(float));
516 516
517 pretwiddle(&tmp0[ 0], src, 1024, 84, 4, 16, 4, ff_on2avc_tabs_20_84_1);517 pretwiddle(&tmp0[ 0], src, 1024, 84, 4, 16, 4, ff_on2avc_tabs_20_84_1);
518 pretwiddle(&tmp0[256], src, 1024, 84, 4, 16, 4, ff_on2avc_tabs_20_84_2);518 pretwiddle(&tmp0[256], src, 1024, 84, 4, 16, 4, ff_on2avc_tabs_20_84_2);
@@ -956,14 +956,14 @@ static av_cold int on2avc_decode_init(AVCodecContext *avctx) · 437 unmodified lines
956 if ((ret = av_tx_init(&c->mdct_small, &c->mdct_small_fn, AV_TX_FLOAT_MDCT, 1, 128, &scale, 0)) < 0)956 if ((ret = av_tx_init(&c->mdct_small, &c->mdct_small_fn, AV_TX_FLOAT_MDCT, 1, 128, &scale, 0)) < 0)
957 return ret;957 return ret;
958 958
959 if ((ret = av_tx_init(&c->fft1024, &c->fft1024_fn, AV_TX_FLOAT_FFT, 1, 1024, NULL, 0)) < 0)
960 return ret;
961 if ((ret = av_tx_init(&c->fft512, &c->fft512_fn, AV_TX_FLOAT_FFT, 1, 512, NULL, 0)) < 0)959 if ((ret = av_tx_init(&c->fft512, &c->fft512_fn, AV_TX_FLOAT_FFT, 1, 512, NULL, 0)) < 0)
962 return ret;960 return ret;
963 if ((ret = av_tx_init(&c->fft256, &c->fft256_fn, AV_TX_FLOAT_FFT, 0, 256, NULL, 0)) < 0)961 if ((ret = av_tx_init(&c->fft256, &c->fft256_fn, AV_TX_FLOAT_FFT, 1, 256, NULL, 0)) < 0)
964 return ret;962 return ret;
965 if ((ret = av_tx_init(&c->fft128, &c->fft128_fn, AV_TX_FLOAT_FFT, 0, 128, NULL, 0)) < 0)963 if ((ret = av_tx_init(&c->fft128, &c->fft128_fn, AV_TX_FLOAT_FFT, 0, 128, NULL, 0)) < 0)
966 return ret;964 return ret;
965 if ((ret = av_tx_init(&c->fft64, &c->fft64_fn, AV_TX_FLOAT_FFT, 0, 64, NULL, 0)) < 0)
966 return ret;
967 967
968 c->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT);968 c->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT);
969 if (!c->fdsp)969 if (!c->fdsp)
@@ -998,10 +998,10 @@ static av_cold int on2avc_decode_close(AVCodecContext *avctx) · 28 unmodified lines
998 av_tx_uninit(&c->mdct);998 av_tx_uninit(&c->mdct);
999 av_tx_uninit(&c->mdct_half);999 av_tx_uninit(&c->mdct_half);
1000 av_tx_uninit(&c->mdct_small);1000 av_tx_uninit(&c->mdct_small);
1001 av_tx_uninit(&c->fft64);
1001 av_tx_uninit(&c->fft128);1002 av_tx_uninit(&c->fft128);
1002 av_tx_uninit(&c->fft256);1003 av_tx_uninit(&c->fft256);
1003 av_tx_uninit(&c->fft512);1004 av_tx_uninit(&c->fft512);
1004 av_tx_uninit(&c->fft1024);
1005 1005
1006 av_freep(&c->fdsp);1006 av_freep(&c->fdsp);
1007 1007

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t