---
libavcodec/ac3enc.c | 323 +++++++++++++++++++++++---------------------------
1 files changed, 149 insertions(+), 174 deletions(-)
diff --git libavcodec/ac3enc.c libavcodec/ac3enc.c
index 707af8f..2e51397 100644
--- libavcodec/ac3enc.c
+++ libavcodec/ac3enc.c
@@ -110,7 +110,7 @@ static av_cold void fft_init(int ln)
n = 1 << ln;
- for(i=0;i<(n/2);i++) {
+ for (i = 0; i < (n/2); i++) {
alpha = 2 * M_PI * (float)i / (float)n;
costab[i] = fix15(cos(alpha));
sintab[i] = fix15(sin(alpha));
@@ -122,7 +122,7 @@ static av_cold void mdct_init(void)
int i;
fft_init(MDCT_NBITS - 2);
- for(i=0;i<MDCT_SAMPLES/4;i++) {
+ for (i = 0; i < MDCT_SAMPLES/4; i++) {
float alpha = 2 * M_PI * (i + 1.0 / 8.0) / (float)MDCT_SAMPLES;
xcos1[i] = fix15(-cos(alpha));
xsin1[i] = fix15(-sin(alpha));
@@ -133,10 +133,10 @@ static av_cold void mdct_init(void)
#define BF(pre, pim, qre, qim, pre1, pim1, qre1, qim1) \
{\
int ax, ay, bx, by;\
- bx=pre1;\
- by=pim1;\
- ax=qre1;\
- ay=qim1;\
+ bx = pre1;\
+ by = pim1;\
+ ax = qre1;\
+ ay = qim1;\
pre = (bx + ax) >> 1;\
pim = (by + ay) >> 1;\
qre = (bx - ax) >> 1;\
@@ -153,15 +153,15 @@ static av_cold void mdct_init(void)
/* do a 2^n point complex fft on 2^ln points. */
static void fft(IComplex *z, int ln)
{
- int j, l, np, np2;
- int nblocks, nloops;
+ int j, l, np, np2;
+ int nblocks, nloops;
register IComplex *p,*q;
int tmp_re, tmp_im;
np = 1 << ln;
/* reverse */
- for(j=0;j<np;j++) {
+ for(j = 0; j < np; j++) {
int k = av_reverse[j] >> (8 - ln);
if (k < j)
FFSWAP(IComplex, z[k], z[j]);
@@ -169,8 +169,8 @@ static void fft(IComplex *z, int ln)
/* pass 0 */
- p=&z[0];
- j=(np >> 1);
+ p = &z[0];
+ j = (np >> 1);
do {
BF(p[0].re, p[0].im, p[1].re, p[1].im,
p[0].re, p[0].im, p[1].re, p[1].im);
@@ -179,21 +179,21 @@ static void fft(IComplex *z, int ln)
/* pass 1 */
- p=&z[0];
- j=np >> 2;
+ p = &z[0];
+ j = np >> 2;
do {
BF(p[0].re, p[0].im, p[2].re, p[2].im,
p[0].re, p[0].im, p[2].re, p[2].im);
BF(p[1].re, p[1].im, p[3].re, p[3].im,
p[1].re, p[1].im, p[3].im, -p[3].re);
- p+=4;
+ p += 4;
} while (--j != 0);
/* pass 2 .. ln-1 */
nblocks = np >> 3;
- nloops = 1 << 2;
- np2 = np >> 1;
+ nloops = 1 << 2;
+ np2 = np >> 1;
do {
p = z;
q = z + nloops;
@@ -204,7 +204,7 @@ static void fft(IComplex *z, int ln)
p++;
q++;
- for(l = nblocks; l < np2; l += nblocks) {
+ for (l = nblocks; l < np2; l += nblocks) {
CMUL(tmp_re, tmp_im, costab[l], -sintab[l], q->re, q->im);
BF(p->re, p->im, q->re, q->im,
p->re, p->im, tmp_re, tmp_im);
@@ -215,7 +215,7 @@ static void fft(IComplex *z, int ln)
q += nloops;
}
nblocks = nblocks >> 1;
- nloops = nloops << 1;
+ nloops = nloops << 1;
} while (nblocks != 0);
}
@@ -227,13 +227,13 @@ static void mdct512(int32_t *out, int16_t *in)
IComplex x[MDCT_SAMPLES/4];
/* shift to simplify computations */
- for(i=0;i<MDCT_SAMPLES/4;i++)
+ for (i = 0; i < MDCT_SAMPLES/4; i++)
rot[i] = -in[i + 3*MDCT_SAMPLES/4];
- for(i=MDCT_SAMPLES/4;i<MDCT_SAMPLES;i++)
- rot[i] = in[i - MDCT_SAMPLES/4];
+ for (i = MDCT_SAMPLES/4; i < MDCT_SAMPLES; i++)
+ rot[i] = in[i - MDCT_SAMPLES/4];
/* pre rotation */
- for(i=0;i<MDCT_SAMPLES/4;i++) {
+ for (i = 0; i < MDCT_SAMPLES/4; i++) {
re = ((int)rot[2*i] - (int)rot[MDCT_SAMPLES-1-2*i]) >> 1;
im = -((int)rot[MDCT_SAMPLES/2+2*i] - (int)rot[MDCT_SAMPLES/2-1-2*i]) >> 1;
CMUL(x[i].re, x[i].im, re, im, -xcos1[i], xsin1[i]);
@@ -242,7 +242,7 @@ static void mdct512(int32_t *out, int16_t *in)
fft(x, MDCT_NBITS - 2);
/* post rotation */
- for(i=0;i<MDCT_SAMPLES/4;i++) {
+ for (i = 0; i < MDCT_SAMPLES/4; i++) {
re = x[i].re;
im = x[i].im;
CMUL(re1, im1, re, im, xsin1[i], xcos1[i]);
@@ -256,7 +256,7 @@ static int calc_exp_diff(uint8_t *exp1, uint8_t *exp2, int n)
{
int sum, i;
sum = 0;
- for(i=0;i<n;i++) {
+ for (i = 0; i < n; i++) {
sum += abs(exp1[i] - exp2[i]);
}
return sum;
@@ -272,7 +272,7 @@ static void compute_exp_strategy(uint8_t exp_strategy[AC3_MAX_BLOCKS][AC3_MAX_CH
/* estimate if the exponent variation & decide if they should be
reused in the next frame */
exp_strategy[0][ch] = EXP_NEW;
- for(i=1;i<AC3_MAX_BLOCKS;i++) {
+ for (i = 1; i < AC3_MAX_BLOCKS; i++) {
exp_diff = calc_exp_diff(exp[i][ch], exp[i-1][ch], AC3_MAX_COEFS);
dprintf(NULL, "exp_diff=%d\n", exp_diff);
if (exp_diff > EXP_DIFF_THRESHOLD)
@@ -311,7 +311,7 @@ static void exponent_min(uint8_t exp[AC3_MAX_COEFS], uint8_t exp1[AC3_MAX_COEFS]
{
int i;
- for(i=0;i<n;i++) {
+ for (i = 0; i < n; i++) {
if (exp1[i] < exp[i])
exp[i] = exp1[i];
}
@@ -320,9 +320,7 @@ static void exponent_min(uint8_t exp[AC3_MAX_COEFS], uint8_t exp1[AC3_MAX_COEFS]
/* update the exponents so that they are the ones the decoder will
decode. Return the number of bits used to code the exponents */
static int encode_exp(uint8_t encoded_exp[AC3_MAX_COEFS],
- uint8_t exp[AC3_MAX_COEFS],
- int nb_exps,
- int exp_strategy)
+ uint8_t exp[AC3_MAX_COEFS], int nb_exps, int exp_strategy)
{
int group_size, nb_groups, i, j, k, exp_min;
uint8_t exp1[AC3_MAX_COEFS];
@@ -344,10 +342,10 @@ static int encode_exp(uint8_t encoded_exp[AC3_MAX_COEFS],
/* for each group, compute the minimum exponent */
exp1[0] = exp[0]; /* DC exponent is handled separately */
k = 1;
- for(i=1;i<=nb_groups;i++) {
+ for (i = 1; i <= nb_groups; i++) {
exp_min = exp[k];
assert(exp_min >= 0 && exp_min <= 24);
- for(j=1;j<group_size;j++) {
+ for (j = 1; j < group_size; j++) {
if (exp[k+j] < exp_min)
exp_min = exp[k+j];
}
@@ -361,16 +359,16 @@ static int encode_exp(uint8_t encoded_exp[AC3_MAX_COEFS],
/* Decrease the delta between each groups to within 2
* so that they can be differentially encoded */
- for (i=1;i<=nb_groups;i++)
+ for (i = 1; i <= nb_groups; i++)
exp1[i] = FFMIN(exp1[i], exp1[i-1] + 2);
- for (i=nb_groups-1;i>=0;i--)
+ for (i = nb_groups-1; i >= 0; i--)
exp1[i] = FFMIN(exp1[i], exp1[i+1] + 2);
/* now we have the exponent values the decoder will see */
encoded_exp[0] = exp1[0];
k = 1;
- for(i=1;i<=nb_groups;i++) {
- for(j=0;j<group_size;j++) {
+ for (i = 1; i <= nb_groups; i++) {
+ for (j = 0; j < group_size; j++) {
encoded_exp[k+j] = exp1[i];
}
k += group_size;
@@ -379,7 +377,7 @@ static int encode_exp(uint8_t encoded_exp[AC3_MAX_COEFS],
#ifdef DEBUG
dprintf(NULL, "exponents: strategy=%s\n",
exp_strategy==EXP_D15?"D15":exp_strategy==EXP_D25?"D25":"D45");
- for(i=0;i<=nb_groups * group_size;i++) {
+ for (i = 0; i <= nb_groups * group_size; i++) {
dprintf(NULL, "%d ", encoded_exp[i]);
}
dprintf(NULL, "\n");
@@ -394,7 +392,7 @@ static int compute_mantissa_size(AC3EncodeContext *s, uint8_t *m, int nb_coefs)
int bits, mant, i;
bits = 0;
- for(i=0;i<nb_coefs;i++) {
+ for (i = 0; i < nb_coefs; i++) {
mant = m[i];
switch(mant) {
case 0:
@@ -448,9 +446,9 @@ static void bit_alloc_masking(AC3EncodeContext *s,
int blk, ch;
int16_t band_psd[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS][50];
- for(blk=0; blk<AC3_MAX_BLOCKS; blk++) {
- for(ch=0;ch<s->channels;ch++) {
- if(exp_strategy[blk][ch] == EXP_REUSE) {
+ for (blk = 0; blk < AC3_MAX_BLOCKS; blk++) {
+ for (ch = 0; ch < s->channels; ch++) {
+ if (exp_strategy[blk][ch] == EXP_REUSE) {
memcpy(psd[blk][ch], psd[blk-1][ch], AC3_MAX_COEFS*sizeof(int16_t));
memcpy(mask[blk][ch], mask[blk-1][ch], 50*sizeof(int16_t));
} else {
@@ -480,17 +478,16 @@ static int bit_alloc(AC3EncodeContext *s,
snr_offset = (((coarse_snr_offset - 15) << 4) + fine_snr_offset) << 2;
/* compute size */
- for(i=0;i<AC3_MAX_BLOCKS;i++) {
+ for (i = 0; i < AC3_MAX_BLOCKS; i++) {
s->mant1_cnt = 0;
s->mant2_cnt = 0;
s->mant4_cnt = 0;
- for(ch=0;ch<s->channels;ch++) {
+ for (ch = 0; ch < s->channels; ch++) {
ff_ac3_bit_alloc_calc_bap(mask[i][ch], psd[i][ch], 0,
s->nb_coefs[ch], snr_offset,
s->bit_alloc.floor, ff_ac3_bap_tab,
bap[i][ch]);
- frame_bits += compute_mantissa_size(s, bap[i][ch],
- s->nb_coefs[ch]);
+ frame_bits += compute_mantissa_size(s, bap[i][ch], s->nb_coefs[ch]);
}
}
#if 0
@@ -522,15 +519,15 @@ static int compute_bit_allocation(AC3EncodeContext *s,
s->slow_gain_code = 1;
s->db_per_bit_code = 2;
s->floor_code = 4;
- for(ch=0;ch<s->channels;ch++)
+ for (ch = 0; ch < s->channels; ch++)
s->fast_gain_code[ch] = 4;
/* compute real values */
s->bit_alloc.slow_decay = ff_ac3_slow_decay_tab[s->slow_decay_code] >> s->bit_alloc.sr_shift;
s->bit_alloc.fast_decay = ff_ac3_fast_decay_tab[s->fast_decay_code] >> s->bit_alloc.sr_shift;
- s->bit_alloc.slow_gain = ff_ac3_slow_gain_tab[s->slow_gain_code];
+ s->bit_alloc.slow_gain = ff_ac3_slow_gain_tab[s->slow_gain_code];
s->bit_alloc.db_per_bit = ff_ac3_db_per_bit_tab[s->db_per_bit_code];
- s->bit_alloc.floor = ff_ac3_floor_tab[s->floor_code];
+ s->bit_alloc.floor = ff_ac3_floor_tab[s->floor_code];
/* header size */
frame_bits += 65;
@@ -539,16 +536,16 @@ static int compute_bit_allocation(AC3EncodeContext *s,
frame_bits += frame_bits_inc[s->channel_mode];
/* audio blocks */
- for(i=0;i<AC3_MAX_BLOCKS;i++) {
+ for (i = 0; i < AC3_MAX_BLOCKS; i++) {
frame_bits += s->fbw_channels * 2 + 2; /* blksw * c, dithflag * c, dynrnge, cplstre */
if (s->channel_mode == AC3_CHMODE_STEREO) {
frame_bits++; /* rematstr */
- if(i==0) frame_bits += 4;
+ if (i == 0) frame_bits += 4;
}
frame_bits += 2 * s->fbw_channels; /* chexpstr[2] * c */
if (s->lfe_on)
frame_bits++; /* lfeexpstr */
- for(ch=0;ch<s->fbw_channels;ch++) {
+ for (ch = 0; ch < s->fbw_channels; ch++) {
if (exp_strategy[i][ch] != EXP_REUSE)
frame_bits += 6 + 2; /* chbwcod[6], gainrng[2] */
}
@@ -616,10 +613,10 @@ static int compute_bit_allocation(AC3EncodeContext *s,
{
int blk;
- for(blk=0;blk<AC3_MAX_BLOCKS;i++) {
- for(ch=0;ch<s->channels;ch++) {
+ for (blk = 0; blk < AC3_MAX_BLOCKS; i++) {
+ for (ch = 0; ch < s->channels; ch++) {
dprintf(s->avctx, "bap[blk=%d][ch=%d]=", blk, ch);
- for(i=0;i<s->nb_coefs[ch];i++) {
+ for (i = 0; i < s->nb_coefs[ch]; i++) {
dprintf(s->avctx, "%d ",bap[blk][ch][i]);
}
dprintf(s->avctx, "\n");
@@ -699,49 +696,49 @@ static av_cold int AC3_encode_init(AVCodecContext *avctx)
}
/* frequency */
- for(i=0;i<3;i++) {
- for(j=0;j<3;j++)
+ for (i = 0; i < 3; i++) {
+ for (j = 0; j < 3; j++)
if ((ff_ac3_sample_rate_tab[j] >> i) == freq)
goto found;
}
return -1;
found:
- s->sample_rate = freq;
+ s->sample_rate = freq;
s->bit_alloc.sr_shift = i;
- s->bit_alloc.sr_code = j;
- s->bitstream_id = 8 + s->bit_alloc.sr_shift;
- s->bitstream_mode = 0; /* complete main audio service */
+ s->bit_alloc.sr_code = j;
+ s->bitstream_id = 8 + s->bit_alloc.sr_shift;
+ s->bitstream_mode = 0; /* complete main audio service */
/* bitrate & frame size */
- for(i=0;i<19;i++) {
+ for (i = 0; i < 19; i++) {
if ((ff_ac3_bitrate_tab[i] >> s->bit_alloc.sr_shift)*1000 == bitrate)
break;
}
if (i == 19)
return -1;
- s->bit_rate = bitrate;
+ s->bit_rate = bitrate;
s->frame_size_code = i << 1;
- s->frame_size_min = ff_ac3_frame_size_tab[s->frame_size_code][s->bit_alloc.sr_code];
- s->bits_written = 0;
+ s->frame_size_min = ff_ac3_frame_size_tab[s->frame_size_code][s->bit_alloc.sr_code];
+ s->bits_written = 0;
s->samples_written = 0;
- s->frame_size = s->frame_size_min;
+ s->frame_size = s->frame_size_min;
/* bit allocation init */
- if(avctx->cutoff) {
+ if (avctx->cutoff) {
/* calculate bandwidth based on user-specified cutoff frequency */
- int cutoff = av_clip(avctx->cutoff, 1, s->sample_rate >> 1);
+ int cutoff = av_clip(avctx->cutoff, 1, s->sample_rate >> 1);
int fbw_coeffs = cutoff * 2 * AC3_MAX_COEFS / s->sample_rate;
- bw_code = av_clip((fbw_coeffs - 73) / 3, 0, 60);
+ bw_code = av_clip((fbw_coeffs - 73) / 3, 0, 60);
} else {
/* use default bandwidth setting */
/* XXX: should compute the bandwidth according to the frame
size, so that we avoid annoying high frequency artifacts */
bw_code = 50;
}
- for(ch=0;ch<s->fbw_channels;ch++) {
+ for (ch = 0; ch < s->fbw_channels; ch++) {
/* bandwidth for each channel */
s->bandwidth_code[ch] = bw_code;
- s->nb_coefs[ch] = bw_code * 3 + 73;
+ s->nb_coefs[ch] = bw_code * 3 + 73;
}
if (s->lfe_on) {
s->nb_coefs[s->lfe_ch] = 7; /* fixed */
@@ -751,7 +748,7 @@ static av_cold int AC3_encode_init(AVCodecContext *avctx)
mdct_init();
- avctx->coded_frame= avcodec_alloc_frame();
+ avctx->coded_frame = avcodec_alloc_frame();
avctx->coded_frame->key_frame= 1;
return 0;
@@ -762,29 +759,29 @@ static void output_frame_header(AC3EncodeContext *s, unsigned char *frame)
{
init_put_bits(&s->pb, frame, AC3_MAX_CODED_FRAME_SIZE);
- put_bits(&s->pb, 16, 0x0b77); /* frame header */
- put_bits(&s->pb, 16, 0); /* crc1: will be filled later */
- put_bits(&s->pb, 2, s->bit_alloc.sr_code);
- put_bits(&s->pb, 6, s->frame_size_code + (s->frame_size - s->frame_size_min));
- put_bits(&s->pb, 5, s->bitstream_id);
- put_bits(&s->pb, 3, s->bitstream_mode);
- put_bits(&s->pb, 3, s->channel_mode);
+ put_bits(&s->pb, 16, 0x0b77); /* frame header */
+ put_bits(&s->pb, 16, 0); /* crc1: will be filled later */
+ put_bits(&s->pb, 2, s->bit_alloc.sr_code);
+ put_bits(&s->pb, 6, s->frame_size_code + (s->frame_size - s->frame_size_min));
+ put_bits(&s->pb, 5, s->bitstream_id);
+ put_bits(&s->pb, 3, s->bitstream_mode);
+ put_bits(&s->pb, 3, s->channel_mode);
if ((s->channel_mode & 0x01) && s->channel_mode != AC3_CHMODE_MONO)
- put_bits(&s->pb, 2, 1); /* XXX -4.5 dB */
+ put_bits(&s->pb, 2, 1); /* XXX -4.5 dB */
if (s->channel_mode & 0x04)
- put_bits(&s->pb, 2, 1); /* XXX -6 dB */
+ put_bits(&s->pb, 2, 1); /* XXX -6 dB */
if (s->channel_mode == AC3_CHMODE_STEREO)
- put_bits(&s->pb, 2, 0); /* surround not indicated */
- put_bits(&s->pb, 1, s->lfe_on); /* LFE */
- put_bits(&s->pb, 5, 31); /* dialog norm: -31 db */
- put_bits(&s->pb, 1, 0); /* no compression control word */
- put_bits(&s->pb, 1, 0); /* no lang code */
- put_bits(&s->pb, 1, 0); /* no audio production info */
- put_bits(&s->pb, 1, 0); /* no copyright */
- put_bits(&s->pb, 1, 1); /* original bitstream */
- put_bits(&s->pb, 1, 0); /* no time code 1 */
- put_bits(&s->pb, 1, 0); /* no time code 2 */
- put_bits(&s->pb, 1, 0); /* no additional bit stream info */
+ put_bits(&s->pb, 2, 0); /* surround not indicated */
+ put_bits(&s->pb, 1, s->lfe_on); /* LFE */
+ put_bits(&s->pb, 5, 31); /* dialog norm: -31 db */
+ put_bits(&s->pb, 1, 0); /* no compression control word */
+ put_bits(&s->pb, 1, 0); /* no lang code */
+ put_bits(&s->pb, 1, 0); /* no audio production info */
+ put_bits(&s->pb, 1, 0); /* no copyright */
+ put_bits(&s->pb, 1, 1); /* original bitstream */
+ put_bits(&s->pb, 1, 0); /* no time code 1 */
+ put_bits(&s->pb, 1, 0); /* no time code 2 */
+ put_bits(&s->pb, 1, 0); /* no additional bit stream info */
}
/* symetric quantization on 'levels' levels */
@@ -842,10 +839,10 @@ static void output_audio_block(AC3EncodeContext *s,
uint16_t *qmant1_ptr, *qmant2_ptr, *qmant4_ptr;
int delta0, delta1, delta2;
- for(ch=0;ch<s->fbw_channels;ch++)
+ for (ch = 0; ch < s->fbw_channels; ch++)
put_bits(&s->pb, 1, 0); /* 512 point MDCT */
- for(ch=0;ch<s->fbw_channels;ch++)
- put_bits(&s->pb, 1, 1); /* no dither */
+ for (ch = 0; ch < s->fbw_channels; ch++)
+ put_bits(&s->pb, 1, 1); /* dither */
put_bits(&s->pb, 1, 0); /* no dynamic range */
if (block_num == 0) {
/* for block 0, even if no coupling, we must say it. This is a
@@ -856,26 +853,22 @@ static void output_audio_block(AC3EncodeContext *s,
put_bits(&s->pb, 1, 0); /* no new coupling strategy */
}
- if (s->channel_mode == AC3_CHMODE_STEREO)
- {
- if(block_num==0)
- {
+ if (s->channel_mode == AC3_CHMODE_STEREO) {
+ if (block_num == 0) {
/* first block must define rematrixing (rematstr) */
put_bits(&s->pb, 1, 1);
/* dummy rematrixing rematflg(1:4)=0 */
- for (rbnd=0;rbnd<4;rbnd++)
- put_bits(&s->pb, 1, 0);
- }
- else
- {
+ for (rbnd = 0; rbnd < 4; rbnd++)
+ put_bits(&s->pb, 1, 0);
+ } else {
/* no matrixing (but should be used in the future) */
put_bits(&s->pb, 1, 0);
- }
- }
+ }
+ }
/* exponent strategy */
- for(ch=0;ch<s->fbw_channels;ch++) {
+ for (ch = 0; ch < s->fbw_channels; ch++) {
put_bits(&s->pb, 2, exp_strategy[ch]);
}
@@ -883,7 +876,7 @@ static void output_audio_block(AC3EncodeContext *s,
put_bits(&s->pb, 1, exp_strategy[s->lfe_ch]);
}
- for(ch=0;ch<s->fbw_channels;ch++) {
+ for (ch = 0; ch < s->fbw_channels; ch++) {
if (exp_strategy[ch] != EXP_REUSE)
put_bits(&s->pb, 6, s->bandwidth_code[ch]);
}
@@ -912,7 +905,7 @@ static void output_audio_block(AC3EncodeContext *s,
put_bits(&s->pb, 4, exp1);
/* next ones are delta encoded */
- for(i=0;i<nb_groups;i++) {
+ for (i = 0; i < nb_groups; i++) {
/* merge three delta in one code */
exp0 = exp1;
exp1 = p[0];
@@ -951,7 +944,7 @@ static void output_audio_block(AC3EncodeContext *s,
put_bits(&s->pb, 1, baie); /* always present with bai */
if (baie) {
put_bits(&s->pb, 6, s->coarse_snr_offset);
- for(ch=0;ch<s->channels;ch++) {
+ for (ch = 0; ch < s->channels; ch++) {
put_bits(&s->pb, 4, s->fine_snr_offset[ch]);
put_bits(&s->pb, 3, s->fast_gain_code[ch]);
}
@@ -965,13 +958,13 @@ static void output_audio_block(AC3EncodeContext *s,
modify the output stream. */
/* first pass: quantize */
- mant1_cnt = mant2_cnt = mant4_cnt = 0;
+ mant1_cnt = mant2_cnt = mant4_cnt = 0;
qmant1_ptr = qmant2_ptr = qmant4_ptr = NULL;
for (ch = 0; ch < s->channels; ch++) {
int b, c, e, v;
- for(i=0;i<s->nb_coefs[ch];i++) {
+ for (i = 0; i < s->nb_coefs[ch]; i++) {
c = mdct_coefs[ch][i];
e = encoded_exp[ch][i] - global_exp[ch];
b = bap[ch][i];
@@ -1058,36 +1051,18 @@ static void output_audio_block(AC3EncodeContext *s,
for (ch = 0; ch < s->channels; ch++) {
int b, q;
- for(i=0;i<s->nb_coefs[ch];i++) {
+ for (i = 0; i < s->nb_coefs[ch]; i++) {
q = qmant[ch][i];
b = bap[ch][i];
switch(b) {
- case 0:
- break;
- case 1:
- if (q != 128)
- put_bits(&s->pb, 5, q);
- break;
- case 2:
- if (q != 128)
- put_bits(&s->pb, 7, q);
- break;
- case 3:
- put_bits(&s->pb, 3, q);
- break;
- case 4:
- if (q != 128)
- put_bits(&s->pb, 7, q);
- break;
- case 14:
- put_bits(&s->pb, 14, q);
- break;
- case 15:
- put_bits(&s->pb, 16, q);
- break;
- default:
- put_bits(&s->pb, b - 1, q);
- break;
+ case 0: break;
+ case 1: if (q != 128) put_bits(&s->pb, 5, q); break;
+ case 2: if (q != 128) put_bits(&s->pb, 7, q); break;
+ case 3: put_bits(&s->pb, 3, q); break;
+ case 4: if (q != 128) put_bits(&s->pb, 7, q); break;
+ case 14: put_bits(&s->pb, 14, q); break;
+ case 15: put_bits(&s->pb, 16, q); break;
+ default: put_bits(&s->pb, b-1, q); break;
}
}
}
@@ -1131,7 +1106,7 @@ static int log2_tab(int16_t *tab, int n)
int i, v;
v = 0;
- for(i=0;i<n;i++) {
+ for (i = 0; i < n; i++) {
v |= abs(tab[i]);
}
return av_log2(v);
@@ -1142,12 +1117,12 @@ static void lshift_tab(int16_t *tab, int n, int lshift)
int i;
if (lshift > 0) {
- for(i=0;i<n;i++) {
+ for (i = 0; i < n; i++) {
tab[i] <<= lshift;
}
} else if (lshift < 0) {
lshift = -lshift;
- for(i=0;i<n;i++) {
+ for (i = 0; i < n; i++) {
tab[i] >>= lshift;
}
}
@@ -1166,23 +1141,23 @@ static int output_frame_end(AC3EncodeContext *s)
frame = s->pb.buf;
n = 2 * s->frame_size - (put_bits_ptr(&s->pb) - frame) - 2;
assert(n >= 0);
- if(n>0)
+ if (n > 0)
memset(put_bits_ptr(&s->pb), 0, n);
/* Now we must compute both crcs : this is not so easy for crc1
because it is at the beginning of the data... */
frame_size_58 = (frame_size >> 1) + (frame_size >> 3);
crc1 = av_bswap16(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0,
- frame + 4, 2 * frame_size_58 - 4));
+ frame + 4, 2 * frame_size_58 - 4));
/* XXX: could precompute crc_inv */
crc_inv = pow_poly((CRC16_POLY >> 1), (16 * frame_size_58) - 16, CRC16_POLY);
- crc1 = mul_poly(crc_inv, crc1, CRC16_POLY);
+ crc1 = mul_poly(crc_inv, crc1, CRC16_POLY);
AV_WB16(frame+2,crc1);
crc2 = av_bswap16(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0,
- frame + 2 * frame_size_58,
- (frame_size - frame_size_58) * 2 - 2));
- AV_WB16(frame+2*frame_size-2,crc2);
+ frame + 2 * frame_size_58,
+ (frame_size - frame_size_58) * 2 - 2));
+ AV_WB16(frame+2*frame_size-2, crc2);
// printf("n=%d frame_size=%d\n", n, frame_size);
return frame_size * 2;
@@ -1204,10 +1179,10 @@ static int AC3_encode_frame(AVCodecContext *avctx,
int frame_bits;
frame_bits = 0;
- for(ch=0;ch<s->channels;ch++) {
+ for (ch = 0; ch < s->channels; ch++) {
int ich = s->channel_map[ch];
/* fixed mdct to the six sub blocks & exponent computation */
- for(i=0;i<AC3_MAX_BLOCKS;i++) {
+ for (i = 0; i < AC3_MAX_BLOCKS; i++) {
const int16_t *sptr;
int sinc;
@@ -1215,19 +1190,19 @@ static int AC3_encode_frame(AVCodecContext *avctx,
memcpy(input_samples, s->last_samples[ich], AC3_BLOCK_SIZE * sizeof(int16_t));
sinc = s->channels;
sptr = samples + (sinc * AC3_BLOCK_SIZE * i) + ich;
- for(j=0;j<AC3_BLOCK_SIZE;j++) {
+ for (j = 0; j < AC3_BLOCK_SIZE; j++) {
v = *sptr;
input_samples[j + AC3_BLOCK_SIZE] = v;
- s->last_samples[ich][j] = v;
+ s->last_samples[ich][j] = v;
sptr += sinc;
}
/* apply the MDCT window */
- for(j=0;j<AC3_BLOCK_SIZE;j++) {
- input_samples[j] = MUL16(input_samples[j],
- ff_ac3_window[j]) >> 15;
+ for (j = 0; j < AC3_BLOCK_SIZE; j++) {
+ input_samples[j] = MUL16(input_samples[j],
+ ff_ac3_window[j]) >> 15;
input_samples[AC3_BLOCK_SIZE*2-j-1] = MUL16(input_samples[AC3_BLOCK_SIZE*2-j-1],
- ff_ac3_window[j]) >> 15;
+ ff_ac3_window[j]) >> 15;
}
/* Normalize the samples to use the maximum available
@@ -1243,7 +1218,7 @@ static int AC3_encode_frame(AVCodecContext *avctx,
/* compute "exponents". We take into account the
normalization there */
- for(j=0;j<AC3_MAX_COEFS;j++) {
+ for (j = 0; j < AC3_MAX_COEFS; j++) {
int e;
v = abs(mdct_coef[i][ch][j]);
if (v == 0)
@@ -1275,7 +1250,7 @@ static int AC3_encode_frame(AVCodecContext *avctx,
exp[i][ch], s->nb_coefs[ch],
exp_strategy[i][ch]);
/* copy encoded exponents for reuse case */
- for(k=i+1;k<j;k++) {
+ for (k = i+1; k < j; k++) {
memcpy(encoded_exp[k][ch], encoded_exp[i][ch],
s->nb_coefs[ch] * sizeof(uint8_t));
}
@@ -1284,21 +1259,21 @@ static int AC3_encode_frame(AVCodecContext *avctx,
}
/* adjust for fractional frame sizes */
- while(s->bits_written >= s->bit_rate && s->samples_written >= s->sample_rate) {
- s->bits_written -= s->bit_rate;
+ while (s->bits_written >= s->bit_rate && s->samples_written >= s->sample_rate) {
+ s->bits_written -= s->bit_rate;
s->samples_written -= s->sample_rate;
}
- s->frame_size = s->frame_size_min + (s->bits_written * s->sample_rate < s->samples_written * s->bit_rate);
- s->bits_written += s->frame_size * 16;
+ s->frame_size = s->frame_size_min + (s->bits_written * s->sample_rate < s->samples_written * s->bit_rate);
+ s->bits_written += s->frame_size * 16;
s->samples_written += AC3_FRAME_SIZE;
compute_bit_allocation(s, bap, encoded_exp, exp_strategy, frame_bits);
/* everything is known... let's output the frame */
output_frame_header(s, frame);
- for(i=0;i<AC3_MAX_BLOCKS;i++) {
- output_audio_block(s, exp_strategy[i], encoded_exp[i],
- bap[i], mdct_coef[i], exp_samples[i], i);
+ for( i = 0; i < AC3_MAX_BLOCKS; i++) {
+ output_audio_block(s, exp_strategy[i], encoded_exp[i], bap[i],
+ mdct_coef[i], exp_samples[i], i);
}
return output_frame_end(s);
}
@@ -1325,18 +1300,18 @@ static void fft_test(AVLFG *lfg)
/* FFT test */
- for(i=0;i<FN;i++) {
+ for (i = 0; i < FN; i++) {
in[i].re = av_lfg_get(lfg) % 65535 - 32767;
in[i].im = av_lfg_get(lfg) % 65535 - 32767;
- in1[i] = in[i];
+ in1[i] = in[i];
}
fft(in, 7);
/* do it by hand */
- for(k=0;k<FN;k++) {
+ for (k = 0; k < FN; k++) {
sum_re = 0;
sum_im = 0;
- for(n=0;n<FN;n++) {
+ for (n = 0; n < FN; n++) {
a = -2 * M_PI * (n * k) / FN;
sum_re += in1[n].re * cos(a) - in1[n].im * sin(a);
sum_im += in1[n].re * sin(a) + in1[n].im * cos(a);
@@ -1355,26 +1330,26 @@ static void mdct_test(AVLFG *lfg)
float s, a, err, e, emax;
int i, k, n;
- for(i=0;i<MDCT_SAMPLES;i++) {
- input[i] = (av_lfg_get(lfg) % 65535 - 32767) * 9 / 10;
+ for (i = 0; i < MDCT_SAMPLES; i++) {
+ input[i] = (av_lfg_get(lfg) % 65535 - 32767) * 9 / 10;
input1[i] = input[i];
}
mdct512(output, input);
/* do it by hand */
- for(k=0;k<AC3_MAX_COEFS;k++) {
+ for (k = 0; k < AC3_MAX_COEFS; k++) {
s = 0;
- for(n=0;n<MDCT_SAMPLES;n++) {
- a = (2*M_PI*(2*n+1+MDCT_SAMPLES/2)*(2*k+1) / (4 * MDCT_SAMPLES));
+ for (n = 0; n < MDCT_SAMPLES; n++) {
+ a = (2*M_PI * (2*n + 1 + MDCT_SAMPLES/2) * (2*k + 1) / (4*MDCT_SAMPLES));
s += input1[n] * cos(a);
}
output1[k] = -2 * s / MDCT_SAMPLES;
}
- err = 0;
+ err = 0;
emax = 0;
- for(i=0;i<AC3_MAX_COEFS;i++) {
+ for (i = 0; i < AC3_MAX_COEFS; i++) {
av_log(NULL, AV_LOG_DEBUG, "%3d: %7d %7.0f\n", i, output[i], output1[i]);
e = output[i] - output1[i];
if (e > emax)
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
