#include "avcodec.h"
#include "ac3_parser.h"
#include "bitstream.h"
+#include "crc.h"
#include "dsputil.h"
#include "random.h"
uint8_t dba_lengths[AC3_MAX_CHANNELS][8]; ///< delta segment lengths
uint8_t dba_values[AC3_MAX_CHANNELS][8]; ///< delta values for each segment
- int sampling_rate; ///< sample frequency, in Hz
+ int sample_rate; ///< sample frequency, in Hz
int bit_rate; ///< stream bit rate, in bits-per-second
int frame_size; ///< current frame size, in bytes
surround_mix_level = gain_levels[surround_levels[hdr.surround_mix_level]];
s->lfe_on = hdr.lfe_on;
s->bit_alloc_params.sr_shift = hdr.sr_shift;
- s->sampling_rate = hdr.sample_rate;
+ s->sample_rate = hdr.sample_rate;
s->bit_rate = hdr.bit_rate;
s->channels = hdr.channels;
s->fbw_channels = s->channels - s->lfe_on;
else
end = s->end_freq[ch];
for(i=0; i<end; i++) {
- if(bap[i] == 0)
+ if(!bap[i])
coeffs[i] = 0.0f;
}
if(s->channel_in_cpl[ch]) {
bap = s->bap[CPL_CH];
for(; i<s->end_freq[CPL_CH]; i++) {
- if(bap[i] == 0)
+ if(!bap[i])
coeffs[i] = 0.0f;
}
}
/**
* Downmix the output to mono or stereo.
*/
-static void ac3_downmix(float samples[AC3_MAX_CHANNELS][256], int fbw_channels,
- int output_mode, float coef[AC3_MAX_CHANNELS][2])
+static void ac3_downmix(AC3DecodeContext *s)
{
int i, j;
float v0, v1, s0, s1;
for(i=0; i<256; i++) {
v0 = v1 = s0 = s1 = 0.0f;
- for(j=0; j<fbw_channels; j++) {
- v0 += samples[j][i] * coef[j][0];
- v1 += samples[j][i] * coef[j][1];
- s0 += coef[j][0];
- s1 += coef[j][1];
+ for(j=0; j<s->fbw_channels; j++) {
+ v0 += s->output[j][i] * s->downmix_coeffs[j][0];
+ v1 += s->output[j][i] * s->downmix_coeffs[j][1];
+ s0 += s->downmix_coeffs[j][0];
+ s1 += s->downmix_coeffs[j][1];
}
v0 /= s0;
v1 /= s1;
- if(output_mode == AC3_CHMODE_MONO) {
- samples[0][i] = (v0 + v1) * LEVEL_MINUS_3DB;
- } else if(output_mode == AC3_CHMODE_STEREO) {
- samples[0][i] = v0;
- samples[1][i] = v1;
+ if(s->output_mode == AC3_CHMODE_MONO) {
+ s->output[0][i] = (v0 + v1) * LEVEL_MINUS_3DB;
+ } else if(s->output_mode == AC3_CHMODE_STEREO) {
+ s->output[0][i] = v0;
+ s->output[1][i] = v1;
}
}
}
/* downmix output if needed */
if(s->channels != s->out_channels && !((s->output_mode & AC3_OUTPUT_LFEON) &&
s->fbw_channels == s->out_channels)) {
- ac3_downmix(s->output, s->fbw_channels, s->output_mode,
- s->downmix_coeffs);
+ ac3_downmix(s);
}
/* convert float to 16-bit integer */
return -1;
}
- avctx->sample_rate = s->sampling_rate;
- avctx->bit_rate = s->bit_rate;
-
/* check that reported frame size fits in input buffer */
if(s->frame_size > buf_size) {
av_log(avctx, AV_LOG_ERROR, "incomplete frame\n");
return -1;
}
+ /* check for crc mismatch */
+ if(avctx->error_resilience > 0) {
+ if(av_crc(av_crc8005, 0, &buf[2], s->frame_size-2)) {
+ av_log(avctx, AV_LOG_ERROR, "frame CRC mismatch\n");
+ return -1;
+ }
+ /* TODO: error concealment */
+ }
+
+ avctx->sample_rate = s->sample_rate;
+ avctx->bit_rate = s->bit_rate;
+
/* channel config */
s->out_channels = s->channels;
if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&