Revision 26f548bb libavcodec/fft-test.c

View differences:

libavcodec/fft-test.c
327 327
    case TRANSFORM_MDCT:
328 328
        if (do_inverse) {
329 329
            imdct_ref((float *)tab_ref, (float *)tab1, fft_nbits);
330
            ff_imdct_calc(m, tab2, (float *)tab1);
330
            m->imdct_calc(m, tab2, (float *)tab1);
331 331
            err = check_diff((float *)tab_ref, tab2, fft_size, scale);
332 332
        } else {
333 333
            mdct_ref((float *)tab_ref, (float *)tab1, fft_nbits);
334 334

  
335
            ff_mdct_calc(m, tab2, (float *)tab1);
335
            m->mdct_calc(m, tab2, (float *)tab1);
336 336

  
337 337
            err = check_diff((float *)tab_ref, tab2, fft_size / 2, scale);
338 338
        }
339 339
        break;
340 340
    case TRANSFORM_FFT:
341 341
        memcpy(tab, tab1, fft_size * sizeof(FFTComplex));
342
        ff_fft_permute(s, tab);
343
        ff_fft_calc(s, tab);
342
        s->fft_permute(s, tab);
343
        s->fft_calc(s, tab);
344 344

  
345 345
        fft_ref(tab_ref, tab1, fft_nbits);
346 346
        err = check_diff((float *)tab_ref, (float *)tab, fft_size * 2, 1.0);
......
357 357
            memcpy(tab2, tab1, fft_size * sizeof(FFTSample));
358 358
            tab2[1] = tab1[fft_size_2].re;
359 359

  
360
            ff_rdft_calc(r, tab2);
360
            r->rdft_calc(r, tab2);
361 361
            fft_ref(tab_ref, tab1, fft_nbits);
362 362
            for (i = 0; i < fft_size; i++) {
363 363
                tab[i].re = tab2[i];
......
369 369
                tab2[i]    = tab1[i].re;
370 370
                tab1[i].im = 0;
371 371
            }
372
            ff_rdft_calc(r, tab2);
372
            r->rdft_calc(r, tab2);
373 373
            fft_ref(tab_ref, tab1, fft_nbits);
374 374
            tab_ref[0].im = tab_ref[fft_size_2].re;
375 375
            err = check_diff((float *)tab_ref, (float *)tab2, fft_size, 1.0);
......
377 377
        break;
378 378
    case TRANSFORM_DCT:
379 379
        memcpy(tab, tab1, fft_size * sizeof(FFTComplex));
380
        ff_dct_calc(d, tab);
380
        d->dct_calc(d, tab);
381 381
        if (do_inverse) {
382 382
            idct_ref(tab_ref, tab1, fft_nbits);
383 383
        } else {
......
402 402
                switch (transform) {
403 403
                case TRANSFORM_MDCT:
404 404
                    if (do_inverse) {
405
                        ff_imdct_calc(m, (float *)tab, (float *)tab1);
405
                        m->imdct_calc(m, (float *)tab, (float *)tab1);
406 406
                    } else {
407
                        ff_mdct_calc(m, (float *)tab, (float *)tab1);
407
                        m->mdct_calc(m, (float *)tab, (float *)tab1);
408 408
                    }
409 409
                    break;
410 410
                case TRANSFORM_FFT:
411 411
                    memcpy(tab, tab1, fft_size * sizeof(FFTComplex));
412
                    ff_fft_calc(s, tab);
412
                    s->fft_calc(s, tab);
413 413
                    break;
414 414
                case TRANSFORM_RDFT:
415 415
                    memcpy(tab2, tab1, fft_size * sizeof(FFTSample));
416
                    ff_rdft_calc(r, tab2);
416
                    r->rdft_calc(r, tab2);
417 417
                    break;
418 418
                case TRANSFORM_DCT:
419 419
                    memcpy(tab2, tab1, fft_size * sizeof(FFTSample));
420
                    ff_dct_calc(d, tab2);
420
                    d->dct_calc(d, tab2);
421 421
                    break;
422 422
                }
423 423
            }

Also available in: Unified diff