* SBC decoder implementation
*/
-#include <stdbool.h>
#include "avcodec.h"
#include "internal.h"
#include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
#include "sbc.h"
#include "sbcdec_data.h"
/* Distribute the new matrix value to the shifted position */
v[offset[i]] =
- ( ff_synmatrix4[i][0] * frame->sb_sample[blk][ch][0] +
- ff_synmatrix4[i][1] * frame->sb_sample[blk][ch][1] +
- ff_synmatrix4[i][2] * frame->sb_sample[blk][ch][2] +
- ff_synmatrix4[i][3] * frame->sb_sample[blk][ch][3] ) >> 15;
+ (int)( (unsigned)ff_synmatrix4[i][0] * frame->sb_sample[blk][ch][0] +
+ (unsigned)ff_synmatrix4[i][1] * frame->sb_sample[blk][ch][1] +
+ (unsigned)ff_synmatrix4[i][2] * frame->sb_sample[blk][ch][2] +
+ (unsigned)ff_synmatrix4[i][3] * frame->sb_sample[blk][ch][3] ) >> 15;
}
/* Compute the samples */
/* Store in output, Q0 */
AV_WN16A(&output_frame->data[ch][blk * 8 + i * 2], av_clip_int16(
- ( v[offset[i] + 0] * ff_sbc_proto_4_40m0[idx + 0] +
- v[offset[k] + 1] * ff_sbc_proto_4_40m1[idx + 0] +
- v[offset[i] + 2] * ff_sbc_proto_4_40m0[idx + 1] +
- v[offset[k] + 3] * ff_sbc_proto_4_40m1[idx + 1] +
- v[offset[i] + 4] * ff_sbc_proto_4_40m0[idx + 2] +
- v[offset[k] + 5] * ff_sbc_proto_4_40m1[idx + 2] +
- v[offset[i] + 6] * ff_sbc_proto_4_40m0[idx + 3] +
- v[offset[k] + 7] * ff_sbc_proto_4_40m1[idx + 3] +
- v[offset[i] + 8] * ff_sbc_proto_4_40m0[idx + 4] +
- v[offset[k] + 9] * ff_sbc_proto_4_40m1[idx + 4] ) >> 15));
+ (int)( (unsigned)v[offset[i] + 0] * ff_sbc_proto_4_40m0[idx + 0] +
+ (unsigned)v[offset[k] + 1] * ff_sbc_proto_4_40m1[idx + 0] +
+ (unsigned)v[offset[i] + 2] * ff_sbc_proto_4_40m0[idx + 1] +
+ (unsigned)v[offset[k] + 3] * ff_sbc_proto_4_40m1[idx + 1] +
+ (unsigned)v[offset[i] + 4] * ff_sbc_proto_4_40m0[idx + 2] +
+ (unsigned)v[offset[k] + 5] * ff_sbc_proto_4_40m1[idx + 2] +
+ (unsigned)v[offset[i] + 6] * ff_sbc_proto_4_40m0[idx + 3] +
+ (unsigned)v[offset[k] + 7] * ff_sbc_proto_4_40m1[idx + 3] +
+ (unsigned)v[offset[i] + 8] * ff_sbc_proto_4_40m0[idx + 4] +
+ (unsigned)v[offset[k] + 9] * ff_sbc_proto_4_40m1[idx + 4] ) >> 15));
}
}
SBCDecContext *sbc = avctx->priv_data;
int i, ch;
+ avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
+
sbc->frame.crc_ctx = av_crc_get_table(AV_CRC_8_EBU);
memset(sbc->dsp.V, 0, sizeof(sbc->dsp.V));
if (frame_length <= 0)
return frame_length;
- avctx->channels =
- frame->channels = sbc->frame.channels;
- frame->format = AV_SAMPLE_FMT_S16P;
+ avctx->channels = sbc->frame.channels;
+
frame->nb_samples = sbc->frame.blocks * sbc->frame.subbands;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
return frame_length;
}
-AVCodec ff_sbc_decoder = {
+const AVCodec ff_sbc_decoder = {
.name = "sbc",
.long_name = NULL_IF_CONFIG_SMALL("SBC (low-complexity subband codec)"),
.type = AVMEDIA_TYPE_AUDIO,
.priv_data_size = sizeof(SBCDecContext),
.init = sbc_decode_init,
.decode = sbc_decode_frame,
- .capabilities = AV_CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
.channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO,
AV_CH_LAYOUT_STEREO, 0},