summaryrefslogtreecommitdiff
path: root/silk/dec_API.c
diff options
context:
space:
mode:
authorTimothy B. Terriberry <tterribe@xiph.org>2011-10-17 14:20:55 -0700
committerGregory Maxwell <greg@xiph.org>2011-10-17 23:31:20 -0400
commit6559d36a46cbc72ecb2c055a943ff1d35696533f (patch)
tree2adb0f9717409318ddb00cd84ad0a14aae992623 /silk/dec_API.c
parentf2d6480f90b47ff942b590f7a4194ba381029702 (diff)
downloadopus-6559d36a46cbc72ecb2c055a943ff1d35696533f.tar.gz
Remove redundant mid-only flag when side VAD flag is set.
If there is activity in a regular, side SILK frame, then it must be coded, so we don't need to send a mid-only flag.
Diffstat (limited to 'silk/dec_API.c')
-rw-r--r--silk/dec_API.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/silk/dec_API.c b/silk/dec_API.c
index 9b7bd4a7..d979e5be 100644
--- a/silk/dec_API.c
+++ b/silk/dec_API.c
@@ -212,7 +212,7 @@ opus_int silk_Decode(
{
silk_stereo_decode_pred( psRangeDec, MS_pred_Q13 );
/* For LBRR data, decode mid-only flag only if side-channel's LBRR flag is false */
- if( lostFlag == FLAG_DECODE_NORMAL ||
+ if( ( lostFlag == FLAG_DECODE_NORMAL && channel_state[ 1 ].VAD_flags[ channel_state[ 0 ].nFramesDecoded ] == 0 ) ||
( lostFlag == FLAG_DECODE_LBRR && channel_state[ 1 ].LBRR_flags[ channel_state[ 0 ].nFramesDecoded ] == 0 ) )
{
silk_stereo_decode_mid_only( psRangeDec, &decode_only_middle );