mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-28 12:32:17 +02:00
cosmetics: alignment after last commit
Originally committed as revision 16035 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
72a6244b5d
commit
20e047262f
@ -81,10 +81,10 @@ void ff_ac3_bit_alloc_calc_psd(int8_t *exp, int start, int end, int16_t *psd,
|
|||||||
}
|
}
|
||||||
|
|
||||||
int ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd,
|
int ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd,
|
||||||
int start, int end, int fast_gain, int is_lfe,
|
int start, int end, int fast_gain, int is_lfe,
|
||||||
int dba_mode, int dba_nsegs, uint8_t *dba_offsets,
|
int dba_mode, int dba_nsegs, uint8_t *dba_offsets,
|
||||||
uint8_t *dba_lengths, uint8_t *dba_values,
|
uint8_t *dba_lengths, uint8_t *dba_values,
|
||||||
int16_t *mask)
|
int16_t *mask)
|
||||||
{
|
{
|
||||||
int16_t excite[50]; /* excitation */
|
int16_t excite[50]; /* excitation */
|
||||||
int bin, k;
|
int bin, k;
|
||||||
|
@ -152,10 +152,10 @@ void ff_ac3_bit_alloc_calc_psd(int8_t *exp, int start, int end, int16_t *psd,
|
|||||||
* @return returns 0 for success, non-zero for error
|
* @return returns 0 for success, non-zero for error
|
||||||
*/
|
*/
|
||||||
int ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd,
|
int ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd,
|
||||||
int start, int end, int fast_gain, int is_lfe,
|
int start, int end, int fast_gain, int is_lfe,
|
||||||
int dba_mode, int dba_nsegs, uint8_t *dba_offsets,
|
int dba_mode, int dba_nsegs, uint8_t *dba_offsets,
|
||||||
uint8_t *dba_lengths, uint8_t *dba_values,
|
uint8_t *dba_lengths, uint8_t *dba_values,
|
||||||
int16_t *mask);
|
int16_t *mask);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Calculates bit allocation pointers.
|
* Calculates bit allocation pointers.
|
||||||
|
@ -1134,11 +1134,11 @@ static int decode_audio_block(AC3DecodeContext *s, int blk)
|
|||||||
/* Compute excitation function, Compute masking curve, and
|
/* Compute excitation function, Compute masking curve, and
|
||||||
Apply delta bit allocation */
|
Apply delta bit allocation */
|
||||||
if (ff_ac3_bit_alloc_calc_mask(&s->bit_alloc_params, s->band_psd[ch],
|
if (ff_ac3_bit_alloc_calc_mask(&s->bit_alloc_params, s->band_psd[ch],
|
||||||
s->start_freq[ch], s->end_freq[ch],
|
s->start_freq[ch], s->end_freq[ch],
|
||||||
s->fast_gain[ch], (ch == s->lfe_ch),
|
s->fast_gain[ch], (ch == s->lfe_ch),
|
||||||
s->dba_mode[ch], s->dba_nsegs[ch],
|
s->dba_mode[ch], s->dba_nsegs[ch],
|
||||||
s->dba_offsets[ch], s->dba_lengths[ch],
|
s->dba_offsets[ch], s->dba_lengths[ch],
|
||||||
s->dba_values[ch], s->mask[ch])) {
|
s->dba_values[ch], s->mask[ch])) {
|
||||||
av_log(s->avctx, AV_LOG_ERROR, "error in bit allocation\n");
|
av_log(s->avctx, AV_LOG_ERROR, "error in bit allocation\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user