virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

ffplay: use public fft interface

Browse Source 
Originally committed as revision 22292 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2010-03-07 21:56:48 +00:00
parent c70948315b
commit 166621ab72
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ffplay.c
View File

@ -30,7 +30,7 @@
#include "libavcodec/audioconvert.h" #include "libavcodec/audioconvert.h"
#include "libavcodec/colorspace.h" #include "libavcodec/colorspace.h"
#include "libavcodec/opt.h" #include "libavcodec/opt.h"
#include "libavcodec/fft.h" #include "libavcodec/avfft.h"
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
# include "libavfilter/avfilter.h" # include "libavfilter/avfilter.h"
@ -165,7 +165,7 @@ typedef struct VideoState {
int16_t sample_array[SAMPLE_ARRAY_SIZE]; int16_t sample_array[SAMPLE_ARRAY_SIZE];
int sample_array_index; int sample_array_index;
int last_i_start; int last_i_start;
RDFTContext rdft; RDFTContext *rdft;
int rdft_bits; int rdft_bits;
int xpos; int xpos;
@ -905,8 +905,8 @@ static void video_audio_display(VideoState *s)
}else{ }else{
nb_display_channels= FFMIN(nb_display_channels, 2); nb_display_channels= FFMIN(nb_display_channels, 2);
if(rdft_bits != s->rdft_bits){ if(rdft_bits != s->rdft_bits){
ff_rdft_end(&s->rdft); av_rdft_end(s->rdft);
ff_rdft_init(&s->rdft, rdft_bits, DFT_R2C); s->rdft = av_rdft_init(rdft_bits, DFT_R2C);
s->rdft_bits= rdft_bits; s->rdft_bits= rdft_bits;
} }
{ {
@ -920,7 +920,7 @@ static void video_audio_display(VideoState *s)
if (i >= SAMPLE_ARRAY_SIZE) if (i >= SAMPLE_ARRAY_SIZE)
i -= SAMPLE_ARRAY_SIZE; i -= SAMPLE_ARRAY_SIZE;
} }
ff_rdft_calc(&s->rdft, data[ch]); av_rdft_calc(s->rdft, data[ch]);
} }
//least efficient way to do this, we should of course directly access it but its more than fast enough //least efficient way to do this, we should of course directly access it but its more than fast enough
for(y=0; y<s->height; y++){ for(y=0; y<s->height; y++){