diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-19 13:55:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-19 13:55:51 +0100 |
| commit | fe2efc5264940d0561b50bcce65dc8a24f352d9e (patch) | |
| tree | 5512001861486c6c947cf973e6d1e0926038ab8d /libavfilter/vsrc_mandelbrot.c | |
| parent | cf670fbc9688774fa8856b67bcf120dc7ebf90b5 (diff) | |
| download | ffmpeg-fe2efc5264940d0561b50bcce65dc8a24f352d9e.tar.gz | |
vsrc_mandelbrot: factorize periodicity checking too.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vsrc_mandelbrot.c')
| -rw-r--r-- | libavfilter/vsrc_mandelbrot.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavfilter/vsrc_mandelbrot.c b/libavfilter/vsrc_mandelbrot.c index 833033e44c..5701094cbd 100644 --- a/libavfilter/vsrc_mandelbrot.c +++ b/libavfilter/vsrc_mandelbrot.c @@ -237,6 +237,16 @@ static void draw_mandelbrot(AVFilterContext *ctx, uint32_t *color, int linesize, outr= inr*inr - ini*ini + cr;\ outi= 2*inr*ini + ci; +#define Z_Z2_C_ZYKLUS(outr,outi,inr,ini, Z)\ + Z_Z2_C(outr,outi,inr,ini)\ + if(use_zyklus){\ + if(Z && mb->zyklus[i>>1][0]==outr && mb->zyklus[i>>1][1]==outi)\ + break;\ + mb->zyklus[i][0]= outr;\ + mb->zyklus[i][1]= outi;\ + } + + for(i=0; i<mb->maxiter; i++){ double t; if(zr*zr + zi*zi > mb->bailout){ @@ -247,19 +257,9 @@ static void draw_mandelbrot(AVFilterContext *ctx, uint32_t *color, int linesize, c= lrintf((sin(zr)+1)*127) + lrintf((sin(zr/1.234)+1)*127)*256*256 + lrintf((sin(zr/100)+1)*127)*256; break; } - Z_Z2_C(t, zi, zr, zi) - if(use_zyklus){ - mb->zyklus[i][0]= t; - mb->zyklus[i][1]= zi; - } + Z_Z2_C_ZYKLUS(t, zi, zr, zi, 0) i++; - Z_Z2_C(zr, zi, t, zi) - if(use_zyklus){ - if(mb->zyklus[i>>1][0]==zr && mb->zyklus[i>>1][1]==zi) - break; - mb->zyklus[i][0]= zr; - mb->zyklus[i][1]= zi; - } + Z_Z2_C_ZYKLUS(zr, zi, t, zi, 1) } if(!c){ if(mb->inner==PERIOD){ |