* Copyright (C) 2004 Benjamin Zores
* Copyright (C) 2006 Benjamin Larsson
* Copyright (C) 2007 Konstantin Shishkov
+ * Copyright (C) 2012 Paul B Mahol
+ * Copyright (C) 2014 Niels Möller
*
* This file is part of Libav.
*
#include <stddef.h>
#include <stdio.h>
+#include "libavutil/attributes.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/float_dsp.h"
#include "avcodec.h"
#include "dca.h"
+#include "dca_syncwords.h"
#include "dcadata.h"
#include "dcadsp.h"
#include "dcahuff.h"
-#include "dca_exss.h"
#include "fft.h"
#include "fmtconvert.h"
#include "get_bits.h"
#include "internal.h"
#include "mathops.h"
+#include "profiles.h"
#include "put_bits.h"
#include "synth_filter.h"
dca_bitalloc_index.offset = 1;
dca_bitalloc_index.wrap = 2;
for (i = 0; i < 5; i++) {
- dca_bitalloc_index.vlc[i].table = &dca_table[dca_vlc_offs[i]];
- dca_bitalloc_index.vlc[i].table_allocated = dca_vlc_offs[i + 1] - dca_vlc_offs[i];
+ dca_bitalloc_index.vlc[i].table = &dca_table[ff_dca_vlc_offs[i]];
+ dca_bitalloc_index.vlc[i].table_allocated = ff_dca_vlc_offs[i + 1] - ff_dca_vlc_offs[i];
init_vlc(&dca_bitalloc_index.vlc[i], bitalloc_12_vlc_bits[i], 12,
bitalloc_12_bits[i], 1, 1,
bitalloc_12_codes[i], 2, 2, INIT_VLC_USE_NEW_STATIC);
dca_scalefactor.offset = -64;
dca_scalefactor.wrap = 2;
for (i = 0; i < 5; i++) {
- dca_scalefactor.vlc[i].table = &dca_table[dca_vlc_offs[i + 5]];
- dca_scalefactor.vlc[i].table_allocated = dca_vlc_offs[i + 6] - dca_vlc_offs[i + 5];
+ dca_scalefactor.vlc[i].table = &dca_table[ff_dca_vlc_offs[i + 5]];
+ dca_scalefactor.vlc[i].table_allocated = ff_dca_vlc_offs[i + 6] - ff_dca_vlc_offs[i + 5];
init_vlc(&dca_scalefactor.vlc[i], SCALES_VLC_BITS, 129,
scales_bits[i], 1, 1,
scales_codes[i], 2, 2, INIT_VLC_USE_NEW_STATIC);
dca_tmode.offset = 0;
dca_tmode.wrap = 1;
for (i = 0; i < 4; i++) {
- dca_tmode.vlc[i].table = &dca_table[dca_vlc_offs[i + 10]];
- dca_tmode.vlc[i].table_allocated = dca_vlc_offs[i + 11] - dca_vlc_offs[i + 10];
+ dca_tmode.vlc[i].table = &dca_table[ff_dca_vlc_offs[i + 10]];
+ dca_tmode.vlc[i].table_allocated = ff_dca_vlc_offs[i + 11] - ff_dca_vlc_offs[i + 10];
init_vlc(&dca_tmode.vlc[i], tmode_vlc_bits[i], 4,
tmode_bits[i], 1, 1,
tmode_codes[i], 2, 2, INIT_VLC_USE_NEW_STATIC);
break;
dca_smpl_bitalloc[i + 1].offset = bitalloc_offsets[i];
dca_smpl_bitalloc[i + 1].wrap = 1 + (j > 4);
- dca_smpl_bitalloc[i + 1].vlc[j].table = &dca_table[dca_vlc_offs[c]];
- dca_smpl_bitalloc[i + 1].vlc[j].table_allocated = dca_vlc_offs[c + 1] - dca_vlc_offs[c];
+ dca_smpl_bitalloc[i + 1].vlc[j].table = &dca_table[ff_dca_vlc_offs[c]];
+ dca_smpl_bitalloc[i + 1].vlc[j].table_allocated = ff_dca_vlc_offs[c + 1] - ff_dca_vlc_offs[c];
init_vlc(&dca_smpl_bitalloc[i + 1].vlc[j], bitalloc_maxbits[i][j],
bitalloc_sizes[i],
static int dca_parse_audio_coding_header(DCAContext *s, int base_channel)
{
int i, j;
- static const float adj_table[4] = { 1.0, 1.1250, 1.2500, 1.4375 };
+ static const uint8_t adj_table[4] = { 16, 18, 20, 23 };
static const int bitlen[11] = { 0, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3 };
static const int thr[11] = { 0, 1, 3, 3, 3, 3, 7, 7, 7, 7, 7 };
- s->total_channels = get_bits(&s->gb, 3) + 1 + base_channel;
- s->prim_channels = s->total_channels;
+ s->audio_header.total_channels = get_bits(&s->gb, 3) + 1 + base_channel;
+ s->audio_header.prim_channels = s->audio_header.total_channels;
- if (s->prim_channels > DCA_PRIM_CHANNELS_MAX)
- s->prim_channels = DCA_PRIM_CHANNELS_MAX;
+ if (s->audio_header.prim_channels > DCA_PRIM_CHANNELS_MAX)
+ s->audio_header.prim_channels = DCA_PRIM_CHANNELS_MAX;
- for (i = base_channel; i < s->prim_channels; i++) {
- s->subband_activity[i] = get_bits(&s->gb, 5) + 2;
- if (s->subband_activity[i] > DCA_SUBBANDS)
- s->subband_activity[i] = DCA_SUBBANDS;
+ for (i = base_channel; i < s->audio_header.prim_channels; i++) {
+ s->audio_header.subband_activity[i] = get_bits(&s->gb, 5) + 2;
+ if (s->audio_header.subband_activity[i] > DCA_SUBBANDS)
+ s->audio_header.subband_activity[i] = DCA_SUBBANDS;
}
- for (i = base_channel; i < s->prim_channels; i++) {
- s->vq_start_subband[i] = get_bits(&s->gb, 5) + 1;
- if (s->vq_start_subband[i] > DCA_SUBBANDS)
- s->vq_start_subband[i] = DCA_SUBBANDS;
+ for (i = base_channel; i < s->audio_header.prim_channels; i++) {
+ s->audio_header.vq_start_subband[i] = get_bits(&s->gb, 5) + 1;
+ if (s->audio_header.vq_start_subband[i] > DCA_SUBBANDS)
+ s->audio_header.vq_start_subband[i] = DCA_SUBBANDS;
}
- get_array(&s->gb, s->joint_intensity + base_channel, s->prim_channels - base_channel, 3);
- get_array(&s->gb, s->transient_huffman + base_channel, s->prim_channels - base_channel, 2);
- get_array(&s->gb, s->scalefactor_huffman + base_channel, s->prim_channels - base_channel, 3);
- get_array(&s->gb, s->bitalloc_huffman + base_channel, s->prim_channels - base_channel, 3);
+ get_array(&s->gb, s->audio_header.joint_intensity + base_channel,
+ s->audio_header.prim_channels - base_channel, 3);
+ get_array(&s->gb, s->audio_header.transient_huffman + base_channel,
+ s->audio_header.prim_channels - base_channel, 2);
+ get_array(&s->gb, s->audio_header.scalefactor_huffman + base_channel,
+ s->audio_header.prim_channels - base_channel, 3);
+ get_array(&s->gb, s->audio_header.bitalloc_huffman + base_channel,
+ s->audio_header.prim_channels - base_channel, 3);
/* Get codebooks quantization indexes */
if (!base_channel)
- memset(s->quant_index_huffman, 0, sizeof(s->quant_index_huffman));
+ memset(s->audio_header.quant_index_huffman, 0, sizeof(s->audio_header.quant_index_huffman));
for (j = 1; j < 11; j++)
- for (i = base_channel; i < s->prim_channels; i++)
- s->quant_index_huffman[i][j] = get_bits(&s->gb, bitlen[j]);
+ for (i = base_channel; i < s->audio_header.prim_channels; i++)
+ s->audio_header.quant_index_huffman[i][j] = get_bits(&s->gb, bitlen[j]);
/* Get scale factor adjustment */
for (j = 0; j < 11; j++)
- for (i = base_channel; i < s->prim_channels; i++)
- s->scalefactor_adj[i][j] = 1;
+ for (i = base_channel; i < s->audio_header.prim_channels; i++)
+ s->audio_header.scalefactor_adj[i][j] = 16;
for (j = 1; j < 11; j++)
- for (i = base_channel; i < s->prim_channels; i++)
- if (s->quant_index_huffman[i][j] < thr[j])
- s->scalefactor_adj[i][j] = adj_table[get_bits(&s->gb, 2)];
+ for (i = base_channel; i < s->audio_header.prim_channels; i++)
+ if (s->audio_header.quant_index_huffman[i][j] < thr[j])
+ s->audio_header.scalefactor_adj[i][j] = adj_table[get_bits(&s->gb, 2)];
if (s->crc_present) {
/* Audio header CRC check */
if (!s->sample_rate)
return AVERROR_INVALIDDATA;
s->bit_rate_index = get_bits(&s->gb, 5);
- s->bit_rate = dca_bit_rates[s->bit_rate_index];
+ s->bit_rate = ff_dca_bit_rates[s->bit_rate_index];
if (!s->bit_rate)
return AVERROR_INVALIDDATA;
s->output |= DCA_LFE;
/* Primary audio coding header */
- s->subframes = get_bits(&s->gb, 4) + 1;
+ s->audio_header.subframes = get_bits(&s->gb, 4) + 1;
return dca_parse_audio_coding_header(s, 0);
}
s->partial_samples[s->current_subframe] = get_bits(&s->gb, 3);
}
- for (j = base_channel; j < s->prim_channels; j++) {
- for (k = 0; k < s->subband_activity[j]; k++)
- s->prediction_mode[j][k] = get_bits(&s->gb, 1);
+ for (j = base_channel; j < s->audio_header.prim_channels; j++) {
+ for (k = 0; k < s->audio_header.subband_activity[j]; k++)
+ s->dca_chan[j].prediction_mode[k] = get_bits(&s->gb, 1);
}
/* Get prediction codebook */
- for (j = base_channel; j < s->prim_channels; j++) {
- for (k = 0; k < s->subband_activity[j]; k++) {
- if (s->prediction_mode[j][k] > 0) {
+ for (j = base_channel; j < s->audio_header.prim_channels; j++) {
+ for (k = 0; k < s->audio_header.subband_activity[j]; k++) {
+ if (s->dca_chan[j].prediction_mode[k] > 0) {
/* (Prediction coefficient VQ address) */
- s->prediction_vq[j][k] = get_bits(&s->gb, 12);
+ s->dca_chan[j].prediction_vq[k] = get_bits(&s->gb, 12);
}
}
}
/* Bit allocation index */
- for (j = base_channel; j < s->prim_channels; j++) {
- for (k = 0; k < s->vq_start_subband[j]; k++) {
- if (s->bitalloc_huffman[j] == 6)
- s->bitalloc[j][k] = get_bits(&s->gb, 5);
- else if (s->bitalloc_huffman[j] == 5)
- s->bitalloc[j][k] = get_bits(&s->gb, 4);
- else if (s->bitalloc_huffman[j] == 7) {
+ for (j = base_channel; j < s->audio_header.prim_channels; j++) {
+ for (k = 0; k < s->audio_header.vq_start_subband[j]; k++) {
+ if (s->audio_header.bitalloc_huffman[j] == 6)
+ s->dca_chan[j].bitalloc[k] = get_bits(&s->gb, 5);
+ else if (s->audio_header.bitalloc_huffman[j] == 5)
+ s->dca_chan[j].bitalloc[k] = get_bits(&s->gb, 4);
+ else if (s->audio_header.bitalloc_huffman[j] == 7) {
av_log(s->avctx, AV_LOG_ERROR,
"Invalid bit allocation index\n");
return AVERROR_INVALIDDATA;
} else {
- s->bitalloc[j][k] =
- get_bitalloc(&s->gb, &dca_bitalloc_index, s->bitalloc_huffman[j]);
+ s->dca_chan[j].bitalloc[k] =
+ get_bitalloc(&s->gb, &dca_bitalloc_index, s->audio_header.bitalloc_huffman[j]);
}
- if (s->bitalloc[j][k] > 26) {
- av_dlog(s->avctx, "bitalloc index [%i][%i] too big (%i)\n",
- j, k, s->bitalloc[j][k]);
+ if (s->dca_chan[j].bitalloc[k] > 26) {
+ ff_dlog(s->avctx, "bitalloc index [%i][%i] too big (%i)\n",
+ j, k, s->dca_chan[j].bitalloc[k]);
return AVERROR_INVALIDDATA;
}
}
}
/* Transition mode */
- for (j = base_channel; j < s->prim_channels; j++) {
- for (k = 0; k < s->subband_activity[j]; k++) {
- s->transition_mode[j][k] = 0;
+ for (j = base_channel; j < s->audio_header.prim_channels; j++) {
+ for (k = 0; k < s->audio_header.subband_activity[j]; k++) {
+ s->dca_chan[j].transition_mode[k] = 0;
if (s->subsubframes[s->current_subframe] > 1 &&
- k < s->vq_start_subband[j] && s->bitalloc[j][k] > 0) {
- s->transition_mode[j][k] =
- get_bitalloc(&s->gb, &dca_tmode, s->transient_huffman[j]);
+ k < s->audio_header.vq_start_subband[j] && s->dca_chan[j].bitalloc[k] > 0) {
+ s->dca_chan[j].transition_mode[k] =
+ get_bitalloc(&s->gb, &dca_tmode, s->audio_header.transient_huffman[j]);
}
}
}
if (get_bits_left(&s->gb) < 0)
return AVERROR_INVALIDDATA;
- for (j = base_channel; j < s->prim_channels; j++) {
+ for (j = base_channel; j < s->audio_header.prim_channels; j++) {
const uint32_t *scale_table;
int scale_sum, log_size;
- memset(s->scale_factor[j], 0,
- s->subband_activity[j] * sizeof(s->scale_factor[0][0][0]) * 2);
+ memset(s->dca_chan[j].scale_factor, 0,
+ s->audio_header.subband_activity[j] * sizeof(s->dca_chan[j].scale_factor[0][0]) * 2);
- if (s->scalefactor_huffman[j] == 6) {
- scale_table = scale_factor_quant7;
+ if (s->audio_header.scalefactor_huffman[j] == 6) {
+ scale_table = ff_dca_scale_factor_quant7;
log_size = 7;
} else {
- scale_table = scale_factor_quant6;
+ scale_table = ff_dca_scale_factor_quant6;
log_size = 6;
}
/* When huffman coded, only the difference is encoded */
scale_sum = 0;
- for (k = 0; k < s->subband_activity[j]; k++) {
- if (k >= s->vq_start_subband[j] || s->bitalloc[j][k] > 0) {
- scale_sum = get_scale(&s->gb, s->scalefactor_huffman[j], scale_sum, log_size);
- s->scale_factor[j][k][0] = scale_table[scale_sum];
+ for (k = 0; k < s->audio_header.subband_activity[j]; k++) {
+ if (k >= s->audio_header.vq_start_subband[j] || s->dca_chan[j].bitalloc[k] > 0) {
+ scale_sum = get_scale(&s->gb, s->audio_header.scalefactor_huffman[j], scale_sum, log_size);
+ s->dca_chan[j].scale_factor[k][0] = scale_table[scale_sum];
}
- if (k < s->vq_start_subband[j] && s->transition_mode[j][k]) {
+ if (k < s->audio_header.vq_start_subband[j] && s->dca_chan[j].transition_mode[k]) {
/* Get second scale factor */
- scale_sum = get_scale(&s->gb, s->scalefactor_huffman[j], scale_sum, log_size);
- s->scale_factor[j][k][1] = scale_table[scale_sum];
+ scale_sum = get_scale(&s->gb, s->audio_header.scalefactor_huffman[j], scale_sum, log_size);
+ s->dca_chan[j].scale_factor[k][1] = scale_table[scale_sum];
}
}
}
/* Joint subband scale factor codebook select */
- for (j = base_channel; j < s->prim_channels; j++) {
+ for (j = base_channel; j < s->audio_header.prim_channels; j++) {
/* Transmitted only if joint subband coding enabled */
- if (s->joint_intensity[j] > 0)
- s->joint_huff[j] = get_bits(&s->gb, 3);
+ if (s->audio_header.joint_intensity[j] > 0)
+ s->dca_chan[j].joint_huff = get_bits(&s->gb, 3);
}
if (get_bits_left(&s->gb) < 0)
return AVERROR_INVALIDDATA;
/* Scale factors for joint subband coding */
- for (j = base_channel; j < s->prim_channels; j++) {
+ for (j = base_channel; j < s->audio_header.prim_channels; j++) {
int source_channel;
/* Transmitted only if joint subband coding enabled */
- if (s->joint_intensity[j] > 0) {
+ if (s->audio_header.joint_intensity[j] > 0) {
int scale = 0;
- source_channel = s->joint_intensity[j] - 1;
+ source_channel = s->audio_header.joint_intensity[j] - 1;
/* When huffman coded, only the difference is encoded
* (is this valid as well for joint scales ???) */
- for (k = s->subband_activity[j]; k < s->subband_activity[source_channel]; k++) {
- scale = get_scale(&s->gb, s->joint_huff[j], 64 /* bias */, 7);
- s->joint_scale_factor[j][k] = scale; /*joint_scale_table[scale]; */
+ for (k = s->audio_header.subband_activity[j];
+ k < s->audio_header.subband_activity[source_channel]; k++) {
+ scale = get_scale(&s->gb, s->dca_chan[j].joint_huff, 64 /* bias */, 7);
+ s->dca_chan[j].joint_scale_factor[k] = scale; /*joint_scale_table[scale]; */
}
if (!(s->debug_flag & 0x02)) {
*/
/* VQ encoded high frequency subbands */
- for (j = base_channel; j < s->prim_channels; j++)
- for (k = s->vq_start_subband[j]; k < s->subband_activity[j]; k++)
+ for (j = base_channel; j < s->audio_header.prim_channels; j++)
+ for (k = s->audio_header.vq_start_subband[j]; k < s->audio_header.subband_activity[j]; k++)
/* 1 vector -> 32 samples */
- s->high_freq_vq[j][k] = get_bits(&s->gb, 10);
+ s->dca_chan[j].high_freq_vq[k] = get_bits(&s->gb, 10);
/* Low frequency effect data */
if (!base_channel && s->lfe) {
/* Scale factor index */
skip_bits(&s->gb, 1);
- s->lfe_scale_factor = scale_factor_quant7[get_bits(&s->gb, 7)];
+ s->lfe_scale_factor = ff_dca_scale_factor_quant7[get_bits(&s->gb, 7)];
/* Quantization step size * scale factor */
lfe_scale = 0.035 * s->lfe_scale_factor;
}
static void qmf_32_subbands(DCAContext *s, int chans,
- float samples_in[32][8], float *samples_out,
+ float samples_in[DCA_SUBBANDS][SAMPLES_PER_SUBBAND], float *samples_out,
float scale)
{
const float *prCoeff;
- int sb_act = s->subband_activity[chans];
+ int sb_act = s->audio_header.subband_activity[chans];
scale *= sqrt(1 / 8.0);
/* Select filter */
if (!s->multirate_inter) /* Non-perfect reconstruction */
- prCoeff = fir_32bands_nonperfect;
+ prCoeff = ff_dca_fir_32bands_nonperfect;
else /* Perfect reconstruction */
- prCoeff = fir_32bands_perfect;
+ prCoeff = ff_dca_fir_32bands_perfect;
s->dcadsp.qmf_32_subbands(samples_in, sb_act, &s->synth, &s->imdct,
- s->subband_fir_hist[chans],
- &s->hist_index[chans],
- s->subband_fir_noidea[chans], prCoeff,
+ s->dca_chan[chans].subband_fir_hist,
+ &s->dca_chan[chans].hist_index,
+ s->dca_chan[chans].subband_fir_noidea, prCoeff,
samples_out, s->raXin, scale);
}
-static void lfe_interpolation_fir(DCAContext *s, int decimation_select,
- int num_deci_sample, float *samples_in,
+static QMF64_table *qmf64_precompute(void)
+{
+ unsigned i, j;
+ QMF64_table *table = av_malloc(sizeof(*table));
+ if (!table)
+ return NULL;
+
+ for (i = 0; i < 32; i++)
+ for (j = 0; j < 32; j++)
+ table->dct4_coeff[i][j] = cos((2 * i + 1) * (2 * j + 1) * M_PI / 128);
+ for (i = 0; i < 32; i++)
+ for (j = 0; j < 32; j++)
+ table->dct2_coeff[i][j] = cos((2 * i + 1) * j * M_PI / 64);
+
+ /* FIXME: Is the factor 0.125 = 1/8 right? */
+ for (i = 0; i < 32; i++)
+ table->rcos[i] = 0.125 / cos((2 * i + 1) * M_PI / 256);
+ for (i = 0; i < 32; i++)
+ table->rsin[i] = -0.125 / sin((2 * i + 1) * M_PI / 256);
+
+ return table;
+}
+
+/* FIXME: Totally unoptimized. Based on the reference code and
+ * http://multimedia.cx/mirror/dca-transform.pdf, with guessed tweaks
+ * for doubling the size. */
+static void qmf_64_subbands(DCAContext *s, int chans,
+ float samples_in[DCA_SUBBANDS_X96K][SAMPLES_PER_SUBBAND],
+ float *samples_out, float scale)
+{
+ float raXin[64];
+ float A[32], B[32];
+ float *raX = s->dca_chan[chans].subband_fir_hist;
+ float *raZ = s->dca_chan[chans].subband_fir_noidea;
+ unsigned i, j, k, subindex;
+
+ for (i = s->audio_header.subband_activity[chans]; i < DCA_SUBBANDS_X96K; i++)
+ raXin[i] = 0.0;
+ for (subindex = 0; subindex < SAMPLES_PER_SUBBAND; subindex++) {
+ for (i = 0; i < s->audio_header.subband_activity[chans]; i++)
+ raXin[i] = samples_in[i][subindex];
+
+ for (k = 0; k < 32; k++) {
+ A[k] = 0.0;
+ for (i = 0; i < 32; i++)
+ A[k] += (raXin[2 * i] + raXin[2 * i + 1]) * s->qmf64_table->dct4_coeff[k][i];
+ }
+ for (k = 0; k < 32; k++) {
+ B[k] = raXin[0] * s->qmf64_table->dct2_coeff[k][0];
+ for (i = 1; i < 32; i++)
+ B[k] += (raXin[2 * i] + raXin[2 * i - 1]) * s->qmf64_table->dct2_coeff[k][i];
+ }
+ for (k = 0; k < 32; k++) {
+ raX[k] = s->qmf64_table->rcos[k] * (A[k] + B[k]);
+ raX[63 - k] = s->qmf64_table->rsin[k] * (A[k] - B[k]);
+ }
+
+ for (i = 0; i < DCA_SUBBANDS_X96K; i++) {
+ float out = raZ[i];
+ for (j = 0; j < 1024; j += 128)
+ out += ff_dca_fir_64bands[j + i] * (raX[j + i] - raX[j + 63 - i]);
+ *samples_out++ = out * scale;
+ }
+
+ for (i = 0; i < DCA_SUBBANDS_X96K; i++) {
+ float hist = 0.0;
+ for (j = 0; j < 1024; j += 128)
+ hist += ff_dca_fir_64bands[64 + j + i] * (-raX[i + j] - raX[j + 63 - i]);
+
+ raZ[i] = hist;
+ }
+
+ /* FIXME: Make buffer circular, to avoid this move. */
+ memmove(raX + 64, raX, (1024 - 64) * sizeof(*raX));
+ }
+}
+
+static void lfe_interpolation_fir(DCAContext *s, const float *samples_in,
float *samples_out)
{
/* samples_in: An array holding decimated samples.
int deciindex;
/* Select decimation filter */
- if (decimation_select == 1) {
+ if (s->lfe == 1) {
idx = 1;
- prCoeff = lfe_fir_128;
+ prCoeff = ff_dca_lfe_fir_128;
} else {
- idx = 0;
- prCoeff = lfe_fir_64;
+ idx = 0;
+ if (s->exss_ext_mask & DCA_EXT_EXSS_XLL)
+ prCoeff = ff_dca_lfe_xll_fir_64;
+ else
+ prCoeff = ff_dca_lfe_fir_64;
}
/* Interpolation */
- for (deciindex = 0; deciindex < num_deci_sample; deciindex++) {
+ for (deciindex = 0; deciindex < 2 * s->lfe; deciindex++) {
s->dcadsp.lfe_fir[idx](samples_out, samples_in, prCoeff);
samples_in++;
samples_out += 2 * 32 * (1 + idx);
break;
}
if (lfe_present) {
- int lf_buf = dca_lfe_index[srcfmt];
- int lf_idx = dca_channels[srcfmt];
+ int lf_buf = ff_dca_lfe_index[srcfmt];
+ int lf_idx = ff_dca_channels[srcfmt];
for (i = 0; i < 256; i++) {
samples[0][i] += samples[lf_buf][i] * coef[lf_idx][0];
samples[1][i] += samples[lf_buf][i] * coef[lf_idx][1];
{
int k, l;
int subsubframe = s->current_subsubframe;
-
- const float *quant_step_table;
-
- /* FIXME */
- float (*subband_samples)[DCA_SUBBANDS][8] = s->subband_samples[block_index];
- LOCAL_ALIGNED_16(int32_t, block, [8 * DCA_SUBBANDS]);
+ const uint32_t *quant_step_table;
/*
* Audio data
/* Select quantization step size table */
if (s->bit_rate_index == 0x1f)
- quant_step_table = lossless_quant_d;
+ quant_step_table = ff_dca_lossless_quant;
else
- quant_step_table = lossy_quant_d;
+ quant_step_table = ff_dca_lossy_quant;
- for (k = base_channel; k < s->prim_channels; k++) {
- float rscale[DCA_SUBBANDS];
+ for (k = base_channel; k < s->audio_header.prim_channels; k++) {
+ int32_t (*subband_samples)[8] = s->dca_chan[k].subband_samples[block_index];
if (get_bits_left(&s->gb) < 0)
return AVERROR_INVALIDDATA;
- for (l = 0; l < s->vq_start_subband[k]; l++) {
+ for (l = 0; l < s->audio_header.vq_start_subband[k]; l++) {
int m;
/* Select the mid-tread linear quantizer */
- int abits = s->bitalloc[k][l];
-
- float quant_step_size = quant_step_table[abits];
-
- /*
- * Determine quantization index code book and its type
- */
+ int abits = s->dca_chan[k].bitalloc[l];
- /* Select quantization index code book */
- int sel = s->quant_index_huffman[k][abits];
+ uint32_t quant_step_size = quant_step_table[abits];
/*
* Extract bits from the bit stream
*/
- if (!abits) {
- rscale[l] = 0;
- memset(block + 8 * l, 0, 8 * sizeof(block[0]));
- } else {
+ if (!abits)
+ memset(subband_samples[l], 0, SAMPLES_PER_SUBBAND *
+ sizeof(subband_samples[l][0]));
+ else {
+ uint32_t rscale;
/* Deal with transients */
- int sfi = s->transition_mode[k][l] && subsubframe >= s->transition_mode[k][l];
- rscale[l] = quant_step_size * s->scale_factor[k][l][sfi] *
- s->scalefactor_adj[k][sel];
+ int sfi = s->dca_chan[k].transition_mode[l] &&
+ subsubframe >= s->dca_chan[k].transition_mode[l];
+ /* Determine quantization index code book and its type.
+ Select quantization index code book */
+ int sel = s->audio_header.quant_index_huffman[k][abits];
+
+ rscale = (s->dca_chan[k].scale_factor[l][sfi] *
+ s->audio_header.scalefactor_adj[k][sel] + 8) >> 4;
if (abits >= 11 || !dca_smpl_bitalloc[abits].vlc[sel].table) {
if (abits <= 7) {
block_code1 = get_bits(&s->gb, size);
block_code2 = get_bits(&s->gb, size);
err = decode_blockcodes(block_code1, block_code2,
- levels, block + 8 * l);
+ levels, subband_samples[l]);
if (err) {
av_log(s->avctx, AV_LOG_ERROR,
"ERROR: block code look-up failed\n");
}
} else {
/* no coding */
- for (m = 0; m < 8; m++)
- block[8 * l + m] = get_sbits(&s->gb, abits - 3);
+ for (m = 0; m < SAMPLES_PER_SUBBAND; m++)
+ subband_samples[l][m] = get_sbits(&s->gb, abits - 3);
}
} else {
/* Huffman coded */
- for (m = 0; m < 8; m++)
- block[8 * l + m] = get_bitalloc(&s->gb,
- &dca_smpl_bitalloc[abits], sel);
+ for (m = 0; m < SAMPLES_PER_SUBBAND; m++)
+ subband_samples[l][m] = get_bitalloc(&s->gb,
+ &dca_smpl_bitalloc[abits], sel);
}
+ s->dcadsp.dequantize(subband_samples[l], quant_step_size, rscale);
}
}
- s->fmt_conv.int32_to_float_fmul_array8(&s->fmt_conv, subband_samples[k][0],
- block, rscale, 8 * s->vq_start_subband[k]);
-
- for (l = 0; l < s->vq_start_subband[k]; l++) {
+ for (l = 0; l < s->audio_header.vq_start_subband[k]; l++) {
int m;
/*
* Inverse ADPCM if in prediction mode
*/
- if (s->prediction_mode[k][l]) {
+ if (s->dca_chan[k].prediction_mode[l]) {
int n;
if (s->predictor_history)
- subband_samples[k][l][0] += (adpcm_vb[s->prediction_vq[k][l]][0] *
- s->subband_samples_hist[k][l][3] +
- adpcm_vb[s->prediction_vq[k][l]][1] *
- s->subband_samples_hist[k][l][2] +
- adpcm_vb[s->prediction_vq[k][l]][2] *
- s->subband_samples_hist[k][l][1] +
- adpcm_vb[s->prediction_vq[k][l]][3] *
- s->subband_samples_hist[k][l][0]) *
- (1.0f / 8192);
- for (m = 1; m < 8; m++) {
- float sum = adpcm_vb[s->prediction_vq[k][l]][0] *
- subband_samples[k][l][m - 1];
+ subband_samples[l][0] += (ff_dca_adpcm_vb[s->dca_chan[k].prediction_vq[l]][0] *
+ (int64_t)s->dca_chan[k].subband_samples_hist[l][3] +
+ ff_dca_adpcm_vb[s->dca_chan[k].prediction_vq[l]][1] *
+ (int64_t)s->dca_chan[k].subband_samples_hist[l][2] +
+ ff_dca_adpcm_vb[s->dca_chan[k].prediction_vq[l]][2] *
+ (int64_t)s->dca_chan[k].subband_samples_hist[l][1] +
+ ff_dca_adpcm_vb[s->dca_chan[k].prediction_vq[l]][3] *
+ (int64_t)s->dca_chan[k].subband_samples_hist[l][0]) +
+ (1 << 12) >> 13;
+ for (m = 1; m < SAMPLES_PER_SUBBAND; m++) {
+ int64_t sum = ff_dca_adpcm_vb[s->dca_chan[k].prediction_vq[l]][0] *
+ (int64_t)subband_samples[l][m - 1];
for (n = 2; n <= 4; n++)
if (m >= n)
- sum += adpcm_vb[s->prediction_vq[k][l]][n - 1] *
- subband_samples[k][l][m - n];
+ sum += ff_dca_adpcm_vb[s->dca_chan[k].prediction_vq[l]][n - 1] *
+ (int64_t)subband_samples[l][m - n];
else if (s->predictor_history)
- sum += adpcm_vb[s->prediction_vq[k][l]][n - 1] *
- s->subband_samples_hist[k][l][m - n + 4];
- subband_samples[k][l][m] += sum * 1.0f / 8192;
+ sum += ff_dca_adpcm_vb[s->dca_chan[k].prediction_vq[l]][n - 1] *
+ (int64_t)s->dca_chan[k].subband_samples_hist[l][m - n + 4];
+ subband_samples[l][m] += (int32_t)(sum + (1 << 12) >> 13);
}
}
+
}
+ /* Backup predictor history for adpcm */
+ for (l = 0; l < DCA_SUBBANDS; l++)
+ AV_COPY128(s->dca_chan[k].subband_samples_hist[l], &subband_samples[l][4]);
+
/*
* Decode VQ encoded high frequencies
*/
- if (s->subband_activity[k] > s->vq_start_subband[k]) {
+ if (s->audio_header.subband_activity[k] > s->audio_header.vq_start_subband[k]) {
if (!s->debug_flag & 0x01) {
av_log(s->avctx, AV_LOG_DEBUG,
"Stream with high frequencies VQ coding\n");
s->debug_flag |= 0x01;
}
- s->dcadsp.decode_hf(subband_samples[k], s->high_freq_vq[k],
- high_freq_vq, subsubframe * 8,
- s->scale_factor[k], s->vq_start_subband[k],
- s->subband_activity[k]);
+
+ s->dcadsp.decode_hf(subband_samples, s->dca_chan[k].high_freq_vq,
+ ff_dca_high_freq_vq,
+ subsubframe * SAMPLES_PER_SUBBAND,
+ s->dca_chan[k].scale_factor,
+ s->audio_header.vq_start_subband[k],
+ s->audio_header.subband_activity[k]);
}
}
}
}
- /* Backup predictor history for adpcm */
- for (k = base_channel; k < s->prim_channels; k++)
- for (l = 0; l < s->vq_start_subband[k]; l++)
- AV_COPY128(s->subband_samples_hist[k][l], &subband_samples[k][l][4]);
-
return 0;
}
-static int dca_filter_channels(DCAContext *s, int block_index)
+static int dca_filter_channels(DCAContext *s, int block_index, int upsample)
{
- float (*subband_samples)[DCA_SUBBANDS][8] = s->subband_samples[block_index];
int k;
- /* 32 subbands QMF */
- for (k = 0; k < s->prim_channels; k++) {
- if (s->channel_order_tab[k] >= 0)
- qmf_32_subbands(s, k, subband_samples[k],
- s->samples_chanptr[s->channel_order_tab[k]],
- M_SQRT1_2 / 32768.0);
+ if (upsample) {
+ LOCAL_ALIGNED(32, float, samples, [DCA_SUBBANDS_X96K], [SAMPLES_PER_SUBBAND]);
+
+ if (!s->qmf64_table) {
+ s->qmf64_table = qmf64_precompute();
+ if (!s->qmf64_table)
+ return AVERROR(ENOMEM);
+ }
+
+ /* 64 subbands QMF */
+ for (k = 0; k < s->audio_header.prim_channels; k++) {
+ int32_t (*subband_samples)[SAMPLES_PER_SUBBAND] =
+ s->dca_chan[k].subband_samples[block_index];
+
+ s->fmt_conv.int32_to_float(samples[0], subband_samples[0],
+ DCA_SUBBANDS_X96K * SAMPLES_PER_SUBBAND);
+
+ if (s->channel_order_tab[k] >= 0)
+ qmf_64_subbands(s, k, samples,
+ s->samples_chanptr[s->channel_order_tab[k]],
+ /* Upsampling needs a factor 2 here. */
+ M_SQRT2 / 32768.0);
+ }
+ } else {
+ /* 32 subbands QMF */
+ LOCAL_ALIGNED(32, float, samples, [DCA_SUBBANDS], [SAMPLES_PER_SUBBAND]);
+
+ for (k = 0; k < s->audio_header.prim_channels; k++) {
+ int32_t (*subband_samples)[SAMPLES_PER_SUBBAND] =
+ s->dca_chan[k].subband_samples[block_index];
+
+ s->fmt_conv.int32_to_float(samples[0], subband_samples[0],
+ DCA_SUBBANDS * SAMPLES_PER_SUBBAND);
+
+ if (s->channel_order_tab[k] >= 0)
+ qmf_32_subbands(s, k, samples,
+ s->samples_chanptr[s->channel_order_tab[k]],
+ M_SQRT1_2 / 32768.0);
+ }
}
/* Generate LFE samples for this subsubframe FIXME!!! */
if (s->lfe) {
- lfe_interpolation_fir(s, s->lfe, 2 * s->lfe,
+ float *samples = s->samples_chanptr[ff_dca_lfe_index[s->amode]];
+ lfe_interpolation_fir(s,
s->lfe_data + 2 * s->lfe * (block_index + 4),
- s->samples_chanptr[dca_lfe_index[s->amode]]);
- /* Outputs 20bits pcm samples */
+ samples);
+ if (upsample) {
+ unsigned i;
+ /* Should apply the filter in Table 6-11 when upsampling. For
+ * now, just duplicate. */
+ for (i = 511; i > 0; i--) {
+ samples[2 * i] =
+ samples[2 * i + 1] = samples[i];
+ }
+ samples[1] = samples[0];
+ }
}
+ /* FIXME: This downmixing is probably broken with upsample.
+ * Probably totally broken also with XLL in general. */
/* Downmixing to Stereo */
- if (s->prim_channels + !!s->lfe > 2 &&
+ if (s->audio_header.prim_channels + !!s->lfe > 2 &&
s->avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) {
dca_downmix(s->samples_chanptr, s->amode, !!s->lfe, s->downmix_coef,
s->channel_order_tab);
am);
return AVERROR_INVALIDDATA;
}
- for (out = 0; out < dca_channels[s->core_downmix_amode]; out++) {
- for (in = 0; in < s->prim_channels + !!s->lfe; in++) {
+ for (out = 0; out < ff_dca_channels[s->core_downmix_amode]; out++) {
+ for (in = 0; in < s->audio_header.prim_channels + !!s->lfe; in++) {
uint16_t tmp = get_bits(&s->gb, 9);
if ((tmp & 0xFF) > 241) {
av_log(s->avctx, AV_LOG_ERROR,
align_get_bits(&s->gb); // byte align
skip_bits(&s->gb, 16); // nAUXCRC16
- // additional data (reserved, cf. ETSI TS 102 114 V1.4.1)
- if ((reserved = (aux_data_end - get_bits_count(&s->gb))) < 0) {
- av_log(s->avctx, AV_LOG_ERROR,
- "Overread auxiliary data by %d bits\n", -reserved);
- return AVERROR_INVALIDDATA;
- } else if (reserved) {
+ /*
+ * additional data (reserved, cf. ETSI TS 102 114 V1.4.1)
+ *
+ * Note: don't check for overreads, aux_data_count can't be trusted.
+ */
+ if ((reserved = (aux_data_end - get_bits_count(&s->gb))) > 0) {
avpriv_request_sample(s->avctx,
"Core auxiliary data reserved content");
skip_bits_long(&s->gb, reserved);
int ret;
/* Sanity check */
- if (s->current_subframe >= s->subframes) {
+ if (s->current_subframe >= s->audio_header.subframes) {
av_log(s->avctx, AV_LOG_DEBUG, "check failed: %i>%i",
- s->current_subframe, s->subframes);
+ s->current_subframe, s->audio_header.subframes);
return AVERROR_INVALIDDATA;
}
s->current_subsubframe = 0;
s->current_subframe++;
}
- if (s->current_subframe >= s->subframes) {
+ if (s->current_subframe >= s->audio_header.subframes) {
/* Read subframe footer */
if ((ret = dca_subframe_footer(s, base_channel)))
return ret;
{
int sign = (code >> 8) - 1;
code &= 0xff;
- return ((dca_dmixtable[code] ^ sign) - sign) * (1.0 / (1U << 15));
+ return ((ff_dca_dmixtable[code] ^ sign) - sign) * (1.0 / (1U << 15));
}
-/**
- * Main frame decoding function
- * FIXME add arguments
- */
-static int dca_decode_frame(AVCodecContext *avctx, void *data,
- int *got_frame_ptr, AVPacket *avpkt)
+static int scan_for_extensions(AVCodecContext *avctx)
{
- AVFrame *frame = data;
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
-
- int lfe_samples;
- int num_core_channels = 0;
- int i, ret;
- float **samples_flt;
DCAContext *s = avctx->priv_data;
- int channels, full_channels;
- int core_ss_end;
-
- s->xch_present = 0;
-
- s->dca_buffer_size = ff_dca_convert_bitstream(buf, buf_size, s->dca_buffer,
- DCA_MAX_FRAME_SIZE + DCA_MAX_EXSS_HEADER_SIZE);
- if (s->dca_buffer_size == AVERROR_INVALIDDATA) {
- av_log(avctx, AV_LOG_ERROR, "Not a valid DCA frame\n");
- return AVERROR_INVALIDDATA;
- }
-
- if ((ret = dca_parse_frame_header(s)) < 0) {
- // seems like the frame is corrupt, try with the next one
- return ret;
- }
- // set AVCodec values with parsed data
- avctx->sample_rate = s->sample_rate;
- avctx->bit_rate = s->bit_rate;
-
- s->profile = FF_PROFILE_DTS;
-
- for (i = 0; i < (s->sample_blocks / 8); i++) {
- if ((ret = dca_decode_block(s, 0, i))) {
- av_log(avctx, AV_LOG_ERROR, "error decoding block\n");
- return ret;
- }
- }
-
- /* record number of core channels incase less than max channels are requested */
- num_core_channels = s->prim_channels;
-
- if (s->ext_coding)
- s->core_ext_mask = dca_ext_audio_descr_mask[s->ext_descr];
- else
- s->core_ext_mask = 0;
+ int core_ss_end, ret = 0;
core_ss_end = FFMIN(s->frame_size, s->dca_buffer_size) * 8;
while (core_ss_end - get_bits_count(&s->gb) >= 32) {
uint32_t bits = get_bits_long(&s->gb, 32);
+ int i;
switch (bits) {
- case 0x5a5a5a5a: {
+ case DCA_SYNCWORD_XCH: {
int ext_amode, xch_fsize;
- s->xch_base_channel = s->prim_channels;
+ s->xch_base_channel = s->audio_header.prim_channels;
/* validate sync word using XCHFSIZE field */
xch_fsize = show_bits(&s->gb, 10);
s->xch_present = 1;
break;
}
- case 0x47004a03:
+ case DCA_SYNCWORD_XXCH:
/* XXCh: extended channels */
/* usually found either in core or HD part in DTS-HD HRA streams,
* but not in DTS-ES which contains XCh extensions instead */
/* check for ExSS (HD part) */
if (s->dca_buffer_size - s->frame_size > 32 &&
- get_bits_long(&s->gb, 32) == DCA_HD_MARKER)
+ get_bits_long(&s->gb, 32) == DCA_SYNCWORD_SUBSTREAM)
ff_dca_exss_parse_header(s);
- avctx->profile = s->profile;
+ return ret;
+}
- full_channels = channels = s->prim_channels + !!s->lfe;
+static int set_channel_layout(AVCodecContext *avctx, int channels, int num_core_channels)
+{
+ DCAContext *s = avctx->priv_data;
+ int i;
if (s->amode < 16) {
avctx->channel_layout = dca_core_channel_layout[s->amode];
- if (s->prim_channels + !!s->lfe > 2 &&
+ if (s->audio_header.prim_channels + !!s->lfe > 2 &&
avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) {
/*
* Neither the core's auxiliary data nor our default tables contain
s->xch_disable = 1;
}
-#if FF_API_REQUEST_CHANNELS
-FF_DISABLE_DEPRECATION_WARNINGS
- if (s->xch_present && !s->xch_disable &&
- (!avctx->request_channels ||
- avctx->request_channels > num_core_channels + !!s->lfe)) {
-FF_ENABLE_DEPRECATION_WARNINGS
-#else
if (s->xch_present && !s->xch_disable) {
-#endif
avctx->channel_layout |= AV_CH_BACK_CENTER;
if (s->lfe) {
avctx->channel_layout |= AV_CH_LOW_FREQUENCY;
- s->channel_order_tab = dca_channel_reorder_lfe_xch[s->amode];
+ s->channel_order_tab = ff_dca_channel_reorder_lfe_xch[s->amode];
} else {
- s->channel_order_tab = dca_channel_reorder_nolfe_xch[s->amode];
+ s->channel_order_tab = ff_dca_channel_reorder_nolfe_xch[s->amode];
}
} else {
channels = num_core_channels + !!s->lfe;
s->xch_present = 0; /* disable further xch processing */
if (s->lfe) {
avctx->channel_layout |= AV_CH_LOW_FREQUENCY;
- s->channel_order_tab = dca_channel_reorder_lfe[s->amode];
+ s->channel_order_tab = ff_dca_channel_reorder_lfe[s->amode];
} else
- s->channel_order_tab = dca_channel_reorder_nolfe[s->amode];
+ s->channel_order_tab = ff_dca_channel_reorder_nolfe[s->amode];
}
if (channels > !!s->lfe &&
if (num_core_channels + !!s->lfe > 2 &&
avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) {
channels = 2;
- s->output = s->prim_channels == 2 ? s->amode : DCA_STEREO;
+ s->output = s->audio_header.prim_channels == 2 ? s->amode : DCA_STEREO;
avctx->channel_layout = AV_CH_LAYOUT_STEREO;
/* Stereo downmix coefficients
s->output = s->core_downmix_amode;
} else {
int am = s->amode & DCA_CHANNEL_MASK;
- if (am >= FF_ARRAY_ELEMS(dca_default_coeffs)) {
+ if (am >= FF_ARRAY_ELEMS(ff_dca_default_coeffs)) {
av_log(s->avctx, AV_LOG_ERROR,
"Invalid channel mode %d\n", am);
return AVERROR_INVALIDDATA;
}
if (num_core_channels + !!s->lfe >
- FF_ARRAY_ELEMS(dca_default_coeffs[0])) {
+ FF_ARRAY_ELEMS(ff_dca_default_coeffs[0])) {
avpriv_request_sample(s->avctx, "Downmixing %d channels",
- s->prim_channels + !!s->lfe);
+ s->audio_header.prim_channels + !!s->lfe);
return AVERROR_PATCHWELCOME;
}
for (i = 0; i < num_core_channels + !!s->lfe; i++) {
- s->downmix_coef[i][0] = dca_default_coeffs[am][i][0];
- s->downmix_coef[i][1] = dca_default_coeffs[am][i][1];
+ s->downmix_coef[i][0] = ff_dca_default_coeffs[am][i][0];
+ s->downmix_coef[i][1] = ff_dca_default_coeffs[am][i][1];
}
}
- av_dlog(s->avctx, "Stereo downmix coeffs:\n");
+ ff_dlog(s->avctx, "Stereo downmix coeffs:\n");
for (i = 0; i < num_core_channels + !!s->lfe; i++) {
- av_dlog(s->avctx, "L, input channel %d = %f\n", i,
+ ff_dlog(s->avctx, "L, input channel %d = %f\n", i,
s->downmix_coef[i][0]);
- av_dlog(s->avctx, "R, input channel %d = %f\n", i,
+ ff_dlog(s->avctx, "R, input channel %d = %f\n", i,
s->downmix_coef[i][1]);
}
- av_dlog(s->avctx, "\n");
+ ff_dlog(s->avctx, "\n");
}
} else {
- av_log(avctx, AV_LOG_ERROR, "Non standard configuration %d !\n", s->amode);
+ av_log(avctx, AV_LOG_ERROR, "Nonstandard configuration %d !\n", s->amode);
return AVERROR_INVALIDDATA;
}
+
+ return 0;
+}
+
+/**
+ * Main frame decoding function
+ * FIXME add arguments
+ */
+static int dca_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame_ptr, AVPacket *avpkt)
+{
+ AVFrame *frame = data;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+
+ int lfe_samples;
+ int num_core_channels = 0;
+ int i, ret;
+ float **samples_flt;
+ DCAContext *s = avctx->priv_data;
+ int channels, full_channels;
+ int upsample = 0;
+
+ s->exss_ext_mask = 0;
+ s->xch_present = 0;
+
+ s->dca_buffer_size = ff_dca_convert_bitstream(buf, buf_size, s->dca_buffer,
+ DCA_MAX_FRAME_SIZE + DCA_MAX_EXSS_HEADER_SIZE);
+ if (s->dca_buffer_size == AVERROR_INVALIDDATA) {
+ av_log(avctx, AV_LOG_ERROR, "Not a valid DCA frame\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if ((ret = dca_parse_frame_header(s)) < 0) {
+ // seems like the frame is corrupt, try with the next one
+ return ret;
+ }
+ // set AVCodec values with parsed data
+ avctx->sample_rate = s->sample_rate;
+ avctx->bit_rate = s->bit_rate;
+
+ s->profile = FF_PROFILE_DTS;
+
+ for (i = 0; i < (s->sample_blocks / SAMPLES_PER_SUBBAND); i++) {
+ if ((ret = dca_decode_block(s, 0, i))) {
+ av_log(avctx, AV_LOG_ERROR, "error decoding block\n");
+ return ret;
+ }
+ }
+
+ /* record number of core channels incase less than max channels are requested */
+ num_core_channels = s->audio_header.prim_channels;
+
+ if (s->ext_coding)
+ s->core_ext_mask = dca_ext_audio_descr_mask[s->ext_descr];
+ else
+ s->core_ext_mask = 0;
+
+ ret = scan_for_extensions(avctx);
+
+ avctx->profile = s->profile;
+
+ full_channels = channels = s->audio_header.prim_channels + !!s->lfe;
+
+ ret = set_channel_layout(avctx, channels, num_core_channels);
+ if (ret < 0)
+ return ret;
avctx->channels = channels;
/* get output buffer */
- frame->nb_samples = 256 * (s->sample_blocks / 8);
+ frame->nb_samples = 256 * (s->sample_blocks / SAMPLES_PER_SUBBAND);
+ if (s->exss_ext_mask & DCA_EXT_EXSS_XLL) {
+ int xll_nb_samples = s->xll_segments * s->xll_smpl_in_seg;
+ /* Check for invalid/unsupported conditions first */
+ if (s->xll_residual_channels > channels) {
+ av_log(s->avctx, AV_LOG_WARNING,
+ "DCA: too many residual channels (%d, core channels %d). Disabling XLL\n",
+ s->xll_residual_channels, channels);
+ s->exss_ext_mask &= ~DCA_EXT_EXSS_XLL;
+ } else if (xll_nb_samples != frame->nb_samples &&
+ 2 * frame->nb_samples != xll_nb_samples) {
+ av_log(s->avctx, AV_LOG_WARNING,
+ "DCA: unsupported upsampling (%d XLL samples, %d core samples). Disabling XLL\n",
+ xll_nb_samples, frame->nb_samples);
+ s->exss_ext_mask &= ~DCA_EXT_EXSS_XLL;
+ } else {
+ if (2 * frame->nb_samples == xll_nb_samples) {
+ av_log(s->avctx, AV_LOG_INFO,
+ "XLL: upsampling core channels by a factor of 2\n");
+ upsample = 1;
+
+ frame->nb_samples = xll_nb_samples;
+ // FIXME: Is it good enough to copy from the first channel set?
+ avctx->sample_rate = s->xll_chsets[0].sampling_frequency;
+ }
+ /* If downmixing to stereo, don't decode additional channels.
+ * FIXME: Using the xch_disable flag for this doesn't seem right. */
+ if (!s->xch_disable)
+ avctx->channels += s->xll_channels - s->xll_residual_channels;
+ }
+ }
+
+ /* FIXME: This is an ugly hack, to just revert to the default
+ * layout if we have additional channels. Need to convert the XLL
+ * channel masks to libav channel_layout mask. */
+ if (av_get_channel_layout_nb_channels(avctx->channel_layout) != avctx->channels)
+ avctx->channel_layout = 0;
+
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
/* filter to get final output */
- for (i = 0; i < (s->sample_blocks / 8); i++) {
+ for (i = 0; i < (s->sample_blocks / SAMPLES_PER_SUBBAND); i++) {
int ch;
-
+ unsigned block = upsample ? 512 : 256;
for (ch = 0; ch < channels; ch++)
- s->samples_chanptr[ch] = samples_flt[ch] + i * 256;
+ s->samples_chanptr[ch] = samples_flt[ch] + i * block;
for (; ch < full_channels; ch++)
- s->samples_chanptr[ch] = s->extra_channels[ch - channels] + i * 256;
+ s->samples_chanptr[ch] = s->extra_channels[ch - channels] + i * block;
- dca_filter_channels(s, i);
+ dca_filter_channels(s, i, upsample);
/* If this was marked as a DTS-ES stream we need to subtract back- */
/* channel from SL & SR to remove matrixed back-channel signal */
}
/* update lfe history */
- lfe_samples = 2 * s->lfe * (s->sample_blocks / 8);
+ lfe_samples = 2 * s->lfe * (s->sample_blocks / SAMPLES_PER_SUBBAND);
for (i = 0; i < 2 * s->lfe * 4; i++)
s->lfe_data[i] = s->lfe_data[i + lfe_samples];
+ if (s->exss_ext_mask & DCA_EXT_EXSS_XLL) {
+ ret = ff_dca_xll_decode_audio(s, frame);
+ if (ret < 0)
+ return ret;
+ }
/* AVMatrixEncoding
*
* DCA_STEREO_TOTAL (Lt/Rt) is equivalent to Dolby Surround */
s->avctx = avctx;
dca_init_vlcs();
- avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
+ avpriv_float_dsp_init(&s->fdsp, avctx->flags & AV_CODEC_FLAG_BITEXACT);
ff_mdct_init(&s->imdct, 6, 1, 1.0);
ff_synth_filter_init(&s->synth);
ff_dcadsp_init(&s->dcadsp);
avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
/* allow downmixing to stereo */
-#if FF_API_REQUEST_CHANNELS
-FF_DISABLE_DEPRECATION_WARNINGS
- if (avctx->request_channels == 2)
- avctx->request_channel_layout = AV_CH_LAYOUT_STEREO;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
if (avctx->channels > 2 &&
avctx->request_channel_layout == AV_CH_LAYOUT_STEREO)
avctx->channels = 2;
DCAContext *s = avctx->priv_data;
ff_mdct_end(&s->imdct);
av_freep(&s->extra_channels_buffer);
+ av_freep(&s->xll_sample_buf);
+ av_freep(&s->qmf64_table);
return 0;
}
-static const AVProfile profiles[] = {
- { FF_PROFILE_DTS, "DTS" },
- { FF_PROFILE_DTS_ES, "DTS-ES" },
- { FF_PROFILE_DTS_96_24, "DTS 96/24" },
- { FF_PROFILE_DTS_HD_HRA, "DTS-HD HRA" },
- { FF_PROFILE_DTS_HD_MA, "DTS-HD MA" },
- { FF_PROFILE_UNKNOWN },
-};
-
static const AVOption options[] = {
{ "disable_xch", "disable decoding of the XCh extension", offsetof(DCAContext, xch_disable), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM },
+ { "disable_xll", "disable decoding of the XLL extension", offsetof(DCAContext, xll_disable), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM },
{ NULL },
};
.init = dca_decode_init,
.decode = dca_decode_frame,
.close = dca_decode_end,
- .capabilities = CODEC_CAP_CHANNEL_CONF | CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
- .profiles = NULL_IF_CONFIG_SMALL(profiles),
+ .profiles = NULL_IF_CONFIG_SMALL(ff_dca_profiles),
.priv_class = &dca_decoder_class,
};
projects / ffmpeg / blobdiff