#define LTP_ORDER 5
static void silk_decode_frame(SilkContext *s, OpusRangeCoder *rc,
- int frame_num, int channel, int coded_channels, int active, int active1)
+ int frame_num, int channel, int coded_channels,
+ int active, int active1, int redundant)
{
/* per frame */
int voiced; // combines with active to indicate inactive, active, or active+voiced
silk_decode_excitation(s, rc, residual + SILK_MAX_LAG, qoffset_high,
active, voiced);
- /* skip synthesising the side channel if we want mono-only */
- if (s->output_channels == channel)
+ /* skip synthesising the output if we do not need it */
+ // TODO: implement error recovery
+ if (s->output_channels == channel || redundant)
return;
/* generate the output signal */
active[i][j] = ff_opus_rc_dec_log(rc, 1);
redundancy[i] = ff_opus_rc_dec_log(rc, 1);
- if (redundancy[i]) {
- avpriv_report_missing_feature(s->avctx, "LBRR frames");
- return AVERROR_PATCHWELCOME;
+ }
+
+ /* read the per-frame LBRR flags */
+ for (i = 0; i < coded_channels; i++)
+ if (redundancy[i] && duration_ms > 20) {
+ redundancy[i] = ff_opus_rc_dec_cdf(rc, duration_ms == 40 ?
+ ff_silk_model_lbrr_flags_40 : ff_silk_model_lbrr_flags_60);
}
+
+ /* decode the LBRR frames */
+ for (i = 0; i < nb_frames; i++) {
+ for (j = 0; j < coded_channels; j++)
+ if (redundancy[j] & (1 << i)) {
+ int active1 = (j == 0 && !(redundancy[1] & (1 << i))) ? 0 : 1;
+ silk_decode_frame(s, rc, i, j, coded_channels, 1, active1, 1);
+ }
}
for (i = 0; i < nb_frames; i++) {
for (j = 0; j < coded_channels && !s->midonly; j++)
- silk_decode_frame(s, rc, i, j, coded_channels, active[j][i], active[1][i]);
+ silk_decode_frame(s, rc, i, j, coded_channels, active[j][i], active[1][i], 0);
/* reset the side channel if it is not coded */
if (s->midonly && s->frame[1].coded)