From 32d5c2d6d4f7ea22a2e59649e6f26c376d9dfbe0 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jmvalin@jmvalin.ca>
Date: Tue, 4 Oct 2011 20:20:13 -0400
Subject: [PATCH] Disabling LBRR for whever there's a change in
bandwidth/channels/framesize
---
silk/enc_API.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/silk/enc_API.c b/silk/enc_API.c
index 8251f0185..3fa2715d4 100644
--- a/silk/enc_API.c
+++ b/silk/enc_API.c
@@ -177,6 +177,7 @@ opus_int silk_Encode(
opus_int32 TargetRate_bps, MStargetRates_bps[ 2 ], channelRate_bps, LBRR_symbol;
silk_encoder *psEnc = ( silk_encoder * )encState;
opus_int16 buf[ MAX_FRAME_LENGTH_MS * MAX_API_FS_KHZ ];
+ opus_int transition;
psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded = psEnc->state_Fxx[ 1 ].sCmn.nFramesEncoded = 0;
@@ -199,6 +200,9 @@ opus_int silk_Encode(
silk_memcpy( &psEnc->state_Fxx[ 1 ].sCmn.In_HP_State, &psEnc->state_Fxx[ 0 ].sCmn.In_HP_State, sizeof( psEnc->state_Fxx[ 1 ].sCmn.In_HP_State ) );
}
}
+
+ transition = (encControl->payloadSize_ms != psEnc->state_Fxx[ 0 ].sCmn.PacketSize_ms) || (psEnc->nChannelsInternal != encControl->nChannelsInternal);
+
psEnc->nChannelsAPI = encControl->nChannelsAPI;
psEnc->nChannelsInternal = encControl->nChannelsInternal;
@@ -247,6 +251,12 @@ opus_int silk_Encode(
silk_assert( 0 );
return ret;
}
+ if (psEnc->state_Fxx[n].sCmn.first_frame_after_reset || transition)
+ {
+ for( i = 0; i < psEnc->state_Fxx[ 0 ].sCmn.nFramesPerPacket; i++ ) {
+ psEnc->state_Fxx[ n ].sCmn.LBRR_flags[ i ] = 0;
+ }
+ }
}
silk_assert( encControl->nChannelsInternal == 1 || psEnc->state_Fxx[ 0 ].sCmn.fs_kHz == psEnc->state_Fxx[ 1 ].sCmn.fs_kHz );
--
GitLab