#include <stddef.h>
#include <stdio.h>
+#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/float_dsp.h"
#include "libavutil/intmath.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/mathematics.h"
-#include "libavutil/audioconvert.h"
#include "libavutil/samplefmt.h"
#include "avcodec.h"
#include "dsputil.h"
int xxch_chset_nch[4];
float xxch_dmix_sf[DCA_CHSETS_MAX];
- uint32_t xxch_downmix; /* downmix enabled per channel set */
uint32_t xxch_dmix_embedded; /* lower layer has mix pre-embedded, per chset */
float xxch_dmix_coeff[DCA_PRIM_CHANNELS_MAX][32]; /* worst case sizing */
s->xxch_dmix_sf[s->xxch_chset] = scale_factor;
for (i = base_channel; i < s->prim_channels; i++) {
- s->xxch_downmix |= (1 << i);
mask[i] = get_bits(&s->gb, s->xxch_nbits_spk_mask);
}
core_spk = get_bits(&s->gb, spkmsk_bits);
s->xxch_core_spkmask = core_spk;
s->xxch_nbits_spk_mask = spkmsk_bits;
- s->xxch_downmix = 0;
s->xxch_dmix_embedded = 0;
/* skip to the end of the header */
return AVERROR_INVALIDDATA;
}
- s->xxch_downmix = 0;
+ s->xxch_dmix_embedded = 0;
} else {
/* we only get here if an XXCH channel set can be added to the mix */
channel_mask = s->xxch_core_spkmask;