---
libavcodec/dct.c | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/libavcodec/dct.c b/libavcodec/dct.c
index 5c63af3..a3d83f6 100644
--- a/libavcodec/dct.c
+++ b/libavcodec/dct.c
@@ -32,10 +32,10 @@
#include "dct.h"
#include "dct32.h"
-/* sin((M_PI * x / (2*n)) */
+/* sin((M_PI * x / (2 * n)) */
#define SIN(s,n,x) (s->costab[(n) - (x)])
-/* cos((M_PI * x / (2*n)) */
+/* cos((M_PI * x / (2 * n)) */
#define COS(s,n,x) (s->costab[x])
static void ff_dst_calc_I_c(DCTContext *ctx, FFTSample *data)
@@ -44,10 +44,10 @@ static void ff_dst_calc_I_c(DCTContext *ctx, FFTSample
*data)
int i;
data[0] = 0;
- for(i = 1; i < n/2; i++) {
+ for(i = 1; i < n / 2; i++) {
float tmp1 = data[i ];
float tmp2 = data[n - i];
- float s = SIN(ctx, n, 2*i);
+ float s = SIN(ctx, n, 2 * i);
s *= tmp1 + tmp2;
tmp1 = (tmp1 - tmp2) * 0.5f;
@@ -55,17 +55,17 @@ static void ff_dst_calc_I_c(DCTContext *ctx, FFTSample
*data)
data[n - i] = s - tmp1;
}
- data[n/2] *= 2;
+ data[n / 2] *= 2;
ctx->rdft.rdft_calc(&ctx->rdft, data);
data[0] *= 0.5f;
- for(i = 1; i < n-2; i += 2) {
+ for(i = 1; i < n - 2; i += 2) {
data[i + 1] += data[i - 1];
data[i ] = -data[i + 2];
}
- data[n-1] = 0;
+ data[n - 1] = 0;
}
static void ff_dct_calc_I_c(DCTContext *ctx, FFTSample *data)
@@ -74,11 +74,11 @@ static void ff_dct_calc_I_c(DCTContext *ctx, FFTSample
*data)
int i;
float next = -0.5f * (data[0] - data[n]);
- for(i = 0; i < n/2; i++) {
+ for(i = 0; i < n / 2; i++) {
float tmp1 = data[i ];
float tmp2 = data[n - i];
- float s = SIN(ctx, n, 2*i);
- float c = COS(ctx, n, 2*i);
+ float s = SIN(ctx, n, 2 * i);
+ float c = COS(ctx, n, 2 * i);
c *= tmp1 - tmp2;
s *= tmp1 - tmp2;
@@ -137,10 +137,10 @@ static void ff_dct_calc_II_c(DCTContext *ctx, FFTSample
*data)
int i;
float next;
- for (i=0; i < n/2; i++) {
+ for (i = 0; i < n / 2; i++) {
float tmp1 = data[i ];
float tmp2 = data[n - i - 1];
- float s = SIN(ctx, n, 2*i + 1);
+ float s = SIN(ctx, n, 2 * i + 1);
s *= tmp1 - tmp2;
tmp1 = (tmp1 + tmp2) * 0.5f;
@@ -162,9 +162,9 @@ static void ff_dct_calc_II_c(DCTContext *ctx, FFTSample
*data)
data[i ] = c * inr + s * ini;
- data[i+1] = next;
+ data[i + 1] = next;
- next += s * inr - c * ini;
+ next += s * inr - c * ini;
}
}
@@ -186,30 +186,31 @@ av_cold int ff_dct_init(DCTContext *s, int nbits, enum
DCTTransformType inverse)
if (inverse == DCT_II && nbits == 5) {
s->dct_calc = dct32_func;
} else {
- ff_init_ff_cos_tabs(nbits+2);
+ ff_init_ff_cos_tabs(nbits + 2);
- s->costab = ff_cos_tabs[nbits+2];
+ s->costab = ff_cos_tabs[nbits + 2];
- s->csc2 = av_malloc(n/2 * sizeof(FFTSample));
+ s->csc2 = av_malloc(n / 2 * sizeof(FFTSample));
if (ff_rdft_init(&s->rdft, nbits, inverse == DCT_III) < 0) {
av_free(s->csc2);
return -1;
}
- for (i = 0; i < n/2; i++)
- s->csc2[i] = 0.5 / sin((M_PI / (2*n) * (2*i + 1)));
+ for (i = 0; i < n / 2; i++)
+ s->csc2[i] = 0.5 / sin((M_PI / (2 * n) * (2 * i + 1)));
- switch(inverse) {
- case DCT_I : s->dct_calc = ff_dct_calc_I_c; break;
- case DCT_II : s->dct_calc = ff_dct_calc_II_c ; break;
+ switch (inverse) {
+ case DCT_I : s->dct_calc = ff_dct_calc_I_c; break;
+ case DCT_II : s->dct_calc = ff_dct_calc_II_c; break;
case DCT_III: s->dct_calc = ff_dct_calc_III_c; break;
- case DST_I : s->dct_calc = ff_dst_calc_I_c; break;
+ case DST_I : s->dct_calc = ff_dst_calc_I_c; break;
}
}
s->dct32 = ff_dct32_float;
- if (HAVE_MMX) ff_dct_init_mmx(s);
+ if (HAVE_MMX)
+ ff_dct_init_mmx(s);
return 0;
}
--
1.7.7.3
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
