RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Give RDFT types more meaningful names 

Originally committed as revision 22290 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2010-03-07 21:47:44 +00:00
parent 3bd8a2ef6c
commit 41ea18fb0d
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffplay.c
View File

@ -906,7 +906,7 @@ static void video_audio_display(VideoState *s)
nb_display_channels= FFMIN(nb_display_channels, 2);
if(rdft_bits != s->rdft_bits){
ff_rdft_end(&s->rdft);
ff_rdft_init(&s->rdft, rdft_bits, RDFT);
ff_rdft_init(&s->rdft, rdft_bits, DFT_R2C);
s->rdft_bits= rdft_bits;
}
{

2
libavcodec/binkaudio.c
View File

@ -125,7 +125,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
s->coeffs_ptr[i] = s->coeffs + i * s->frame_len;
if (CONFIG_BINKAUDIO_RDFT_DECODER && avctx->codec->id == CODEC_ID_BINKAUDIO_RDFT)
ff_rdft_init(&s->trans.rdft, frame_len_bits, IRIDFT);
ff_rdft_init(&s->trans.rdft, frame_len_bits, DFT_C2R);
else if (CONFIG_BINKAUDIO_DCT_DECODER)
ff_dct_init(&s->trans.dct, frame_len_bits, 1);
else

6
libavcodec/fft-test.c
View File

@ -292,10 +292,10 @@ int main(int argc, char **argv)
break;
case TRANSFORM_RDFT:
if (do_inverse)
av_log(NULL, AV_LOG_INFO,"IRDFT");
av_log(NULL, AV_LOG_INFO,"IDFT_C2R");
else
av_log(NULL, AV_LOG_INFO,"RDFT");
ff_rdft_init(r, fft_nbits, do_inverse ? IRDFT : RDFT);
av_log(NULL, AV_LOG_INFO,"DFT_R2C");
ff_rdft_init(r, fft_nbits, do_inverse ? IDFT_C2R : DFT_R2C);
fft_ref_init(fft_nbits, do_inverse);
break;
case TRANSFORM_DCT:

8
libavcodec/fft.h
View File

@ -195,10 +195,10 @@ void ff_mdct_end(FFTContext *s);
/* Real Discrete Fourier Transform */
enum RDFTransformType {
RDFT,
IRDFT,
RIDFT,
IRIDFT,
DFT_R2C,
IDFT_C2R,
IDFT_R2C,
DFT_C2R,
};
typedef struct {

2
libavcodec/qdm2.c
View File

@ -1928,7 +1928,7 @@ static av_cold int qdm2_decode_init(AVCodecContext *avctx)
return -1;
}
ff_rdft_init(&s->rdft_ctx, s->fft_order, IRDFT);
ff_rdft_init(&s->rdft_ctx, s->fft_order, IDFT_C2R);
qdm2_init(s);

10
libavcodec/rdft.c
View File

@ -53,21 +53,21 @@ av_cold int ff_rdft_init(RDFTContext *s, int nbits, enum RDFTransformType trans)
{
int n = 1 << nbits;
int i;
const double theta = (trans == RDFT || trans == IRIDFT ? -1 : 1)*2*M_PI/n;
const double theta = (trans == DFT_R2C || trans == DFT_C2R ? -1 : 1)*2*M_PI/n;
s->nbits = nbits;
s->inverse = trans == IRDFT || trans == IRIDFT;
s->sign_convention = trans == RIDFT || trans == IRIDFT ? 1 : -1;
s->inverse = trans == IDFT_C2R || trans == DFT_C2R;
s->sign_convention = trans == IDFT_R2C || trans == DFT_C2R ? 1 : -1;
if (nbits < 4 || nbits > 16)
return -1;
if (ff_fft_init(&s->fft, nbits-1, trans == IRDFT || trans == RIDFT) < 0)
if (ff_fft_init(&s->fft, nbits-1, trans == IDFT_C2R || trans == IDFT_R2C) < 0)
return -1;
ff_init_ff_cos_tabs(nbits);
s->tcos = ff_cos_tabs[nbits];
s->tsin = ff_sin_tabs[nbits]+(trans == RDFT || trans == IRIDFT)*(n>>2);
s->tsin = ff_sin_tabs[nbits]+(trans == DFT_R2C || trans == DFT_C2R)*(n>>2);
#if !CONFIG_HARDCODED_TABLES
for (i = 0; i < (n>>2); i++) {
s->tsin[i] = sin(i*theta);