#define AVCODEC_DCADEC_H
#include "libavutil/common.h"
+#include "libavutil/crc.h"
#include "libavutil/float_dsp.h"
#include "avcodec.h"
#include "dca_core.h"
#include "dca_exss.h"
#include "dca_xll.h"
+#include "dca_lbr.h"
#define DCA_BUFFER_PADDING_SIZE 1024
#define DCA_PACKET_CORE 0x01
#define DCA_PACKET_EXSS 0x02
#define DCA_PACKET_XLL 0x04
-#define DCA_PACKET_RECOVERY 0x08
+#define DCA_PACKET_LBR 0x08
+#define DCA_PACKET_RECOVERY 0x10
typedef struct DCAContext {
const AVClass *class; ///< class for AVOptions
DCACoreDecoder core; ///< Core decoder context
DCAExssParser exss; ///< EXSS parser context
DCAXllDecoder xll; ///< XLL decoder context
+ DCALbrDecoder lbr; ///< LBR decoder context
DCADSPContext dcadsp;
+ const AVCRC *crctab;
+
uint8_t *buffer; ///< Packet buffer
unsigned int buffer_size;
int ff_dca_set_channel_layout(AVCodecContext *avctx, int *ch_remap, int dca_mask);
-int ff_dca_check_crc(GetBitContext *s, int p1, int p2);
-
void ff_dca_downmix_to_stereo_fixed(DCADSPContext *dcadsp, int32_t **samples,
int *coeff_l, int nsamples, int ch_mask);
void ff_dca_downmix_to_stereo_float(AVFloatDSPContext *fdsp, float **samples,
int *coeff_l, int nsamples, int ch_mask);
+static inline int ff_dca_check_crc(AVCodecContext *avctx, GetBitContext *s,
+ int p1, int p2)
+{
+ DCAContext *dca = avctx->priv_data;
+
+ if (!(avctx->err_recognition & (AV_EF_CRCCHECK | AV_EF_CAREFUL)))
+ return 0;
+ if (((p1 | p2) & 7) || p1 < 0 || p2 > s->size_in_bits || p2 - p1 < 16)
+ return -1;
+ if (av_crc(dca->crctab, 0xffff, s->buffer + p1 / 8, (p2 - p1) / 8))
+ return -1;
+ return 0;
+}
+
static inline int ff_dca_seek_bits(GetBitContext *s, int p)
{
if (p < s->index || p > s->size_in_bits)