generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reindent after r22618.

Browse Source 
Originally committed as revision 22619 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2010-03-21 11:36:17 +00:00
parent 8305c76b53
commit b531e1ab59
1 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
libavcodec/dct.c
View File

@ -42,68 +42,69 @@ static void ff_dct_calc_III_c(DCTContext *ctx, FFTSample *data)
int n = 1 << ctx->nbits; int n = 1 << ctx->nbits;
int i; int i;
float next = data[n - 1]; float next = data[n - 1];
float inv_n = 1.0f / n; float inv_n = 1.0f / n;
for (i = n - 2; i >= 2; i -= 2) { for (i = n - 2; i >= 2; i -= 2) {
float val1 = data[i ]; float val1 = data[i ];
float val2 = data[i - 1] - data[i + 1]; float val2 = data[i - 1] - data[i + 1];
float c = COS(ctx, n, i); float c = COS(ctx, n, i);
float s = SIN(ctx, n, i); float s = SIN(ctx, n, i);
data[i ] = c * val1 + s * val2; data[i ] = c * val1 + s * val2;
data[i + 1] = s * val1 - c * val2; data[i + 1] = s * val1 - c * val2;
} }
data[1] = 2 * next; data[1] = 2 * next;
ff_rdft_calc(&ctx->rdft, data); ff_rdft_calc(&ctx->rdft, data);
for (i = 0; i < n / 2; i++) { for (i = 0; i < n / 2; i++) {
float tmp1 = data[i ] * inv_n; float tmp1 = data[i ] * inv_n;
float tmp2 = data[n - i - 1] * inv_n; float tmp2 = data[n - i - 1] * inv_n;
float csc = ctx->csc2[i] * (tmp1 - tmp2); float csc = ctx->csc2[i] * (tmp1 - tmp2);
tmp1 += tmp2; tmp1 += tmp2;
data[i ] = tmp1 + csc; data[i ] = tmp1 + csc;
data[n - i - 1] = tmp1 - csc; data[n - i - 1] = tmp1 - csc;
} }
} }
static void ff_dct_calc_II_c(DCTContext *ctx, FFTSample *data) static void ff_dct_calc_II_c(DCTContext *ctx, FFTSample *data)
{ {
int n = 1 << ctx->nbits; int n = 1 << ctx->nbits;
int i; int i;
float next; float next;
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);
s *= tmp1 - tmp2; for (i=0; i < n/2; i++) {
tmp1 = (tmp1 + tmp2) * 0.5f; float tmp1 = data[i ];
float tmp2 = data[n - i - 1];
float s = SIN(ctx, n, 2*i + 1);
data[i ] = tmp1 + s; s *= tmp1 - tmp2;
data[n-i-1] = tmp1 - s; tmp1 = (tmp1 + tmp2) * 0.5f;
}
ff_rdft_calc(&ctx->rdft, data); data[i ] = tmp1 + s;
data[n-i-1] = tmp1 - s;
}
next = data[1] * 0.5; ff_rdft_calc(&ctx->rdft, data);
data[1] *= -1;
for (i = n - 2; i >= 0; i -= 2) { next = data[1] * 0.5;
float inr = data[i ]; data[1] *= -1;
float ini = data[i + 1];
float c = COS(ctx, n, i);
float s = SIN(ctx, n, i);
data[i ] = c * inr + s * ini; for (i = n - 2; i >= 0; i -= 2) {
float inr = data[i ];
float ini = data[i + 1];
float c = COS(ctx, n, i);
float s = SIN(ctx, n, i);
data[i+1] = next; data[i ] = c * inr + s * ini;
next += s * inr - c * ini; data[i+1] = next;
}
next += s * inr - c * ini;
}
} }
void ff_dct_calc(DCTContext *s, FFTSample *data) void ff_dct_calc(DCTContext *s, FFTSample *data)